Rewrite project

1 files changed, 10 insertions, 18 deletions

diff --git a/telegrambot.py b/telegrambot.py
index e750240..af3fd5a 100644
--- a/telegrambot.py
+++ b/telegrambot.py
@@ -1,24 +1,16 @@
 import logging
+from telegram import Update
+from telegram.ext import ApplicationBuilder, ContextTypes, MessageHandler, filters
+from config import BOT_TOKEN, CHANNEL_ID, USER_ID
 
-from telegram.ext import Updater, Dispatcher, CallbackContext, MessageHandler
-from telegram.ext.filters import Filters
-from telegram import Bot, Update
 
-from config import BOT_TOKEN, USER_ID, GROUP_ID
-
-
-LOG = logging.getLogger(__name__)
-updater = Updater(token=BOT_TOKEN)
-disp: Dispatcher = updater.dispatcher
-bot: Bot = updater.bot
-
-
-def handle_msg_rec(update: Update, context: CallbackContext) -> None:
+async def relay(update: Update, context: ContextTypes.DEFAULT_TYPE):
     if update.message.from_user.id != int(USER_ID):
         return
-    update.message.forward(int(GROUP_ID))
-    LOG.info(f"Message from {update.message.from_user.id} was forwarded to {GROUP_ID}")
-    update.message.delete()
-
+    await update.message.forward(int(CHANNEL_ID))
+    LOG.info(f"Message from {update.message.from_user.name} was forwarded to {CHANNEL_ID}")
+    await update.message.delete()
 
-disp.add_handler(MessageHandler(Filters.update, callback=handle_msg_rec))
+LOG = logging.getLogger(__name__)
+app = ApplicationBuilder().token(BOT_TOKEN).build()
+app.add_handler(MessageHandler(filters.ALL, relay))