Added notification blocks

Author: Seluj78

backend/PyMatcha/models/notification.py

@@ -22,6 +22,7 @@
 from datetime import datetime
 from typing import Optional
 
+from PyMatcha.models.user import User
 from PyMatcha.utils import create_notifications_table
 from PyMatcha.utils.orm import Field
 from PyMatcha.utils.orm import Model
@@ -40,17 +41,21 @@ class Notification(Model):
 
     @staticmethod
     def create(
+        trigger_id: int,
         user_id: int,
         content: str,
         type: str,
         link_to: Optional[str],
         is_seen: bool = False,
         dt_received: datetime = datetime.utcnow(),
-    ) -> Notification:
+    ) -> Optional[Notification]:
         if type not in ["match", "like", "superlike", "unlike", "view", "message", "message_like"]:
             raise ValueError(
                 "type must be one of ['match', 'like', 'superlike', 'unlike', 'view', 'message', 'message_like']"
             )
+        blocked_ids = [block.blocked_id for block in User.get(id=user_id).get_blocks()]
+        if trigger_id in blocked_ids:
+            return None
         new_notif = Notification(
             user_id=user_id, content=content, type=type, link_to=link_to, is_seen=is_seen, dt_received=dt_received
         )

backend/PyMatcha/routes/api/like.py

@@ -55,15 +55,21 @@ def like_profile(uid):
     if u.already_likes(current_user.id):
         Match.create(user_1=current_user.id, user_2=u.id)
         Notification.create(
-            user_id=u.id, content=f"{u.first_name} liked you! Go check them out!", type="like", link_to=f"users/{u.id}"
+            trigger_id=current_user.id,
+            user_id=u.id,
+            content=f"{current_user.first_name} liked you! Go check them out!",
+            type="like",
+            link_to=f"users/{current_user.id}",
         )
         Notification.create(
+            trigger_id=current_user.id,
             user_id=u.id,
             content=f"You and {current_user.first_name} matched!",
             type="match",
             link_to=f"conversation/{current_user.id}",
         )
         Notification.create(
+            trigger_id=u.id,
             user_id=current_user.id,
             content=f"You and {u.first_name} matched!",
             type="match",
@@ -73,15 +79,20 @@ def like_profile(uid):
 
     if is_superlike:
         Notification.create(
+            trigger_id=current_user.id,
             user_id=u.id,
-            content=f"{u.first_name} superliked you 😏! Go check them out!",
+            content=f"{current_user.first_name} superliked you 😏! Go check them out!",
             type="superlike",
-            link_to=f"users/{u.id}",
+            link_to=f"users/{current_user.id}",
         )
         return Success("Superliked user.")
     else:
         Notification.create(
-            user_id=u.id, content=f"{u.first_name} liked you! Go check them out!", type="like", link_to=f"users/{u.id}"
+            trigger_id=current_user.id,
+            user_id=u.id,
+            content=f"{current_user.first_name} liked you! Go check them out!",
+            type="like",
+            link_to=f"users/{current_user.id}",
         )
         return Success("Liked user.")
 
@@ -99,6 +110,12 @@ def unlike_profile(uid):
         raise BadRequestError("You never liked this person in the first place.")
     Like.get_multi(liked_id=u.id, liker_id=current_user.id).delete()
 
-    Notification.create(user_id=u.id, content=f"{u.first_name} unliked you.", type="unlike", link_to=None)
+    Notification.create(
+        trigger_id=current_user.id,
+        user_id=u.id,
+        content=f"{current_user.first_name} unliked you.",
+        type="unlike",
+        link_to=None,
+    )
 
     return Success(f"Unliked user {u.id}.")

backend/PyMatcha/routes/api/messages.py

@@ -73,6 +73,7 @@ def send_message():
     current_user.send_message(to_id=to_user.id, content=content)
     current_app.logger.debug("/messages -> Message successfully sent to {}.".format(to_uid))
     Notification.create(
+        trigger_id=current_user.id,
         user_id=to_user.id,
         content=f"{current_user.first_name} said: {content}",
         type="message",
@@ -127,6 +128,7 @@ def like_message(message_id):
     message.is_liked = True
     message.save()
     Notification.create(
+        trigger_id=current_user.id,
         user_id=message.from_id,
         content=f"{current_user.first_name} liked you message!",
         type="message_like",

backend/PyMatcha/routes/api/profile/view.py

@@ -47,6 +47,7 @@ def view_profile(uid):
     user_dict["distance"] = _get_distance(current_user.geohash, u.geohash)
 
     Notification.create(
+        trigger_id=current_user.id,
         user_id=u.id,
         content=f"{current_user.first_name} just viewed your profile! Go check their profile out!",
         type="view",