From 70ccb3cf25dd19cb5be5b6a46f35fc13000c6c0a Mon Sep 17 00:00:00 2001 From: TonyJabbour Date: Tue, 28 Sep 2021 22:01:17 +0200 Subject: [PATCH] Add some changes for webhook --- bin/lib/Tracker.py | 4 ++-- bin/packages/Term.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/lib/Tracker.py b/bin/lib/Tracker.py index 20be8cf2..8829e2a4 100755 --- a/bin/lib/Tracker.py +++ b/bin/lib/Tracker.py @@ -107,7 +107,7 @@ def get_tracker_mails(tracker_uuid): return list(r_serv_tracker.smembers('tracker:mail:{}'.format(tracker_uuid))) def get_tracker_webhook(tracker_uuid): - return r_serv_tracker.hget('tracker:{}'.format(tracker_uuid), 'webhook') + return r_serv_tracker.hget('tracker:webhook:{}'.format(tracker_uuid)) def get_tracker_uuid_sources(tracker_uuid): return list(r_serv_tracker.smembers(f'tracker:sources:{tracker_uuid}')) @@ -472,7 +472,7 @@ def create_tracker(tracker, tracker_type, user_id, level, tags, mails, descripti for source in sources: # escape source ? r_serv_tracker.sadd(f'tracker:sources:{tracker_uuid}', escape(source)) - + r_serv_tracker.sadd(f'tracker:webhook:{tracker_uuid}', webhook) # toggle refresh module tracker list/set r_serv_tracker.set('tracker:refresh:{}'.format(tracker_type), time.time()) if tracker_type != old_type: # toggle old type refresh diff --git a/bin/packages/Term.py b/bin/packages/Term.py index 5bd91cd0..956dd2e7 100755 --- a/bin/packages/Term.py +++ b/bin/packages/Term.py @@ -375,7 +375,7 @@ def get_term_mails(term_uuid): return list(r_serv_term.smembers('tracker:mail:{}'.format(term_uuid))) def get_term_webhook(term_uuid): - return list(r_serv_term.hget('tracker:webhook:{}'.format(term_uuid))) + return r_serv_term.hget('tracker:webhook:{}'.format(term_uuid)) def add_tracked_item(term_uuid, item_id, item_date): # track item