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

fix: support any-method for legacy signal query

Browse Source
This commit is contained in:
Johnathen Sheppard
2024-02-19 16:14:08 +01:00
parent a2b045cf97
commit d0109e080a
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/interface.py
View File

@@ -162,7 +162,10 @@ def get_dispatch():
lines_timeout = lines_unfiltered.filter(DispatchObject.timestamp < timeout_cutoff_timestamp) lines_timeout = lines_unfiltered.filter(DispatchObject.timestamp < timeout_cutoff_timestamp)
if method != "all": if method != "all":
dispatch_objects = lines_timeout.filter(DispatchObject.method == method).all() dispatch_objects = lines_timeout.filter(DispatchObject.method==method).all()
user_settings = db.session.query(UserSettings).filter(UserSettings.user==user)
if method == user_settings.get_highest_prio_method():
dispatch_objects += lines_timeout.filter(DispatchObject.method=="any").all()
else: else:
dispatch_objects = lines_timeout.all() dispatch_objects = lines_timeout.all()
@@ -185,6 +188,10 @@ def get_dispatch():
dispatch_by_person[dobj.username] += "\n{}".format(dobj.message) dispatch_by_person[dobj.username] += "\n{}".format(dobj.message)
dispatch_secrets.append(dobj.dispatch_secret) dispatch_secrets.append(dobj.dispatch_secret)
# legacy hack #
if method == "any":
method = "signal"
response = [ { "person" : tupel[0].decode("utf-8"), response = [ { "person" : tupel[0].decode("utf-8"),
"message" : tupel[1], "message" : tupel[1],
"method" : method, "method" : method,