Messenger is ready

classes/holo_user.py

@@ -1,6 +1,6 @@
 from app import app, isAnAdmin
 from typing import Any, List, Union
-from pyrogram.types import User, ChatMember, ChatPrivileges, Chat, Message
+from pyrogram.types import User, ChatMember, ChatPrivileges, Chat, Message, Photo, Video, Document, Animation, Voice
 from pyrogram.client import Client
 from pyrogram.errors import bad_request_400
 from modules.database import col_users, col_context, col_warnings, col_applications, col_sponsorships, col_messages
@@ -71,11 +71,97 @@ class HoloUser():
         col_users.update_one(filter={"_id": self.db_id}, update={ "$set": { key: value } }, upsert=True)
         logWrite(f"Set attribute {key} of user {self.id} to {value}")
 
-    async def message(self, origin: Message, text: Union[str, None] = None, photo: Union[str, None] = None, video: Union[str, None] = None, file: Union[str, None] = None):
-        new_message = await app.send_message(self.id, text+locale("message_reply_notice", "message"))
-        await origin.reply_text(locale("message_sent", "message"), quote=should_quote(origin))
-        logWrite(f"Admin {origin.from_user.id} sent message '{' '.join(origin.command[2:])}' to {self.id}")
-        col_messages.insert_one({"origin": {"chat": origin.chat.id, "id": origin.id}, "destination": {"chat": new_message.chat.id, "id": new_message.id}})
+    async def message(self,
+        origin: Union[Message, None] = None,
+        context: Union[Message, None] = None,
+        text: Union[str, None] = None,
+        caption: Union[str, None] = None,
+        photo: Union[str, Photo, None] = None,
+        video: Union[str, Video, None] = None,
+        file: Union[str, Document, None] = None,
+        animation: Union[str, Animation, None] = None,
+        voice: Union[str, Voice, None] = None,
+        adm_origin: bool = False,
+        adm_context: bool = False
+    ):  
+
+        if text is not None:
+            logWrite(f"{context.from_user.id} sent message '{text}' to {self.id}")
+        elif caption is not None:
+            logWrite(f"{context.from_user.id} sent message '{caption}' to {self.id}")
+        else:
+            logWrite(f"{context.from_user.id} sent message to {self.id}")
+
+        if text is not None:
+            if adm_context:
+                text += locale("message_reply_notice", "message")
+            elif adm_origin:
+                text = locale("message_from", "message").format(context.from_user.first_name, context.from_user.id) + text + locale("message_reply_notice", "message")
+        else:
+            text = locale("message_reply_notice", "message")
+
+        if caption is not None:
+            if adm_context:
+                caption += locale("message_reply_notice", "message")
+            elif adm_origin:
+                caption = locale("message_from", "message").format(context.from_user.first_name, context.from_user.id) + caption + locale("message_reply_notice", "message")
+        else:
+            caption = locale("message_reply_notice", "message")
+
+        if origin is not None:
+
+            if photo is not None:
+                if isinstance(photo, Photo):
+                    photo = photo.file_id
+                new_message = await origin.reply_photo(photo, caption=caption, quote=True)
+            elif video is not None:
+                if isinstance(video, Video):
+                    video = video.file_id
+                new_message = await origin.reply_video(video, caption=caption, quote=True)
+            elif file is not None:
+                if isinstance(file, Document):
+                    file = file.file_id
+                new_message = await origin.reply_document(file, caption=caption, quote=True)
+            elif animation is not None:
+                if isinstance(animation, Animation):
+                    animation = animation.file_id
+                new_message = await origin.reply_animation(animation, caption=caption, quote=True)
+            elif voice is not None:
+                if isinstance(voice, Voice):
+                    voice = voice.file_id
+                new_message = await origin.reply_voice(voice, caption=caption, quote=True)
+            else:
+                new_message = await origin.reply_text(text, quote=True)
+
+        else:
+
+            if photo is not None:
+                if isinstance(photo, Photo):
+                    photo = photo.file_id
+                new_message = await app.send_photo(self.id, photo, caption=caption)
+            elif video is not None:
+                if isinstance(video, Video):
+                    video = video.file_id
+                new_message = await app.send_video(self.id, video, caption=caption)
+            elif file is not None:
+                if isinstance(file, Document):
+                    file = file.file_id
+                new_message = await app.send_document(self.id, file, caption=caption)
+            elif animation is not None:
+                if isinstance(animation, Animation):
+                    animation = animation.file_id
+                new_message = await app.send_animation(animation, caption=caption, quote=True)
+            elif voice is not None:
+                if isinstance(voice, Voice):
+                    voice = voice.file_id
+                new_message = await app.send_voice(voice, caption=caption, quote=True)
+            else:
+                new_message = await app.send_message(self.id, text)
+
+        # new_message = await app.send_message(self.id, text+locale("message_reply_notice", "message"))
+        await context.reply_text(locale("message_sent", "message"), quote=should_quote(context))
+
+        col_messages.insert_one({"origin": {"chat": context.chat.id, "id": context.id}, "destination": {"chat": new_message.chat.id, "id": new_message.id}})
 
     async def set_label(self, chat: Chat, label: str):
         """Set label in destination group