From 1b868e430bd73813f5af4774d7e3fe61a8062b10 Mon Sep 17 00:00:00 2001
From: Pavel_Duron <pavel@telegram.com>
Date: Tue, 13 Dec 2022 17:51:47 +1000
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D1=83=D1=8E=20=D1=84=D1=83=D0=BD=D0=BA=D0=B8?=
 =?UTF-8?q?=D1=8E=20=D1=80=D0=B0=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD=D0=B0/?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20=D1=80=D0=B5=D0=B3?=
 =?UTF-8?q?=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86=D0=B8=D1=8E=20=D1=85=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B4=D0=BB=D0=B5=D1=80=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bot.py                | 19 +++++++------------
 handlers/__init__.py  |  1 +
 handlers/pipisa.py    |  8 ++++----
 handlers/sendalarm.py | 13 +++++++------
 othersq/__init__.py   |  1 -
 othersq/sendnot.py    | 28 ----------------------------
 6 files changed, 19 insertions(+), 51 deletions(-)
 delete mode 100644 othersq/__init__.py
 delete mode 100644 othersq/sendnot.py

diff --git a/bot.py b/bot.py
index 04c2d03..8bb07db 100644
--- a/bot.py
+++ b/bot.py
@@ -4,12 +4,12 @@ import graypy
 from aiogram import executor
 
 from create_bot import dp
-from handlers import pipisa, time_new_year, start_help
-from othersq import sendnot
-
+from handlers import pipisa, time_new_year, sendalarm, start_help
+import handlers
 
 
 
+# logging.basicConfig(level=logging.DEBUG)
 
 
 logging.basicConfig(
@@ -17,15 +17,10 @@ logging.basicConfig(
     handlers = [ graypy.GELFUDPHandler('localhost', 12201) ]
 )
 
-
-
-
-
-pipisa.register_handlers_pipisa(dp)
-time_new_year.register_handlers_time(dp)
-start_help.register_handlers_StartHelp(dp)
-sendnot.register_handlers_sendnotal(dp)
-
+# pipisa.register_handlers_pipisa(dp)
+# time_new_year.register_handlers_time(dp)
+# sendalarm.register_handlers_test(dp)
+# start_help.register_handlers_StartHelp(dp)
 
 
 if __name__ == '__main__':
diff --git a/handlers/__init__.py b/handlers/__init__.py
index 153685f..4a2e0b0 100644
--- a/handlers/__init__.py
+++ b/handlers/__init__.py
@@ -1,3 +1,4 @@
 from handlers import pipisa
 from handlers import time_new_year
+from handlers import sendalarm
 from handlers import start_help
\ No newline at end of file
diff --git a/handlers/pipisa.py b/handlers/pipisa.py
index f1766be..96440c0 100644
--- a/handlers/pipisa.py
+++ b/handlers/pipisa.py
@@ -166,8 +166,8 @@ async def send_global_top(message: types.Message):
         session.close_all()
 
 
-def register_handlers_pipisa(dp: Dispatcher):
-    dp.register_message_handler(up_dick)
-    dp.register_message_handler(send_topchat)
-    dp.register_message_handler(send_global_top)
+# def register_handlers_pipisa(dp: Dispatcher):
+#     dp.register_message_handler(up_dick)
+#     dp.register_message_handler(send_topchat)
+#     dp.register_message_handler(send_global_top)
 
diff --git a/handlers/sendalarm.py b/handlers/sendalarm.py
index 1132a50..914489a 100644
--- a/handlers/sendalarm.py
+++ b/handlers/sendalarm.py
@@ -1,12 +1,13 @@
 
+from create_bot import dp, bot
 from aiogram import types, Dispatcher
+from sqdb import user, session
+
 
-from sqdb import session, user
-from create_bot import bot, dp
 
 @dp.message_handler(commands=['sendall'])
-async def sendalarm(message: types.Message):
-    print('начал работать')
+async def sendall(message: types.Message):
+    print('команда прошла')
     if message.chat.type == 'private':
         if message.from_user.id == 226765676:
             text = message.text[9:]
@@ -24,5 +25,5 @@ async def sendalarm(message: types.Message):
             finally: session.close_all()
 
 
-def register_handlers_sendalarming(dp: Dispatcher):
-    dp.register_message_handler(sendalarm)
\ No newline at end of file
+# def register_handlers_test(dp: Dispatcher):
+#     dp.register_message_handler(send_welcome)
\ No newline at end of file
diff --git a/othersq/__init__.py b/othersq/__init__.py
deleted file mode 100644
index bf46e75..0000000
--- a/othersq/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from othersq import sendnot
\ No newline at end of file
diff --git a/othersq/sendnot.py b/othersq/sendnot.py
deleted file mode 100644
index 26d5a44..0000000
--- a/othersq/sendnot.py
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-from aiogram import types, Dispatcher
-
-from sqdb import session, user
-from create_bot import bot, dp
-
-@dp.message_handler(commands=['sendall'])
-async def sendall(message: types.Message):
-    print('начал работать')
-    if message.chat.type == 'private':
-        if message.from_user.id == 226765676:
-            text = message.text[9:]
-            try:
-                chats_id = session.query(user.chat_id).distinct()
-                for row in chats_id:
-                    try:
-                        await bot.send_message(row[0], text)
-                    except:
-                        print('вероятно бота нет в чате')
-                await bot.send_message(message.from_user.id, 'Сообщение успешно отправлено во все чаты')
-            except: 
-                session.rollback()
-                print('eror sendall')
-            finally: session.close_all()
-
-def register_handlers_sendnotal(dp: Dispatcher):
-    dp.register_message_handler(sendall)
\ No newline at end of file