TeamPGM/PagerMaid-Modify
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

✨ Fix repeat command forward error (#154)

Browse Source
This commit is contained in:
Sam 2021-12-10 23:37:07 +08:00 committed by GitHub
parent 7a01d3a0d0
commit b5428ea0f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pagermaid/modules/message.py
View File

@ -3,7 +3,7 @@
from telethon.tl.functions.messages import DeleteChatUserRequest
from telethon.tl.functions.channels import LeaveChannelRequest
from telethon.errors import ForbiddenError, AuthKeyError
from telethon.errors.rpcerrorlist import ChatIdInvalidError, FloodWaitError, UserNotParticipantError
from telethon.errors.rpcerrorlist import ChatIdInvalidError, FloodWaitError, UserNotParticipantError, MessageIdInvalidError
from distutils.util import strtobool
from telethon.tl.types import ChannelForbidden
@ -160,18 +160,29 @@ async def re(context):
await context.delete()
except ValueError:
pass
try:
for nums in range(0, num):
await reply.forward_to(int(context.chat_id))
except ForbiddenError:
return
except FloodWaitError:
return
except ValueError:
return
except AuthKeyError:
await context.respond(lang('re_forbidden'))
return
forward_allowed = True
for nums in range(0, num):
try:
if forward_allowed:
await reply.forward_to(reply.peer_id)
else:
await bot.send_message(reply.peer_id, reply)
except MessageIdInvalidError:
if forward_allowed:
forward_allowed = False
await bot.send_message(reply.peer_id, reply)
else:
await context.respond(lang('re_forbidden'))
return
except ForbiddenError:
return
except FloodWaitError:
return
except ValueError:
return
except AuthKeyError:
await context.respond(lang('re_forbidden'))
return
else:
await context.edit(lang('not_reply'))