update

api/webhook.py

@@ -1,17 +1,17 @@
 from sanic import Sanic
 from sanic.response import text
-from handlers.handle_feedback import handle_feedback, handle_answer
-from handlers.handle_members_change import handle_join, handle_left
-from handlers.handle_join_request import handle_join_request
-from handlers.handle_default import handle_default
-from handlers.command_my import handle_command_my
-from handlers.command_graph import handle_command_graph
-from handlers.command_ask import handle_command_ask
-from handlers.callback_vouch import handle_button
-from handlers.callback_unlink import handle_unlink
-from handlers.handle_startup import handle_startup
-from api import register_webhook, send_message
-from config import FEEDBACK_CHAT_ID
+from bot.handlers.handle_feedback import handle_feedback, handle_answer
+from bot.handlers.handle_members_change import handle_join, handle_left
+from bot.handlers.handle_join_request import handle_join_request
+from bot.handlers.handle_default import handle_default
+from bot.handlers.command_my import handle_command_my
+from bot.handlers.command_graph import handle_command_graph
+from bot.handlers.command_ask import handle_command_ask
+from bot.handlers.callback_vouch import handle_button
+from bot.handlers.callback_unlink import handle_unlink
+from bot.handlers.handle_startup import handle_startup
+from bot.api import register_webhook, send_message
+from bot.config import FEEDBACK_CHAT_ID
 
 app = Sanic(name="welcomecenter")
 app.config.REGISTERED = False

bot/api.py

@@ -2,7 +2,7 @@ import requests
 import aiohttp
 import json
 import os
-from config import BOT_TOKEN, WEBHOOK
+from bot.config import BOT_TOKEN, WEBHOOK
 
 
 apiBase = f"https://api.telegram.org/bot{TOKEN}/"

bot/handlers/callback_unlink.py

@@ -1,7 +1,7 @@
-from api import send_message, delete_message, kick_member
-from handlers.command_my import handle_command_my
-from utils.mention import userdata_extract
-from storage import Profile
+from bot.api import send_message, delete_message, kick_member
+from bot.handlers.command_my import handle_command_my
+from bot.utils.mention import userdata_extract
+from bot.storage import Profile
 
 # remove link of callback sender 
 # from member vouched before

bot/handlers/callback_vouch.py

@@ -1,6 +1,6 @@
-from api import send_message, forward_message, delete_message, \
+from bot.api import send_message, forward_message, delete_message, \
     approve_chat_join_request, edit_replymarkup, get_chat
-from storage import Profile, storage
+from bot.storage import Profile, storage
 
 
 def update_button(chat_id, member_id, text='❤️'):

bot/handlers/command_ask.py

@@ -1,6 +1,6 @@
-from storage import Profile
-from handlers.send_button import show_request_msg
-from api import get_member
+from bot.storage import Profile
+from bot.handlers.send_button import show_request_msg
+from bot.api import get_member
 
 def handle_command_ask(msg):
     print(f'handling request resend')

bot/handlers/command_graph.py

@@ -1,6 +1,6 @@
-from utils.graph import generate_chart
-from api import send_document
-from storage import storage, scan
+from bot.utils.graph import generate_chart
+from bot.api import send_document
+from bot.storage import storage, scan
 import json
 
 

bot/handlers/command_my.py

@@ -1,6 +1,6 @@
-from storage import Profile, scan
-from api import get_member, send_message, get_chat_administrators
-from utils.mention import userdata_extract
+from bot.storage import Profile, scan
+from bot.api import get_member, send_message, get_chat_administrators
+from bot.utils.mention import userdata_extract
 
 
 def construct_unlink_buttons(actor):

bot/handlers/handle_default.py

@@ -1,7 +1,6 @@
-from api import send_message, delete_message, get_chat_administrators
-from storage import Profile
-from handlers.send_button import show_request_msg
-from storage import storage
+from bot.api import send_message, delete_message, get_chat_administrators
+from bot.storage import Profile, storage
+from bot.handlers.send_button import show_request_msg
 
 def handle_default(msg):
     print(f'default handler for all messages')

bot/handlers/handle_feedback.py

@@ -1,10 +1,10 @@
 import json
 
-from api import send_message, forward_message, delete_message, get_chat_administrators
-from handlers.send_button import show_request_msg
-from utils.mention import userdata_extract
-from storage import storage, Profile
-from config import FEEDBACK_CHAT_ID
+from bot.api import send_message, forward_message, delete_message, get_chat_administrators
+from bot.handlers.send_button import show_request_msg
+from bot.utils.mention import userdata_extract
+from bot.storage import storage, Profile
+from bot.config import FEEDBACK_CHAT_ID
 
 
 def handle_feedback(msg):

bot/handlers/handle_join_request.py

@@ -1,6 +1,6 @@
-from api import approve_chat_join_request, delete_message           
-from handlers.send_button import show_request_msg
-from storage import Profile, storage
+from bot.api import approve_chat_join_request, delete_message           
+from bot.handlers.send_button import show_request_msg
+from bot.storage import Profile, storage
 
 
 def handle_join_request(msg):

bot/handlers/handle_members_change.py

@@ -1,7 +1,7 @@
-from handlers.send_button import show_request_msg
-from api import delete_message
-from storage import Profile, storage
-from config import FEEDBACK_CHAT_ID
+from bot.handlers.send_button import show_request_msg
+from bot.api import delete_message
+from bot.storage import Profile, storage
+from bot.config import FEEDBACK_CHAT_ID
 
 def handle_join(msg):
     chat_id = str(msg['chat']['id'])

bot/handlers/handle_startup.py

@@ -1,7 +1,7 @@
 from storage import scan, Profile
-from api import approve_chat_join_request, kick_member
-from handlers.callback_vouch import update_button
-from utils.mention import userdata_extract
+from bot.api import approve_chat_join_request, kick_member
+from bot.handlers.callback_vouch import update_button
+from bot.utils.mention import userdata_extract
 
 # устанавливает соответствие данных
 def handle_startup():

bot/handlers/send_button.py

@@ -1,6 +1,6 @@
-from api import send_message, send_photo, get_userphotos
-from utils.mention import mention, userdata_extract
-from storage import storage
+from bot.api import send_message, send_photo, get_userphotos
+from bot.utils.mention import mention, userdata_extract
+from bot.storage import storage
 
 def show_request_msg(msg):
     chat_id = str(msg['chat']['id'])

bot/storage/__init__.py

@@ -1,6 +1,6 @@
 import redis
-from storage.profile import Profile as ProfileObj
-from config import REDIS_URL
+from profile import Profile as ProfileObj
+from bot.config import REDIS_URL
 import json
 
 

vercel.json

@@ -1,7 +1,7 @@
 {
   "version": 2,
   "functions": {
-    "src/webhook.py": {
+    "api/webhook.py": {
       "memory": 1024,
       "maxDuration": 10
     }
@@ -9,7 +9,7 @@
   "routes": [
     {
       "src": "/",
-      "dest": "/src/webhook.py"
+      "dest": "/api/webhook.py"
     }
   ]
 }