From 7349fd0d06efde983b4d9067070f52bc786f4d54 Mon Sep 17 00:00:00 2001 From: yzhh Date: Thu, 11 Feb 2021 23:10:14 +0800 Subject: [PATCH] add cytoid profile --- modules/server/__init__.py | 10 ++++++++-- modules/server/server.py | 7 ++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/modules/server/__init__.py b/modules/server/__init__.py index 0c4d15c4..1b9001a8 100644 --- a/modules/server/__init__.py +++ b/modules/server/__init__.py @@ -12,9 +12,15 @@ async def main(kwargs: dict): msgsplit = message.split(' ') if '-r' in msgsplit: message = re.sub(' -r|-r ', '', message) - sendmsg = await server(message, raw=True) + raw = True else: - sendmsg = await server(message) + raw =False + if '-p' in msgsplit: + message = re.sub(' -p|-p ', '', message) + showplayer = True + else: + showplayer = False + sendmsg = server(message, raw, showplayer) sendmsg = await check([sendmsg]) send = await sendMessage(kwargs, sendmsg) await asyncio.sleep(30) diff --git a/modules/server/server.py b/modules/server/server.py index 1f5c582a..45ddfc2f 100644 --- a/modules/server/server.py +++ b/modules/server/server.py @@ -5,7 +5,7 @@ import traceback import aiohttp -async def server(address, raw=False): +async def server(address, raw=False, showplayer=False): matchObj = re.match(r'(.*):(.*)', address, re.M | re.I) servers = [] @@ -69,6 +69,11 @@ async def server(address, raw=False): if 'players' in jejson: onlinesplayer = f"在线玩家：{str(jejson['players']['online'])} / {str(jejson['players']['max'])}" servers.append(onlinesplayer) + if showplayer: + playerlist = [] + for x in jejson['players']['sample']: + playerlist.append(x['name']) + servers.append('当前在线玩家：\n' + '\n'.join(playerlist)) if 'version' in jejson: versions = "游戏版本：" + file['data']['version']['name'] servers.append(versions)