extern/apprise
1
0
Fork 0
mirror of https://github.com/caronc/apprise.git synced 2024-10-04 17:22:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

applied user feedback

Browse Source
This commit is contained in:
Chris Caron 2024-08-29 17:35:16 -04:00
parent a2b1115873
commit 9f5030945f
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apprise/plugins/wxpusher.py
View File

@ -55,13 +55,31 @@ IS_USER = re.compile(
r'^\s*(?P<full>(?P<prefix>UID_)(?P<user>[^\s]+))\s*$', re.I)
WXPUSHER_RESPONSE_CODES = {
1000: "The request was processed successfully.",
1001: "The token provided in the request is missing.",
1002: "The token provided in the request is incorrect or expired.",
1003: "The body of the message was not provided.",
1004: "The user or topic you're trying to send the message to does not "
"exist",
1005: "The app or topic binding process failed.",
1006: "There was an error in sending the message.",
1007: "The message content exceeds the allowed length.",
1008: "The API call frequency is too high and the server rejected the "
"request.",
1009: "There might be other issues that are not explicitly covered by "
"the above codes",
1010: "The IP address making the request is not whitelisted.",
}
class WxPusherContentType:
"""
Defines the different supported content types
"""
TEXT = 0
HTML = 1
MARKDOWN = 2
TEXT = 1
HTML = 2
MARKDOWN = 3
class SubscriptionType:
@ -254,8 +272,12 @@ class NotifyWxPusher(NotifyBase):
len(self._users) + len(self._topics)))
else:
error_str = content.get('msg') if content else (
WXPUSHER_RESPONSE_CODES.get(
content.get("code") if content else None,
"An unknown error occured."))
# We had a problem
error_str = content.get('msg') if content else None
status_str = \
NotifyWxPusher.http_response_code_lookup(
r.status_code) if not error_str else error_str

6
test/test_plugin_wxpusher.py
View File

@ -241,7 +241,7 @@ def test_plugin_wxpusher_edge_cases(mock_post):
'appToken': 'AT_appid',
'content': 'test body',
'summary': 'My Title',
'contentType': 0,
'contentType': 1,
'topicIds': [],
'uids': ['UID_abcd'],
'url': None,
@ -286,7 +286,7 @@ def test_plugin_wxpusher_result_set(mock_post):
'appToken': 'AT_appid',
'content': 'test body',
'summary': 'My Title',
'contentType': 0,
'contentType': 1,
'topicIds': [123],
'uids': ['UID_456'],
'url': None,
@ -316,7 +316,7 @@ def test_plugin_wxpusher_result_set(mock_post):
'appToken': 'AT_appid',
'content': 'test body',
'summary': 'My Title',
'contentType': 0,
'contentType': 1,
'topicIds': [123456789],
'uids': ['UID_123', 'UID_abc'],
'url': None,