diff --git a/zephyr/views.py b/zephyr/views.py index 7932677616..0211311a7c 100644 --- a/zephyr/views.py +++ b/zephyr/views.py @@ -170,8 +170,6 @@ def zephyr(request): return json_error("Invalid field 'time'") return zephyr_backend(request, request.user) -huddle_dedup = {} - @login_required @require_post def forge_zephyr(request): @@ -192,15 +190,12 @@ def forge_zephyr(request): if (request.POST['type'] == 'personal' and ',' in request.POST['recipient']): # Huddle message, need to make sure we're not syncing it twice! - huddle_val = hashlib.md5(request.POST['sender'] + "|" + - request.POST['new_zephyr'] + "|" + - request.POST['time']).hexdigest() - if huddle_val in huddle_dedup: + if Zephyr.objects.filter(sender=request.POST['sender'], + content=request.POST['new_zephyr'], + time=request.POST['time']): # This is a duplicate huddle message, deduplicate! return json_success() - huddle_dedup[huddle_val] = True - # Now confirm all the other recipients exist in our system for user_email in request.POST["recipient"].split(","): try: diff --git a/zephyr/zephyr_mirror.py b/zephyr/zephyr_mirror.py index b1667b456d..48bc01c867 100644 --- a/zephyr/zephyr_mirror.py +++ b/zephyr/zephyr_mirror.py @@ -192,7 +192,7 @@ def zephyr_to_humbug(options): def get_zephyrs(last_received): browser.addheaders.append(('X-CSRFToken', csrf_token)) submit_hash = {'last_received': last_received, - "mit_sync_bot": True} + "mit_sync_bot": 'yes'} submit_data = urllib.urlencode([(k, v.encode('utf-8')) for k,v in submit_hash.items()]) res = browser.open("https://app.humbughq.com/get_updates_longpoll", submit_data) return simplejson.loads(res.read())['zephyrs']