update
This commit is contained in:
@@ -1,17 +1,17 @@
|
|||||||
from sanic import Sanic
|
from sanic import Sanic
|
||||||
from sanic.response import text
|
from sanic.response import text
|
||||||
from handlers.handle_feedback import handle_feedback, handle_answer
|
from bot.handlers.handle_feedback import handle_feedback, handle_answer
|
||||||
from handlers.handle_members_change import handle_join, handle_left
|
from bot.handlers.handle_members_change import handle_join, handle_left
|
||||||
from handlers.handle_join_request import handle_join_request
|
from bot.handlers.handle_join_request import handle_join_request
|
||||||
from handlers.handle_default import handle_default
|
from bot.handlers.handle_default import handle_default
|
||||||
from handlers.command_my import handle_command_my
|
from bot.handlers.command_my import handle_command_my
|
||||||
from handlers.command_graph import handle_command_graph
|
from bot.handlers.command_graph import handle_command_graph
|
||||||
from handlers.command_ask import handle_command_ask
|
from bot.handlers.command_ask import handle_command_ask
|
||||||
from handlers.callback_vouch import handle_button
|
from bot.handlers.callback_vouch import handle_button
|
||||||
from handlers.callback_unlink import handle_unlink
|
from bot.handlers.callback_unlink import handle_unlink
|
||||||
from handlers.handle_startup import handle_startup
|
from bot.handlers.handle_startup import handle_startup
|
||||||
from api import register_webhook, send_message
|
from bot.api import register_webhook, send_message
|
||||||
from config import FEEDBACK_CHAT_ID
|
from bot.config import FEEDBACK_CHAT_ID
|
||||||
|
|
||||||
app = Sanic(name="welcomecenter")
|
app = Sanic(name="welcomecenter")
|
||||||
app.config.REGISTERED = False
|
app.config.REGISTERED = False
|
@@ -2,7 +2,7 @@ import requests
|
|||||||
import aiohttp
|
import aiohttp
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
from config import BOT_TOKEN, WEBHOOK
|
from bot.config import BOT_TOKEN, WEBHOOK
|
||||||
|
|
||||||
|
|
||||||
apiBase = f"https://api.telegram.org/bot{TOKEN}/"
|
apiBase = f"https://api.telegram.org/bot{TOKEN}/"
|
@@ -1,7 +1,7 @@
|
|||||||
from api import send_message, delete_message, kick_member
|
from bot.api import send_message, delete_message, kick_member
|
||||||
from handlers.command_my import handle_command_my
|
from bot.handlers.command_my import handle_command_my
|
||||||
from utils.mention import userdata_extract
|
from bot.utils.mention import userdata_extract
|
||||||
from storage import Profile
|
from bot.storage import Profile
|
||||||
|
|
||||||
# remove link of callback sender
|
# remove link of callback sender
|
||||||
# from member vouched before
|
# from member vouched before
|
@@ -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
|
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='❤️'):
|
def update_button(chat_id, member_id, text='❤️'):
|
@@ -1,6 +1,6 @@
|
|||||||
from storage import Profile
|
from bot.storage import Profile
|
||||||
from handlers.send_button import show_request_msg
|
from bot.handlers.send_button import show_request_msg
|
||||||
from api import get_member
|
from bot.api import get_member
|
||||||
|
|
||||||
def handle_command_ask(msg):
|
def handle_command_ask(msg):
|
||||||
print(f'handling request resend')
|
print(f'handling request resend')
|
@@ -1,6 +1,6 @@
|
|||||||
from utils.graph import generate_chart
|
from bot.utils.graph import generate_chart
|
||||||
from api import send_document
|
from bot.api import send_document
|
||||||
from storage import storage, scan
|
from bot.storage import storage, scan
|
||||||
import json
|
import json
|
||||||
|
|
||||||
|
|
@@ -1,6 +1,6 @@
|
|||||||
from storage import Profile, scan
|
from bot.storage import Profile, scan
|
||||||
from api import get_member, send_message, get_chat_administrators
|
from bot.api import get_member, send_message, get_chat_administrators
|
||||||
from utils.mention import userdata_extract
|
from bot.utils.mention import userdata_extract
|
||||||
|
|
||||||
|
|
||||||
def construct_unlink_buttons(actor):
|
def construct_unlink_buttons(actor):
|
@@ -1,7 +1,6 @@
|
|||||||
from api import send_message, delete_message, get_chat_administrators
|
from bot.api import send_message, delete_message, get_chat_administrators
|
||||||
from storage import Profile
|
from bot.storage import Profile, storage
|
||||||
from handlers.send_button import show_request_msg
|
from bot.handlers.send_button import show_request_msg
|
||||||
from storage import storage
|
|
||||||
|
|
||||||
def handle_default(msg):
|
def handle_default(msg):
|
||||||
print(f'default handler for all messages')
|
print(f'default handler for all messages')
|
@@ -1,10 +1,10 @@
|
|||||||
import json
|
import json
|
||||||
|
|
||||||
from api import send_message, forward_message, delete_message, get_chat_administrators
|
from bot.api import send_message, forward_message, delete_message, get_chat_administrators
|
||||||
from handlers.send_button import show_request_msg
|
from bot.handlers.send_button import show_request_msg
|
||||||
from utils.mention import userdata_extract
|
from bot.utils.mention import userdata_extract
|
||||||
from storage import storage, Profile
|
from bot.storage import storage, Profile
|
||||||
from config import FEEDBACK_CHAT_ID
|
from bot.config import FEEDBACK_CHAT_ID
|
||||||
|
|
||||||
|
|
||||||
def handle_feedback(msg):
|
def handle_feedback(msg):
|
@@ -1,6 +1,6 @@
|
|||||||
from api import approve_chat_join_request, delete_message
|
from bot.api import approve_chat_join_request, delete_message
|
||||||
from handlers.send_button import show_request_msg
|
from bot.handlers.send_button import show_request_msg
|
||||||
from storage import Profile, storage
|
from bot.storage import Profile, storage
|
||||||
|
|
||||||
|
|
||||||
def handle_join_request(msg):
|
def handle_join_request(msg):
|
@@ -1,7 +1,7 @@
|
|||||||
from handlers.send_button import show_request_msg
|
from bot.handlers.send_button import show_request_msg
|
||||||
from api import delete_message
|
from bot.api import delete_message
|
||||||
from storage import Profile, storage
|
from bot.storage import Profile, storage
|
||||||
from config import FEEDBACK_CHAT_ID
|
from bot.config import FEEDBACK_CHAT_ID
|
||||||
|
|
||||||
def handle_join(msg):
|
def handle_join(msg):
|
||||||
chat_id = str(msg['chat']['id'])
|
chat_id = str(msg['chat']['id'])
|
@@ -1,7 +1,7 @@
|
|||||||
from storage import scan, Profile
|
from storage import scan, Profile
|
||||||
from api import approve_chat_join_request, kick_member
|
from bot.api import approve_chat_join_request, kick_member
|
||||||
from handlers.callback_vouch import update_button
|
from bot.handlers.callback_vouch import update_button
|
||||||
from utils.mention import userdata_extract
|
from bot.utils.mention import userdata_extract
|
||||||
|
|
||||||
# устанавливает соответствие данных
|
# устанавливает соответствие данных
|
||||||
def handle_startup():
|
def handle_startup():
|
@@ -1,6 +1,6 @@
|
|||||||
from api import send_message, send_photo, get_userphotos
|
from bot.api import send_message, send_photo, get_userphotos
|
||||||
from utils.mention import mention, userdata_extract
|
from bot.utils.mention import mention, userdata_extract
|
||||||
from storage import storage
|
from bot.storage import storage
|
||||||
|
|
||||||
def show_request_msg(msg):
|
def show_request_msg(msg):
|
||||||
chat_id = str(msg['chat']['id'])
|
chat_id = str(msg['chat']['id'])
|
@@ -1,6 +1,6 @@
|
|||||||
import redis
|
import redis
|
||||||
from storage.profile import Profile as ProfileObj
|
from profile import Profile as ProfileObj
|
||||||
from config import REDIS_URL
|
from bot.config import REDIS_URL
|
||||||
import json
|
import json
|
||||||
|
|
||||||
|
|
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 2,
|
"version": 2,
|
||||||
"functions": {
|
"functions": {
|
||||||
"src/webhook.py": {
|
"api/webhook.py": {
|
||||||
"memory": 1024,
|
"memory": 1024,
|
||||||
"maxDuration": 10
|
"maxDuration": 10
|
||||||
}
|
}
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
"routes": [
|
"routes": [
|
||||||
{
|
{
|
||||||
"src": "/",
|
"src": "/",
|
||||||
"dest": "/src/webhook.py"
|
"dest": "/api/webhook.py"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user