fix bugs

Author: Deutscher775

src/Bot/guilded_bot.py

@@ -31,6 +31,7 @@
 async def send_iamup():
     async with aiohttp.ClientSession() as session:
         async with session.post(f"https://status.astroid.cc/monitor/iamup/guilded") as r:
+            await session.close()
             if r.status == 200:
                 print("Sent up status.")
             else:

src/Bot/nerimity_bot.py

@@ -23,6 +23,7 @@ async def send_message(endpoint, params):
 async def send_iamup():
     async with aiohttp.ClientSession() as session:
         async with session.post(f"https://status.astroid.cc/monitor/iamup/nerimity") as r:
+            await session.close()
             if r.status == 200:
                 print("Sent up status.")
             else:

src/api.py

@@ -31,6 +31,7 @@
 import logging
 import astroidapi
 import threading
+import subprocess
 
 # Configure logging to log to a file
 logFormatter = logging.Formatter("%(asctime)s [%(threadName)-12.12s] [%(levelname)-5.5s]  %(message)s")
@@ -84,7 +85,16 @@ def view_logs(token: Annotated[str, fastapi.Query(max_length=85, min_length=10)]
 
 @api.get("/ga-test")
 def ga_test():
-    return fastapi.responses.JSONResponse(status_code=200, content={"commited": "210824-15"})
+    try:
+        # Get the current commit hash
+        result = subprocess.run(['git', 'rev-parse', 'HEAD'], 
+                              capture_output=True, text=True, check=True)
+        commit_hash = result.stdout.strip()[:7]  # Get short hash (first 7 chars)
+        
+        return fastapi.responses.JSONResponse(status_code=200, content={"commited": commit_hash})
+    except subprocess.CalledProcessError:
+        # Fallback if git command fails
+        return fastapi.responses.JSONResponse(status_code=200, content={"commited": "unknown"})
 
 @api.get("/assets/{asset}", description="Get an asset.")
 def get_asset(asset: str, width: int = None, height: int = None):

src/astroidapi/emoji_handler.py

@@ -84,6 +84,20 @@ async def convert_message(message, sender, receiver, endpoint):
                 endpoint_data = await surrealdb_handler.get_endpoint(endpoint, __file__)
                 if endpoint_data["config"]["emoji_filtering"]:
                     message = message.replace(emoji, "")
+    
+    elif sender == "revolt":
+        emojis = re.findall(r':\w+:', message)
+        print(emojis)
+        for emoji in emojis:
+            print(emoji)
+            emoji_data = await convert_emoji(emoji, sender, receiver, endpoint)
+            print(emoji_data)
+            if emoji_data is not None:
+                message = message.replace(emoji, emoji_data)
+            else:    
+                endpoint_data = await surrealdb_handler.get_endpoint(endpoint, __file__)
+                if endpoint_data["config"]["emoji_filtering"]:
+                    message = message.replace(emoji, "")
 
     return message
 
@@ -257,4 +271,56 @@ async def _sync_discord_emojis(endpoint, platform):
             print(f"Deleted emoji file {emoji['id']}.png")
         except Exception as e:
             print(f"Failed to delete emoji file {emoji['id']}.png")
-            continue
+            continue
+
+
+async def add_emoji(endpoint, emoji):
+    endpoint_data = await surrealdb_handler.get_endpoint(int(endpoint), __file__)
+    endpoint_emojis = endpoint_data["config"]["emojis"]
+    endpoint_emojis.append(emoji)
+    await surrealdb_handler.write_to_structure(int(endpoint), "config.emojis", endpoint_emojis)
+    return {
+                "message": f"Added emoji {emoji} to endpoint {endpoint}"
+    }
+
+
+async def remove_emoji(endpoint, emoji):
+    endpoint_data = await surrealdb_handler.get_endpoint(int(endpoint), __file__)
+    endpoint_emojis = endpoint_data["config"]["emojis"]
+    for emoji_data in endpoint_emojis:
+        if "discord" in emoji_data.keys():
+            if emoji_data["discord"] == emoji["discord"]:
+                endpoint_emojis.remove(endpoint_emojis[endpoint_emojis.index(emoji_data)])
+                await surrealdb_handler.write_to_structure(int(endpoint), "config.emojis", endpoint_emojis)
+                return {"message": f"Removed emoji {emoji['discord']} from endpoint {endpoint}"}
+        if "nerimity" in emoji_data.keys():
+            if emoji_data["nerimity"] == emoji["nerimity"]:
+                endpoint_emojis.remove(endpoint_emojis[endpoint_emojis.index(emoji_data)])
+                await surrealdb_handler.write_to_structure(int(endpoint), "config.emojis", endpoint_emojis)
+                return {"message": f"Removed emoji {emoji['nerimity']} from endpoint {endpoint}"}
+        if "guilded" in emoji_data.keys():
+            if emoji_data["guilded"] == emoji["guilded"]:
+                endpoint_emojis.remove(endpoint_emojis[endpoint_emojis.index(emoji_data)])
+                await surrealdb_handler.write_to_structure(int(endpoint), "config.emojis", endpoint_emojis)
+                return {"message": f"Removed emoji {emoji['guilded']} from endpoint {endpoint}"}
+        if "revolt" in emoji_data.keys():
+            if emoji_data["revolt"] == emoji["revolt"]:
+                endpoint_emojis.remove(endpoint_emojis[endpoint_emojis.index(emoji_data)])
+                await surrealdb_handler.write_to_structure(int(endpoint), "config.emojis", endpoint_emojis)
+                return {"message": f"Removed emoji {emoji['revolt']} from endpoint {endpoint}"}
+
+
+async def update_emoji(endpoint, emoji):
+    endpoint_data = await surrealdb_handler.get_endpoint(int(endpoint), __file__)
+    endpoint_emojis = endpoint_data["config"]["emojis"]
+    for emoji_data in endpoint_emojis:
+        if "discord" in emoji_data.keys():
+            emoji_data["discord"] = emoji["discord"]
+        if "nerimity" in emoji_data.keys():
+            emoji_data["nerimity"] = emoji["nerimity"]
+        if "guilded" in emoji_data.keys():
+            emoji_data["guilded"] = emoji["guilded"]
+        if "revolt" in emoji_data.keys():
+            emoji_data["revolt"] = emoji["revolt"]
+    await surrealdb_handler.write_to_structure(int(endpoint), "config.emojis", endpoint_emojis)
+    return {"message": f"Updated emoji {emoji['discord']} in endpoint {endpoint}"}

src/astroidapi/endpoint_update_handler.py

@@ -223,8 +223,8 @@ async def update_endpoint(
                         if message_attachments:
                             if "," in message_attachments:
                                 for val in message_attachments.split(","):
-                                    if val.lower() not in [x.lower() for x in endpoint_data["meta"]["message"]["attachments"]]:
-                                        endpoint_data["meta"]["message"]["attachments"].append(val.lower())
+                                    if val not in [x for x in endpoint_data["meta"]["message"]["attachments"]]:
+                                        endpoint_data["meta"]["message"]["attachments"].append(val)
                             else:
                                 endpoint_data["meta"]["message"]["attachments"] = [message_attachments]
 

src/astroidapi/queue_processor.py

@@ -76,6 +76,10 @@ async def clearLoadedMessage(cls, endpoint, message):
 
     @classmethod
     async def appendMessage(cls, endpoint, updated_json):
+        is_suspend = await surrealdb_handler.Suspension.Endpoints.get_suspend_status(endpoint)
+        if is_suspend["suspended"]:
+            print(f"Endpoint {endpoint} is suspended. Not appending message.")
+            return False
         print(f"Appending message for endpoint {endpoint}")
         if updated_json is None:
             raise Exception("You must provide a valid 'updated_json' json object to appendMessage.")

src/astroidapi/sending_handler.py

@@ -127,17 +127,21 @@ async def send_to_discord(cls, updated_json, endpoint, attachments: list = None)
                     else:
                         raise errors.SendingError.ChannelNotFound(f'The channel {updated_json["meta"]["sender-channel"]} ({updated_json["meta"]["sender"]}) does not seem to be a registered channel on other platforms.')
                 except IndexError:
+                    await surrealdb_handler.QueueHandler.remove_from_queue(endpoint, updated_json)
                     return True
                 nextcord_files = []
                 if attachments is not None:
                     for attachment in attachments:
                         file = nextcord.File(attachment.name, filename=attachment.name.split("/")[-1])
                         nextcord_files.append(file)
                         await surrealdb_handler.AttachmentProcessor.update_attachment(attachment.name.split("/")[-1].split(".")[0], sentby="discord")
-                updated_json["meta"]["message"]["content"] = await emoji_handler.convert_message(updated_json["meta"]["message"]["content"], updated_json["meta"]["sender"], "discord", endpoint)
+                message_content = updated_json["meta"]["message"].get("content")
+                print(message_content)
+                if message_content is not None and message_content != "":
+                    updated_json["meta"]["message"]["content"] = await emoji_handler.convert_message(message_content, updated_json["meta"]["sender"], "discord", endpoint)
                 async with aiohttp.ClientSession() as session:
                     webhook_obj = nextcord.Webhook.from_url(webhook, session=session)
-                    message_content = updated_json["meta"]["message"]["content"]
+                    message_content = updated_json["meta"]["message"].get("content")
                     if message_content is None or message_content == "" or message_content == " ":
                         if updated_json["meta"]["message"]["attachments"] is not None:
                             if updated_json["meta"]["message"]["attachments"] is not None:
@@ -177,26 +181,28 @@ async def send_to_guilded(cls, updated_json, endpoint, attachments: list = None)
                     else:
                         raise errors.SendingError.ChannelNotFound(f'The channel {updated_json["meta"]["sender-channel"]} ({updated_json["meta"]["sender"]}) does not seem to be a registered channel on other platforms.')
                 except IndexError:
+                    await surrealdb_handler.QueueHandler.remove_from_queue(endpoint, updated_json)
                     return True
                 guilded_files = []
                 if attachments is not None:
                     for attachment in attachments:
                         file = guilded.File(attachment.name, filename=attachment.name.split("/")[-1])
                         guilded_files.append(file)
                         await surrealdb_handler.AttachmentProcessor.update_attachment(attachment.name.split("/")[-1].split(".")[0], sentby="guilded")
-                updated_json["meta"]["message"]["content"] = await emoji_handler.convert_message(updated_json["meta"]["message"]["content"], updated_json["meta"]["sender"], "guilded", endpoint)
+                message_content = updated_json["meta"]["message"].get("content")
+                if message_content is None or message_content == "" or message_content == " ":
+                    updated_json["meta"]["message"]["content"] = await emoji_handler.convert_message(message_content, updated_json["meta"]["sender"], "guilded", endpoint)
                 async with aiohttp.ClientSession() as session:
                     asyncio.create_task(read_handler.ReadHandler.mark_read(endpoint, "guilded"))
                     webhook_obj = guilded.Webhook.from_url(webhook, session=session)
                     try:
-                        message_content = updated_json["meta"]["message"]["content"]
                         try:
                             message_content = formatter.Format.format_links_guilded_safe(message_content)
                         except Exception as e:
                             print("[SendToGuilded] Failed to format links: ", e)
-                        if message_content is None or message_content == "" or message_content == " ":
+                        if message_content is None and message_content != "":
                             if updated_json["meta"]["message"]["attachments"] is not None:
-                                message_content = "‎ "
+                                message_content = "‎"
                         if updated_json["meta"]["message"]["isReply"] is True:
                             reply_emoji_filtered = await emoji_handler.convert_message(updated_json["meta"]["message"]["reply"]["message"], updated_json["meta"]["sender"], "guilded", endpoint)
                             message_content = f"> **{updated_json['meta']['message']['reply']['author']}**\n> {reply_emoji_filtered}\n\n{message_content}"
@@ -237,10 +243,12 @@ async def send_to_nerimity(cls, updated_json, endpoint, attachments: list = None
                         else:
                             raise errors.SendingError.ChannelNotFound(f'The channel {sender_channel} ({updated_json["meta"]["sender"]}) does not seem to be a registered channel on other platforms.')
                     except IndexError:
+                        await surrealdb_handler.QueueHandler.remove_from_queue(endpoint, updated_json)
                         return True
                     message_author_name = response_json["meta"]["message"]["author"]["name"]
-                    message_content = response_json["meta"]["message"]["content"]
-                    message_content = await emoji_handler.convert_message(message_content, updated_json["meta"]["sender"], "nerimity", endpoint)
+                    message_content = response_json["meta"]["message"].get("content")
+                    if message_content is not None and message_content != "":
+                        message_content = await emoji_handler.convert_message(message_content, updated_json["meta"]["sender"], "nerimity", endpoint)
                     if updated_json["config"]["isbeta"] is True:
                         headers = {
 
@@ -309,6 +317,7 @@ async def send_to_revolt(cls, updated_json, endpoint, attachments: list = None):
                 else:
                     raise errors.SendingError.ChannelNotFound(f"The channel {updated_json["meta"]["sender-channel"]} ({updated_json["meta"]["sender"]}) does not seem to be a registered channel on other platforms.")
             except IndexError:
+                await surrealdb_handler.QueueHandler.remove_from_queue(endpoint, updated_json)
                 return True   
             headers = {
                 "X-Bot-Token": f"{config.REVOLT_TOKEN}"
@@ -319,8 +328,31 @@ async def send_to_revolt(cls, updated_json, endpoint, attachments: list = None):
                     "avatar": updated_json["meta"]["message"]["author"]["avatar"],
                     "name": updated_json["meta"]["message"]["author"]["name"]
                 },
-                "content": updated_json["meta"]["message"]["content"]
+                "content": updated_json["meta"]["message"].get("content")
             }
+            message_content = updated_json["meta"]["message"].get("content")
+            if message_content is not None and message_content != "":
+                payload["content"] = await emoji_handler.convert_message(payload["content"], updated_json["meta"]["sender"], "revolt", endpoint)
+            if updated_json["meta"]["message"]["isReply"] is True and message_content is not None:
+                reply_emoji_filtered = await emoji_handler.convert_message(updated_json["meta"]["message"]["reply"]["message"], updated_json["meta"]["sender"], "revolt", endpoint)
+                payload["content"] = f"> **{updated_json['meta']['message']['reply']['author']}**\n> {reply_emoji_filtered}\n\n{payload['content']}"    
+            if attachments is not None:
+                formdata = aiohttp.FormData()                                                                                                           
+                try:
+                    if '../' in attachments[0].name or '..\\' in attachments[0].name:
+                        raise Exception("Invalid file path")
+                    else:
+                        formdata.add_field("file", open(os.path.abspath(attachments[0].name), "rb"), filename=attachments[0].name.split("/")[-1], content_type=f"image/{attachments[0].name.split('.')[-1]}")
+                        async with aiohttp.ClientSession() as session:
+                            async with session.post("https://autumn.revolt.chat/attachments", headers=headers, data=formdata) as r:
+                                if r.ok:
+                                    payload["attachments"] = [(await r.json())["id"]]
+                                else:
+                                    raise errors.SendingError.SendFromRevoltError(f"Failed to upload attachment to revolt. Response: {r.status}, {r.reason}")
+                            await session.close()
+                except Exception as e:
+                    print("Error uploading attachment to revolt: ", e)
+
 
             async with aiohttp.ClientSession() as session:
                 async with session.post(url, headers=headers, json=payload) as r:

src/astroidapi/suspension_handler.py

@@ -24,6 +24,14 @@ async def is_suspended(cls, endpoint_id):
         except TypeError:
             return False
 
+    @classmethod
+    async def get_suspend_info(cls, endpoint_id):
+        try:
+            info = await surrealdb_handler.Suspension.get_suspend_status(endpoint_id)
+            return info["reason"]
+        except errors.SurrealDBHandler.GetSuspensionStatusError as e:
+            raise errors.SuspensionHandlerError.GetSuspensionStatusError(e)
+    
     @classmethod
     async def suspend(cls, endpoint_id, reason, suspended_by: int, expire_at: int = None):
         try: