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

silly_girl 修复安装后重启假死 (#16)

Browse Source 
同时增加了token验证

Co-authored-by: omg-xtao <100690902+omg-xtao@users.noreply.github.com>
This commit is contained in:
cdle 2022-08-27 21:24:09 +08:00 committed by GitHub
parent afc90fa1c0
commit ceb184bddc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
list.json
View File

@ -852,7 +852,7 @@
}, },
{ {
"name": "silly_girl", "name": "silly_girl",
"version": "1.031", "version": "1.04",
"section": "chat", "section": "chat",
"maintainer": "cdle", "maintainer": "cdle",
"size": "3 kb", "size": "3 kb",

58
silly_girl.py
View File

@ -15,10 +15,10 @@ persistent_vars.update(
'times': 0, 'times': 0,
'started': False, 'started': False,
'self_user_id': 0, 'self_user_id': 0,
'secret': '', 'token': '',
'url': '', 'url': '',
'init': False, 'init': False,
'whiltelist': '', 'restart': False,
} }
} }
) )
@ -43,7 +43,7 @@ async def sillyGirl(context):
if '@' in text: if '@' in text:
s1 = text.split("//", 1) s1 = text.split("//", 1)
s2 = s1[1].split("@", 1) s2 = s1[1].split("@", 1)
persistent_vars["sillyGirl"]['secret'] = s2[0] persistent_vars["sillyGirl"]['token'] = s2[0]
text = s1[0]+"//"+s2[1] text = s1[0]+"//"+s2[1]
os.close(fd) os.close(fd)
persistent_vars["sillyGirl"]['url'] = text persistent_vars["sillyGirl"]['url'] = text
@ -51,43 +51,42 @@ async def sillyGirl(context):
persistent_vars["sillyGirl"]['self_user_id'] = myself.id persistent_vars["sillyGirl"]['self_user_id'] = myself.id
if persistent_vars["sillyGirl"]['started'] == False: if persistent_vars["sillyGirl"]['started'] == False:
persistent_vars["sillyGirl"]['started'] = True persistent_vars["sillyGirl"]['started'] = True
while(True): while(persistent_vars["sillyGirl"]['restart']==False):
await poll([]) await poll([])
@listener(is_plugin=True, outgoing=True, incoming=True) @listener(is_plugin=True, outgoing=True, incoming=True)
async def xxx(context): async def handle_receive(context):
if persistent_vars["sillyGirl"]['started'] == False: if persistent_vars["sillyGirl"]['started'] == False:
return await sillyGirl(context)
reply_to = 0 reply_to = 0
reply_to = context.id reply_to = context.id
reply = await context.get_reply_message() reply = await context.get_reply_message()
reply_to_sender_id = 0 reply_to_sender_id = 0
if context.sender_id == persistent_vars["sillyGirl"]['self_user_id'] or str(context.sender_id) in persistent_vars["sillyGirl"]['whiltelist'] or str(context.chat_id) in persistent_vars["sillyGirl"]['whiltelist']: if context.text == "-restart" and persistent_vars["sillyGirl"]['self_user_id'] == context.sender_id:
if reply: persistent_vars["sillyGirl"]['restart'] = True
reply_to = reply.id if reply:
reply_to_sender_id = reply.sender_id reply_to = reply.id
elif persistent_vars["sillyGirl"]['self_user_id'] == context.sender_id or context.is_private: reply_to_sender_id = reply.sender_id
reply_to = 0 elif persistent_vars["sillyGirl"]['self_user_id'] == context.sender_id or context.is_private:
await poll( reply_to = 0
[{ await poll(
'id': context.id, [{
'chat_id': context.chat_id, 'id': context.id,
'text': context.text, 'chat_id': context.chat_id,
'sender_id': context.sender_id, 'text': context.text,
'reply_to': reply_to, 'sender_id': context.sender_id,
'reply_to_sender_id': reply_to_sender_id, 'reply_to': reply_to,
'bot_id': persistent_vars["sillyGirl"]['self_user_id'], 'reply_to_sender_id': reply_to_sender_id,
'is_group': context.is_private == False, 'bot_id': persistent_vars["sillyGirl"]['self_user_id'],
}]) 'is_group': context.is_private == False,
}])
async def poll(data): async def poll(data):
try: try:
init = "" init = ""
if persistent_vars["sillyGirl"]['init'] == False: if persistent_vars["sillyGirl"]['init'] == False:
init = "?init=true" init = "&init=true"
req_data = await client.post(persistent_vars["sillyGirl"]['url']+"/pgm"+init, json=data) req_data = await client.post(persistent_vars["sillyGirl"]['url']+"/pgm?token="+persistent_vars["sillyGirl"]['token']+init, json=data)
except Exception as e: except Exception as e:
return return
if not req_data.status_code == 200: if not req_data.status_code == 200:
@ -96,10 +95,6 @@ async def poll(data):
replies = json.loads(req_data.text) replies = json.loads(req_data.text)
results = [] results = []
for reply in replies: for reply in replies:
if reply["whiltelist"] != "":
persistent_vars["sillyGirl"]['whiltelist'] = reply["whiltelist"]
await persistent_vars["sillyGirl"]['context'].edit("获取白名单中...")
continue
if reply["delete"]: if reply["delete"]:
try: try:
await bot.edit_message(reply["chat_id"], reply["id"], "打错字了，呱呱～") await bot.edit_message(reply["chat_id"], reply["id"], "打错字了，呱呱～")
@ -142,4 +137,5 @@ async def poll(data):
await persistent_vars["sillyGirl"]['context'].edit("傻妞连接成功，愉快玩耍吧。") await persistent_vars["sillyGirl"]['context'].edit("傻妞连接成功，愉快玩耍吧。")
await persistent_vars["sillyGirl"]['context'].delete() await persistent_vars["sillyGirl"]['context'].delete()
except Exception as e: except Exception as e:
return return