Sync/SlashBot
1
0
Fork 0
mirror of https://github.com/Rongronggg9/SlashBot.git synced 2025-02-06 17:23:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: strip $ from command

Browse Source
This commit is contained in:
Rongrong 2022-10-21 22:27:45 +08:00
parent 8c5f214ef2
commit ead8fb2c47
No known key found for this signature in database
GPG Key ID: 1C2D45D45AB7FE94
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SlashBot.py
View File

@ -16,7 +16,7 @@ from random import choice
Filters = filters.Filters Filters = filters.Filters
parser = re.compile(r'^(?P<slash>[\\/]_?)' parser = re.compile(r'^(?P<slash>[\\/]_?\$?)'
r'(?P<predicate>([^\s\\]|\\.)*((?<=\S)\\)?)' r'(?P<predicate>([^\s\\]|\\.)*((?<=\S)\\)?)'
r'(\s+(?P<complement>.+))?$') r'(\s+(?P<complement>.+))?$')
ouenParser = re.compile(r'^(' ouenParser = re.compile(r'^('
@ -146,7 +146,7 @@ def parse_command(ctx: telegram.ext.CallbackContext) -> Optional[dict[str, Union
result = {'predicate': htmlEscape(predicate), result = {'predicate': htmlEscape(predicate),
'complement': htmlEscape(complement or ''), 'complement': htmlEscape(complement or ''),
'slash': parsed['slash'], 'slash': parsed['slash'],
'swap': parsed['slash'] != '/', 'swap': parsed['slash'] not in ('/', '/$'),
'omit_le': omit_le} 'omit_le': omit_le}
return result return result
@ -166,7 +166,7 @@ def get_text(user_from: User, user_rpl: User, command: dict):
command['slash'], command['predicate'], command['complement'], command['omit_le'] command['slash'], command['predicate'], command['complement'], command['omit_le']
if predicate == '': if predicate == '':
ret = '!' if slash == '/' else '¡' ret = '!' if not command['swap'] else '¡'
elif predicate == 'me': elif predicate == 'me':
ret = f"{mention_from}{bool(complement) * ' '}{complement}" ret = f"{mention_from}{bool(complement) * ' '}{complement}"
ret += get_tail((complement or user_from.mention(pure=True))[-1]) ret += get_tail((complement or user_from.mention(pure=True))[-1])