aho/welcomecenterbot
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0.0.8-fixes

Browse Source
This commit is contained in:
tonyrewin
2023-04-24 09:14:35 +03:00
parent 437a50fa3c
commit acb86ac200
13 changed files with 72 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tgbot/api.py
View File

@@ -96,9 +96,10 @@ def approve_chat_join_request(chat_id, user_id):
async def send_document(chat_id, data='', filename='chart.svg'):
url = apiBase + "sendDocument"
params = { "chat_id": chat_id }
files = { "document": data }
filedata = aiohttp.FormData()
filedata.add_field('document', data, filename=filename)
async with aiohttp.ClientSession(headers=headers) as session:
async with aiohttp.ClientSession() as session:
async with session.post(url, params=params, data=filedata) as response:
if response.status != 200:
error_text = await response.text()
@@ -114,18 +115,20 @@ async def send_document(chat_id, data='', filename='chart.svg'):
# https://core.telegram.org/bots/api#sendphoto
async def send_photo(png_data, chat_id):
async def send_photo(chat_id, img_data, filename='chart.png'):
url = apiBase + f"sendPhoto"
headers = {"Content-Type": "multipart/form-data"}
files = {"photo": ("chart.png", png_data)}
params = {"chat_id": chat_id}
params = {"chat_id": chat_id }
filedata = aiohttp.FormData()
filedata.add_field('photo', img_data, filename=filename)
async with aiohttp.ClientSession(headers=headers) as session:
async with aiohttp.ClientSession() as session:
async with session.post(url, params=params, data=filedata) as response:
if response.status != 200:
print(f"Error sending photo: {response.status}")
error_text = await response.text()
print(f"Error sending photo: {response.status} - {error_text}")
return None
try:
return await response.json()
except ValueError as e:

1
tgbot/handlers/callback_vouch.py
View File

@@ -1,5 +1,6 @@
from tgbot.api import send_message, forward_message, delete_message
from tgbot.storage import Profile
from tgbot.config import BUTTON_VOUCH
def handle_button(callback_query):

5
tgbot/handlers/command_graph.py
View File

@@ -25,5 +25,6 @@ async def handle_command_graph(msg):
members.append(member)
print(f'found {len(members)} members')
data = generate_chart(members)
r = await send_document(msg['chat']['id'], data, 'chart.svg')
print(r)
if data:
r = await send_document(msg['chat']['id'], data, 'chart.svg')
print(r)

2
tgbot/handlers/command_my.py
View File

@@ -1,5 +1,5 @@
from tgbot.storage import Profile
from tgbot.api import get_member
from tgbot.api import get_member, send_message
def construct_unlink_buttons(actor):
buttons = []

20
tgbot/handlers/handle_default.py
View File

@@ -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
def handle_default(msg):
print(f'default handler for all messages')
@@ -18,14 +18,14 @@ def handle_default(msg):
print(r)
# удалить предыдушее сообщение с кнопкой в этом чате
if sender['request_msg_id'].startswith(chat_id):
chat_id, rmid = sender['request_msg_id'].split(':')
r = delete_message(chat_id, rmid)
prev_msg_id = storage.get(f'btn-{chat_id}-{from_id}')
if prev_msg_id:
r = delete_message(chat_id, prev_msg_id)
print(r)
# показать новое сообщение с кнопкой
request_msg_id = show_request_msg(msg)
sender['request_msg_id'] = f'{chat_id}:{request_msg_id}'
btn_msg_id = show_request_msg(msg)
storage.set(f'btn-{chat_id}-{from_id}', btn_msg_id)
else:
# любое другое сообщение
if len(sender['parents']) == 0:
@@ -33,11 +33,13 @@ def handle_default(msg):
print(f'setting owner as parent for {from_id}')
r = get_chat_administrators(chat_id)
print(r)
owner_id = ''
for admin in r['result']:
if admin['status'] == 'creator':
owner_id = admin['user']['id']
break
owner_id = r['result'][0]['id'] # DEBUG!!
sender['parents'].append(owner_id)
# обновляем профиль владельца
owner = Profile.get(owner_id)
owner['children'].append(from_id)

17
tgbot/handlers/handle_feedback.py
View File

@@ -19,11 +19,14 @@ def handle_feedback(msg):
def handle_answer(msg):
print(f'handle answer from support')
support_msg_id = str(msg['reply_to_message']['message_id'])
# получение сохраненного айди сообщения из личной переписки с ботом
stored_feedback = storage.get(f'fbk-{support_msg_id}')
stored_feedback = json.loads(stored_feedback)
r = send_message(f'{stored_feedback["chat_id"]}', msg['text'], reply_to=stored_feedback["message_id"])
print(r)
answered_msg = msg['reply_to_message']
if answered_msg['from']['is_bot']:
support_msg_id = str(answered_msg['message_id'])
# получение сохраненного информации о сообщении для ответа
stored_feedback = storage.get(f'fbk-{support_msg_id}')
if stored_feedback:
print(f'handle answer from support')
stored_feedback = json.loads(stored_feedback)
r = send_message(f'{stored_feedback["chat_id"]}', msg['text'], reply_to=stored_feedback["message_id"])
print(r)

12
tgbot/handlers/handle_join_request.py
View File

@@ -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
from tgbot.storage import Profile, storage
def handle_join_request(msg):
@@ -11,13 +11,13 @@ def handle_join_request(msg):
if len(actor['parents']) == 0:
# показываем сообщение с кнопкой "поручиться"
request_msg_id = show_request_msg(msg)
btn_msg_id = show_request_msg(msg)
# удаляем предыдущее сообщение с кнопкой в этом чате
if actor['request_msg_id'].startswith(chat_id):
chat_id, rmid = actor['request_msg_id'].split(':')
r = delete_message(chat_id, rmid)
prev_msg_id = storage.get(f'btn-{chat_id}-{from_id}')
if prev_msg_id:
r = delete_message(chat_id, prev_msg_id)
print(r)
actor['request_msg_id'] = f'{chat_id}:{request_msg_id}'
storage.set(f'btn-{chat_id}-{from_id}', btn_msg_id)
else:
# за пользователя поручились ранее
r = approve_chat_join_request(chat_id, from_id)

19
tgbot/handlers/handle_members_change.py
View File

@@ -1,6 +1,6 @@
from tgbot.handlers.send_button import show_request_msg
from tgbot.api import unmute_member, mute_member, delete_message
from tgbot.storage import Profile
from tgbot.storage import Profile, storage
def handle_join(msg):
chat_id = str(msg['chat']['id'])
@@ -12,15 +12,13 @@ def handle_join(msg):
if from_id == newcomer_id:
if len(actor['parents']) == 0:
# показываем сообщение с кнопкой "поручиться"
request_msg_id = show_request_msg(msg)
btn_msg_id = show_request_msg(msg)
storage.set(f'btn-{chat_id}-{from_id}', btn_msg_id)
# до одобрения - мьют
r = mute_member(chat_id, newcomer_id)
print(r)
# обновляем профиль присоединившегося
actor['request_msg_id'] = f'{chat_id}:{request_msg_id}'
Profile.save(actor)
else:
# за пользователя поручились ранее
pass
@@ -44,14 +42,11 @@ def handle_left(msg):
member_id = msg["left_chat_member"]["id"]
chat_id = msg['chat']['id']
# профиль покидающего чат
leaver = Profile.get(member_id)
# удаление сообщения с кнопкой в этом чате
if leaver['request_msg_id'].startswith(chat_id):
chat_id, rmid = leaver['request_msg_id'].split(':')
r = delete_message(chat_id, rmid)
prev_msg_id = storage.get(f'btn-{chat_id}-{member_id}')
if prev_msg_id:
r = delete_message(chat_id, prev_msg_id)
print(r)
storage.remove(f'btn-{chat_id}-{member_id}')
Profile.leaving(leaver)

10
tgbot/handlers/send_button.py
View File

@@ -1,6 +1,6 @@
from tgbot.api import send_message
from tgbot.config import BUTTON_VOUCH, NEWCOMER_MSG
from tgbot.utils import mention
from tgbot.utils.mention import mention
def show_request_msg(msg):
reply_markup = {
@@ -20,8 +20,6 @@ def show_request_msg(msg):
reply_to=msg.get('message_id', ''),
reply_markup=reply_markup
)
request_msg_id = r['result']['message_id']
chat_id = msg['chat']['id']
print(r)
print(f'request message id: {chat_id}:{request_msg_id}')
return request_msg_id
btn_msg_id = r['result']['message_id']
print(f'request message id: {btn_msg_id}')
return btn_msg_id

2
tgbot/storage/__init__.py
View File

@@ -2,7 +2,7 @@ import redis
from tgbot.storage.profile import Profile as ProfileObj
from tgbot.config import REDIS_URL
# сохраняет сессии и пересылаемые сообщения между перезагрузками
# сохраняет сессии, айди кнопок в чатах для удаления и пересылаемые сообщения между перезагрузками
storage = redis.from_url(REDIS_URL)
# хранение необходимой информации о пользователях

5
tgbot/storage/profile.py
View File

@@ -9,7 +9,6 @@ class Profile:
def create(self, member_id, msg=None):
s = {
"id": member_id,
"request_msg_id": 0,
"parents": [],
"children": [],
"chats": []
@@ -38,7 +37,3 @@ class Profile:
else:
r = json.loads(data)
return r
def leaving(self, s):
if len(s['parents']) == 0:
self.storage.delete(f'usr-{s["id"]}')