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

minor bugfix

Browse Source
This commit is contained in:
Rongrong 2021-12-28 22:41:32 +08:00
parent 4011e9cd8c
commit 7a6a32bbab
No known key found for this signature in database
GPG Key ID: A36C9CDA260CB264
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
SlashBot.py
View File

@ -2,14 +2,14 @@ import os
import re import re
import requests import requests
import telegram import telegram
from typing import Tuple, Optional, Callable from typing import Tuple, Optional, Callable, Union, Dict
from telegram.ext import Updater, MessageHandler, filters from telegram.ext import Updater, MessageHandler, filters
Filters = filters.Filters Filters = filters.Filters
parser = re.compile(r'^([\\/]_?)((?:[^ 　\t\\]|\\.)+)[ 　\t]*(.*)$') parser = re.compile(r'^([\\/]_?)((?:[^ 　\t\\]|\\.)+)[ 　\t]*(.*)$')
ESCAPING = ('\\ ', '\\　', '\\\t') ESCAPING = ('\\ ', '\\　', '\\\t')
htmlEscape = lambda s: s.replace("<", "&lt;").replace(">", "&gt;").replace("&", "&amp;") htmlEscape = lambda s: s.replace("<", "&lt;").replace(">", "&gt;").replace("&", "&amp;")
mentionParser = re.compile(r'@([a-zA-Z]\w{4,})$') mentionParser = re.compile(r'@([a-zA-Z]\w{4,})')
delUsername: Optional[Callable] = None # placeholder delUsername: Optional[Callable] = None # placeholder
# Docker env # Docker env
@ -70,7 +70,7 @@ def get_users(msg: telegram.Message) -> Tuple[User, User]:
return from_user, rpl_user return from_user, rpl_user
def parse_command(match: re.Match): def parse_command(match: re.Match) -> Dict[str, Union[str, bool]]:
parsed = match.groups() parsed = match.groups()
predicate = parsed[1] predicate = parsed[1]
for escape in ESCAPING: for escape in ESCAPING:
@ -115,6 +115,14 @@ def reply(update: telegram.Update, context: telegram.ext.CallbackContext):
mention = mentionParser.search(msg.text).group(1) mention = mentionParser.search(msg.text).group(1)
rpl_user = User(username=mention) rpl_user = User(username=mention)
command['predicate'] = command['predicate'][:mention_match.start()] command['predicate'] = command['predicate'][:mention_match.start()]
else:
mention_match = mentionParser.search(command['complement'])
if mention_match:
mention = mentionParser.search(msg.text).group(1)
rpl_user = User(username=mention)
complement = command['complement']
complement = complement[:mention_match.start()] + complement[mention_match.end():]
command['complement'] = complement.strip()
if command['swap'] and (not from_user == rpl_user): if command['swap'] and (not from_user == rpl_user):
(from_user, rpl_user) = (rpl_user, from_user) (from_user, rpl_user) = (rpl_user, from_user)