refactored-src

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.0.12]
+- исправления в коммандах /ask и /my
+- исправление обработки случая без фото
+- 
+
 ## [0.0.11]
 
 - отображение одобренности заявки на кнопке

README.md

@@ -12,3 +12,4 @@
 
  - BOT_TOKEN - токен бота созданный с помощью @BotFather
  - FEEDBACK_CHAT_ID - айди чата для обратной связи
+ - REDIS_URL

src/api.py

@@ -2,15 +2,14 @@ import requests
 import aiohttp
 import json
 import os
+from config import BOT_TOKEN, WEBHOOK
+
 
-TOKEN = os.environ.get('BOT_TOKEN')
 apiBase = f"https://api.telegram.org/bot{TOKEN}/"
 
 
-def register_webhook(url):
-    r = requests.get(
-        apiBase + f'setWebhook?url={url}'
-    )
+def register_webhook():
+    r = requests.get(apiBase + f'setWebhook?url={WEBHOOK}')
     return r.json()
 
 

src/handlers/callback_unlink.py

@@ -1,7 +1,7 @@
-from tgbot.api import send_message, delete_message, kick_member
-from tgbot.handlers.command_my import handle_command_my
-from tgbot.utils.mention import userdata_extract
-from tgbot.storage import Profile
+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
 
 # remove link of callback sender 
 # from member vouched before

src/handlers/callback_vouch.py

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

src/handlers/command_ask.py

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

src/handlers/command_graph.py

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

src/handlers/command_my.py

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

src/handlers/handle_default.py

@@ -1,7 +1,7 @@
-from tgbot.api import send_message, delete_message, get_chat_administrators
-from tgbot.storage import Profile
-from tgbot.handlers.send_button import show_request_msg
-from tgbot.storage import storage
+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
 
 def handle_default(msg):
     print(f'default handler for all messages')

src/handlers/handle_feedback.py

@@ -1,10 +1,10 @@
 import json
 
-from tgbot.api import send_message, forward_message, delete_message, get_chat_administrators
-from tgbot.handlers.send_button import show_request_msg
-from tgbot.utils.mention import userdata_extract
-from tgbot.storage import storage, Profile
-from tgbot.config import FEEDBACK_CHAT_ID
+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
 
 
 def handle_feedback(msg):

src/handlers/handle_join_request.py

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

src/handlers/handle_members_change.py

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

src/handlers/handle_startup.py

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

src/handlers/send_button.py

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

src/storage/__init__.py

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

src/webhook.py

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

vercel.json

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