From 0e06c2a7a507a4839a7669ffa0d33b2bbd5827ee Mon Sep 17 00:00:00 2001
From: Profitroll <47523801+profitrollgame@users.noreply.github.com>
Date: Sun, 11 Dec 2022 23:32:20 +0100
Subject: [PATCH] Now using HoloUser messaging

---
 modules/commands/message.py | 40 +++++++++++++++----------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/modules/commands/message.py b/modules/commands/message.py
index 63274cd..f05c33c 100644
--- a/modules/commands/message.py
+++ b/modules/commands/message.py
@@ -2,6 +2,7 @@ from os import sep
 from app import app, isAnAdmin
 from pyrogram import filters
 from pyrogram.errors import bad_request_400
+from classes.holo_user import HoloUser
 from modules.utils import jsonLoad, jsonSave, logWrite, locale, configGet, should_quote
 from modules.database import col_messages
 
@@ -12,34 +13,25 @@ async def cmd_message(app, msg):
     if msg.chat.id == configGet("admin_group") or await isAnAdmin(msg.from_user.id):
 
         try:
+
             try:
-                destination = await app.get_users(int(msg.command[1]))
-                if destination == [] or destination == None:
-                    raise TypeError
-            except TypeError:
-                try:
-                    destination = await app.get_users(msg.command[1])
-                except bad_request_400.UsernameNotOccupied:
-                    await msg.reply_text(locale("message_no_user", "message"), quote=should_quote(msg))
-                    logWrite(f"Admin {msg.from_user.id} tried to send message '{' '.join(msg.command[2:])}' to '{msg.command[1]}' but 'UsernameNotOccupied'")
-                    return
+                destination = HoloUser(int(msg.command[1]))
             except ValueError:
-                try:
-                    destination = await app.get_users(msg.command[1])
-                except bad_request_400.UsernameNotOccupied:
-                    await msg.reply_text(locale("message_no_user", "message"), quote=should_quote(msg))
-                    logWrite(f"Admin {msg.from_user.id} tried to send message '{' '.join(msg.command[2:])}' to '{msg.command[1]}' but 'UsernameNotOccupied'")
-                    return
+                destination = HoloUser(msg.command[1])
+
             void = msg.command[2]
             message = " ".join(msg.command[2:])
-            try:
-                new_message = await app.send_message(destination.id, message+locale("message_reply_notice", "message"))
-                await msg.reply_text(locale("message_sent", "message"), quote=should_quote(msg))
-                logWrite(f"Admin {msg.from_user.id} sent message '{' '.join(msg.command[2:])}' to {destination.id}")
-                col_messages.insert_one({"origin": {"chat": msg.chat.id, "id": msg.id}, "destination": {"chat": new_message.chat.id, "id": new_message.id}})
-            except bad_request_400.PeerIdInvalid:
-                await msg.reply_text(locale("message_no_user", "message"), quote=should_quote(msg))
-                logWrite(f"Admin {msg.from_user.id} tried to send message '{' '.join(msg.command[2:])}' to {destination.id} but 'PeerIdInvalid'")
+
+            await destination.message(msg, msg.command[2:])
+
+            # try:
+            #     new_message = await app.send_message(destination.id, message+locale("message_reply_notice", "message"))
+            #     await msg.reply_text(locale("message_sent", "message"), quote=should_quote(msg))
+            #     logWrite(f"Admin {msg.from_user.id} sent message '{' '.join(msg.command[2:])}' to {destination.id}")
+            #     col_messages.insert_one({"origin": {"chat": msg.chat.id, "id": msg.id}, "destination": {"chat": new_message.chat.id, "id": new_message.id}})
+            # except bad_request_400.PeerIdInvalid:
+            #     await msg.reply_text(locale("message_no_user", "message"), quote=should_quote(msg))
+            #     logWrite(f"Admin {msg.from_user.id} tried to send message '{' '.join(msg.command[2:])}' to {destination.id} but 'PeerIdInvalid'")
         except IndexError:
             await msg.reply_text(locale("message_invalid_syntax", "message"), quote=should_quote(msg))
             logWrite(f"Admin {msg.from_user.id} tried to send message but 'IndexError'")