Bugfix (login required but Telegram bot doesn't provide it)

bot/views/telegram.py

@@ -9,7 +9,7 @@ from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.db.utils import IntegrityError
 from django.conf import settings
-from counter.views.counter import reset_counter
+from counter.views.counter import perform_reset
 
 import json
 import requests
@@ -160,11 +160,7 @@ def webhook(request):
                 yes_counter = telegram_user.counter
                 seum_message = m
 
-            reset_counter({
-                'who': telegram_ser.counter.id,
-                'reason': seum_message,
-                'counter': yes_counter.id
-            })
+            reset_counter(telegram_ser.counter, binyes_counter, seum_message,)
     except TelegramUser.DoesNotExist:
         print('in that case we send a link to the user')
         if chat['type'] == 'private' and chat['id'] == telegram_user_id:

counter/views/counter.py

@@ -126,36 +126,41 @@ def reset_counter(request):
             except Counter.DoesNotExist:
                 return HttpResponseRedirect(data['redirect'][0])
 
-        reset = Reset(counter=counter, who=who, reason=data['reason'][0])
-
         # we check that the seumer is the autenticated user
-        if reset.who.user is None or reset.who.user != request.user:
+        if who.user is None or who.user != request.user:
             return HttpResponseRedirect(data['redirect'][0])
 
-        reset.save()
+        reason = data['reason'][0]
+        perform_reset(who, counter, reason)
 
-        # Now we deal with the hashtags
-        keywords = parseSeumReason(reason)
-        Hashtag.objects.bulk_create([Hashtag(reset=reset, keyword=keyword) for keyword in keywords])
+    return HttpResponseRedirect(data['redirect'][0])
 
-        # We send the emails only to those who want
-        emails = [u['email'] for u in Counter.objects.filter(email_notifications=True).values('email')]
-        # Now send emails to everyone
-        if reset.who is None or reset.who == counter:
-            selfSeum = True
-        else:
-            selfSeum = False
-        text_of_email = render_to_string(
-            'seumEmail.txt', {'reason': data['reason'][0],
-                              'name': counter.name,
-                              'who': reset.who,
-                              'selfSeum': selfSeum,
-                              })
-        email_to_send = EmailMessage(
-            '[SeumBook] ' + counter.trigramme + ' a le seum',
-            text_of_email,
-            'SeumMan <seum@merigoux.ovh>', emails, [],
-            reply_to=emails)
-        email_to_send.send(fail_silently=True)
 
-    return HttpResponseRedirect(data['redirect'][0])
+def perform_reset(who, counter, reason):
+    reset = Reset(counter=counter, who=who, reason=reason)
+
+    reset.save()
+
+    # Now we deal with the hashtags
+    keywords = parseSeumReason(reason)
+    Hashtag.objects.bulk_create([Hashtag(reset=reset, keyword=keyword) for keyword in keywords])
+
+    # We send the emails only to those who want
+    emails = [u['email'] for u in Counter.objects.filter(email_notifications=True).values('email')]
+    # Now send emails to everyone
+    if reset.who is None or reset.who == counter:
+        selfSeum = True
+    else:
+        selfSeum = False
+    text_of_email = render_to_string(
+        'seumEmail.txt', {'reason': reason,
+                          'name': counter.name,
+                          'who': reset.who,
+                          'selfSeum': selfSeum,
+                          })
+    email_to_send = EmailMessage(
+        '[SeumBook] ' + counter.trigramme + ' a le seum',
+        text_of_email,
+        'SeumMan <seum@merigoux.ovh>', emails, [],
+        reply_to=emails)
+    email_to_send.send(fail_silently=True)