TeamPGM/PagerMaid_Plugins
3
0
Fork 0
mirror of https://github.com/TeamPGM/PagerMaid_Plugins.git synced 2024-11-25 12:51:04 +00:00
Code Issues Projects Releases Wiki Activity

简化代码和删除忘删的debug

Browse Source
This commit is contained in:
c3b2a 2021-01-18 22:42:53 +08:00 committed by GitHub
parent 70980a953d
commit c9a970dbd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
keyword.py
View File

@ -82,7 +82,7 @@ def get_capture(search_data, group_name):
except: except:
return None return None
async def del_msg(context, t_lim: int): async def del_msg(context, t_lim):
await asyncio.sleep(t_lim) await asyncio.sleep(t_lim)
await context.delete() await context.delete()
@ -269,7 +269,7 @@ async def reply_set(context):
return return
elif params[0] == "list": elif params[0] == "list":
if params[1] == "show" and len(params) == 2: if params[1] == "show" and len(params) == 2:
user_list = settings_dict["list"] if "list" in settings_dict else None user_list = settings_dict.get("list", None)
if user_list: if user_list:
msg = "List: \n" msg = "List: \n"
for p in user_list.split(","): for p in user_list.split(","):
@ -282,7 +282,7 @@ async def reply_set(context):
return return
elif params[1] == "add" and len(params) == 3: elif params[1] == "add" and len(params) == 3:
if is_num(params[2]): if is_num(params[2]):
tmp = settings_dict["list"] if "list" in settings_dict else None tmp = settings_dict.get("list", None)
if not tmp: settings_dict["list"] = params[2] if not tmp: settings_dict["list"] = params[2]
else: settings_dict["list"] += f",{params[2]}" else: settings_dict["list"] += f",{params[2]}"
redis.set(redis_data, save_rules(settings_dict, None)) redis.set(redis_data, save_rules(settings_dict, None))
@ -295,7 +295,7 @@ async def reply_set(context):
return return
elif params[1] == "del" and len(params) == 3: elif params[1] == "del" and len(params) == 3:
if is_num(params[2]): if is_num(params[2]):
tmp = settings_dict["list"] if "list" in settings_dict else None tmp = settings_dict.get("list", None)
if tmp: if tmp:
user_list = settings_dict["list"].split(",") user_list = settings_dict["list"].split(",")
if params[2] in user_list: if params[2] in user_list:
@ -348,11 +348,11 @@ async def auto_reply(context):
regex_dict = get_redis(f"keyword.{chat_id}.regex") regex_dict = get_redis(f"keyword.{chat_id}.regex")
g_settings = get_redis("keyword.settings") g_settings = get_redis("keyword.settings")
n_settings = get_redis(f"keyword.{chat_id}.settings") n_settings = get_redis(f"keyword.{chat_id}.settings")
g_mode = g_settings["mode"] if "mode" in g_settings else None g_mode = g_settings.get("mode", None)
n_mode = n_settings["mode"] if "mode" in n_settings else None n_mode = n_settings.get("mode", None)
mode = "0" mode = "0"
g_list = g_settings["list"] if "list" in g_settings else None g_list = g_settings.get("list", None)
n_list = n_settings["list"] if "list" in n_settings else None n_list = g_settings.get("list", None)
user_list = [] user_list = []
if g_mode and n_mode: mode = n_mode if g_mode and n_mode: mode = n_mode
elif g_mode or n_mode: mode = g_mode if g_mode else n_mode elif g_mode or n_mode: mode = g_mode if g_mode else n_mode
@ -372,12 +372,8 @@ async def auto_reply(context):
catch_pattern = r"\$\{regex_(?P<str>((?!\}).)+)\}" catch_pattern = r"\$\{regex_(?P<str>((?!\}).)+)\}"
while re.search(catch_pattern, v): while re.search(catch_pattern, v):
search_data = re.search(k, send_text) search_data = re.search(k, send_text)
print(search_data)
group_name = re.search(catch_pattern, v).group("str") group_name = re.search(catch_pattern, v).group("str")
print(group_name)
capture_data = get_capture(search_data, group_name) capture_data = get_capture(search_data, group_name)
print(capture_data)
if not capture_data: capture_data = "" if not capture_data: capture_data = ""
v = v.replace("${regex_%s}" % group_name, capture_data) v = v.replace("${regex_%s}" % group_name, capture_data)
print(v)
await send_reply(chat_id, parse_multi(v), context) await send_reply(chat_id, parse_multi(v), context)