Удалены неиспользуемые функции

Moodle/send_calendar.py

@@ -1,7 +1,3 @@
-# TODO: Отправляем календарь на сервер
-#
-import paramiko
-import bot.config as cnf
 import shutil
 
 file = 'calendar.ics'
@@ -10,12 +6,4 @@ folder = '/var/www/vmshay/calendar.ics'
 
 async def send():
     shutil.copy(file, folder)
-    # with paramiko.SSHClient() as ssh:
-    #     ssh.load_system_host_keys()
-    #     ssh.connect(hostname=cnf.SSH_HOST, username=cnf.SSH_USER, password=cnf.SSH_PASS)
-    #
-    #     sftp = ssh.open_sftp()
-    #
-    #     sftp.chdir('/var/www/vmshay')
-    #     sftp.put(file, file)
 

bot/notifications.py

@@ -9,7 +9,7 @@ async def new_bug(data):
     msg = f"<b>Обратная связь</b>\n" \
           f"Сообщение: {data['bug']}\n" \
           f"Отправитель: @{data['from_user']}\n"
-    await bot.send_message(cnf.TRASH_CHAT, msg)
+    await bot.send_message(cnf.CHAT_ID, msg)
 
 
 async def new_user(data):
@@ -17,7 +17,7 @@ async def new_user(data):
           f"TG: @{data['tg']}\n" \
           f"ФИО: {data['FIO']}\n" \
           f"Номер телефона: {data['number']}"
-    await bot.send_message(cnf.TRASH_CHAT, msg, reply_markup=new_user_kb(f"u_accept", f"u_deny", data['id']))
+    await bot.send_message(cnf.CHAT_ID, msg, reply_markup=new_user_kb(f"u_accept", f"u_deny", data['id']))
 
 
 async def new_event(data):
@@ -26,7 +26,7 @@ async def new_event(data):
           f"ФИО: {data['username']}\n" \
           f"C {data['t_start']} до {data['t_end']}\n" \
           f"Описание {data['description']}"
-    await bot.send_message(cnf.TRASH_CHAT, msg, reply_markup=new_user_kb(f"e_accept", f"e_deny", data['id']))
+    await bot.send_message(cnf.CHAT_ID, msg, reply_markup=new_user_kb(f"e_accept", f"e_deny", data['id']))
 
 
 async def notify_user_reg_accept(u_id):

handlers/admin/__init__.py

@@ -2,3 +2,4 @@ import handlers.admin.accept_event
 import handlers.admin.accept_user
 import handlers.admin.deny_user
 import handlers.admin.deny_event
+import handlers.admin.all_message

handlers/admin/all_message.py

@@ -0,0 +1,10 @@
+from aiogram import types, Dispatcher
+from bot.notifications import trash_msg
+
+
+async def handle_all(message: types.Message):
+    await trash_msg(message.text,message.from_user.username)
+
+
+def register(dp: Dispatcher):
+    dp.register_message_handler(handle_all, chat_type='private')

handlers/start.py

@@ -66,28 +66,9 @@ async def get_report(message: types.Message, state: FSMContext):
     await message.delete()
 
 
-async def broadcast_cmd(message: types.Message):
-    await message.delete()
-    await MessageToAll.send_message.set()
-    msg = await message.answer("Введите сооьщение которое будет отправленно всем пользователям")
-    await asyncio.sleep(5)
-    await msg.delete()
-
-
-async def get_message(message: types.Message, state: FSMContext):
-    await state.update_data(bug=message.text)
-    await state.update_data(from_user=message.from_user.username)
-    data = await state.get_data()
-    await state.finish()
-    await message_to_all(data)
-    await message.delete()
-
-
 def main_register(dp: Dispatcher):
     dp.register_message_handler(start_cmd, commands=['start', 'help'])
     dp.register_message_handler(stop_cmd, commands=['stop'])
     dp.register_message_handler(send_report, commands=['feedback'])
     dp.register_message_handler(get_report, state=SendBugState.send_bug)
-    dp.register_message_handler(broadcast_cmd, commands=['broadcast'])
-    dp.register_message_handler(get_message, state=MessageToAll.send_message)
 

main.py

@@ -17,4 +17,5 @@ if __name__ == '__main__':
     handlers.admin.deny_event.register(dp)
     handlers.user.my_events.register(dp)
     handlers.user.all_events.register(dp)
-    executor.start_polling(dp, skip_updates=True)  # , on_startup=on_start
+    handlers.admin.all_message.register(dp)
+    executor.start_polling(dp, skip_updates=True, on_startup=on_start)