Compare commits

..

No commits in common. "1f8c154a127c3703e5e23457566e1e6c08cd2db5" and "main" have entirely different histories.

13 changed files with 69 additions and 66 deletions

2
.gitignore vendored
View File

@ -2,4 +2,4 @@
config.toml
.vs
.vscode
.idea
__pycache__

3
.idea/.gitignore vendored
View File

@ -1,3 +0,0 @@
# 默认忽略的文件
/shelf/
/workspace.xml

View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="jdk" jdkName="Python 3.9 (2)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

View File

@ -1,6 +0,0 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (2)" project-jdk-type="Python SDK" />
</project>

View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/icalingua-python-bot.iml" filepath="$PROJECT_DIR$/.idea/icalingua-python-bot.iml" />
</modules>
</component>
</project>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

View File

@ -191,6 +191,7 @@ async def add_message(data: Dict[str, Any]):
sender_id = data['message']['senderId']
content = data['message']['content']
room_id = data['roomId']
reply = ReplyMessage(id=data['message']['_id'])
if not is_self:
if data.get('message').get('content') == '/bot':
@ -208,7 +209,7 @@ async def add_message(data: Dict[str, Any]):
# else:
# message = Message(content=f"此服务器空无一人",room_id=data['roomId'])
message = Message(content=f"此服务器有 {status.players.online} 个玩家在线",room_id=data['roomId'])
message = Message(content=f"此服务器有 {status.players.online} 个玩家在线",reply_to=reply,room_id=data['roomId'])
await sio.emit('sendMessage', message.to_json())
@ -216,7 +217,7 @@ async def add_message(data: Dict[str, Any]):
server = JavaServer.lookup("192.168.1.6:25565")
query = server.query()
players = query.players.names
message = Message(content=f"此服务器当前在线玩家有 {players}",room_id=data['roomId'])
message = Message(content=f"此服务器当前在线玩家有 {players}",reply_to=reply,room_id=data['roomId'])
await sio.emit('sendMessage', message.to_json())
@ -224,18 +225,20 @@ async def add_message(data: Dict[str, Any]):
ctypet = content[len("!!hitokoto "):]
if content == "!!hitokoto":
result_code, result_data = hitokoto.hitokoto("没有")
result_code, result_data, result_type= hitokoto.hitokoto(None)
else:
result_code, result_data = hitokoto.hitokoto(ctypet)
result_code, result_data, result_type= hitokoto.hitokoto(ctypet)
if result_code == 3:
message = Message(content=f"参数不对哦!",room_id=data['roomId'])
message = Message(content=f"参数不对哦!你可以输入!!hitokoto help查看帮助",reply_to=reply,room_id=data['roomId'])
elif result_code == 2:
message = Message(content=f"发生了不可描述的错误X_X", room_id=data['roomId'])
message = Message(content=f"发生了不可描述的错误X_X但可以肯定的是模块炸了",reply_to=reply,room_id=data['roomId'])
elif result_code == 1:
message = Message(content=f"(参数)句子类型如下\na 动画\nb 漫画\nc 游戏\nd 文学\ne 原创\nf 来自网络\ng 其他\nh 影视\ni 诗词\nj 网易云\nk 哲学\nl 抖机灵",reply_to=reply,room_id=data['roomId'])
elif result_code == 0:
message = Message(content=f"Hitokoto: {result_data['hitokoto']}", room_id=data['roomId'])
message = Message(content=f"{result_data['hitokoto']}\n来源:{result_data['from']}\n类型:{result_type}",reply_to=reply,room_id=data['roomId'])
else:
message = Message(content=f"但你看到这条消息就代表有bug出炉", room_id=data['roomId'])
message = Message(content=f"你看到这条消息就代表有bug出炉但肯定不是模块炸了",reply_to=reply,room_id=data['roomId'])
await sio.emit('sendMessage', message.to_json())
@ -274,10 +277,18 @@ async def add_message(data: Dict[str, Any]):
await asyncio.sleep(random.random() * 2)
await sio.emit('sendMessage', message.to_json())
elif data['message']['content'] == '!!jrrp':
examSet = False
if examSet == True:
print('examSet参数被设定替换人品值')
message = Message(content=f'{sender_name} 今日人品值为 100\n为了让你安心备考加油考试今天你的人品值是100',
reply_to=reply,
room_id=room_id)
await asyncio.sleep(0.5)
await sio.emit('sendMessage', message.to_json())
else:
randomer = random.Random(f'{sender_id}-{data["message"]["date"]}-jrrp-v2')
result = randomer.randint(0, 50) + randomer.randint(0, 50)
print(f'{sender_name} 今日人品值为 {result}')
reply = ReplyMessage(id=data['message']['_id'])
message = Message(content=f'{sender_name} 今日人品值为 {result}',
reply_to=reply,
room_id=room_id)

View File

@ -1,8 +1,10 @@
import requests
import random
def hitokoto(ctypet):
result_type = None
try:
if ctypet == '动画' or ctypet == 'a':
@ -15,7 +17,7 @@ def hitokoto(ctypet):
ctype = 'd'
elif ctypet == '原创' or ctypet == 'e':
ctype = 'e'
elif ctypet == '网络' or ctypet == 'f':
elif ctypet == '来自网络' or ctypet == 'f':
ctype = 'f'
elif ctypet == '其他' or ctypet == 'g':
ctype = 'g'
@ -29,24 +31,48 @@ def hitokoto(ctypet):
ctype = 'k'
elif ctypet == '抖机灵' or ctypet == 'l':
ctype = 'l'
elif ctypet == '没有':
elif ctypet == None:
ctype = random.choice('abcdefghijkl')
params_value = {'c': ctype}
hitokoto = requests.get('https://v1.hitokoto.cn', params=params_value)
return 0, hitokoto.json()
elif ctypet == 'help':
return 1, None, result_type
else:
return 3, None
return 3, None, result_type
params_value = {'c': ctype}
hitokoto = requests.get('https://v1.hitokoto.cn', params=params_value)
return 0, hitokoto.json()
htype=hitokoto.json()['type']
if htype=='a':
result_type = '动画'
elif htype=='b':
result_type = '动漫'
elif htype=='c':
result_type = '游戏'
elif htype=='d':
result_type = '文学'
elif htype=='e':
result_type = '原创'
elif htype=='f':
result_type = '来自网络'
elif htype=='g':
result_type = '其他'
elif htype=='h':
result_type = '影视'
elif htype=='i':
result_type = '诗词'
elif htype=='j':
result_type = '网易云'
elif htype=='k':
result_type = '哲学'
elif htype=='l':
result_type = '抖机灵'
else:
result_type = '无法获取'
return 0, hitokoto.json(), result_type
except IOError:
return 2, None
return 2, None, result_type

View File

@ -4,3 +4,4 @@ qtoml
pynacl
python-socketio[asyncio_client]
mcstatus
requests