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

fix-conflicts

Browse Source
This commit is contained in:
tonyrewin 2023-04-17 15:53:02 +03:00
parent 26767f328b
commit dce273ebbf
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/index.py
View File

@ -42,23 +42,11 @@ async def handle(req):
print(update) print(update)
msg = update.get('message', update.get('edited_message')) msg = update.get('message', update.get('edited_message'))
if msg['chat']['type'] == 'private': if msg['chat']['type'] == 'private':
<<<<<<< HEAD
=======
if not msg:
msg = update['edited_message']
mid = msg['message_id']
cid = msg['chat']['id']
# delete_message(FEEDBACK_CHAT_ID, forwarded_ids[(cid, mid)])
>>>>>>> origin/main
mid = msg['message_id'] mid = msg['message_id']
cid = msg['chat']['id'] cid = msg['chat']['id']
r = forward_message(cid, mid, FEEDBACK_CHAT_ID) r = forward_message(cid, mid, FEEDBACK_CHAT_ID)
print(r.json()) print(r.json())
<<<<<<< HEAD
storage.set(f'fbk-{cid}-{mid}', r['id']) storage.set(f'fbk-{cid}-{mid}', r['id'])
=======
forwarded_ids[(cid,mid)] = r['id']
>>>>>>> origin/main
elif str(msg['chat']['id']) == CHAT_ID: elif str(msg['chat']['id']) == CHAT_ID:
print(f'message in chat') print(f'message in chat')
if 'new_chat_member' in msg: if 'new_chat_member' in msg: