sheppy/atlantis-event-dispatcher
1
0
Fork 0
mirror of https://github.com/FAUSheppy/atlantis-event-dispatcher synced 2025-12-06 06:21:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: support dynamic links in msg or link-field
Some checks failed
ci / docker (push) Failing after 17s
Details

Browse Source
This commit is contained in:
Johnathen Sheppard
2025-06-05 21:45:16 +02:00
parent 35f9fc2a99
commit 4e4f53b330
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
client/dispatch-query.py
View File

@@ -27,7 +27,7 @@ def debug_send(uuid, data, fail_it=False):
def email_send(dispatch_uuid, email_address, message, smtp_target, def email_send(dispatch_uuid, email_address, message, smtp_target,
smtp_target_port, smtp_user, smtp_pass): smtp_target_port, smtp_user, smtp_pass):
'''Send message via email''' '''Send message via email'''
if not email_address: if not email_address:
print("Missing E-Mail Address for STMP send", file=sys.stderr) print("Missing E-Mail Address for STMP send", file=sys.stderr)
report_failed_dispatch(dispatch_uuid, "Missing email-field in dispatch infor") report_failed_dispatch(dispatch_uuid, "Missing email-field in dispatch infor")
@@ -54,21 +54,32 @@ def ntfy_api_get_topic(ntfy_api_server, ntfy_api_token, username):
print(r.text) print(r.text)
return r.json().get("topic") return r.json().get("topic")
def ntfy_send(dispatch_uuid, user_topic, title, message, ntfy_push_target, ntfy_user, ntfy_pass): def ntfy_send(dispatch_uuid, user_topic, title, message, link,
ntfy_push_target, ntfy_user, ntfy_pass):
'''Send message via NTFY topic''' '''Send message via NTFY topic'''
# check message for links #
if not link:
pattern = r"https:\/\/[^\s]+"
match = re.search(pattern, text)
if match:
link = match.group(0)
# limit message length and title # # limit message length and title #
title = title or "" title = title or ""
message = message or "" message = message or ""
message = message[:1024] message = message[:1024]
title = title[:512] title = title[:512]
if not user_topic: if not user_topic:
report_failed_dispatch(dispatch_uuid, "No user topic") report_failed_dispatch(dispatch_uuid, "No user topic")
return return
try: try:
# build message # # build message #
payload = { payload = {
"topic" : user_topic, "topic" : user_topic,
@@ -77,7 +88,7 @@ def ntfy_send(dispatch_uuid, user_topic, title, message, ntfy_push_target, ntfy_
#"tags" : [], #"tags" : [],
"priority" : 4, "priority" : 4,
#"attach" : None, #"attach" : None,
"click" : "https://vid.pr0gramm.com/2022/11/06/ed66c8c5a9cd1a3b.mp4", "click" : link,
#"actions" : [] #"actions" : []
} }
@@ -140,7 +151,7 @@ if __name__ == "__main__":
parser.add_argument('--loop', default=True, action=argparse.BooleanOptionalAction) parser.add_argument('--loop', default=True, action=argparse.BooleanOptionalAction)
args = parser.parse_args() args = parser.parse_args()
dispatch_server = args.dispatch_server or os.environ.get("DISPATCH_SERVER") dispatch_server = args.dispatch_server or os.environ.get("DISPATCH_SERVER")
@@ -166,7 +177,7 @@ if __name__ == "__main__":
while args.loop or first_run: while args.loop or first_run:
# request dispatches # # request dispatches #
response = requests.get(dispatch_server + response = requests.get(dispatch_server +
"/get-dispatch?method=all&timeout=0&dispatch-access-token={}".format(DISPATCH_ACCESS_TOKEN)) "/get-dispatch?method=all&timeout=0&dispatch-access-token={}".format(DISPATCH_ACCESS_TOKEN))
# check status # # check status #
@@ -190,6 +201,7 @@ if __name__ == "__main__":
method = entry["method"] method = entry["method"]
message = entry["message"] message = entry["message"]
title = entry.get("title") title = entry.get("title")
link = entry.get("link")
# method dependent fields # # method dependent fields #
phone = entry.get("phone") phone = entry.get("phone")
@@ -200,7 +212,7 @@ if __name__ == "__main__":
pass pass
elif method == "ntfy": elif method == "ntfy":
user_topic = ntfy_api_get_topic(ntfy_api_server, ntfy_api_token, user) user_topic = ntfy_api_get_topic(ntfy_api_server, ntfy_api_token, user)
ntfy_send(dispatch_uuid, user_topic, title, message, ntfy_send(dispatch_uuid, user_topic, title, message, link,
ntfy_push_target, ntfy_user, ntfy_pass) ntfy_push_target, ntfy_user, ntfy_pass)
elif method == "email": elif method == "email":
email_send(dispatch_uuid, email_address, message, smtp_target, email_send(dispatch_uuid, email_address, message, smtp_target,
@@ -216,6 +228,6 @@ if __name__ == "__main__":
# wait a moment # # wait a moment #
if args.loop: if args.loop:
time.sleep(5) time.sleep(5)
# handle non-loop runs # # handle non-loop runs #
first_run = False first_run = False