add messages list and friend req list handlers

handlers/levelextras.py

@@ -171,7 +171,7 @@ async def level_scores_handler(request: aiohttp.web.Request) -> aiohttp.web.Resp
     account_id = int(
         post_data["accountID"]
     )  # Lets declare this as we will re-use it later
-    if not auth.check_gjp(account_id, post_data["gjp"]):
+    if not await auth.check_gjp(account_id, post_data["gjp"]):
         return aiohttp.web.Response(text=ResponseCodes.GENERIC_FAIL)
 
     # Creating the current score object.

handlers/profiles.py

@@ -3,12 +3,20 @@
 from objects.accounts import (
     Account,
 )  # Makes it WAY easier to work with the objects inside VSCode
-from helpers.generalhelper import create_offsets_from_page, joint_string, pipe_string
+from helpers.generalhelper import (
+    create_offsets_from_page,
+    joint_string,
+    pipe_string,
+    string_bool,
+    paginate_list,
+    create_offsets_from_page
+)
 from helpers.timehelper import time_ago
 from helpers.auth import auth
 from helpers.searchhelper import search_helper
 from constants import ResponseCodes, Permissions
 from cron.cachelb import top_stars, top_cp
+from objects.accounts import FriendRequest, Message # To be nicer to PyLint
 import aiohttp
 import logging
 
@@ -313,7 +321,7 @@ async def friends_list_handler(request: aiohttp.web.Response):
     account_id = int(post_data["accountID"])
     friends_type = int(post_data["type"])
 
-    if not auth.check_gjp(account_id, post_data["gjp"]):
+    if not await auth.check_gjp(account_id, post_data["gjp"]):
         return aiohttp.web.Response(text=ResponseCodes.GENERIC_FAIL)
 
     id_function = {  # Coro to get a list of friends ids.
@@ -350,4 +358,78 @@ async def friends_list_handler(request: aiohttp.web.Response):
     return aiohttp.web.Response(text=response)
 
 async def friend_req_handler(request: aiohttp.web.Response):
-    """Handles friend requests ."""
+    """Handles friend requests."""
+
+    post_data = await request.post()
+    account_id = int(post_data["accountID"])
+
+    if not await auth.check_gjp(account_id, post_data["gjp"]):
+        return aiohttp.web.Response(text=ResponseCodes.GENERIC_FAIL)
+
+    sent = string_bool(post_data.get("getSent", "0"))
+    page = int(post_data["page"])
+    offset = create_offsets_from_page(page, 10)
+    requests = []
+    response = ""
+
+    if sent:
+        requests = await user_helper.get_friend_requests_from(account_id)
+    else:
+        requests = await user_helper.get_friend_requests_to(account_id)
+
+    for req in paginate_list(requests, page, 10):
+        req : FriendRequest
+        user = await user_helper.get_object(req.target_id if sent else req.account_id)
+        response += joint_string({
+            1: user.username,
+            2: user.user_id,
+            9: user.icon,
+            10: user.colour1,
+            11: user.colour2,
+            14: user.icon_type,
+            15: 0,
+            16: user.account_id,
+            32: req.id,
+            35: req.content_base64,
+            37: req.timestamp,
+            41: req.new
+        }) + "|"
+
+    response = f"{response[:-1]}#{len(requests)}:{offset}:10"
+    logging.debug(response)
+    return aiohttp.web.Response(text=response)
+
+async def message_list_handler(request: aiohttp.web.Response):
+    """Handles message list."""
+
+    # Looks familiar huh??
+    post_data = await request.post()
+    account_id = int(post_data["accountID"])
+
+    if not await auth.check_gjp(account_id, post_data["gjp"]):
+        return aiohttp.web.Response(text=ResponseCodes.GENERIC_FAIL)
+
+    sent = string_bool(post_data.get("getSent", "0"))
+    page = int(post_data["page"])
+    offset = create_offsets_from_page(page, 10)
+    messages = await user_helper.get_messages(account_id, sent, page)
+    message_count = await user_helper.get_message_count(account_id, sent)
+    response = ""
+
+    for msg in messages:
+        msg: Message
+        user = await user_helper.get_object(msg.target_id if not sent else msg.account_id)
+        response += joint_string({
+            1: msg.id,
+            2: user.account_id,
+            3: user.user_id,
+            4: msg.subject_base64,
+            6: user.username,
+            7: time_ago(msg.timestamp),
+            8: msg.read,
+            9: int(sent)
+        }) + "|"
+
+    response = f"{response[:-1]}#{message_count}:{offset}:10"
+    logging.debug(response)
+    return aiohttp.web.Response(text=response)

helpers/userhelper.py

@@ -3,7 +3,7 @@
 from helpers.timehelper import get_timestamp, Timer
 from helpers.crypthelper import decode_base64, hash_bcrypt, encode_base64
 from helpers.lang import lang
-from objects.accounts import Account, AccountExtras, FriendRequest
+from objects.accounts import Account, AccountExtras, FriendRequest, Message
 from objects.comments import AccountComment
 from conn.mysql import myconn
 from constants import Permissions, Relationships
@@ -552,5 +552,33 @@ async def gdpr_delete(self, account_id : int) -> None:
 
             await mycursor.execute("DELETE FROM comments WHERE userID = %s", (user.user_id,))
         await myconn.conn.commit()
+
+    async def get_messages(self, account_id : int, get_from : bool = False, page : int = 0):
+        """Gets list of message objects for user"""
+        offset = page * 10
+        async with myconn.conn.cursor() as mycursor:
+            await mycursor.execute(f"SELECT userID, userName, body, subject, accID, messageID, toAccountID, timestamp, isNew FROM messages WHERE {'accID' if not get_from else 'toAccountID'} = %s LIMIT 10 OFFSET %s", (account_id, offset))
+            messages_db = await mycursor.fetchall()
+
+        return [
+            Message(
+                user_id = i[0],
+                username=i[1],
+                content_base64=i[2],
+                subject_base64=i[3],
+                account_id=i[4],
+                id = i[5],
+                target_id=i[6],
+                timestamp=int(i[7]),
+                read= i[8]
+            )
+            for i in messages_db
+        ]
+
+    async def get_message_count(self, account_id : int, get_from : bool = False) -> int:
+        """Returns the number of messages a user has."""
+        async with myconn.conn.cursor() as mycursor:
+            await mycursor.execute(f"SELECT COUNT(*) FROM messages WHERE {'accID' if not get_from else 'toAccountID'} = %s", (account_id,))
+            return (await mycursor.fetchall())[0]
 
 user_helper = UserHelper()  # This has to be a common class.

main.py

@@ -21,6 +21,8 @@
     leaderboards_handler,
     mod_check_handler,
     friends_list_handler,
+    friend_req_handler,
+    message_list_handler
 )
 from handlers.songs import featured_artists_handler, get_songinfo_handler
 from handlers.levels import (
@@ -88,6 +90,8 @@ def config_routes(app: web.Application) -> None:
         ("/database/getGJAccountComments20.php", profile_comment_handler),
         ("/database/accounts/registerGJAccount.php", register_handler),
         ("/database/accounts/loginGJAccount.php", login_handler),
+        ("/database/getGJFriendRequests20.php", friend_req_handler),
+        ("/database/getGJMessages20.php", message_list_handler)
     ]
 
     for r, h in routes:

objects/accounts.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+from helpers.crypthelper import decode_base64, encode_base64
 
 
 @dataclass
@@ -63,3 +64,24 @@ class FriendRequest:
     content: str
     timestamp: int
     new: bool
+
+@dataclass
+class Message:
+    """Message dataclass."""
+    user_id : int
+    username : str
+    content_base64 : str
+    subject_base64 : str
+    account_id : int
+    id : int
+    target_id : int
+    timestamp : int
+    read : bool
+
+    @property
+    def content(self) -> str:
+        return decode_base64(self.content_base64)
+
+    @content.setter
+    def content_setter(self, set_to : str):
+        self.content_base64 = encode_base64(set_to)