From 63469b013c8dca653d581874a83a6408efa93025 Mon Sep 17 00:00:00 2001 From: Yannik Schmidt Date: Sat, 15 Jul 2023 14:08:10 +0200 Subject: [PATCH] fix: correctly confirm all relevant dispatches ..and not just the first --- interface.py | 5 ++++- signal-query-dispatch.py | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/interface.py b/interface.py index f5b4060..3970911 100755 --- a/interface.py +++ b/interface.py @@ -66,13 +66,16 @@ def get_dispatch(): # accumulate messages by person # dispatch_by_person = dict() + dispatch_secrets = [] for dobj in dispatch_objects: if dobj.username not in dispatch_by_person: dispatch_by_person.update({ dobj.username : dobj.message }) + dispatch_secrets.append(dobj.dispatch_secret) else: dispatch_by_person[dobj.username] += "\n{}".format(dobj.message) + dispatch_secrets.append(dobj.dispatch_secret) - response = [ { "person" : tupel[0], "message" : tupel[1], "method" : method, "uid" : dobj.dispatch_secret } + response = [ { "person" : tupel[0], "message" : tupel[1], "method" : method, "uids" : dispatch_secrets } for tupel in dispatch_by_person.items() ] return flask.jsonify(response) diff --git a/signal-query-dispatch.py b/signal-query-dispatch.py index f5f92b9..422fff4 100755 --- a/signal-query-dispatch.py +++ b/signal-query-dispatch.py @@ -50,7 +50,7 @@ if __name__ == "__main__": user = entry["person"] message = entry["message"] - uid = entry["uid"] + uid_list = entry["uids"] # send message # if entry["method"] == "signal": @@ -60,6 +60,7 @@ if __name__ == "__main__": # confirm dispatch if not args.no_confirm: - confirm_dispatch(args.target, uid) + for uid in uid_list: + confirm_dispatch(args.target, uid) sys.exit(0)