extern/apprise-api
1
0
Fork 0
mirror of https://github.com/caronc/apprise-api.git synced 2025-08-09 22:57:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

apprise:// payload handling fixed with tags from CLI (#110)

Browse Source
This commit is contained in:
Chris Caron
2023-03-17 14:23:47 -04:00
committed by GitHub
parent ebe0a7fecc
commit 314cca276d
2 changed files with 135 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
apprise_api/api/views.py
View File

@ -615,35 +615,43 @@ class NotifyView(View):
# Validation - Tag Logic:
# "TagA" : TagA
# "TagA, TagB" : TagA OR TagB
# "TagA TagB" : TagA AND TagB
# "TagA TagC, TagB" : (TagA AND TagC) OR TagB
# ['TagA', 'TagB'] : TagA OR TagB
# [('TagA', 'TagC'), 'TagB'] : (TagA AND TagC) OR TagB
# [('TagB', 'TagC')] : TagB AND TagC
if not TAG_VALIDATION_RE.match(content.get('tag')):
msg = _('Unsupported characters found in tag definition.')
status = ResponseCode.bad_request
return HttpResponse(msg, status=status) \
if not json_response else JsonResponse({
'error': msg,
},
encoder=JSONEncoder,
safe=False,
status=status,
)
tag = content.get('tag')
if isinstance(tag, (list, set, tuple)):
# Assign our tags as they were provided
tags = tag
# If we get here, our specified tag was valid
tags = []
for _tag in TAG_DETECT_RE.findall(content.get('tag')):
tag = _tag.strip()
if not tag:
continue
elif isinstance(tag, str):
if not TAG_VALIDATION_RE.match(content.get('tag')):
msg = _('Unsupported characters found in tag definition.')
status = ResponseCode.bad_request
return HttpResponse(msg, status=status) \
if not json_response else JsonResponse({
'error': msg,
},
encoder=JSONEncoder,
safe=False,
status=status,
)
# Disect our results
group = TAG_AND_DELIM_RE.split(tag)
if len(group) > 1:
tags.append(tuple(group))
else:
tags.append(tag)
# If we get here, our specified tag was valid
tags = []
for _tag in TAG_DETECT_RE.findall(content.get('tag')):
tag = _tag.strip()
if not tag:
continue
# Disect our results
group = TAG_AND_DELIM_RE.split(tag)
if len(group) > 1:
tags.append(tuple(group))
else:
tags.append(tag)
# Update our tag block
content['tag'] = tags