From 7c0016c4be893fdbbc12ef7a8ed0b26363ebb17c Mon Sep 17 00:00:00 2001 From: SharwOrange Date: Sat, 30 Dec 2023 18:23:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=86=E4=B8=80=E8=A8=80?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- connect.py | 14 ++--- module/hitokoto/__init__.py | 50 +++++++++++++----- .../__pycache__/__init__.cpython-311.pyc | Bin 470 -> 2304 bytes 3 files changed, 46 insertions(+), 18 deletions(-) diff --git a/connect.py b/connect.py index 1455675..e5bbabe 100644 --- a/connect.py +++ b/connect.py @@ -224,18 +224,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查看帮助",room_id=data['roomId']) elif result_code == 2: - message = Message(content=f"发生了不可描述的错误X_X", room_id=data['roomId']) + message = Message(content=f"发生了不可描述的错误X_X，但可以肯定的是模块炸了（", room_id=data['roomId']) + elif result_code == 1: + message = Message(content=f"（参数）句子类型如下\na 动画\nb 漫画\nc 游戏\nd 文学\ne 原创\nf 来自网络\ng 其他\nh 影视\ni 诗词\nj 网易云\nk 哲学\nl 抖机灵", 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_type}", room_id=data['roomId']) else: - message = Message(content=f"但你看到这条消息就代表有bug出炉", room_id=data['roomId']) + message = Message(content=f"你看到这条消息就代表有bug出炉，但肯定不是模块炸了（", room_id=data['roomId']) await sio.emit('sendMessage', message.to_json()) diff --git a/module/hitokoto/__init__.py b/module/hitokoto/__init__.py index 69316d5..a37f290 100644 --- a/module/hitokoto/__init__.py +++ b/module/hitokoto/__init__.py @@ -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 diff --git a/module/hitokoto/__pycache__/__init__.cpython-311.pyc b/module/hitokoto/__pycache__/__init__.cpython-311.pyc index 2ae9f3e3ea77a5aa6ffe2fd3ce7ab2e76d740840..551b3d868fa6fe90ac3df9f7341a951c82617be1 100644 GIT binary patch literal 2304 zcmcJQe@q)?7{}kY*Oo$iw9rz1b}$Oth@k|hli+5ejG0NqKZs@{&6?6XXrb-Z>y-^{ z4JMnbjgHPCkT_$5k=3EuoKcstB^s0ceIxwQT(YEzqrhL1@DJHvK6gj2XVkc4+1uW8 z&-4Af&wKCP^IUt4Br6b%cmABAE#(OPAqK^v*>iT9z?nxBqHqum%V#`{Db0B_tfBA_ z>L9knse?Yemm!|Ca1e0pjDQuh6Sy43VT}oC-KZXXjqI}orAcVQJSc>UY89#l`WsN4 zis}`r2YL%=nTi?|Y5@8*&~g>6P-q3vS)fK0H7V2t^a4;)MJp9r33L*uSw$@hwE!Ih zTBV}Z3atiu3aC{@Z3?vkJqff%MePc;1MLM`tDl^njZ>(Gu@TffF!q1OZ z<^((@NB4f%y!MfR{Zh1fV}A3-rveVd;70^OUSZ+NqdS)cJT6bZa!b0@goF#Jxx&>u z8z258;Gkggj`%2gbj%+Zp9l(CKOKy0iA}jB_SJiKKgUI)y zSkOnjtTz-DwA@sLmM@aZ!tKi2pU)J2{CxA$FY7aNtk{fOqUq2Jde$4Jn2@0N`I&%^ z77Q%?Zj6p{QGpnvIYB!fWx_()$+!AhmSM&DK5=`Z%R*eqc=*ZZ!hZh|gN6uE8 z>`(URNNf7sD%s4F&6y+Fp~YjFW6z9yuu8V`WP8?r^YC>?_Sx;={Z+D+CtEY4H;Khi zCiF!2^WQmK>P+&?LtDe_n;F*wTlbo+yZGEDS4js?I&xN9npzm(tp|D2!TjHXy2gdK z)A6L~p|x@LDBsfaYZGrBd|(}1vkoQ=`AYjtC>8pc`Gi>*U8`(Q>T*U)+L`K2_U0N| zlLN_t99f<2OARN7pFTeHl&EJB z1f5tiIhfbBVC2nC-mv%GCSb@`#!B`ov-!4>3);>gp0V}iNSUd ztoTpB))qVeTeJf%Vx3?f8;;6v%PZ^w2*sa?=!;&W2_sk(Ok}~?DU8d2?A367Ekg+_LR}3*7RUrJKvl;GbOq2} zCci4NjFOUqVk>?9GDE$L%#!@<{E~dVB(RziETVT^7y`jUL^L zED~2(Brd?vXP{c3ABtFj6xf873`L+=DB=VXzc_3lw%Qf(0J$JX7OMk^56p~=j5iqg S8^G`b3lpQ{2L?<6Y!Co)17*Sh