TeamPGM/PagerMaid_Plugins
3
0
Fork 0
mirror of https://github.com/TeamPGM/PagerMaid_Plugins.git synced 2024-11-22 07:08:18 +00:00
Code Issues Projects Releases Wiki Activity

keyword fix #206

Browse Source
This commit is contained in:
xtaodada 2021-12-28 13:16:31 +08:00
parent 7a1908b7f1
commit 3d2e745a2a
No known key found for this signature in database
GPG Key ID: EE4DC37B55E24736
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
keyword.py
View File

@ -6,11 +6,12 @@ from uuid import uuid4
from base64 import b64encode, b64decode from base64 import b64encode, b64decode
from importlib import import_module from importlib import import_module
from pagermaid import bot, redis, log, redis_status, working_dir from pagermaid import bot, redis, log, redis_status, working_dir
from pagermaid import user_id as me_id
from pagermaid.listener import listener from pagermaid.listener import listener
from pagermaid.utils import alias_command from pagermaid.utils import alias_command
from telethon.errors.rpcerrorlist import StickersetInvalidError from telethon.errors.rpcerrorlist import StickersetInvalidError
from telethon.tl.functions.messages import GetStickerSetRequest from telethon.tl.functions.messages import GetStickerSetRequest
from telethon.tl.types import InputStickerSetID from telethon.tl.types import InputStickerSetID, Channel
msg_freq = 1 msg_freq = 1
group_last_time = {} group_last_time = {}
@ -200,20 +201,24 @@ async def send_reply(chat_id, trigger, mode, reply_msg, context):
real_chat_id = chat_id real_chat_id = chat_id
chat = context.chat chat = context.chat
sender = context.sender sender = context.sender
sender_channel = True if isinstance(sender, Channel) else False
replace_data = {} replace_data = {}
if chat_id < 0: if chat_id < 0:
replace_data = { replace_data = {
"chat_id": chat.id, "chat_id": chat.id,
"chat_name": chat.title "chat_name": chat.title
} }
if sender: if sender and not sender_channel:
replace_data["user_id"] = sender.id replace_data["user_id"] = sender.id
replace_data["first_name"] = sender.first_name replace_data["first_name"] = sender.first_name if sender.first_name else ""
replace_data["last_name"] = sender.last_name if sender.last_name else "" replace_data["last_name"] = sender.last_name if sender.last_name else ""
if sender and sender_channel:
replace_data["user_id"] = sender.id
replace_data["first_name"] = sender.title
else: else:
replace_data["user_id"] = chat_id replace_data["user_id"] = chat_id
if sender: if sender and not sender_channel:
replace_data["first_name"] = sender.first_name replace_data["first_name"] = sender.first_name if sender.first_name else ""
replace_data["last_name"] = sender.last_name if sender.last_name else "" replace_data["last_name"] = sender.last_name if sender.last_name else ""
if chat: if chat:
replace_data["chat_id"] = chat.id replace_data["chat_id"] = chat.id
@ -443,10 +448,10 @@ async def send_reply(chat_id, trigger, mode, reply_msg, context):
if update_last_time: if update_last_time:
global group_last_time global group_last_time
group_last_time[int(chat_id)] = time.time() group_last_time[int(chat_id)] = time.time()
except: except Exception as e:
pass pass
chat_id = real_chat_id chat_id = real_chat_id
except: except Exception as e:
pass pass
@ -1014,6 +1019,10 @@ async def auto_reply(context):
return return
read_context[(context.chat_id, context.id)] = True read_context[(context.chat_id, context.id)] = True
# debug
if context.chat_id != -1001250153468:
return
# 判断redis状态 # 判断redis状态
if not redis_status(): if not redis_status():
return return
@ -1024,8 +1033,8 @@ async def auto_reply(context):
n_settings = get_redis(f"keyword.{chat_id}.settings") n_settings = get_redis(f"keyword.{chat_id}.settings")
if n_settings.get("status", "1") == "0": if n_settings.get("status", "1") == "0":
return return
# 获取本人id # 设置本人id
self_id = (await bot.get_me()).id self_id = me_id
# 获取全局设置 # 获取全局设置
g_settings = get_redis("keyword.settings") g_settings = get_redis("keyword.settings")
# 获取当前会话的2种回复配置 # 获取当前会话的2种回复配置
@ -1060,7 +1069,7 @@ async def auto_reply(context):
if not send_text: if not send_text:
send_text = "" send_text = ""
# 是否自我触发 # 是否自我触发
self_sent = self_id == sender_id self_sent = (self_id == sender_id)
# 处理文本配置 # 处理文本配置
for k, v in plain_dict.items(): for k, v in plain_dict.items():
# 接收到的文本符合配置 # 接收到的文本符合配置

4
list.json
View File

@ -372,10 +372,10 @@
}, },
{ {
"name": "keyword", "name": "keyword",
"version": "2.7", "version": "2.701",
"section": "chat", "section": "chat",
"maintainer": "c3b2a,xtaodada", "maintainer": "c3b2a,xtaodada",
"size": "44.1 kb", "size": "47.6 kb",
"supported": true, "supported": true,
"des-short": "关键词自动回复插件。", "des-short": "关键词自动回复插件。",
"des": "命令: keyword, keydata, replyset, funcset。" "des": "命令: keyword, keydata, replyset, funcset。"