notifications

Main/views/AccountView.py

@@ -1,10 +1,10 @@
 from django.contrib.auth.models import User
 from django.db.models import Q
 
-from SprintLib.queue import notify
 from Main.models import Friendship
 from SprintLib.BaseView import BaseView
 from SprintLib.language import languages
+from SprintLib.queue import send_to_queue
 from SprintLib.utils import delete_file, write_bytes
 
 
@@ -46,17 +46,26 @@ class AccountView(BaseView):
             ).first()
             if friendship is None:
                 Friendship.objects.create(from_user=self.request.user, to_user=self.context["account"])
-                notify(self.context['account'], 'friends', f"Пользователь {self.request.user.username} хочет добавить тебя в друзья")
+                send_to_queue("notification", {
+                    "type": "friends_add",
+                    "from_user": self.request.user.id,
+                    "to_user": self.context["account"].id
+                })
             elif friendship.verified or friendship.from_user == self.request.user:
                 friendship.delete()
             else:
                 if self.request.POST["to_do"] == "yes":
                     friendship.verified = True
                     friendship.save()
-                    notify(self.context['account'], 'friends', f"Пользователь {self.request.user.username} добавил тебя в друзья")
                 else:
                     friendship.delete()
-                    notify(self.context['account'], 'friends', f"Пользователь {self.request.user.username} отклонил твою заявку")
+                send_to_queue("notification", {
+                    "type": "friends_accept",
+                    "from_user": self.request.user.id,
+                    "to_user": self.context['account'].id,
+                    "accepted": self.request.POST['to_do'] == 'yes'
+                })
+
         return "/account?username=" + self.request.GET["username"]
 
     def post_upload_photo(self):

Main/views/SendCodeView.py

@@ -5,7 +5,7 @@ from django.contrib.auth.models import User
 
 from Sprint import settings
 from SprintLib.BaseView import BaseView
-from SprintLib.queue import notify
+from SprintLib.queue import send_to_queue
 
 
 class SendCodeView(BaseView):
@@ -23,7 +23,10 @@ class SendCodeView(BaseView):
         print(f"Отправлен код для {username}", code)
         user.userinfo.code = code
         user.userinfo.save()
-        notify(user, "any", "Код для входа в сервис: " + str(code))
+        send_to_queue("telegram", {
+            "chat_id": user.userinfo.telegram_chat_id,
+            "text": "Код для входа в сервис: " + str(code)
+        })
         return {"success": True, "message": "Код отправлен"}
 
     def post_check(self):