From 07293c67174a8acc9e023a03f0870443dc20f80b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 10 Dec 2023 19:33:06 +0800 Subject: [PATCH 001/168] reduce png size --- .../mai/default_pic/UI_CMN_DXRating_S_01.png | Bin 1068 -> 825 bytes .../mai/default_pic/UI_CMN_DXRating_S_02.png | Bin 1021 -> 857 bytes .../mai/default_pic/UI_CMN_DXRating_S_03.png | Bin 1049 -> 847 bytes .../mai/default_pic/UI_CMN_DXRating_S_04.png | Bin 1045 -> 883 bytes .../mai/default_pic/UI_CMN_DXRating_S_05.png | Bin 1038 -> 847 bytes .../mai/default_pic/UI_CMN_DXRating_S_06.png | Bin 1042 -> 858 bytes .../mai/default_pic/UI_CMN_DXRating_S_07.png | Bin 1253 -> 964 bytes .../mai/default_pic/UI_CMN_DXRating_S_08.png | Bin 1268 -> 981 bytes .../mai/default_pic/UI_CMN_DXRating_S_09.png | Bin 1274 -> 1019 bytes .../mai/default_pic/UI_CMN_DXRating_S_10.png | Bin 1297 -> 1073 bytes .../mai/default_pic/UI_CMN_MiniDialog_01.png | Bin 6000 -> 2937 bytes .../static/mai/default_pic/UI_CMN_Name_DX.png | Bin 1851 -> 1154 bytes .../default_pic/UI_CMN_Shougou_Rainbow.png | Bin 385 -> 575 bytes .../UI_CMN_TabTitle_MaimaiTitle_Ver214.png | Bin 148 -> 113 bytes .../static/mai/default_pic/UI_GAM_Rank_A.png | Bin 1073 -> 701 bytes .../static/mai/default_pic/UI_GAM_Rank_AA.png | Bin 1750 -> 1001 bytes .../mai/default_pic/UI_GAM_Rank_AAA.png | Bin 1924 -> 1255 bytes .../static/mai/default_pic/UI_GAM_Rank_B.png | Bin 808 -> 510 bytes .../static/mai/default_pic/UI_GAM_Rank_BB.png | Bin 1433 -> 818 bytes .../mai/default_pic/UI_GAM_Rank_BBB.png | Bin 1918 -> 1061 bytes .../static/mai/default_pic/UI_GAM_Rank_C.png | Bin 1302 -> 742 bytes .../static/mai/default_pic/UI_GAM_Rank_D.png | Bin 907 -> 588 bytes .../static/mai/default_pic/UI_GAM_Rank_S.png | Bin 1309 -> 747 bytes .../static/mai/default_pic/UI_GAM_Rank_SS.png | Bin 1493 -> 1080 bytes .../mai/default_pic/UI_GAM_Rank_SSS.png | Bin 2116 -> 1539 bytes .../mai/default_pic/UI_GAM_Rank_SSSp.png | Bin 2239 -> 1634 bytes .../mai/default_pic/UI_GAM_Rank_SSp.png | Bin 1693 -> 1208 bytes .../static/mai/default_pic/UI_GAM_Rank_Sp.png | Bin 1412 -> 804 bytes .../default_pic/UI_MSS_MBase_Icon_AP_S.png | Bin 1711 -> 914 bytes .../default_pic/UI_MSS_MBase_Icon_APp_S.png | Bin 1766 -> 927 bytes .../default_pic/UI_MSS_MBase_Icon_FC_S.png | Bin 1769 -> 936 bytes .../default_pic/UI_MSS_MBase_Icon_FCp_S.png | Bin 1803 -> 983 bytes .../default_pic/UI_MSS_MBase_Icon_FSD_S.png | Bin 1760 -> 909 bytes .../default_pic/UI_MSS_MBase_Icon_FSDp_S.png | Bin 1798 -> 943 bytes .../default_pic/UI_MSS_MBase_Icon_FS_S.png | Bin 1715 -> 886 bytes .../default_pic/UI_MSS_MBase_Icon_FSp_S.png | Bin 1807 -> 937 bytes .../mai/default_pic/UI_NUM_Drating_0.png | Bin 960 -> 634 bytes .../mai/default_pic/UI_NUM_Drating_1.png | Bin 420 -> 327 bytes .../mai/default_pic/UI_NUM_Drating_2.png | Bin 909 -> 584 bytes .../mai/default_pic/UI_NUM_Drating_3.png | Bin 1063 -> 652 bytes .../mai/default_pic/UI_NUM_Drating_4.png | Bin 698 -> 494 bytes .../mai/default_pic/UI_NUM_Drating_5.png | Bin 0 -> 608 bytes .../mai/default_pic/UI_NUM_Drating_6.png | Bin 0 -> 695 bytes .../mai/default_pic/UI_NUM_Drating_7.png | Bin 0 -> 497 bytes .../mai/default_pic/UI_NUM_Drating_8.png | Bin 0 -> 681 bytes .../mai/default_pic/UI_NUM_Drating_9.png | Bin 0 -> 645 bytes .../mai/default_pic/UI_RSL_MBase_Parts_01.png | Bin 0 -> 546 bytes .../mai/default_pic/UI_RSL_MBase_Parts_02.png | Bin 0 -> 864 bytes .../mai/default_pic/UI_TST_PlateMask.png | Bin 0 -> 403 bytes .../mai/default_pic/UI_TTR_BG_Base_Plus.png | Bin 0 -> 210 bytes modules/core/utils.py | 6 +++--- 51 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 assets/maimai/static/mai/default_pic/UI_NUM_Drating_5.png create mode 100644 assets/maimai/static/mai/default_pic/UI_NUM_Drating_6.png create mode 100644 assets/maimai/static/mai/default_pic/UI_NUM_Drating_7.png create mode 100644 assets/maimai/static/mai/default_pic/UI_NUM_Drating_8.png create mode 100644 assets/maimai/static/mai/default_pic/UI_NUM_Drating_9.png create mode 100644 assets/maimai/static/mai/default_pic/UI_RSL_MBase_Parts_01.png create mode 100644 assets/maimai/static/mai/default_pic/UI_RSL_MBase_Parts_02.png create mode 100644 assets/maimai/static/mai/default_pic/UI_TST_PlateMask.png create mode 100644 assets/maimai/static/mai/default_pic/UI_TTR_BG_Base_Plus.png diff --git a/assets/maimai/static/mai/default_pic/UI_CMN_DXRating_S_01.png b/assets/maimai/static/mai/default_pic/UI_CMN_DXRating_S_01.png index 5a9c90da5bdf2e6b9c06edf50568a2f77a4f1bc4..f271502019ac27f7e3b90a48360e1a5edada0023 100644 GIT binary patch delta 802 zcmV+-1Ks?r2)PE3B!A3MOjJbx005qzp8fs(o}Qkbo}Qkbo}Qkbo}Qkbo}Qkbo}Qkb zo}Qkbo}Qkbp8x;*eL;pq-sgNl8LJKKlCl_xJbW;eX-4zP_fTqgz&1QA|wM z)zy-Yj*p9rgMWW?aB#=Q#>2tEyt%ouv9YbItE#A|etLR&b#+ouQ1tZl-`?KZ+1Z?# znV6N8jfshihljYfwqRRZq|9@7&qS8Ui+tq~l9&kmiA(8spqov3P+y*ky?!?W&zx6XjI2e$P zGR8%0Tw}CqwRn5$o{U+f5#ATb{TahukSmuQGnYMQ$;gNa8xzK#w}m zXMf5HfPWHe>KSlL{H41~#qE-Fs8YbS7Ig(em6pfXb8eqwM}2k3w)8yj`TuiOr3PHG zW3eR9xTCVZ2)MeGB%ko67F&sOy#bHFfI!px@J+e=|4OnFNoGS-D7eAY% zIk~V-=<#y@HKVbYKxVjMajt4fam{)ZTr&~w#`i{`ZIYbC&+SFH-?iRwB_hsn7*#Ww zz~M*Q6GqW^f8l7k#oZlJo)WqNH!o^?1F6sGF2Y-!uR=I3Qr@;F#OIt}{^66zKp*c5 gxf|?M$mg=xZx?`36QxzdHUIzs07*qoM6N<$f}>Qbg#Z8m literal 1068 zcmeAS@N?(olHy`uVBq!ia0vp^>ws8=gBeJw|NNK)q!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`q6n0G|+7pya%H^Zx(;|L4yiCp$Z5TU!?!n~3o6OBXK|=HyhCmd>3y z^U=eHYges0eDL7b&6|Jy`c+p|HKC`cuCj9J;>8E{?VHr!|Lf<^70Z^D6clu~w?BXO z?8u=*+cs~G3Jt9;FP}YQ#*ZIARxDi_8xaxc?F zId|qvQC?nrWaNVf4@wIPJe-}sfB*jM*|Q7h&iQ$IPMbXW@87=@`}(|GT;|W2bM)}x ziM_qOot^vl?sau=Shjfak;8|Be0(;pUmxu2n-CrS=Jo5xj~?ybxpUKo4dFpS`B_=n zX=&%ro?S3!PFGvowk=zJ{`~px-@gTO=N>i3C>Mnc4<~+ej=O0v1Zm2mhgn0qo$JG+FN!_Qc*m#WXX%8 zy&w|RoYqqsrB8zmf6Q7yw9HqnH|}a8qCM7Vs5QJe?`O0 zPOeBn`>2?t#HFeCvy>mORUa-s&8)n<$y~cpYgL`Jm+96GLN^tz2ii(?NUi<%ZrP3E zw`X-TRI{9`+wa_5s&V&4pvZA)@x6@eSZn_>H#-*w#0v8s_B3HCwsxzW&YfKI`gvcn z)4Vf}?r0`h@tCSzojdcW%tae9v5g{UN)PrNOg$IN7IsIjKi%|O%)CPVtBJXH`KDVh z*(JSppX9l_E$81pQ_rh?<~5<@>9_pk_6+k6T}xRDzhAK7<$nH-nSBXQ>+@F;cLN`M z;5e>6g-<(KPjubGTLrHyn4i!4{_xQx{`V2ZSHsU1w!Ze0GdFJU&}|9 z?0EFATsCP>VCT0*O3$+bk7w=B*LOM**rR3gSXot>YbpP!$f zo}QkD;{I4yS3^BLo}QkC;QUBROjBiSajwC1xXeXBKvH68XO^W*R9I@CuR}gQh2HsB zR#r$wMn*zIgWL9Np|YB)uV|U5Wt5^{gO5v6Rzf~Le9Gc)tAD*>ikDu0idl7kRA_Kj zQ&UnWtClea+>0!`hI?*Os=xY@@V7JUoBV>VD4WS8jJnPf}${%oG3s01R|ePE!B}&ZnAi z54V6=NEPb~Dt`n300JIKL_t(o!|m8kY0tNad3RM!`?}?7)t`ue z_ES|$Z@Ed(s_u4NfkY%UZ!sVteQ>?RsKyop_Daq>c7GJy8fm#t@Va*R+!0mgaBvx< z!O)?~2%npCwbz$H83%>`=A0>ATgdpyW>wZR*_jVqAoubl6=@O2xdI)UK%MnI4YyAXQQINR!Cc{R;!!$=c+PoEXcBCM)Bmij>$IU>@b&+a>azs0&C`VJ;Sb#dw(OERNS(|c^UOsaFwW6HYtHAn|>}P zE*BNj%w}T2MTe}@v;j#j{an#>xp*m&rCu9*nc;H(H_?6+Kw`LFA?|9|(QqxxDW2xc zU`4=PlPnd3YlkFz;d47wIm1CftVz<6;dAW@Pn98}xT}qOuMC<+Hbw`oma(5WdEIZh zX*;d@WFz(oH6=^$MtaqI#Jt;QHG@pKrN4dA642TCk5qEHNT-t5KT!H8lSd|98~^|S M07*qoM6N<$g6~46tpET3 literal 1021 zcmeAS@N?(olHy`uVBq!ia0vp^>ws8=gBeJw|NNK)q!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`lj^0G|+7pya%H^V%N$bF#B@wzYM!v55!|FWY?~I5j6Mw=}tXM)ipY znX^_EtUZvua8t{@pAm&saSc5Y1(m5&7Ui$r8{gdDa`#8tw51^#1+g{lwP&9et~;2s zaFcgXXn0pENS|IS~v z$JxOlZSo=yFQ2S=>pi`EeZ!*aFTScd`7m$Uj;#6XJ^h1%ld}R7(n`0VN$Hy%Q{9%m zXmjhszbXB5i#8sqIrYfJ)~@;1*YbT=ob4TQ7H^5G@A3%>OX{4KwP1sXw{Q90ORi2% zMH`QL2ZuM^{2W!*P_pe*{>t6e$M5GZ+3N1@>FVkhS=Qj@;81z!hFSf)24Fbmlmz(& zGyJC?DDwX_0~n9DJY5_^D(1Ys5gvTVL4-A7ujQ*-q9TDC9XGh@1cnHRN}GusxmW%F z|NA@_S)mP1Op?WNM!RR9d2)KLui9=`*RU^s8#yO6sR}=l&EZ-zDXDvPvd+4B7bk0T zFm3Yj>##z%}>8($gn!)=zFlWWi#2bQlp4{<0AlQBUarDpUpU$YC z=zc59`EbUvUAy<~O+9z_c%05LeH)MGTmn2#{p22Xys-G$HFf0<^$AJ^Mej5xC{$`0 zUqA4Q?Z=(o2WPyW78r|#J?wn70(f;Os zA@5)1)4bPx{_oxy>6@`-*Sf1keOtp0{d!hA`HV=yRk@Uh&%6J|Y41GAy)Q8L>gGwA Rxxm!L;OXk;vd$@?2>^T67!Lpd diff --git a/assets/maimai/static/mai/default_pic/UI_CMN_DXRating_S_03.png b/assets/maimai/static/mai/default_pic/UI_CMN_DXRating_S_03.png index 59fbe4178cf3989bee2d5851fc2fbc3bb04c79b8..9c284dd3f7c50903f82f5505c0b795d1ab76be94 100644 GIT binary patch delta 824 zcmV-81IPTC2+szPB!AmbOjJbx005qzo}HbYot>SYo}QndpPikZo}QkcpP!zdo}Qkb zpP!$fpP#P&fLK>oLp?p7o}R7ze@je4U2IK7KtDr1K3ix^jKXVCSVn@cWPGJzlFM$a z`F@_^c9hOu zP*6=tNu=v}j>T+>ylIHIXK#&IN<~Ge+={B?h^_R5pyqdbqF{QWU|w)fNJv1d>V}%y zbA_~KaF1DQhgM*4PE%P%qqvr(!;`4hjZ<1jPgF!*0?`lv000eiQchC<2X+zD$+xMb zo0(Wh!^kl^0Dk}i7D+@wR9M69*x7EQFc^m6q?vu@&u0gdrEDPtXqG0;)@JKI+x=hB z7|0QWlt=*zQr`nkIPfFOlI6ehUbfXPKClw>3;8>A(A| z8gk2^m8}k3PNj&m=rB-8dgn&*VHYaS&l>4@aJ!J&RDZy}o;`O6nV9tI=hT}xkd3nE zb^$oo^>gbj0gR7vO+`^G-w4-Llo5GKls>W+M3%B8nki32q+jlo=XC-XfRNgBy!;5a zg)onZ27pCAqTEZgi5d`7>Y_=sZX@U+kt?-ncu(VMnu1p%122wn*QU9LZ<_qT#UkSF z;MlFjRe$pC*3$_p=s1_t41#Eb?F(8I7(4QN;QkTQfNKDAl4Z-qDO|1dSAwVs&Bk+_ zyT!tje?36wwr$_MJy+H+XbQL*8a&1wzKV|IK054ly=UzK1m!fy{l zr!lXL_3x?R-Th?jb0w(y{SzxeA1`W^@>Hu<%GW=ok30~fi=(3e0000ws8=gBeJw|NNK)q!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`q700G|+7pya%H^Va=qaI&*=wzYM!v55!|pK_rfHpe%yG@xuo%-jd1 z^{bM44rH}#N?ZN2E~P3cuO}k4GO%hct5GO*)+ym+KoG z={DznX+nXYtF!&eZ?*HEmQOyL@9F7SG&y?hpZfgXNOu?e@;Pz6hqCi~BXT>#*Zi*U z+>`0zU{}2;q32Mxw~tfP`V=2ur{E~}#jh&oJuGYAk&3p2hyo%Ye z*==Dho6}bRs9XEDzG7}%-;tbokIG!^Y*&4)nRcbn#lg09OIlu6cwm@Y$+VcJ4XINv z6|VhV*Rdnr&B=c8>&m{PIf3D>%RkqoR0gg5S{oSVn$Zw4@l;;t?u@zjOWU@lxw|=} zH-xx3ILy3JoZ0l-7Z|w3B|(0{4FBm45?21x2FCF%PZ!6KiaBp@ga;pT5MfQ&Yxyc_ zL*hZbBVBhDzO}^)3Ld#vo&W#;LEa8#LD5zgqh~fLW#%(aPPd-zQ)X<`vtq7~tO}F2 zm50O{?lp6KnpY?BteX`$S(}4N$R})C*d3Rp2Tz<|%^AKg@|(NTto^T*Zmm}P?r)cB zE|^v1=X&)V!nHYN2K1=w4TXk}Awv+MlY38pR zsh_>HkFe<&mB$Z$Ub=C z!-*FWQX%DY)C@dLSd00W{hYvU{72%+xg@_i`Va1~CK$4rs$PwaI>t3odbQjd*Wy@% z{#aw!bO(DRTAhyIYZu?!>U7iK$D(uS5Jh-$vform;OW6a*lTV*Mjj1YO@IT*p{*Jir z&X4IfAF5=sZG3meyI$tMx&Lw2FZXFO>*oC{pS*ciKt^cnYE{|nH7!?tD<=DhKUiUV j;>&sS-+SFAO*VhHHvfob+euYmB4hA$^>bP0l+XkK-uoF` diff --git a/assets/maimai/static/mai/default_pic/UI_CMN_DXRating_S_04.png b/assets/maimai/static/mai/default_pic/UI_CMN_DXRating_S_04.png index 9aed976297e94203fd9bb353033800c67508f519..6849ba4f8769599774a8156954cabf96f9096343 100644 GIT binary patch delta 860 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 Vtp$@_-vOpC22WQ%mvv4FO#r+S5A^^5 diff --git a/assets/maimai/static/mai/default_pic/UI_CMN_DXRating_S_06.png b/assets/maimai/static/mai/default_pic/UI_CMN_DXRating_S_06.png index de4fd344be4cc7d01b390bbe717d0ee2a5df75fb..5c9b9ade00ff4861ff65b9582259e3ea0e784666 100644 GIT binary patch delta 835 zcmV-J1HAl_2-*gaB!AveOjJbx005bpnV+AZo}Qkbo}QhZot>SXo}QkcpP!wbou8kd zpP!$dot@gC{#aL6Lp?p7o}SpB`)E~cS4vk#KR`l0KC6MkoOiF3a;0TcX-`B<)1CCg zk>P)1iL{5!vWCm4fWMb?sE%%&Ra8_*K||G@_@#ZhpLw#9aDSpsMNGPj){1MFc3*#L zS8!5LP)$im%a-f6iP5ct#i*XIpP!$CW{q-Od2U*DP(@8jMMcMx=EtAkT1#0}NK{Kg zNY0i7-!^QkEnPf6=;iF_bK03I%5}EJI_lSEa#G{FfcQ+Q|YseMj zU&wy);jbu$+&pMicUKWtA{R*!9R}p24{ns~)M#-3rhl$XgIlB0#scm(lIM1)(g*dE zeX0+9s@&wcwLp7uvTyYplD%!*k)~<0t`)AUX)an?RKuN4fT`97T^a4oV4RkB>}!gb0E z1;Pt$kJY!_3fr8t)ZZ4_faiIa@6T0TTNsk2!^-OJcIJ9nai6G%unnidpph!qE3pfd z88%wsI!*Q!cSKsStDCt@l`EU{hnTUXX%%+gaDUHvDN9sb)92JgI}=X|wnz~f?- zi)O$@i_~AvGrpy=lJ*uq+X-WV9 N002ovPDHLkV1mF~ry&3U literal 1042 zcmeAS@N?(olHy`uVBq!ia0vp^>ws8=gBeJw|NNK)q!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`q7O0G|+7pya%H^KLEp=VWK+Y-{UcV-pb`zOCazMrcl6RB3nijKdQj z%qUs4s^P%A%1zhi{w#{AYE11ZimsekxM+F(-lp{aYjb~0DPEctUQnCVeth!N)r|+| zS8fXR3@wN%@5-KjWzP30MN7lIBm7)_-0d7sPkTMBczJ4Y=7}lKoo#Fn^xfXnc6xK$ z>CDjFDDTLF6Ygh+7q~k(U!L>r*yN{M+Ryqpd$wjyzA^t#V_L7LgG+DToYjqon$mjf zQaW$U`@O7gkBhy-q=H5ME0rFJnJFm7*qx;TbZ%z1kwJou1<2y4P#%M+_2 zHYS8~n7wfm3=GLx(ZQAUe(&r5^+n3B9FA~trktrf@g~n`vVOVQ%s0=TNCaB%wDORd zRx-hSgWiUsBHndfhC8y{eAg*(co?cp4!aYwRDa_9aN%_|oA-P_Vp@OQby2wQyZJSz z-udrHI~GyrxbV&vgD{t)I@2aCx@5GdC{1-$!qh)Gp<8>eUa4E{+c^7$@42Iz->47^x$Z7JLuFReR{l7`r!y`mJ9~Y_|0KGWZm-%VZc)yD`=P=9g73=V4GT2OOZb1g zux|`Mv*tk=Yr^9@&JQ}4e0&nayZZIhV)KS%^{0o=&4_P1UMOo(IKQd*yp6^F2bZlc z$NUT}j(?QpaKto_gV#%sHAU|#bJB&0qA|M|ml;I5K4Hq68WR_HZs~5t2mcg*P5iw= z_51UWuJdb79@{+SccjVR34g8EEvrv?`S8`tdUM;=oULJ3w?^ICc+4x}?w;I9FPY|S kV4wN-XVU)b9#x-s+P~$`$o64A4oqVVp00i_>zopr0Llw1k^lez diff --git a/assets/maimai/static/mai/default_pic/UI_CMN_DXRating_S_07.png b/assets/maimai/static/mai/default_pic/UI_CMN_DXRating_S_07.png index 688b65ae0a7ef2bfb916c2ca4a00e25911b9ec30..eb5b8f2e0d885d885afcf305ce7dbed74a8ce849 100644 GIT binary patch delta 943 zcmV;g15o_s3B(7GBYyz`P)t-s0001+o131Vo}Zteo}Qkaot>hhqMeYb zpP!$f_=rofP&imuS3^BLo}QjdK0IAPJ3>A_en&clNII}jIQEB2zi>xVKs;-WXF@xmO*r0tNWyYQ zw`@g9MMbA(M4e(oj9WroNIpW{gmM_ekSWs$sq+1w z%2Ov@)#*;XHQc7(Pl^OI@hRX=2ywDQedB*d1LA?b?0>nfO(EWOxMJg!XxzC}{JJ61 z9qx7lw0>J%u9XaKQ3Q)28Cs&jTpj|KM!=2Mn#UO!h+ow;gZK4v)erXzU_c4DV#ei0 zYmec#Sjx@DDOcKupUX@kuG-;dq;_dGZn;$e)hOn>;Ypn}_eV6N&{ zMBlwK5r0{0p0{@q)^b;?#>+IAJBLnLW&2cnT9LMZ(Q4Y8swB}rSFRYc^SvA1`MRP570l5Y<_i$Mn<*d8h zmVGX{b)Z4Ap>pv*+cEiVq0`{M1_s_$AvW6O>H%~iasEk$!#0oO40b1Jy2(YsoFEw=%z zD$teyTo2~50BG$@#c}tSF=e>}GK#lAv3K%e$gw2R-3PggU zZNZcsQiN6|td_;0Dg`Y?Sw@_qU<-8yrz(pUP@6%U{ueznzjNl!z2EN1l}qX6E*>sC z9&fprAr$ts+S#RU(K)5ekMc$pDKKJja1z6p1IH z1{shag0TXmG=jLMrA$HCyphWjg9L)4Qs6O~pU?6+6h6W5B`6%uppzNmAEJo|sp3`* zmBsL-0yszr6>^|~Lh8?Z^M8@owQaWU1Wn zIqUas%aW!~Om#u4$C7(edsfYdL+Z-SnqtW}>xmUJ#`2ozxS2aCHR|FE7tU`>IJfB7 zs0u8S-z&JNt=HEl)E6%`_fUC#*Vm36RKNKwuDfMzNVqT3hCVs2BU?3~af1{8JYTiWq*Z=@p+kQ+=DR5m--|UKw~VQ#-hgIi#JET-9W*p}8kpZ!JUnSl9?*TYt6ewu5pwQv;)qDmeye1ZzBwe@ zo#9pn^xA55Cc$L;33v9LipjC}RKtcxIsKY-Ym8KaQ}h;Xe?M}@sd_V*yt3_VZ&dSY zuB9s8;N&$F+5I(GUB9pW=~ioKMaT7aAMe86+3Z%frCR7*m|}CCUU|AG-21_ePGi1b zH~0eG*|m0#ACH$#1np8^u?sDdCSc0-5on_xfQ+CZtP!mm+jopJg5DWb+-;b3H>8PS67|xMh0!M7EG{? zqa^{|brR3Lfq`Fqs=Tl5aaq)EZ=JJTy8Ph8skD&k7duGlYo1<{GaG#KK4kAYPfSV) IE2cXBFG1;UH2?qr diff --git a/assets/maimai/static/mai/default_pic/UI_CMN_DXRating_S_08.png b/assets/maimai/static/mai/default_pic/UI_CMN_DXRating_S_08.png index 18d8fc1e6de01cd24b95a4ed7b203bbb171d8075..87e3609769f50ba0edf5bc4ff518e1149bd742bd 100644 GIT binary patch delta 960 zcmV;x13&!q3DpOXBYy!1P)t-s0001+o134XpP!$fo}Qkbo}QndpPikZqN1Xmot>SX zo$2xQW0kX5S64$lJ)WMPLp?r6NKHjUMpSHlN>W+1xw~SNvQ=?{X=Z2V@AJ{u+G3Kh zRa8_^OG`#TK)%AotF5n}pP*QIjapV$L_k33@buy6?76(ZsDG-gTYr^^h>B}zYEn>8 zN<~FULqp~4@Y&$wUWcKTmY7_Dn1+RiQ)hNkWphkdU`f@%Pgcp@`xgKJ01I?dPE!B|&ZnAiP!kKcfIP>i zKmY&&aY;l$R9M69*lBZ`P!z^-O`D}XCl6o(tp(WztN0%X3x7X9G9f`7FUX2 zX2|bcsvPE|pvAo)|7%6zgw55LgR4vS%di|;qS;)Y1D6)Sb=GQ)Ey!@+FlpH9IdjzjUeXCjPs%nxu zs-2M>et&0ftEWUa#R3skzV?gV%SkPdwBC3%n$6vYRfm}spv^7V8Cy`8Lx@%>fe%C% zDVSYNB!j0`HP=A?!A>YK{U+ykWQOF5y4ya`6_4?kJ zc0pWGsKzJ2@fkweIG1+uDU~+4ailXD03Ro`EJJ=#Zc{;vc?VXFN8H#E`ht56gelgY z&c%yzjdP?=xD7>BLuie0NpSb{6a+V0#$A?9|8jX@TuoCjIF@n7+=TL&OGhS`azOOQ zu75AMd=B&=8_Z`w?GHC)bM=(TrT7C-x(!cgIXYMFv$tP8e5e!omh1eR>+!C(@62Tn zxUyW1c)=|>?`rO~+y+qcKzjh-b~cwi;3gp|A4FVY(*Wd{1J}KljSjr(CNshH{yeEQ zhH#w>6b^|dxLF?`*2k(^+@KV{s`&P>J~{S{k4wSPNbhsi@7nCPm_Y{2HrC!P!Ms#j iSzQk-PaDC&^7R|P&?t39{oBC+0000ws8=gBeJw|NNK)q!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`q5t0X`wFK*@RY=Dqy*HF@f0Cp$Z5TU!?!n~3o6gU3#0XJ!=@7EPKo zC9Zv8XkNWnP-J9fZ&*=l(xeSO5lI1wxxNvJGw00PxOIDHXZO?B@8`^0n3t2=+|+#K z*4?c;cZV0XxOw>ageL^0l_X7CACgn!?&;_1;^yw)aP$7-`3n|hrlnuIb3ZC9{LIBG zdk-Dmcj%~BaFmCqUu^pVpO6@52S*n>`^1Us;<}bZ*H3kEb_q-=Oq#N(y`#&^*?G#; z>DzYh>1gk4X=#1-?o&j0x3isnaCUV>RiCS~TWDdEn~PgaMC6Toj}|Uka^c#|wHr2v z6*jxMdwB;&c>0G$*G&mdFY}Mf4Dj||v3lK;*Y96^_%e0cj2*l8#dR!7=vkgLacxxH zl;kO!0)2dro;n*79^vZXuyn<$m21|wwYCRml)HQQ1f>>-7B)vWOb_(&J$&Nyh3mHt z967#q=bq%r8zV|PTvh^J{Y#sO8Suqjp}vwx<3?X4Sp7f4|JTuIB4{H0NL0vp>um z6IQzHNbw5Y5xz5gSGaGpchcgcq6z$YTekd{G*61+U$=glT+IB^gFB3(d@l>r-u;DG$$GEv>!xhxO(*Zr;VS z#3j?j!u2Ch?K!hTF>2j<0q*d1T`yN(ugGF9D2^+7zRtA#oYlqcVk;hh4US$}$1F9& zTxnmYSu*#?J|4mKkZE(yRAPJBmu5%z6-a+`~#&?4HJ@O>DX$ z@6HC^N!piNcl6zj9px8o8fHAW$NcVcvtD{$$K_fMo2njl|DTdlJjzpBpYL=@uK4#z zmF0UVd))qo+v|7O7{?giEq}YX;{LTR{xi)hbe~*0t~1?^@#FdAi4Q)BD|FtgdY1Sg zd*1DgqN5e8(~s?E6uz(Cz2%Rx&$>S^w^x69uD^U!N5M(eYo&?*CY8F}Z^mZGUoLq&_H@`kUwz<<5STmMwl lZQBzsjz6t?pL6Ajc~yFc$cj9hx4`7i;OXk;vd$@?2>?a;vOoX; diff --git a/assets/maimai/static/mai/default_pic/UI_CMN_DXRating_S_09.png b/assets/maimai/static/mai/default_pic/UI_CMN_DXRating_S_09.png index ceb8056ae4798a63884a08d01383064b3f4e464d..8d231ff1f5293671f0a002c8a6f3bb26d13b7980 100644 GIT binary patch delta 998 zcmVVZo}Zteo}Qkbo}QhZ zou8kdpP!%q;{ex(DOgumLp?p7o}O1nI%iKe)rKiTJv~lBI+JBG#IF)=V=l6EE&bsG zR#jC-KRcRfF-1T?T~ssDgegr)Nm5ETab+#Qdn>o27S6X1_TUx=gVWO@^gVg$ai0nC{s%RU{~5K2TXw(i))s|$?sCOK#iFotDZjfQqAs^W;nzB? zO?zCcKe(2N$V7i=iCS~H3tZ|RH-J_@8ij%26-qigk&ml(xNo5-qo@bvw$~oPX)+Zb z4$@3&34cx{X7X{>4tG>)Uk?W@J_}&A9rq%gPM>_sxIb0XN_?n!B};_^=7P3ER7;-` zQGRYSy>;!^G7ML%#;a3n?ik#@Fmntja1ma~QN)->VBgRj#)+;Iko|1J1*A53Ge$?; zTuzg;4EAk1nK8{39GIs5n~QCayNQ+R*!GrRD}TAeN{R!Z_FRk00P_Ym_VJaaae|p$ z?lKbgjpWvW8p+gg{dLC8O)NuW{s?m&pa14gVF%k;hnofRRIOI$ecE1gWy={p29hR5 z^hPed!DYh!?s9D+0Iz&nHemFWyB-?c9d53MO^164)ahcYITtSfr+yoZ>k zjenrnz$Kc(yp@2%&9C4jPdk6O{QtOm468|74t5=}yIiVCE@c6Gd@2-NE(04tlGy|@ zx7>uswGxs`*-yZS)4ET~lU?QB`}no$R~Audxt(5f0n8{m)!K4d33n;3f;)@0+~8W? z127xh8&3f^ZOvr`+%n{RQ}KYmH2zfbDsssRO^U6G%A9^z%a zp^D3miiKS(w9EQ!*4m=?==4;G#Y)(<=kJ7g9Fav|JnDn@QZYC*5b2)=qLKdV7nN&N U*9d96kN^Mx07*qoM6N<$g7gyBdjJ3c literal 1274 zcmeAS@N?(olHy`uVBq!ia0vp^>ws8=gBeJw|NNK)q!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`q6&0X`wFK*@RY=KX)naJ^mA$ErWa$*y1FJaf z3(w0m2z9f{4>s$FH@?`SH96HN+}+C0+1lN~`t4=b)ib2?lJ#DmXO9grakjO&ca-bw zc7b!-`7`{@Bi$|cRqJF0n7iBCxY^lUY|%Vir?aU<&)dnSCC=n(o94tOWiMx|`F-+7 zHwaB^RPL=)`SXBrNv^(&o$bVA!wD%yD+~1foUCSL8U{F7C4?Ejxx}`1mek`@oV%Bc z1-V+M`B^0SSZplO>q#`Kjx-JOGT*jX{O3KUe~%az^vfOJD0HYs`((YAi>=MYX3Y&H zde_=CgT2hJ?dOdTHFmSN-ZWow`(p9_dX=6;<1lxt_IQ)onTDH7b%VXluk7V}e46vZ zPW~esgs--0F3QnA(V(3hWFF{caeR}|--iq_!6sjBG1nGoeY?%PY>G^{n`K#;>4svx zJW7T&H_&1D)-PII_9INUnK^Y;Nm#*`nizzFLv z3GxeO_&=yX?ad=>3=B-(o-U3d6?5L+_#S>aK!m+uk9oXF--3?Cd@>R2Tv~^-Tp1m? z`D8S<>B;Q)erWIZ74@6-d9N(-oqYX?Dz1!W=Wjh*cjH+>;*FOdsa@EZU7kMuG+)pu z)%ra1_m2F<`ro!C%zrW8ael>_;@=zXD<3R)AjiaZr#$b;on`wDTO6tpInGvi=cH|; zRS6&GJAneD*{7fSP0dh#-t}evGh>VDJc*f~%k*Lo9Q9V7&ib9pZByjN4_TelOfx1H zt&cs<`)u~L@Hf+%tEJB}dvLsyeV}*ubDB(^s`+gfw&vv8)+Tty@aeeovcAvT(hR;uBO^us) zvua17C{OsyuXzdU_Jm#B->I}#I{ak8)W*5KT93k(OYd{;d%5q`%NMEbXWa0j!?wor%^qNiXYh3Ob6Mw<&;$Veh>x=X diff --git a/assets/maimai/static/mai/default_pic/UI_CMN_DXRating_S_10.png b/assets/maimai/static/mai/default_pic/UI_CMN_DXRating_S_10.png index 3b6e600befa0cd3bec6570ae10845d8314c35140..0b926783ac634347d0365f4f9d5c2683c6b69d4b 100644 GIT binary patch delta 1053 zcmV+&1mgRV3b6=~BYy#6P)t-s0001+o134XpPrtcot>ScqN1Ljo}Zteot>SXot>VZ zo}HbYpP!$fpPyJ)SO4)_|C5u3;{HQDJ+A(Mo}QjYKR$6$QBp%gT}erCuEDZ!aHwl* z{O((BW<&jwl2J=Pj)h3jeSPKFR##S5R#a5CtWT1NNl8UTNq<8>`;n3OkB{PphQxPw znq_6s#Z$+;QdCk>tDsFyN=jQuNL*DwhTr>)(&u!y%guazz;babt4ZHm2W>)>dFvS#$?W0qrMkYHenU0vSMRc3utVs%lns864jOpAg@ zOh`yqMn-F6Lry|M$+RZ^0000EbW%=J00yU;6ARPHw|{_fa9Bv0K4??`00MAHL_t(o z!|mATQyM`S$8ktBJw6XVZx3TGAc#n}fW0fBXzV4u_ul{i>~V||L14l%+|A_s;$DAd zXYcl&b^WisbzQljIiPdbE$(?uyT9(K8J`)|skd&PGvhkV-O;qmC9bwH>G9Z|OUCm@ zn!Chxf`3*vSLRMQgKKEkW^jgj~c0t)hwL56sJY zj%e*LY<^kBiih8WHQuwbR*lz3^|?1tYFl#Cz<(YmVHLZHK4ve(3XS0w(MkqppK5ZY zRzai9ai^wqlNQIm5V0qLz;C<{1bk&K!WOrP$hWodK(*H7_9$r(05#@L@C*d=0v7g> zVAI$ypJncmSTVUlAWO3Lab?YMr}}^5fcXG{MST35>qidZA;}#A49e&8BNf^Xab?~( zZ+`-@X?T5=T=HY}NPI1E1rdOO6K$usi)kd8`%&uIDQ+r@qU5H4Af*QE!1cX^*yKI* z>ADxm3NA_Rh>?Nh?nY49rQ8X(w{u)y8apw8Y34Jx7OGmKDz5r@^6Bhns3^Qj)!cO( z59<}ZDRJG}#@z|q4(rDm@|Mh9zS4UzX?N|r$MO!+W!8P|lIDOeUhQ%@r*5~)c^3Tv X0=ws8=gBeJw|NNK)q!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`q6g0X`wFK*@RY=CwWg_kZ%_{~x2*{cCWtvvan!b+NID2oEpYeIYnC zCoH!#xqHT=wzjpoxrKp&hs(>i78d@RII%7wVnRYfU3mD?Ilc$B1{P+zOzQOd^*VCJ zJl~QW*X|~d=eNQO*B#teSQzEuQ5_aGJ2mykgb6FMvtvCy16^F)9c!^Ppq8Ci_KE6BX zNn6|7t}Yi_+p{$_|0Yce_OZWqDkMJK(aphj(+dCXYyA6LJ?E#VM|*h8Oi9^XP;jZP z?%biEDp}!L+?kOqpu(yBH-CY?L7U*q%d{5Bd_favS4qu)})|R?` zdl|KCw$GnQlVUtPTB4%%YzWx4%0D~V`PYOA4_jMzuJ!l#u=94cYp!;Gay`t=!Qs!l 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 QT6+MT?2p+!wGB@HA7P*ikN^Mx diff --git a/assets/maimai/static/mai/default_pic/UI_CMN_Name_DX.png b/assets/maimai/static/mai/default_pic/UI_CMN_Name_DX.png index 2c44b7db741a19c7ec93eada5aa2fd9bd91a3e75..2f4aac5d33ee380d5577810bd85d3172db8659b4 100644 GIT binary patch delta 1020 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 diff --git a/assets/maimai/static/mai/default_pic/UI_CMN_TabTitle_MaimaiTitle_Ver214.png b/assets/maimai/static/mai/default_pic/UI_CMN_TabTitle_MaimaiTitle_Ver214.png index 1f07453f139165fed7020daa67956a2f94fea611..650b2e9f458a8720942e4f299fb2f040e6c554d0 100644 GIT binary patch delta 83 zcmbQjSU5q&mpQ;E#Fc@8VR@D9Eg;2M666=m;PC858jvI7>Eaj?aro^)Lq;I)kizff h+m7)i0GSL76UxQTF)$h&|DpoodAjPkN%FypgP@i(^Q|oVN!J p8G&jJE%@r6%get2$Yfx6aF;>s90Oxe|I9leuBWS?%Q~loCIFw+8i4=+ diff --git a/assets/maimai/static/mai/default_pic/UI_GAM_Rank_A.png b/assets/maimai/static/mai/default_pic/UI_GAM_Rank_A.png index 6e0788043d39fc0f939de14c9d81b59b07be9a7c..e5764d3535c6cfea6ff2d9c2435ab2f240e189cc 100644 GIT binary patch delta 614 zcmdnUv6pp%3dg+wpAc6D28M}&q7xI?h)4C`Z~i@b`uEb6zh^J}IehHT z{=>i5Z~irP*3Svke)dlOQQ!9e-TS{cZvDM-?a!Y5zZNb3*)`#3Q)li@g?B(Vs+9!! z1v6YreQ@yTjQYvFjgtJIpPkvYb^XdE^V;*Ww0^w1bYXLKSzM%%0v9WD!G;YC42&6` zE{-7&LOia;M~=yANcFM$FWOmf z)p7FV*rl_QUUAHudHUnsn0}=#uB-WVU-CS>!7)Mp`{Ju}k~?y=J3Dsm>32)xx~V&i*@FXX)@Mu)2gg zo#Q$6Z&~E2TT+`E?;m;jBl^Xi)m!gw?W@$k(!QlA;gv_$yS|kUceNMPJN7PBd&DKC ovaL`=g7v@8#+=O`uK#5H^*!+;=c=$Pz?fq2boFyt=akR{0LCXXy#N3J literal 1073 zcmeAS@N?(olHy`uVBq!ia0vp^%0R5g!3-p)&J5TJq!^2X+?^P2p46!aaySb-B8wRq z_>O=u<5X=vX`q760G|+7pyYoX;Lq_>-{aGNZ{H1(|21{i&(?0J+TXvwr{w(q`~|M{ z@1-k$4jqN6oWJBpan;WW)1b2d{(a9X`g7#?_oS@CWc)pQ z0Vw`^)w*9Z=l!T}`!#z3ko%*e{?Goyzn8E6o>}<+?_Y$**KhtkefIapEs&P2JHBTX z{#v#QBKxzc^XG)AKdKtxihpn2`D@{_e~+KQMgHEo`{(4D-y63=we(K@o|gCj&)@%F zzWk_fg)962{m1vz+@Ebd|KGib3;sQI_RpUE5bm!TbANVC0J6WQ=l}oq9mx25&&vJHc9#bSf3{a)a=gRA_DxyQYa>6` z)oC-COZP34JJcu5{&2$jPKRd0-hvy~O)koq9_uVza%go1+Xw5BIt zc$aMDAwT^S=gt(rqE}m7&p9j)*?q3;^abX<(=wZjgWf#e!z2D+QR)@LFW!X>-bOKU zPrOVerJk+&=YIXg#mA+;ZQK$6Yxv&{JJTFcur^>zFt^Q%lA)muNB1Pw?RIWSAT@mRQw>Qm9xpk+xP?h-H%1_*> zX@d8xu72dZH+`n+kA#`2TH6X+4~CvDSsy5^HL3r@Nu@sFwqJ{W^2C>XTV471u54C= z$HkiFrgQ70AHNIOGE=QT=fE<*XP0s`H=Zs3eq2bv{2BY7D?24;gcX0C`}fjk5tZJb zyw>*;Q?LH%-@bt9N$tP9z9{r`56f>h523`DJyl_%Dr0j#}~Hs%SEEQ drv4~T=GV70|84B-56s~V44$rjF6*2UngAJauNMFS diff --git a/assets/maimai/static/mai/default_pic/UI_GAM_Rank_AA.png b/assets/maimai/static/mai/default_pic/UI_GAM_Rank_AA.png index c5a6eea25be27d69cab236f92a22b1e7c59d9cc7..83a201e278c002f5387363fb605aa91a643fe3d6 100644 GIT binary patch delta 860 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 We`<}J&3?7`lMoLVgfq!84D&ysG~Q?c delta 1920 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 B?PdS~ literal 1918 zcmcIki93{A93I;(lDcTqf}$H0C82Ibu4SeojYe0Nh9*K%qq6oeqG-V+p%kK263Oj` zY%w#KNkf)ot1-qBS;9=1e)l_5_b<55eV^yN=Y8Mb?>yf*-*=ub#?IDyzJi(p4u_jh zz*`Wp84dlpG8kLi`o6#>DSx81xl~*2hA_;?pTax(<8VsVXh)i+a9^!KfUV z!*I3<+2TRi^%@CV7PLV-`vRdY@OlV#S0VcY5BdKpfXP`1XaZsl ze4GNI7@i8iiwkc@fj5PEww5FAk?4$1NGErLz2x9WILKnCAB8RDkS3{O_EEK^v~jm0k09k;1c56&x&#hwo+^u*z0_7g029}G+#z9~Fn zk|jx9WfC$9M{cl{2r5%Z0<+mJa)*b=eoIOdTb=*`MNn~ zv_5;{l()+=vW}x>Sm-`*yy<0(S=PjZmNz%>_TKW`j?1|hJP+re(N@X-G~waX`npWJ zJd5Px8t{<2jb-H9E+5kFBXatk)W0%y`#GxMtjYzv`<)V;3khFYTr?U|vYsAMG-bEh zORGae6SGqlUM@6MiZ(t|7in>Q zucxCP!`?e4O^ba$a8HPbUX^bAyXrf&6=&qA%zeBES?)Kb2Nn&B0~V$2oRiFc_|jK7 zp7}ViCT*J96-t&m8oXFfda-`SOyio)d4GB<7M%#XxQT3N;4hb#mqn-LtQM&|u;~Mj zbDdk%YIOCUuemN;-6pV7{9i@$^`Ms`APVy;T+w znN18agLLc{I;(p86pK`&_-KclF2#|yM!q9lWoYeoos+5#sqR~U4N&vs+faVP#9|ZA zC(T70mYmD+?`zAgcj3y1J+_LEo#newG^6f4i%*K6v6;UZY@u}rMOjU|Eb>URaxJ;5 z(DAbN`w5C%SMmA2r>6!&>huqM63`PNI13W8XE*WM{M(YEC+&g`oct*D zwXs4*keG@$&2~+CrQYkKIz1dPLuLA4tOL1OlyTUTgs>+3mr(7C)<0{q1 jv`uXc6CJ#uNGz?DvAZRGuABJYbhbjO6|Jsl^{`~pu#hCy8 z{QL3d`Rm*ERpHtqNOaA)x z{Pykl=F{}u!}Hw0=eK_5wR_~QZr+|z*^M*UiZ0iPD)7;*@6M;+pjI32%f!J3D37iH z00DMML_t(I%k9!D9OKw%6;q=~)vuDJ<;AXRLDRCWKWF_{6GA!G;KpPcW!kh~XJ zCOgZeqxePBxwC~LpSfh#)&5419OGB+Gzvf6Pk?_|0Nnyky)ria#+5F>icT^>t!mDC zEka5o_rSBMWtE7jWF<(<_Yab)F`#Bn8ogO!Oc8b!vI-xT6mPBrMQ^4HJSrvug~>m) z5xL*Ms`{uckYlQ4*o^NWI#S8gHm)2~mtXGqAR0}2MCoAqsG$w{$ijA^FH8k)B8xNN zRhWM-*b6a9co*gcav^3722-;iV$x6%rUls$lZBT2$Pf=Phtqc-+3+BCY{U%xc+S^o zo1z9JydTyHUf34SQ0~HpZ4971j}rga(?jN3ZMZnqZ=-BU)Gq<07kNLaxj}Vvu7M5f z`XG8b32x>NoL1oGy*X-eplPWm?~zn+Y1lo@--)Oe9P#pc=ZE+eYt2HV^NHVyF606> nQQ8qC&}lY~>^hT=Ec5yU`{ZYdxaN#v00000NkvXXu0mjfd}TQa literal 1302 zcmb7Cdo-J87*E)2i_(_qrn>e_YZuWnRTXAkT@EHL4cnQawQCo0pR7YG&XoN(Hh$0mcByxNArJp+f-Fwdadw##)^E~hSp6`2dg9Cj` zQ2S8`1j5A6*9!;5!_YqVsv(4AN-z@&$V8lv2a?xomjQ{_@V;S*2!v_3ej~|fQ!50* zz&scm>J25q|6E$->YAWS`lvzjpjk~z8!m7}X*#V$ct7UUbT}51??fMKGE|{)8tJ7?5hz3`Nn_!1WI>|5f zg85F|5Dm#j={ucmzQiJr=R3ku)O=z3=2sA(u8ExgD;**NYQWR>Y&bhr89d*XIY&=| zy5Tg)t z^kvVNRv{BLf3IBRZA$p_t(VlRPgft`nfet6CB@9t`PQG|GUd`FOr!&Kf^uJ-TDja` zExhp=Y%UMftqE9~bqOqY;H|!e0%-?;D+%Ve{8-(YJuoa?Pz0MTtvIKcWhbSofn|&11Y0CmKg;9RK7(?%i zpt{J#j7}%xFNcM(d1ZD<_Uuv?Dy#AGrwz={8O{bTFQJUN>=CP7jJ+P$<84O-ynEid z_!H-t*YGXYHet8#6Nnex0_Y9-g7*G{?+MY}9asDMZ1Zxo_>YUSRs+U#=J*gp;xCw8 zKE>ug&NKTCWJe?GPzC5jgFvJ55d0UE1oq2CF2faVn8=N;(P>=BjuA0Mb>B&1gSbb2v_JX$_4N7g@%QS`$>6TW-mAUYov6%xq{?`d!C$MxYU2O^03vi!PE!EDgeAF`?BK(c zV)5sH+0w_pv#Okoa&KG{_RX|@YGf=O4F!>R$^ZZX4M{{nR5;7+)KzZ7KomexCvlj$ z48F$1vBOY?{qL!gr>@k*PqTsCzb74OMj9~AsS3p$s(Q0iz0Ecy{?+N-Jf5H;C$+}M zC#` zfBpHf@I*00_UE6keS5<{|9A)C0?C^%k6nDS3&L&L;j!UjCy>4HWXZha`EWHr#@?HA z+jsf^8J)WWfaH{e@jwy?{`~vhu+?enm5C7UsR!$?zc>tJfBpIX$M3Jx52voZ&Rnqb+OCx7Kd9efRYlL@|)uc6Bn4Ja%t2kX&-A0!Y?vvG3X)IP*yQx(jV5AFO-( z^$AcAE7-cN@c}TP%S(d%f*I7NANc?N=Dx{UZ}u;*Q6{H$$z1^JZ;|1{PfAOzQ6lDy0k@Snv_?$E!%tYQTV3fqR%=f zT2+6tcAl6My5h8mX!Rb|efeRl+>}zEiY{BV#;dF3?uvDdQS3`zmwvtQpyi8OM%Fgx zx{OTTKPwcrXbNnpR(aLn$NH-2o!rVQPR)QF{J&JC8XQ@rjMVwM&6xC9FS#Z9Y~gST z&5+r%h&92fRV~qLOXiHgg$6%dXSZ4&FZ{e=fm2|IMQ)AYv}vxxa zwKjViDHZ+kve1P5XuU1WySHWN@2D@(=q+S9UZ!DZXkl6EkpApJv96|(o=@>gRoC!m z>rZc8=48IT{5yYt#I=okpS@eol3ZypFaD62@c%D+_O;%#w_E#Y{c~bP0l+XkKW70dG diff --git a/assets/maimai/static/mai/default_pic/UI_GAM_Rank_S.png b/assets/maimai/static/mai/default_pic/UI_GAM_Rank_S.png index 5947c4ce59c44028944ceb00ab9c419a9c2ccc45..f5bad4b457b9f76943b43a1300d175a2420cac07 100644 GIT binary patch delta 626 zcmV-&0*(Eh3hM=sBnbIXOjJbx005CuB9UMdkzf;%U=xvG6OmvAf8zlE|NsC0{Qv&; z|NZ9w@`wNHM*scp|LHRS|M~y=%K!DE|MZ&w@Noa@P5i_)T|NGeg_`U!4wg2|7|Msc>@Ob~_7yth6|M|oJ_`d)1 zlmG5#|L86Mu84wrV@n$f`10qz zvWjFvJTfR35c%w(oRex`?M!Yz0004cNkltFXFfDH$lohsVtOC_qz4bq65N`i6O7Tj0kR(Q^rxY<_JMz^TP=+%S*XL8(nTW*?{qKmy<@dR@q<;us#x;={s@?WfgGi zrQc|I*tiEdg|b(GFnX-{z2}F?f82|C8_kBALCK|(M@Z{u=hn3WPF^V*(Qj2+BYSXcPxQ825`@21NzYiLeXAWGGBP0mTKdS|+s+ zK@bPgrLf3=Ar}XZLdt$j88xT9US&%}AUS@2Fzup*c&t<}xWP~PUQYhwq;FQ|In zjRBfDh<8I^fJNp%P#S{Sc%4;tLTHNV1DM(l$$n^7NG>}C)nlmTSm8oshbb$l#U!8h zgzR%bg@vnF`<*1(lDK1*LAKHeD5?Opj%#JH1R`53eGiS|Uz{)-d7~vtnzf} zVi6>Jp={GxSpuYCWWUk?v5O9>XE1+}>@~|+Vnbw))d5|kmF4>oJ7exV>6Yst(1$cs zH=vf0&FnEq_L0r{7=$!TSzx6ZGXaoBl8`9TPGA+PCz$&NOB^i&)-dA>p^47UXF@H4 zG>WwI7l>z(jiMSe!4Mc>?kqMYNJ7+78CD)*eN^lIbAMj*{zK5Qubc&v3Rbt zX~GF^xs$*B#ge<3L#*{0j~;^|y0So?`$U;nEACQCvep;w9pVekwz@S@ZG;o%g~jW( z{I|T(p6+}_Nq!F_Gtj8uEYFwEb#QQZuJoaE{ERQ5vp(pwbH=3O*5uxXjH2K`$1M*E zM_%}`90siHj&3{W*L{FpR(byohc;~cac=@UdYQ^fn||K4bl%3Q*DyZmgQuP4Rfd(V zVRg3)T^l>Yzr0X-Q2L(mnt79WQAisfCwJnmQo@3w0-O9#U;P_s#Bs#{ diff --git a/assets/maimai/static/mai/default_pic/UI_GAM_Rank_SS.png b/assets/maimai/static/mai/default_pic/UI_GAM_Rank_SS.png index c8f027f51174a7eec6fc3003fadcaf8b9f01f26a..21ec570a5dbd7bb1f4ad04ad1eaaab9405c24284 100644 GIT binary patch literal 1080 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^!3-p;9=x<>U|^IA@Ck7Ra{mto@EGEZzyF`f z{r~^-|5L&LPk8?Sef|IYw*N29|3BCI|LgSspU3}yp78(Q$Nzus{{ON2|F;$Yzs&ys zsr&z@_WvJi{=W(O|5W_{zwiHlUHboZ$^Vbd|34J`e_`^`}+TH>;Auu`Tr*T|7*|xuN?kAX8Hg3?f*Xy|Nq$g|3mrz=c@l7v$tPOTLKIn z-I5@`V1{+pA8%f%i2inFaoVppC+4*@g?Y>HaXf!?;ppC#)06czSr6>qIiar5Mfh5_ z$tqwo6lQ7&XPeYyH3S_&)}-X)U!6kNJHlShsr{ z%Y;**uUc})8`o)4_Ceun{ZB}=}5*3@%uX%x_Vn?rmfc6pmh5F zLffEaDytjhPaMt7T*i`k(w52Hj*zsId=1}bE3a)14)(@>9PHbgPa! zybWs*cs02~iEU+^mp#*RnT<~@4oI?fFR0z4p;-K_FUIfOLd9!eO&IhW-@0B`+j2yD ze^Sx2SD=>f)|=9x#&6sJH*sXZciD<1T|@ZLRN`V8&BY8<-WoJ(l|Rv{*0g zezq3dA`k8_m)}1>b7|3hZ;SH0X*)cA-BoI?@vZSzKGXfgYW=54X2(^}_ti9i6;ZGB zI65~`tcFigYtn5NqoAlZ+x9nZ*;d{njeg$y4i)^%bzwA&75nb`!Rb|A4)^3(hhJLt zRg7Q1*=6eOI=^^2gU8i1_wMTjADa3`!zycE^y<(et%m%&TX*%IE8Z2g--{op+i3N2 zyPO|&Yy1!K)?aAuRlPhlvj6Q&ZQJTyS{7Yz6h8RnEz`G?|Ie`g&if~4x2}o>CUOQ( LS3j3^P6C<=mtT#`~kLlB}2 zdZR6F(SxLi6jl;S_ChlV!%{&A+by$9Q;g_A?#w=C#+lifoqus=_UrfEb06p4d(NG? zbMO8U+#h`G&VBsm`->qO)F?WTZsun9JQD#Xq)opz&vU{rr3Dt|^)c!j9= z7XJT&sCGo>;D0l)QzhPR|04~e`d>tq-5A;r!22TpZWNyzSrunFR?()|*{2lD8HI0H9MGh@G3D7H0kAC6qn$2j#FhJBFG`1 z@YCVo234dTocxI>eMvap;Tw=if5r9VX%syw_lA41>Hg;EPWo z8k!I1FIC@9or?td*PGTD#NH+mJWHgmE(0VLzJH^gFS%;B5lDZ+R4eA`*3hOd?x7t_7?hEGSg^;^A?!NrsFIy3tVAHv@;KmoG&TpYibP5p@ zJIJWpessas+MmkXS}Q&23o)S2f$~ok=bktPJ9)+J!a2pA zMu9i^SHMoXczH9BeVBr~I*;+(mNF+6!GEUc<=(tB<|nVB-2S!VTyeepGFmjc9=63# zI|3okiq^6j=fD{VK+bw|dt739b>(t$#G6AlxNeRtY_i}il;7BEW)5@m=Jp34rMbSm(pLj|yIRCu-@Y<+?ozo6JdVi@M z^LkVDIbV29zq+dGGdDJ#=?r}5doF#Mnm7B1{M3dhVx2n7M=-|j2D_ia>*_#Q&_#or z7cVBh5(6n-fNE`vl8IZ--R`-#8X2ttx?tk1y@6o4pwa;SQ7bUuH+KzFN4^tntj(snU;Yj#; zuCl>v z#CaNwJO7Vhg@E^U*gqv=Jx5N?g1rFabC-O8GklMaD_6s2w7|=?Wh0F1mhVR+3Ebvk oPSGt>Dl|cY1PKx(NDw>z1Am$pRCVMY9{>OV07*qoM6N<$f&o$1#{d8T diff --git a/assets/maimai/static/mai/default_pic/UI_GAM_Rank_SSS.png b/assets/maimai/static/mai/default_pic/UI_GAM_Rank_SSS.png index 0897375db58db92c90a8973e615aeb237a0f4ce2..aab58bdb5d8b568f1da59115b7f4a95f8e2568a9 100644 GIT binary patch literal 1539 zcmd5+`8N~@9G^)_COVwiq*_cUl{PDOSB}YDYTAw=WRfGBY?+djq)6$>^<;{yA!C{j z88;2qxE2|ioXOENm>G=bKE7-Ji~YR!`F!5zx6gZ@_dfT154&k;8fhXB2rUnH*JI0m zc$s@N)Rr~Hzdj#CjcZ8P%VkWE&+S< zM*-M3!B2EhcKidPQdxGMIEnzAJut0JWy940INkxye*?&50AkhXXOMQvE2^al$&&ax zuy9Qr9060SJ}g4rEL3qIeGE=^0;UyI;}aksR`&FP__dt!T9#J;--#f20D@%TorW1( zsS4(0K$?Q+ehBVauBHIN5-4Yt{Vb5SD(EeW+D3U*t*n3qOOK_g>5@NVffoo|EX-lx zs~%4Z90^Q{U|a|c9yD>Gk^{FtK^zOb7y$fv)y%Al%>l(U$a)m5?TTgwNNPb`3Bp1N zAs+Z4@Xd_Ifz)9L>jmY|h`fXX{4k@w^3mlj_g*=67>npFjI|XHz3`U`=V$K7rNx2p z8+>%f>b?y|qC|pX1C8_#B(Hhnl`|=cgK_h`@fbpA1~*c>w{f9?dtlt-W+;EuVIRYG zL=kEo%6H2k#;V#`$9y@ReUbL7*G&iE;qflg7e@F~R!4TchCVJ>=R(V!T&~^AXSS3E~FpAubUmi_7rT}EGF&nv!&+bsNY^4kR~*zLl^a^V;bs)_!pz1v~v;B zanHvnSUf{m8*_2hhK5axoY4qVmj_l8&pc;dT2wU>=M&uSTSkfe#_zeMcVEb6M$a`0 zsW-Lic;V=?{v~Pqou>P(litPk&NNIW(HB=Q$%krT)~0d#<@wPi*Xj)W<9^Q{zH1Pg@((CL6cg6}>Dx zn#XmG(_tlXJKHUN2!CC*w@Ax4hdyM4J%L93hF@emuL1^tjFciCf=>!0#Ru?8=tUx?l0-+O=aAvbpuT z?6R*GWsWj$N}HbM{z9$At@_*kNGZrIMpB2@zt5(|uxVK%0^4zyd+BGiD(h2A!_Jf6 zbPtGJ9JanJyo^kFII^NkZJM{<#;{ynB=4~5(Y39QK-D{_bZV#hiupB^VmWi0u` z36$-SS!fAT;J#SrU1=bo*)0;C-aR=`L*DY^HN{{Cc?({^*3ulno5UGkHjsXc8-V!+_ z;g+qEoWQ7FB5SlD+qznCHIbZqO?p{V*%p;=RJ_?c(B~9Fh3Y#Zy*yGs(HP=%z*5 z946=41=X8j-2N|ERtLG?I+8mQ9cC5I?dT@p?lv~-xV^QjmD8K3#m}pEm=MR#6QRpd YtWIh*I}ts*`~V0K%wgA8&OwR)0`E4X`~Uy| delta 2114 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 Yb`zzOl#8T~c>n+a07*qoM6N<$f(h|vk^lez literal 1412 zcma)5YfO_@816;x1DPzkPOKt`;zS{HOygLk+`&Ls5V<%(6sMpF76Ek*MZ|(m#snPG z;>;X^qOhQXMyEp|s8MuW%mC5Q(n8B*2B-%2=fZ#RzCLy9Z>^OFy=oOQSL7 z^VUWBQ%(FI7}c130?ieSeh2kQXf9#$88G#3RM!GUAjC9CY@i5-zWZH^C?iz+AvVLC zoVU3$1#&Ko%C~m>R}8Q)B_(!B4mk&!%fKWC93ZAcwiGf~h#8PrLH8JjeyEF}y#due z7)OB#=$fGjfu@>_ORNC{v<*;yk5M6vVF2eFua1;93x54_mE_0HRS%# zQ~^2|-$0oT-F=czK8Iu`-sEC5pI8c-8i;2=%Em+!3@V z381|RW!hU!(PSHjd63Q}iPV`?O)aUaY#22dJ45uyc1WF|E``J%Lu*JvLHz^9&l90* z#h?cf6ejM%ASObUg@HLR3=mC0?gN8lT9P_(4e`wDlxW7i07o5&wn6bf-ns z6SQAsp%5ud(+<-ay^|w)G(hacgWG1?vh0R#=2?Kl0dd<`dqqgtD zc_=PrW@sBu&I^xb)2X-a9qi{5nSJ)}Q?j^r-UltUqlNuT3KK%@tCs9dNsr`xso*vz z9I@;=%GCDtHyw89jq5$25)B62>15 zzm#zf)%;#peeSbAD~bz!p)$1QqzMm~Mf z{p)!FC4AB6=G@+|TMwVO(7NQw`R7|aqW1YHI&(7<9X8NSPt-MJzw-v;4;R49+?xNOa`n<{9ri7GsJxcrHRqc`U!hnQ>K8Y*5cAju$k94@I_x|L?jJwf&Vpos1<#Rvd zNs-sZ)YBGDnGsDDcl5Kmj7)aks_Y<5`l`O6c|P(OmTTHr^sahqN6zM1i`(tHp5}MT zOKx|Z+vZYMSeMCTYopf ZV7jRQokGrk5iEMV3Jyi>0%d0Y-mh-y(3pXXZ`*vjM z3K>@!yLJ?0zV7A-Zrk++g{~BDb73{E&+W;&uw%jg(;2mb8ostzzrZSc!ZN#No%g;P z{=92Xmp3rOD;RAR^^eaLY_`bDcG|Kc{*Kqo)-w%zrotMlkJ#w<^yO4pRkex5i#Mzl zww1>xw7=NBi8iD!YFQWtokBZbX-M76nlfYjaojTJ8vQHkPoM?+hxuLQCglDD3<{tp diff --git a/assets/maimai/static/mai/default_pic/UI_MSS_MBase_Icon_AP_S.png b/assets/maimai/static/mai/default_pic/UI_MSS_MBase_Icon_AP_S.png index fbb6af44051d3a3b1f80d9df34cbc389def1220a..3aff7591fa8bebd445beb39f2f6a12a080eab0e7 100644 GIT binary patch delta 891 zcmV->1BCpq4Uz|tB!Bi$OjJbx007of57J8x)>07FQ4iKp57to*)=>}DQ4iKp57to- z)=>}EQ4iKo57kf()ld%AP!7>g3)N8%)lm=DQ4iHo57JKy)>04EQ4iHo4%JW&)K3l7 zQ4ZBm5Y$l%_pUV7QV{>|P1jWs>!B|4qA%%*CEjQl^{F!7ZGRfrR}$uaAnmL(_Ny}S zxH#~eEaGw`U{(JMo?^>YFR%dm#Ph zN%qV>^~pW-r!n)RFYc5n=#(kvfFk2|9@}CT_|!u6$2|JnMDVpX?2jnpgd^gBAm4Ny z@2)fKr7(hqAAf!T0019!QchC<+7Z;e!Fii!^5);il3z+e9oNsZs4e%MZfs3RFfW3h zcJlxL0xU^HK~y-)y_M&7+CUISkty!oPEYpk3JHl2TEp! zxqo%foY6O);HU?ZC=y!(s#X_E+>YkyGpEPtSRUhP*Z#p<~SSbJ&iHu$xY zm{Y1L*iKYe@=(7OF>XhYTS;&&)IcmTP*}@$o>oyLP;8N3bdT}1n`ry2#@)|wCQ>+q zFEQDoEK(_xjk-JdCbA0`z`YRSsZM~aisWRo(k?tc^2lbyB-U$Bc8mo18>i%Ti5ZTmsW zXTs>(3{4x>T;4K^;c_EqJYp(Of}sq}dPFww$V5j=zR^=}FNkYg;cz^c3p7OyM|T1E z9i7Qc7Bf5wv2iy|Og2MIH>YvA0{fXcSsbN$rsANCPWmA(I~-<0)@XYeT$9QiXI8k) z&UC`^d&;bGu+*)SI-D5SP}B2^vWwDQGF8RGsad7nPyJxGmrubs?G)saj*Nen@M-&4 zNhfJ5`F!O=H`aI3VO-6muxkOHKDnYaJGlqDnRGrT9rJX)PJa{cgWtq|<2O+ZjyQ^6 REIj}K002ovPDHLkV1njcu}S~{ literal 1711 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 fW%o?{AASR+la!gp&QeAI0000DV+qcrd zj0eMX(Oe+OjKEPasl?K@kyQ9icsfv2f8QPui$JKoP!5%R3pE@9G3P$T-Ny+mwo{j| zX(%=o#il_VD#W2dYznH?YYCg8He*pPalB9*A4n918$4?|dKo`)!&+WO7%#RSJYy=1 z#B#hLWjGb$?LhaX8_Su5&n$a+3861-1=mlVLs4sWQ<8s*H;~=7l^oLt>E2NwAV>1e zhx1l(06$1Q`%|HgV9a=t^>~pL&mRqZM3K0$heTNF(G{uN?u7)oq!%s5u3CKv*ZCEd zflh&_ZbsWoW8Oof3&=mFm&Fm{}Ns?w;MPi4`?MACtgN;az>Pzq1cPAQt zN-!KQBYfqNl^drh`@;*+_%7Kld+w;{cb$B@sVhuJ*61j$a_BsuD>-G%-;Gi3k%}7r z%UpO^Z-8OR55|l=STotYv9G}V;~&d9L$zo6kLpP_8oFsCI;KBx-Kr>r{y zMsK2iU0AVfSNI4T?TD#h^Pc5Dm64(cmaN zgaw@k4pTyB`Rfh5AdTJ=D?k%K>!cU)AHsFzO&dpR)_iFr_0X3~3oSs$K%M=WE8!9M z>24Q}kNSrQ-Tn+?z`)&sRt&oV0L~6%7e(X7>(&kyTMsh{lVx^n57mLwCewYc-vmy; zr=5o42WbcoV)+3Y?NnsXaYJ#eUhhdzDg>?^$4hODVcAMuI&s5>LqQ4lU^;eVKoonM z+Qi>=GxS> zV{A+8)kK!7+&W@kSX79re_&ydLsZJ@h{ZSTt5_MUqo1XFxZST{Fq|W$_4MikyDmh| zC9b=_Kc?gUu?6eQXcx|$u)M`(%fK6L+d(VLycEmYIK!+dLvQSu)v#SF4uUr z)0TP9(BoX$!?1(A%m!~8U&r$e)%}Ik^oX!p{dc*EwvS^lvEts=+OK&j^Al<*w}W2D z_u_L3mQx#>ulF2Xo15u3PopAD|BhJTW)gVT!TF`PZtxoF}eovOKG z?VG(N$Aib?TT1Q?VS=C9Hk6_@pZF&G>Uh5rG2R$wnI+#j0Rm?e!>>1nafj0oJ8sXyPxs^rQbK-yg CZI)L6 diff --git a/assets/maimai/static/mai/default_pic/UI_MSS_MBase_Icon_FC_S.png b/assets/maimai/static/mai/default_pic/UI_MSS_MBase_Icon_FC_S.png index ff37604cfc7d3ad2fdce64d5c69628428a13497e..1dd6abbe07bf51388f739e13ce76a183b8a93e01 100644 GIT binary patch delta 915 zcmV;E18n^14X6i@BYy!DP)t-s0000FQ78{mC=XF64oV#lQ78^kCl6654^bx#P$v*k zC=XF64pAo$Q78{lC=O623r{8!RVoirC=gO84^b!&P$v&iCk;?14NxTuPbd#jC=E>} z5Ktg~*Ip1(DXs5XSerj7a5WfPEH-#F7FjD4Rw{7ES6`t*d4JJciOWug$W29)LLOo+ zdedBY&|7G{Q!sit5>zR6&RV18S8l~tP@qRWi9be&IUr>(Yrs`ww^3iSPgtr9$#NmQjtO`Jw&sYFANK|qW^JBB_sfIBjKIVNc^eAQj4>sXuJ zRG8XRlG9OIt$$5ds7q_EMOBwREp<0>$XJ}+RdBLLVx&V&k32HtC>a0%03CEvPE!Ed z)w>bFdGnk~=HO~&%t0O6(#5EkkX|n>t`ra>Tn7UH00JgSL_t(I%eB;bQ`$fn$8iBc z@wQs+wcnV{A>~E{@dUiDdTX!u|313OrU}6??R2KUKYy5=;gg*`o_)stDerQb^b|~` zGr9Mp)yy;lnVv~j^NT?JvF27PZtbxSEY2se6|hgLB24wbhLvG8o`v%b5z9s!GN0ls zg}p0YW!EM(KIpP^Hbp`<%VY=GGSU?y5lSXQmZxzjMr5Z!{|M6}(HU<7 zHj6BXZGV#>=C&xk;HRYaR+X%3H^;sZrnMf#HoIUQ6_1{;LBSStK3l-~A_QwjkTR5u zdbsW_sN(R^zg4b8+{wFOc;x?8XV!C*><8}N^5Sr+$Xchrb|*RU_N0#{LoINhF?&7i zM$<4(IR{Bss2q~ zEPF1;Rpiv@l4mvHx2GRX<2x7rIp?B#i`>RbqiE>d+t=#e8Z39s{`z*>H4gOb$Z~}pQ)IihjRyzZN8S3VZ80J>hv>CW z(*K&wT*=$`yL1y-hs@ABmpciMEqv!8T!Qv+-?)Hm$ig)y^&!2sc=9QrzE^Wa!L9Ap pfpq?_`sD1N`tF48yZ<%60DE7GZ7-Zzcnkml002ovPDHLkV1g>WoFD)I literal 1769 zcmYKf30RZoIoOFnmje*PB_IrQlb{lA0wg2>%<(57iAgX>08!AP!2kiF+Jc}`8L0{a z4php3kwSR{Y;-zN4vSE(vJ5;{#n#(8ii%zSegU8Ld!FyTzxV#1ze338ARXKt5C{Y^ zp34#ejI&<5j{r0sY+3`5jaI~owJ{HqO8{e^!`-GuAW%1~*XAS%<$*w~`cAl25(ktY zLmSZ|JQ~7dLc9)wA=zQx?x`&l^*2tz)~$NGKr=o#+MpFpe>FqYB+^MPzvt8Uzyh0GQG( z*xn_uhKBIoX|%mJq+S}THKGW=PC@?jO&Rcv6yP1jg!D_Iv_1$0S?i25#6nHn;6o84 zEuH>JxUiAStctN_4&hu?iu&jcX#wli zlx=muLw`v6UeCu zi>zS8Rf9^&;bl=t%?TLDI#8&Q>zP8WyCXR>CvjJiRA-~tCJ_Z^LE!{?Nw~Bos{T$= zwvnBBftm9)hngP(o?wLdyitYUu1$rLDkllSZmX~4LVRW$tM#e;+`KHSBM!_uvYY`t zfao6TfWj#ivnuva8B}@OR<~pd62dF~&Wk=C4Z4a|QW!@WiM4Sc88A(hVB_wq60k*o zgz)=@2=q>;0dFXdr=|x=?Gb|N4vcJzI1ME5{uB7t1nbIpO$ED`CR?8-~r- z0Clz50@v|?mb+@%0){72S8M@mNgn+mw4z&X|5w14wabc(hTrwy{7&}HEYp*(t?1=~ z75;Y)p1o-$z`1T*!7$wRfyng%gvILvH>$f921r)?5o3j?;CgyG9hz|3k|lL+tK zNh^Buw~JqSg73N~o)sg>ukV<8r$j=oYhFz~uk+vkRB@~QGmO9FXii7(Y-(cK7{*tb zt|qeV%%{uk%x@0jlxa9qRnY9!`}LO|(8UICeNjo@SZ!g{*hp>OT`ie>%iwTI>YjB? zp-C5aWhb?6N^4DRH?~PN2Ho_DW_b)Rx*M}~w=Z_qvoGa-ISAkHjBe_D2- zT_G=HnL+_wp+p-{tquj41lY)D4aoe`YEx zR_8Y+4?kX9zpy^M;{51OPAU77$8Sd;8o2sPkgZ7A8RB67eDulWN0B@uR`2ZAzr?i< zUR-^BDQ>}=hDpi6*dEKaD`PwDsPRb;q4_3wR(h5S&yA0}_BT)lswZw9Hv2Axj~Ka+~TjxZl{pSZiZ?VT!-L!;Mi02yExfkXd?DWIe;Yyow;_JzxK(&D_wG_s}e*s6Dy zgQrn1-!z-oaQaA#mrAp29X8+j;>m-S*nDDbA3LO2TF+E}@|C~Kx54OQqsy-6!;O>c ze%4a_)umlUva<%pl*`zddiArp|Ly4@bpASc={@81ngz=11q>4^b!(Q78>i zCl6654^b!&Q6~^mDGpI64p1i(RVoirDG*X95K$=)Q78{lC=XC44p1i!PbLsjDGW{} z4^k)%PbdyjDGE|44o4h**Ip1(DXs5XSeid6aW!9|LN|FeZ-2&D7+frQ(pwc*D<5Pp zhR978S}TdmPH4PScDYF~c{wX{HXL9s6ILpC&|7xSTBGGxYrs`gq)AYqNJW!EJ&8Uz zgFGs2F(ha(5>zRB)m&GoOGk-0Gj=qo>{xNfSCZ6GWw}vewNP2BOii6eOq)h*u0?05 zL|mRgK#V{;hJQXbe>*aKIh@^8ncP%duTDddLQ<7IOO883hB$G^SeMySd%a37=J=SiUNvU0^awnReOK`578y8 zKqR&^?M$B+OosVoX9=5s3_<%G!8=HhKWzdqOTRzsXRyJTJEYWOxLn9#)D-MZOd`&bZY^Xxgjb!+ASG= zyNtEz6eS_don@70)?jBPvvOZYez|X)E}yGa-&1G`As0}&kk7O)?+Na8lxq>B_7`>e zmAp@%PQw5tMfa^%1LfHa=!7+gSIb5b} zb*%pUa=Y?W1^b}mg^Y|t550f9OhfhgAUnE*WKgR8hKx74&(PlKYG{h5p{XtW^C(sW kKBgsjlh9&v!2g$i0g6PQA;6~IV*mgE07*qoM6N<$f&#as!~g&Q literal 1803 zcmYLI3pkYN9v>ZTA~TbzWC<~AE@l`Zxy>-`F(ea71fwD1)r%pzp(07pEq|y~_i$blNl!+8< zuxSCgVB|y$M8wKT*j0*=5iO)dv<$HTI|d?Pq%OEnvPZhF@}e;A#$J7YSo*)UN%z8( z7X`o$9KgYCYFBYBC+%VQ7f&OPKL{7qaJGiIqGbe(&>qBL6f#mrG^xXyz*BS#NF;Lv zH2SJE^0M?}YG7O~z(Ge#yrbN%rGTooX(%*<@A2>XZ3`Om5f4i#ar0i%{_o|7dPB*2 zZ^VD~16_b1>-dPqIeu5hsMbnB+9-BXoae{2u$t#pjnBgl zwXwn615YtP1d!S`$}M9|8&bx^A8=Q-h-@OLmJm^MNgPxZ1dy~2r!r16gy-0x5->!x z)Ft7c3UH$~K}7w4YI`^ZBO^E-@Nn2q1JTf2yM5Q8*y}RT-Ld=XfG_EiZ#V!tP!(EE zQZ)}MUK3Wmwz&C$x)%@_M48xsI z5p8r4p$kh0{dE$CC+;E=Shw5PINY+vQyh_~EA}6)4|JcJ0IY)f)#1CZDX_HBFJvT8)(!=s7s*ed1mVJQ?}mh?V?z+ zkexd2WUglBv+{ls@^phYE3yW+jSsr%hJVBC`F$k*#eZHru_#?AG>r88Y8VNemo_Xv zReblILSv#72+fn|vCQEV7vM+4CoT-%KW|}IgS&byi8Z85IzqjW7-vj$+o(S}Bz+i)pSTr5C2Wi@ zMb{EUSDgI}gUq9rrgO%LamViEhC}gVZQa+o(#F}Q(Rax`$4uUMKcvsJTKmyhM)A7b zJSFYDp83A7KWIa=Y}IJ$cWyY_9L~z&%rD=GCcjGhap{?jr?ZE})sTIg`)BO#?@zJ+ zxkH1;kG$+!uQFpf6;K5CVkt3R>r**o{E08pNoSf|s8YdmYf16eqIT05FKR94V#Hm2 zYwpvkC#uqpqW0X#fVQ{KdiA!K`63_B>JqB_hsqU~-jtN7%f*j2rSbdc__L|H*Ut(r zMFdP02Nu0%UyolubCVO}(EsY9t$uoX=bPVXCA5Silj{WWt~T8G&i;~mo>Agdcymww zXi;6TB(JK@Qm}N;Sc3NF4!pDIQhlzi?80BbV?ECPLzebdxQDJOojU! zd1j2U3>HMTL>Y^jRz5c>d#=nKCw?us`ynMQlXli&$MnyN)8yJ+vae?;`So<`Tf-uA zV}74C-|)davm(dqr$3e()t9a~r+2hexmT0cFP6Xf^4b=df?Is|w!3WGGDG<<{9 diff --git a/assets/maimai/static/mai/default_pic/UI_MSS_MBase_Icon_FSD_S.png b/assets/maimai/static/mai/default_pic/UI_MSS_MBase_Icon_FSD_S.png index bd617dabf9f09b3a80d141ea83180c3c8b8b779f..f4721c02e4ef8daf162d6ea1eaafe4104d9d4120 100644 GIT binary patch delta 886 zcmV-+1Bv|L4UGqoB!B!+OjJbx007of57ki*(@GB3Q4iKp57to+)lv}FQ4iKp5Y|x- z)ld%BQ4rQr5Y|x-)lm=CP!7{i4AxQ*)>07GQ4iKp57tr-)=&@CQ4ZBm4bD*w)>04E zP!7~j4bxB$)ld-BQ47yd5cjS$)>07v?@iZL5%Rn_>6$F-p?@y(qA%WO81~FQ-)$P~ zjVI=OAmn%+;c*=8s4?MrAKG0M*j5q#=}P5@B->>d*;x|%-9`1tKJ=$C@S7~#U={u5 zN%+%2^{O)NmMZ9kBjbZ2-f0>0zdG)&GwPl#>4zly;Yaz`L-Dvb;C3DGwKnguH1VD- z=aeb<)I;l}Fn{TsEQZz8Z~y=RB6LztQvle!5#ZZ;)xhSQO7g{yXhALY>(j5Nmu_Ah z_iRl#FfS10us%ir00JIKL_t(I%e|FpSK2@nh6%eMZmrhtZQdDykPsw+L}Uj+1hvcm z|1X^jlQ5d3UwTfTPaJr-Gk0?5P3j-`mQNQBfP+Fhe}DRS^HUZI+2dsMBnQB>`t|X+ z-nUEu+DU?X1h~_&9&$V7z)_r;DFXH_If`uq>F-fB2R_jwOgOa6YqtoeuE$V!P<*9c zz?Eu5c2Rnveg^t_0u!LDx*D2#$bD;WP8GR{w~CrafbraNKn!g0A8c_r-tXPRO-<;JBJ(uSoR2z$HADHc3EVt`j2IC-IUAL%_;nliBrO0h8 zX!{TRP56vMSCnNtI^O=djpn#W1t@jV?unwSCl4*@(i~CQ@E`~pVaoH2YlPogZVX06jBOh@Mk@NKF7;MDZx*=n?Bw}?))JB&JU1|$r3j%OI+kK z(cr1XXH+p%RZ210C-)kqtjSE(!%Quw61j}Y>SVrd-vJ-xJK+ED2jtb9^C`deGXMYp M07*qoM6N<$f@FoS-~a#s literal 1760 zcmYLI2UJr_5Djwl3rZS9Lob4;l+XkfK_T>-7f=i;Sg6N<^r9fBC?G`yu~Ga{5R?z1 zs93OlzY2;1fdmo=C6OAW1c(&L`Advrwhg6{+QW=3*@rvZ;Z4Znc&>99A z#eh%@GMWjYnPfDBgra+{VUUm#Mr>kwqL|+3{%~b}j_y>E{>*K{T$PF77J;9w+ZU$9 z^g@f>A#|4ycI2G)++C9&HD+^_CL?JZI`?9jBqZHc9Q<3N`fP@;Cdre7CH6{Od=;- zS*|vd`8vHV&r2!|=xGOtg9quHWBPN@Y3hjupGH{hu?M_}?CEqJv<5)H*mP@kwV8?P|#qF}kFwU$R*#%>x6 zUeE#7@!UT-5`DXB&W^V=-h8F9hMl z%Z?#9(SX|D7h=~9|NdCEmqZdMx`=rTzzZ}RhFNdK)a&vhcVKf`A+f_SJ^42P;^535 z48!e;f3$64*j4g}_=T3A|7J2f#o)a_qH<>?VzNgf;C>)#YkpxEj`;<~G+?+=0{JV! zvHcB&Kw(I^h+xq!FbZL~0Skk3UUP-v@L;2)AM%VGKk$CvJKNcKClpsR7WTVADyyd2 z1VJ+H?uVah;~-|55yc_Pw!9-?ds$vJJ)i}9R-e_BpN!I6dKIL*l>abbnNWOkxW_Wy zy!0b)`EY4;%ks|Q(xsBpEU#r(B60v%PYnMi{ufO2I6~>-ouq z%FCsGv$vq5mXBoq4rgZ<&>PNKw9>E4hOV4nj0~Ed`OCNd!5yio@XwU;5{nhd`eA5x zeC-{T&Ij^4_O}|6s;E$|*If+N;e}RNQP`(Q4zZQ!K$LE4kE!!H?!Hf5aU$y!ZDY6p zme+B+6Vh5UvX$_vN5`}9X>T`LYMbZk_+`;#GT-Ir$7a~d_7xZv3ouyKOeihT>_eGs z&V$fPP8Px(Wt1Dbx~e(IEudQAP=1%CqL-azVf}SV(!&Z&{_U2W5^HJGg~;G9rKVT& z8WLyhU!>Nrxpcn`k+qsqEQjY}-gWDwp4zM#x$gt@bek;2L;aZ+D>Wk`$ma+yr7n-f zX!t@Q7L-$7?Up-ai>ezD}{n2W7qm9ZDp;47|xg#lR79UZZM-GbB9U*#f73vI| zqYfx~$VY9oGQOyOp+4C4D|Dha!seez`=&)MwkYwg8aKtwguuJ-NF#u!#UI=1TgN|f z^vmjJmty3f#_oR@pJuV8;@IQn^{wT&HocaRP+ISMtM(fWFrtxQQ8S+ID?QcNSHR2W z`>Yq@Jxf2CJFG0Vs;^JKOqe2TdK&q?d{Sr8*I)hbPMd__=nYl9x9MlLSSt_@2D(>u ztghYRs$hMtQWO&DkSw_Gkhc{#MCFYyQC;atGG$u@_n_y|{(C+tiQEh-Yl)$+uHR(z ueRs9qb!spD_!~lSg-iPDBx#ZVDQTvMOw~uhPYig*2xof_yBga=XZ{C^Zk-PR diff --git a/assets/maimai/static/mai/default_pic/UI_MSS_MBase_Icon_FSDp_S.png b/assets/maimai/static/mai/default_pic/UI_MSS_MBase_Icon_FSDp_S.png index 7df2fe9f643f6682195c81951c78619566c06cb2..bf8de1e114b23bf49d72d8c4f3c631a2f8651985 100644 GIT binary patch delta 922 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 literal 1715 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 Wb07E_o9)5Vh6M(2{Tuv#$o>c6{<1Rw diff --git a/assets/maimai/static/mai/default_pic/UI_NUM_Drating_0.png b/assets/maimai/static/mai/default_pic/UI_NUM_Drating_0.png index 0d1cf1cc881ce6e62a658f1a974cf8e18bea7ba7..73a8fb739acca76781cb0a6b153fb86786cd8e29 100644 GIT binary patch delta 537 zcmV+!0_Od|2l@n%Bn8`0OjJdYQ67V{&p+qMJ$PszS4zg5;iXmEG7%%#XQ@;IjWQ`Yh4^>SsP+i8edZx zR7n<7NESag5cJeR(zZCtur)eg7EGC+w4mfBC-sSF=(;H%4uzBFRCm4HU z(F^d9O~}<&aVjIf!TqoioX^t0berxxIH!<@gV`cCI!Kb*@kmKuDKj0GK#m)>- z?e8~;M%+5aLYu_$bNY_1x%8XHAz(CvHw{%=HbHaGo0tCN6L3hQvfdI{+*#(U*sHMtXm#3(rzzH;giHYIw9p`zST1)$N zAT}OeX>xO~<*r4B5U!7tNNk`4gw4av{N;*cSB1*=>y9r@*>Z9)LBz|_<+EdDAZ$iP zhWdOZAUios>fL$!=O=9;;y{vxh0)Pc(AHD{E`rQ(?sGH;@@q-?N^I0YP{RMAn>qn!C8;!iVSTR>8jmriB>-X)eFU2`1eL1 zvprJxC~lPc_vGm!{mcr#NI zeTJ>guett;i+$_*{_J}0bz@y{v5@QDJ^Lo^t*?=~SieHQZokory@fMlKncLp)z4*} HQ$iB}^ow^r diff --git a/assets/maimai/static/mai/default_pic/UI_NUM_Drating_1.png b/assets/maimai/static/mai/default_pic/UI_NUM_Drating_1.png index f69f8700f11b10284cc5aa4d111efb105a68a188..25a06656c7c02642ac64547f72d14fbfeb27c9c3 100644 GIT binary patch delta 255 zcmVJfZ-K~lYv`x?EL=kX-!DlS}rC2ck-nXdfKmB^Z+orD&Bi6C1Wm}k=xEERBVl# z*>e1U=bUFm&>V>7-}f`E5u@hyznP>7hjO(?ot#DBTt`c7-vZ2i9mhhx!ZrW^002ovPDHLk FV1o4obQS;r delta 354 zcmX@kw1jzriaKL)kh>G(&67Iy3=9mM1s;*b3=DinK$vl=HlH+5Fekt##C4*fHc)}O z64$2L`UjR9^KdhBb1|Fg^QDAKEuX0K=eG0zdoBWeEQeMazd36M)PxKoe8n$rGY5)1 z{@S?$NU4+r`2{mrP2O~1p@)9Q|0b`+hg$w4gE#FDA`kxme{uK00|$ZX7kaulhE&X{ zKRV&2P?G_VtF~^^60Op;+#R3(|Ie7?*=`~-Kj3_H)ib}ztFNS-G0N>Z`P?&7ry+tb zCNunk^5^W16Ry+dnNKaw<4#D*4Sf5p{qafVbeW{T|Gq!!T)B1W)peP%b=MxgGxS~C zo3%8r{&J~s?z;CAbB`u6NS;3xB`_^tDC)b^@^*uCn~w{BPvl!&cq6OS>2uPp#;03b gf|%!Oe6`-g@YY>+>btLMJRpC2y85}Sb4q9e0Kg@g#{d8T diff --git a/assets/maimai/static/mai/default_pic/UI_NUM_Drating_2.png b/assets/maimai/static/mai/default_pic/UI_NUM_Drating_2.png index 3942ef59317f9ca2ecda12625dedd4ee0d8fd5b1..4a486b0c6ec190adb06156467e5f56a9e27508ff 100644 GIT binary patch delta 481 zcmV<70UrL12gn4FBn8G$OjJdYQ7w^R9+6-SfB)V@1_l8?HxMl-3mX^*85RZu0|4>S zK<>{!>B~J^PZ$jh1NPQI;KMuGy*bRWHOQ_tz^5~?nJ$ohC3IyUQ%Dv%GY>K>4f@$a zyQ49>qA{wJEu)SrmxCyUbR%k99Aj1*Lpl;TF%Ksq3KS9rA1)%o0000SbW%=J0N{u5 zf3f$_!FO`VyquDaf^K9N*sQ3XQ&3MsIegqvQ~&@06-h)vR5;7M(b;aoKnw-YhEQmr zP`YoPq-jEdLd)8H0sjA|@U>9JOb`zsaUal(j%+;6!G3akSs{*J3(oR*TBR(9*REb! zgcnz}NRn_CMIj*oa+N6cwCWdq#$f7WBwPXY$0r39_D)otwTJ;AY49P=2II?cP#?xVr6AKu-q6T z4kQ^F85Z|xf4Sla5m_}w_t#A)XDcBfH!DWQ!9tLUiDBa`eMvF4U=J|~QMM>Q3HF86 zO+e|=k|4ie2LBbu|NZ|su}Cs`&$r;Y8#ew2fi>k|>i_?M3n0d4vG*V<|1F5@I|m~F z|G!ZRBG>=_zZppVsJ!&x|L&gu|K~LQ|L>d%6gim#BntljpWR*zWE`{v5|e-!41zh9 zi2_~j=IP=XQZZ-mCD&kPM*-Fc3bHyL4GJ@l-kqy(ut{I;j-m%pzw3V9H)q}~D|&Fi zddaTut6$D~*>(K0zNh#36DmsiVP$>N#h*{~>EB<;y5v~+itNBgoA>WnVv-P=x@uZ< zSfHeclSJs%7g-|fp6**0_h-q%iMN-foz!(%n|sKwn!S4Y6TN47|L$GRj<|RHj(%ms zZAWJw-rx)tn^S*hJSmJ(vuV74L8Yck`)S_gPiKuEbex+PIs19UbMX$btw(iqt52r% zK6tAgv&Kq%ciZ9DGxi=ly3Bd|g1{GMdD|Ah)+@=EuQ_ma;X3yVkA+`oo-+Ra&?TIRjH>T(j(tJ>`f_-iZv#5UOcXW6R8K7X-($NUppX8zY%pYL>b_pZ=& z_9mk9`ThxM`Y%tKJjo?acUsTXqet$pTGM*o`q}JTLH}pvD?hVXVwyE(w8Gk|X*cV{1QVjfsc7eP4@ARGt?2LkHLJ=3>1yQ49$m@c4;Dwu>Q zjd~?fMio9b5IHgrBOeJE6$TCr1I@BF%CI%UsWY^kFoJO+Yh4^y#0j!!j^+w4yO z00BBlL_t(I%e|A?R>Ck4h6@GSA{5+ro$gdxEEQQr+_(3CAZJozl5)87_+2scoj;RF z585BG-8HL#RP^?`tRI75Yo}ySL7{3Ze^v)Z?<-pj3oqxJ%)Q;Z4s!L*&X;rr>o9OQ z(~{oOqCQg7b8P$l8>W4%_e-;9&MX30u=yU=^44^AN%~e`^3| zK=}#&=n8AXFZb)4wE#(0OfUJPH@NK-hX!E|kdH}^SEGCXb zkYmS|)2qI)qa`*BO_>eZ*e#-IkII&&+?;lrzos8UU|7nVL5Z`{Kgg1$Zfj*O&rhn% f9T;`(fA|KJ%tnEV3zLWd0000<2SrXqu0mjfp-%02 literal 1063 zcmeAS@N?(olHy`uVBq!ia0vp^azL!a!3-qp!)CexDaPU;cPGZ1Cw1z99L@rd$YKTt zz9S&aI8~cZ8mM4HfKP}kP?99T%F3vr%;jJqXm2hkBgqcb%fiB#5-zo8vC;2aPXF(@ zT-#+C?jsHq_i_||bi`&_lLiwL)COTe)-P8aD>4*-{9q5UcjxU7EH{2}$`;7&tycYa z*SV)kRe+Dh&P+f@of{}Jf z`Ri3jOCx@uNQAHWmN^DMMpL1ZkN_)?5$PxX{(`-el^~D}0fPK2Gg~$O-f{kQ(@9a5 z6CzlcBsZ^93&Iu`VFNPwd0A8xI6q!=fCv^O$~`=6!@D+-md>CK+Z=ku*m<* z&0u=VA|MqFVjlSaKOICbY@Fi0U~`md-`c+q4`sHtO$-30s}fHa$B>FSTPLQ*GdT(z z^G|(y;9BrT=8zB`9)aB(H;4-F-W{+pdjBTlYMJfTe`=PWUp@1A{bpfxj{3z72NZZ2 zS=(EF9o|r|NJA;ebuov!uZerIO1QMN_i@0 zo>+37Q&rKA4+&w|F=4$PQ*^$@vIzdCs;llTJ+`UHNh_mX_=(SFFPXJn=VE$yv>ksI zb^lap$LmTRlM{E6Sh8C0_1;N5^I_k~wCpUlTbH=*Z~d6gx;!>&H8Z>N-2Dm3;pUIz z?C-qZ>os4t(%ze$?V{8s9_xnw9w(b)7Ygqu2}js-9-QK|d}_RH^9`>XXXm`Qou)a@ z*@pjMlaKhtIHA~GsZL>Gg6kVM>OJQ5Fx!5hG)KDZ#hcv^-khwEpTzvEyu01~fz0Ns z>dU!ot=S(tJ*X1?y|meBdUW^8shg%>-hKIN@9kpkqvdbTzU%bj|8rD+e#DPIN-Mtp l`u5N9=JV^@<^Rb4W$2pb$lv#UgE1%>dAj)V7Ze8Z(m&$FJIb&%rjaWm9trx{LfpSP*t|K>wl}<^GOm{{pNcA(g(!4o zA7E4&Tu>NPNftUY4>>Xq3JC)8y&LcV000?uQchCk7R5;7M)7g%KKoEst8W?8OamHN>ao_j-{a?+~+ECDzH^%s1 zHT9*Eh6Lw*mGcdy%l%9GO-Zh>OQ|0B^J&i6`b%gM>Gnj*(u&r8c&m-0#RZH8!)IJ1 zv2{|we_nHqRcH?{Xr_9zXW8S@VV*Yt!uH*5f=SNDIg3P@Z7_W$# z_Z7}NOlQ*!`-W>ckHSnnjJ^#2;M{$I`Gc;bdt;5GXp2$Pa6nw@Y6Zh3nX8VeC2_XAx4o|7>%xCP6~00000NkvXXu0mjf DKghj5 literal 698 zcmeAS@N?(olHy`uVBq!ia0vp^azL!a!3-qp!)CexDaPU;cPGZ1Cw1z99L@rd$YKTt zz9S&aI8~cZ8YuWVz$e5NNaF{Lj0`I#=^R*YoDd=jRGAec^Z%YpL%tG_Eh5DF{(?P_ zF~3U-NLm{4pWa{wWH2)`UfgCL6CeR(=O@bE*>5E!&JJWth_ZdY?2wlrt1Qn6P(@jZJ9Uv(*as!m=&*;1ZL6Gv;$%YIyo+b^&9 z_U-ydMqT+?uPvINaZF16DRK0q=98Ys#k)%RCg>N$94TGNvm!)t-NjF=zfS*}`Y3yP zenF-8-?@9jb)>!IU&QpUn7`!M>Az~v#BM#GE?QUmgZK09os;-O=JRbgtp7XPddBW! zO16jgee8X8{9)ra=?r&iE1RTBn?U`4r$1D@s@ryPLGu5DQvNOazqZAG-~Q^Bl|TN;Jl9`!!^+M7FM{I2)78&qol`;+0KRz(jQ{`u diff --git a/assets/maimai/static/mai/default_pic/UI_NUM_Drating_5.png b/assets/maimai/static/mai/default_pic/UI_NUM_Drating_5.png new file mode 100644 index 0000000000000000000000000000000000000000..862441b891995f50323af6726f60498255bc8c47 GIT binary patch literal 608 zcmeAS@N?(olHy`uVBq!ia0vp^azL!a!3-qp!)Cexsq+CoA+A80*5Lm=mjla<9V`U- zd0A?66@T7v%uA3p)aDfzVS9Dj_Q)#ZIUSlF_QKp;Okb}$+&y4*XTR0?EoNKh=&zch zJEc+G*IC5HT1Z`qOHPXY{RR7HCu}cmv)DSG1v4DHTf4BaG|of$=l9na_iUfrl_&lF#mS}9CMSpa*cz*;o_G?=z`&^B z>Eak-aeD8?>p_PN1Xu&C%cL|_zMPY~<87t+<=g-JN2VHGJC*e5Si$^~+O)}AbN>29 ztvg#7-F9u|tSVRO6u0^Nm&F&F+Bx&Tvrtxweq8&Z`}oI;rrQEH-@W5J_w6&OS0eq- zzu#VP&E(ypPEV)`%SXHxl z#)0)S`~&_Tt#O^5p=0A`A5_Jg<`=%0 zdP_~^liKS1MHNav82Qh6mjzr~Sh4WtWOe1db%CE4RKHskRlE*yY}wm$K%e;q@Al3R~S-lC_V ObmHmi=d#Wzp$Py19oupM literal 0 HcmV?d00001 diff --git a/assets/maimai/static/mai/default_pic/UI_NUM_Drating_6.png b/assets/maimai/static/mai/default_pic/UI_NUM_Drating_6.png new file mode 100644 index 0000000000000000000000000000000000000000..c2d8fd8efaeb6b3cf53b9080aef622d944a04931 GIT binary patch literal 695 zcmeAS@N?(olHy`uVBq!ia0vp^azL!a!3-qp!)Cexsm}pEA+A80KH&d77hQGkzjvI! zUUdv`6XoV&Vq<08G+W=-SwumGLx7Lv*G;Dn7wm8Bv8>3Dw=m>0(&l}B()QtDo6FnH z&ulb1u-tgXB%PV98r>Bt&4o$@iL&87;{ zOIx`mgsb#l?*04!dW!zhX>V=PEcEZ~PJc4hMCiYpl8l#N;Ie|EuhUi9=hp7;-7RGI zWb4w<-BB-Ztkzm~%a}=iYul7fmRkkCiO3#4H7lk#xA0DB?!+1FFE2coC@gJzoTHi7 zZmYTb{=BQHe%t!?*L~_)dGF)7zM`zew{sfa-u|h0+iGS+MRbG1U)(>;FKPTPk0 z68)#SAFQ!iE|8X0(Xuub)fqsN`m}?84fJ+c=)ru`NgVflX^;0 zxNn|2lx<-sD>Z{lDgmhGrKgKyh{fr>m#*hEJBYXjwk0JUFRR*QxMTX4dH?@!lMyM& zol)7f=*@Cv-B?b6i}6#AtP7nZlhqeqSKz(iZ>`Lu8#fL`SbMiKd`0((qGS4(I`>Y$yWHL?ci!nMyPRx2=LdRDZ$GdsVCk{K zD{J}BEZx51^t!n84XclIKlsQIA)d9?@KXhYPS!lfvd151{s@dx?Av3sK**k9xgGQE zML$#YPNbeK?yZ{;Zn{5G5$EaZ=d#Wzp$Pze9kzG? literal 0 HcmV?d00001 diff --git a/assets/maimai/static/mai/default_pic/UI_NUM_Drating_8.png b/assets/maimai/static/mai/default_pic/UI_NUM_Drating_8.png new file mode 100644 index 0000000000000000000000000000000000000000..ba6ec5ae36ea3efeb4cfc9187aa06d40ef72f687 GIT binary patch literal 681 zcmeAS@N?(olHy`uVBq!ia0vp^azL!a!3-qp!)CexsSg1@A+A80rr`fQ7g;HGJ|5ULX``2ge9v`*2chLIwKC2_E zOb)Fy-nr0l>s*5kGxg_mX!ca8mS@O^d5Z_Siw3xfYO8T`1qg-%JuF`m#@t(L)*j4=O12WbpRL;+-82tQ&{q( zbYbxc;a|_*M80;DH&icSy!m%;`CRtylN)6;9$cxl{W3!+DeBDBW!HX841abwA!ZBj z+WhRPooezKDZS^EY!^l!`{j3+OZKnO59UnO)<5Sd{dVJ{t4iyG%yzF1S}ySJ zLQX}W@zT8qpO^LC`+VP~p?frx97dAFVQ6W}- zUgkL+nwPhm7bVMC8u6Eak-aeD9M>t#(20&Rjly4Sv>hy{cwHSL`pcmMxHBYT;| z0R7@WdN*eNJ@@Vn--5rwN1b-MxTL$e*(YtD5@5aIxys4+H?x_(<=^hxGjS7ZlG){T zL9aGuDrR!rR(O`ZKxy9gIk7e>yUtV|54Dc-J-4~@T%lE4#@Q%|v^nBJy+>!f6P_t7 z7du7YYi~JH4+myO{4Dd3zytWo-s~RSQS@^jn9XBqaWx z$JBVmZO8H@%B5_7<=hroAG|y%O8wZY_THN{OR}4#7;l%?b=aCvJVSo0iU0Cd- R#}S~!`9?^k@J8 literal 0 HcmV?d00001 diff --git a/assets/maimai/static/mai/default_pic/UI_RSL_MBase_Parts_01.png b/assets/maimai/static/mai/default_pic/UI_RSL_MBase_Parts_01.png new file mode 100644 index 0000000000000000000000000000000000000000..0c023e27e7ac2ac457f3ad9bf86ce1af95dafb91 GIT binary patch literal 546 zcmV+-0^R+IP)L_t(o!|m1WYJ)HshT$1& z+vl;?sPVJ9er@M}ii=LRDh3?p*T@Y9LAZDcn7p}ME|<&oAM-4k}XhC zVln@9aL;Hbb6b)%GBQI=#)e%vuCf{b*zf3T$fEzCQ1oxh`D^TmNviG3ubq<(o=;XN z$<$zbYwT;pxE$wBlu~!3WOinkFwdA^i`|t>+Hvl_9Ef;rC_6S+o;KMJO=aWUr!32A z;FC%+mXwNelO3UCG}&)_Fj34)s)WrN+c(>YIL<9Y9ng~14HvyIhoRubJ_@s4j`nxJ zo#X?kNTzG-oo}`gP3%FH<9}spa-akP_7eW=$`STxZ+?DT!}Vb@Z*R*!^x7Ohi0!;M k7%t;o;B75TLJ|FPcxXukjT`~TJL|B%rC%jo}(&i}Fjr1Ag&01R|e zPE!D?1>*|F5vz_nHyJ5)hD`tf0&Ph|K~z}7?9aIoz%UF0K?@-1N9?~|haP_!m1wXH z+}t7}A|eyR)@mJL`0O~d7JU!k6#F7dev*=om~qTPa2yFcc{)PYpT3tlXK{IBC$1 q;K15qVPWH9q%Hv3GYUq*zyknM&~Zgy!l7CK0000yEfKP}kkpBDk?>`uTu;C<- z@&Et-r%4xDf$F$Rg8YIRZm$XH{2TSe`~3{XD>*_ybA>%!978H@y}e`0=a?wrk|-3I z?Yi}Tj-|gPnpH3!|ioMIbKCgKY5`4}fcG~4vH%tHJT81@TUY;5v zc|wDrc;8Lq82w#|ray|HD6*GB&?&Ey`#V>9HB2_$zI z9+61mF>I4??op&C_utc*C5h#}R^NB4-j%y|nNKl!oe_Vg`l871s{)U2emiOV_qCbR d_q_VRl+tr=y`r#h@I {{core.help.toggle.timeoffset}}') async def _(msg: Bot.MessageSession, offset: str): try: - tstr_split = [part for part in offset.split(':')] - hour = int(tstr_split[0]) - minute = int(tstr_split[1]) if len(tstr_split) > 1 else 0 + tstr_split = [int(part) for part in offset.split(':')] + hour = tstr_split[0] + minute = tstr_split[1] if len(tstr_split) > 1 else 0 if minute == 0: offset = f"{'+' if hour >= 0 else '-'}{abs(hour)}" else: From d127f6daee8a08fb9f6b37025407ccfac7137cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 10 Dec 2023 20:25:45 +0800 Subject: [PATCH 002/168] Update --- modules/bilibili/__init__.py | 13 +- modules/convert/__init__.py | 23 - modules/convert/constants.txt | 74 -- modules/convert/default_bi_zh-cn_en.txt | 901 ------------------ modules/convert/locales/en_us.json | 5 - modules/convert/locales/zh_cn.json | 5 - modules/convert/locales/zh_tw.json | 5 - .../convert/old/constants_bi_zh-cn_en_old.txt | 75 -- .../convert/old/default_bi_zh-cn_en_old.txt | 889 ----------------- modules/core/su_utils.py | 91 ++ modules/core/update.py | 101 -- modules/core/utils.py | 10 +- modules/maimai/__init__.py | 2 +- modules/random/__init__.py | 25 - modules/random/locales/en_us.json | 8 +- modules/random/locales/zh_cn.json | 8 +- modules/random/locales/zh_tw.json | 8 +- 17 files changed, 105 insertions(+), 2138 deletions(-) delete mode 100644 modules/convert/__init__.py delete mode 100644 modules/convert/constants.txt delete mode 100644 modules/convert/default_bi_zh-cn_en.txt delete mode 100644 modules/convert/locales/en_us.json delete mode 100644 modules/convert/locales/zh_cn.json delete mode 100644 modules/convert/locales/zh_tw.json delete mode 100644 modules/convert/old/constants_bi_zh-cn_en_old.txt delete mode 100644 modules/convert/old/default_bi_zh-cn_en_old.txt delete mode 100644 modules/core/update.py diff --git a/modules/bilibili/__init__.py b/modules/bilibili/__init__.py index db46db1183..b872cafa81 100644 --- a/modules/bilibili/__init__.py +++ b/modules/bilibili/__init__.py @@ -54,7 +54,7 @@ async def _(msg: Bot.MessageSession): await get_info(msg, url, get_detail=False) -""" + @bili.handle(re.compile(r"https?://b23\.tv/(av\d+|BV[A-Za-z0-9]{10}|[A-Za-z0-9]{7})(?:/.*?|)$"), mode="M", desc="{bilibili.help.regex.shorturl}") async def _(msg: Bot.MessageSession): @@ -70,13 +70,10 @@ async def _(msg: Bot.MessageSession): await get_info(msg, url, get_detail=False) - async def parse_shorturl(shorturl): async with aiohttp.ClientSession() as session: - async with session.get(shorturl, allow_redirects=True) as response: - target_url = str(response.url) - parsed_url = urlparse(target_url) - video = parsed_url.path.split("/")[-2] + async with session.get(shorturl, allow_redirects=False) as response: + target_url = urlparse(response.headers.get('Location')) + video = target_url.path.split("/")[-2] url = f"{api_url}?bvid={video}" - return url -""" + return url \ No newline at end of file diff --git a/modules/convert/__init__.py b/modules/convert/__init__.py deleted file mode 100644 index c9c1e9676e..0000000000 --- a/modules/convert/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -from decimal import Decimal - -from pint import UnitRegistry - -from core.builtins import Bot -from core.component import module - -# ureg = UnitRegistry(os.path.dirname(os.path.abspath(__file__)) + -# '/default_bi_zh-cn_en.txt', non_int_type=Decimal) -ureg = UnitRegistry(non_int_type=Decimal) -i = module('convert', alias=['conv', 'unit'], desc='{convert.help.desc}', - developers=['Dianliang233'], support_languages=['en_us']) - - -@i.command(' {{convert.help}}') -async def _(msg: Bot.MessageSession, from_val: str, to_unit: str): - try: - ori = ureg.parse_expression(from_val) - res = ureg.parse_expression(from_val).to(to_unit) - except BaseException: - await msg.finish(msg.locale.t("convert.message.error")) - - await msg.finish(f"{ori:~Pg} = {res:~Pg}") diff --git a/modules/convert/constants.txt b/modules/convert/constants.txt deleted file mode 100644 index 9babc8fa2e..0000000000 --- a/modules/convert/constants.txt +++ /dev/null @@ -1,74 +0,0 @@ -# Default Pint constants definition file -# Based on the International System of Units -# Language: english -# Source: https://physics.nist.gov/cuu/Constants/ -# https://physics.nist.gov/PhysRefData/XrayTrans/Html/search.html -# :copyright: 2013,2019 by Pint Authors, see AUTHORS for more details. - -#### MATHEMATICAL CONSTANTS #### -# As computed by Maxima with fpprec:50 - -pi = 3.1415926535897932384626433832795028841971693993751 = π # pi -tansec = 4.8481368111333441675396429478852851658848753880815e-6 # tangent of 1 arc-second ~ arc_second/radian -ln10 = 2.3025850929940456840179914546843642076011014886288 # natural logarithm of 10 -wien_x = 4.9651142317442763036987591313228939440555849867973 # solution to (x-5)*exp(x)+5 = 0 => x = W(5/exp(5))+5 -wien_u = 2.8214393721220788934031913302944851953458817440731 # solution to (u-3)*exp(u)+3 = 0 => u = W(3/exp(3))+3 -eulers_number = 2.71828182845904523536028747135266249775724709369995 - -#### DEFINED EXACT CONSTANTS #### - -speed_of_light = 299792458 m/s = c = c_0 # since 1983 -planck_constant = 6.62607015e-34 J s = ℎ # since May 2019 -elementary_charge = 1.602176634e-19 C = e # since May 2019 -avogadro_number = 6.02214076e23 # since May 2019 -boltzmann_constant = 1.380649e-23 J K^-1 = k = k_B # since May 2019 -standard_gravity = 9.80665 m/s^2 = g_0 = g0 = g_n = gravity # since 1901 -standard_atmosphere = 1.01325e5 Pa = atm = atmosphere # since 1954 -conventional_josephson_constant = 4.835979e14 Hz / V = K_J90 # since Jan 1990 -conventional_von_klitzing_constant = 2.5812807e4 ohm = R_K90 # since Jan 1990 - -#### DERIVED EXACT CONSTANTS #### -# Floating-point conversion may introduce inaccuracies - -zeta = c / (cm/s) = ζ -dirac_constant = ℎ / (2 * π) = ħ = hbar = atomic_unit_of_action = a_u_action -avogadro_constant = avogadro_number * mol^-1 = N_A -molar_gas_constant = k * N_A = R -faraday_constant = e * N_A -conductance_quantum = 2 * e ** 2 / ℎ = G_0 -magnetic_flux_quantum = ℎ / (2 * e) = Φ_0 = Phi_0 -josephson_constant = 2 * e / ℎ = K_J -von_klitzing_constant = ℎ / e ** 2 = R_K -stefan_boltzmann_constant = 2 / 15 * π ** 5 * k ** 4 / (ℎ ** 3 * c ** 2) = σ = sigma -first_radiation_constant = 2 * π * ℎ * c ** 2 = c_1 -second_radiation_constant = ℎ * c / k = c_2 -wien_wavelength_displacement_law_constant = ℎ * c / (k * wien_x) -wien_frequency_displacement_law_constant = wien_u * k / ℎ - -#### MEASURED CONSTANTS #### -# Recommended CODATA-2018 values -# To some extent, what is measured and what is derived is a bit arbitrary. -# The choice of measured constants is based on convenience and on available uncertainty. -# The uncertainty in the last significant digits is given in parentheses as a comment. - -newtonian_constant_of_gravitation = 6.67430e-11 m^3/(kg s^2) = _ = gravitational_constant # (15) -rydberg_constant = 1.0973731568160e7 * m^-1 = R_∞ = R_inf # (21) -electron_g_factor = -2.00231930436256 = g_e # (35) -atomic_mass_constant = 1.66053906660e-27 kg = m_u # (50) -electron_mass = 9.1093837015e-31 kg = m_e = atomic_unit_of_mass = a_u_mass # (28) -proton_mass = 1.67262192369e-27 kg = m_p # (51) -neutron_mass = 1.67492749804e-27 kg = m_n # (95) -lattice_spacing_of_Si = 1.920155716e-10 m = d_220 # (32) -K_alpha_Cu_d_220 = 0.80232719 # (22) -K_alpha_Mo_d_220 = 0.36940604 # (19) -K_alpha_W_d_220 = 0.108852175 # (98) - -#### DERIVED CONSTANTS #### - -fine_structure_constant = (2 * ℎ * R_inf / (m_e * c)) ** 0.5 = α = alpha -vacuum_permeability = 2 * α * ℎ / (e ** 2 * c) = µ_0 = mu_0 = mu0 = magnetic_constant -vacuum_permittivity = e ** 2 / (2 * α * ℎ * c) = ε_0 = epsilon_0 = eps_0 = eps0 = electric_constant -impedance_of_free_space = 2 * α * ℎ / e ** 2 = Z_0 = characteristic_impedance_of_vacuum -coulomb_constant = α * hbar * c / e ** 2 = k_C -classical_electron_radius = α * hbar / (m_e * c) = r_e -thomson_cross_section = 8 / 3 * π * r_e ** 2 = σ_e = sigma_e diff --git a/modules/convert/default_bi_zh-cn_en.txt b/modules/convert/default_bi_zh-cn_en.txt deleted file mode 100644 index b45b5cc9a6..0000000000 --- a/modules/convert/default_bi_zh-cn_en.txt +++ /dev/null @@ -1,901 +0,0 @@ - -# Default Pint units definition file -# Based on the International System of Units -# Language: english -# :copyright: 2013,2019 by Pint Authors, see AUTHORS for more details. - -# Syntax -# ====== -# Units -# ----- -# = [= ] [= ] [ = ] [...] -# -# The canonical name and aliases should be expressed in singular form. -# Pint automatically deals with plurals built by adding 's' to the singular form; plural -# forms that don't follow this rule should be instead explicitly listed as aliases. -# -# If a unit has no symbol and one wants to define aliases, then the symbol should be -# conventionally set to _. -# -# Example: -# millennium = 1e3 * year = _ = millennia -# -# -# Prefixes -# -------- -# - = [= ] [= ] [ = ] [...] -# -# Example: -# deca- = 1e+1 = da- = deka- -# -# -# Derived dimensions -# ------------------ -# [dimension name] = -# -# Example: -[mass] = # [density] / [volume] -# -# Note that primary dimensions don't need to be declared; they can be -# defined for the first time in a unit definition. -# E.g. see below `meter = [length]` -# -# -# Additional aliases -# ------------------ -# @alias = [ = ] [...] -# -# Used to add aliases to already existing unit definitions. -# Particularly useful when one wants to enrich definitions -# from defaults_en.txt with custom aliases. -# -# Example: -# @alias meter = my_meter - -# See also: https://pint.readthedocs.io/en/latest/defining.html - -@defaults - group = international - system = mks -@end - - -#### PREFIXES #### - -# decimal prefixes -quecto- = 1e-30 = q- = 亏可托- = 亏- -ronto- = 1e-27 = r- = 柔托- = 柔- -yocto- = 1e-24 = y- = 幺科托- = 幺- = 攸- -zepto- = 1e-21 = z- = 仄普托- = 仄- = 介- -atto- = 1e-18 = a- = 阿托- = 阿- -femto- = 1e-15 = f- = 飞母托- = 飞- = 飛- -pico- = 1e-12 = p- = 皮可- = 皮- -nano- = 1e-9 = n- = 纳诺- = 纳- = 奈- -# The micro (U+00B5) and Greek mu (U+03BC) are both valid prefixes, -# and they often use the same glyph. -micro- = 1e-6 = µ- = μ- = u- = 微- -milli- = 1e-3 = m- = 毫- -centi- = 1e-2 = c- = 厘- = 釐- -deci- = 1e-1 = d- = 分- -deca- = 1e+1 = da- = deka- = 十- -hecto- = 1e2 = h- = 百- -kilo- = 1e3 = k- = 千- -mega- = 1e6 = M- = 兆- = 百萬- -giga- = 1e9 = G- = 吉咖- = 吉- -tera- = 1e12 = T- = 太拉- = 太- -peta- = 1e15 = P- = 拍它- = 拍- -exa- = 1e18 = E- = 艾可萨- = 艾- -zetta- = 1e21 = Z- = 泽它- = 泽- = 皆= -yotta- = 1e24 = Y- = 尧它- = 尧- = 佑- -ronna- = 1e27 = R- = 容那- = 容- -quetta- = 1e30 = Q- = 昆它- = 昆- - -# binary_prefixes -kibi- = 2**10 = Ki- -mebi- = 2**20 = Mi- -gibi- = 2**30 = Gi- -tebi- = 2**40 = Ti- -pebi- = 2**50 = Pi- -exbi- = 2**60 = Ei- -zebi- = 2**70 = Zi- -yobi- = 2**80 = Yi- - -# extra_prefixes -semi- = 0.5 = _ = demi- = 半- -sesqui- = 1.5 - - -#### BASE UNITS #### - -meter = [length] = m = metre = 米 = 公尺 -second = [time] = s = sec = 秒 -ampere = [current] = A = amp = 安培 = 安 -candela = [luminosity] = cd = candle = 坎德拉 = 坎 -gram = [mass] = g = 克 = 公克 -mole = [substance] = mol = 摩尔 = 摩 -kelvin = [temperature]; offset: 0 = K = degK = °K = degree_Kelvin = degreeK = 开尔文 = 开 # older names supported for compatibility -radian = [] = rad = 弧度 -bit = [] = 比特 -count = [] = 个 - - -#### CONSTANTS #### - -@import constants.txt - -#### UNITS #### -# Common and less common, grouped by quantity. -# Conversion factors are exact (except when noted), -# although floating-point conversion may introduce inaccuracies - -# Angle -turn = 2 * π * radian = _ = revolution = cycle = circle = 转 -degree = π / 180 * radian = deg = arcdeg = arcdegree = 度 = 角度 -arcminute = degree / 60 = arcmin = arc_minute = angular_minute = 弧分 = 角分 -arcsecond = arcminute / 60 = arcsec = arc_second = angular_second = 弧秒 = 角秒 -milliarcsecond = 1e-3 * arcsecond = mas = 毫弧秒 = 毫角秒 -grade = π / 200 * radian = grad = gon = 百分度 = 梯度 -milliradian = π / 32000 * radian = mil = 毫弧度 = 密位 - -# Solid angle -steradian = radian ** 2 = sr = 球面度 -square_degree = (π / 180) ** 2 * sr = sq_deg = sqdeg = 平方度 - -# Information -baud = bit / second = Bd = bps = 比特每秒 = 波特 - -byte = 8 * bit = B = octet = 字节 -字节 = 8 * bit = _ = octet = # byte -## NOTE: B (byte) symbol can conflict with Bell - -# Ratios -percent = 0.01 = % = 百分 -ppm = 1e-6 = 分比 - -# Length -angstrom = 1e-10 * meter = Å = ångström = Å = 埃格斯特朗 = 埃 -centimeter = cm = 厘米 = 釐米 = 公分 -millimeter = mm = 毫米 = 公厘 = 公釐 -decimeter = dm = 分米 = 公寸 -dekameter = dam = 十米 = 公丈 -hectometer = hm = 百米 = 公引 -kilometer = km = 千米 = 公里 -micron = micrometer = µm = μ = 微米 -fermi = femtometer = fm = 费米 -light_year = speed_of_light * julian_year = ly = lightyear = 光年 -astronomical_unit = 149597870700 * meter = au = 天文单位 = 天文單位# since Aug 2012 -parsec = 1 / tansec * astronomical_unit = pc = 秒差距 -nautical_mile = 1852 * meter = nmi = 海里 = 浬 -bohr = hbar / (alpha * m_e * c) = a_0 = a0 = bohr_radius = atomic_unit_of_length = a_u_length = 玻尔半径 = 原子单位长度 = 波耳半徑 -x_unit_Cu = K_alpha_Cu_d_220 * d_220 / 1537.4 = Xu_Cu = 铜的X单位 = 铜的X射线波长 -x_unit_Mo = K_alpha_Mo_d_220 * d_220 / 707.831 = Xu_Mo = 钼的X单位 = 钼的X射线波长 -angstrom_star = K_alpha_W_d_220 * d_220 / 0.2090100 = Å_star = 埃星 -planck_length = (hbar * gravitational_constant / c ** 3) ** 0.5 = 普朗克长度 = 普朗克長度 - - -# Mass -metric_ton = 1e3 * kilogram = t = tonne = 吨 = 公吨 = 噸 = 公噸 -centigram = cg = 厘克 = 公毫 -milligram = mg = 毫克 = 公絲 -decigram = dg = 分克 = 公銖 -dekagram = dag = 十克 = 公錢 -hectogram = hg = 百克 = 公兩 -kilogram = kg = 千克 = 公斤 -unified_atomic_mass_unit = atomic_mass_constant = u = amu = 原子质量单位 = 原子質量單位 -dalton = atomic_mass_constant = Da = 道尔顿 -grain = 64.79891 * milligram = gr = 格令 = 格林 -gamma_mass = microgram = 微克 = 伽玛质量 -carat = 200 * milligram = ct = karat = 克拉 -planck_mass = (hbar * c / gravitational_constant) ** 0.5 = 普朗克质量 = 普朗克質量 - -# Time -minute = 60 * second = min = 分钟 = 分 -hour = 60 * minute = h = hr = 小时 -day = 24 * hour = d = 日 = 天 -week = 7 * day = 星期 = 周 = 礼拜 -fortnight = 2 * week = 两星期 -year = 365.25 * day = a = yr = julian_year = 年 = 儒略年 -month = year / 12 = 月 - -# decade = 10 * year -## NOTE: decade [time] can conflict with decade [dimensionless] - -century = 100 * year = _ = centuries = 世纪 -millennium = 1e3 * year = _ = millennia = 千年纪 = 千纪 = 千年 -eon = 1e9 * year = 宙 -shake = 1e-8 * second = 抖 -svedberg = 1e-13 * second = 斯韦德贝里 = 斯维德伯格 -atomic_unit_of_time = hbar / E_h = a_u_time = 原子单位时间 -gregorian_year = 365.2425 * day = 公历年 -sidereal_year = 365.256363004 * day = 恒星年 -tropical_year = 365.242190402 * day = 回归年 -common_year = 365 * day = 平年 -leap_year = 366 * day = 闰年 -sidereal_day = day / 1.00273790935079524 = 恒星日 -sidereal_month = 27.32166155 * day = 恒星月 -tropical_month = 27.321582 * day = 回归月 -synodic_month = 29.530589 * day = _ = lunar_month = 同步月 = 朔望月 -planck_time = (hbar * gravitational_constant / c ** 5) ** 0.5 = 普朗克时间 - -# Temperature -degree_Celsius = kelvin; offset: 273.15 = °C = celsius = degC = degreeC = 摄氏度 -degree_Rankine = 5 / 9 * kelvin; offset: 0 = °R = °Ra = rankine = degR = degreeR = 兰氏度 -degree_Fahrenheit = 5 / 9 * kelvin; offset: 233.15 + 200 / 9 = °F = fahrenheit = degF = degreeF = 华氏度 -réaumur = 4 / 5 * kelvin; offset: 273.15 = °Re = reaumur = degRe = degreeRe = degree_Réaumur = 列氏度 -atomic_unit_of_temperature = E_h / k = a_u_temp = 原子单位温度 -planck_temperature = (hbar * c ** 5 / gravitational_constant / k ** 2) ** 0.5 = 普朗克温度 - -# Area -[area] = [length] ** 2 -are = 100 * meter ** 2 = 公亩 -barn = 1e-28 * meter ** 2 = b = 靶恩 -darcy = centipoise * centimeter ** 2 / (second * atmosphere) = 达西 -hectare = 100 * are = ha = 公顷 - -# Volume -[volume] = [length] ** 3 -liter = decimeter ** 3 = l = L = litre = 升 -cubic_centimeter = centimeter ** 3 = cc = 立方厘米 -lambda = microliter = λ -stere = meter ** 3 - -# Frequency -[frequency] = 1 / [time] -hertz = 1 / second = Hz = 赫兹 = 赫 -revolutions_per_minute = revolution / minute = rpm = 转每分 -revolutions_per_second = revolution / second = rps = 转每秒 -counts_per_second = count / second = cps = 次每秒 - -# Wavenumber -[wavenumber] = 1 / [length] -reciprocal_centimeter = 1 / cm = cm_1 = kayser = 倒数厘米 - -# Velocity -[velocity] = [length] / [time] -[speed] = [velocity] -knot = nautical_mile / hour = kt = knot_international = international_knot = 节 -mile_per_hour = mile / hour = mph = MPH = 英里每小时 = 迈 -kilometer_per_hour = kilometer / hour = kph = KPH = 千米每小时 -kilometer_per_second = kilometer / second = kps = 千米每秒 -meter_per_second = meter / second = mps = 米每秒 -foot_per_second = foot / second = fps = 英尺每秒 - -# Volumetric Flow Rate -[volumetric_flow_rate] = [volume] / [time] -sverdrup = 1e6 * meter ** 3 / second = sv = 斯维德鲁普 - -# Acceleration -[acceleration] = [velocity] / [time] -galileo = centimeter / second ** 2 = Gal = 伽利略 - -# Force -[force] = [mass] * [acceleration] -newton = kilogram * meter / second ** 2 = N = 牛顿 = 牛 -dyne = gram * centimeter / second ** 2 = dyn = 达因 -force_kilogram = g_0 * kilogram = kgf = kilogram_force = pond = 千克力 -force_gram = g_0 * gram = gf = gram_force = 克力 -force_metric_ton = g_0 * metric_ton = tf = metric_ton_force = force_t = t_force = 公吨力 = 吨力 -atomic_unit_of_force = E_h / a_0 = a_u_force = 原子单位力 - -# Energy -[energy] = [force] * [length] -joule = newton * meter = J = 焦耳 -erg = dyne * centimeter = 尔格 -watt_hour = watt * hour = Wh = watthour = 瓦时 -electron_volt = e * volt = eV = 电子伏特 -rydberg = ℎ * c * R_inf = Ry = 里德伯格 -hartree = 2 * rydberg = E_h = Eh = hartree_energy = atomic_unit_of_energy = a_u_energy = 哈特里 -calorie = 4.184 * joule = cal = thermochemical_calorie = cal_th = 卡路里 -international_calorie = 4.1868 * joule = cal_it = international_steam_table_calorie = 国际卡路里 -fifteen_degree_calorie = 4.1855 * joule = cal_15 = 卡路里15度 -british_thermal_unit = 1055.056 * joule = Btu = BTU = Btu_iso = 英热单位 -international_british_thermal_unit = 1e3 * pound / kilogram * degR / kelvin * international_calorie = Btu_it = 国际英热单位 -thermochemical_british_thermal_unit = 1e3 * pound / kilogram * degR / kelvin * calorie = Btu_th = 热化学英热单位 -quadrillion_Btu = 1e15 * Btu = quad = 兆英热单位 -therm = 1e5 * Btu = thm = EC_therm = 热量 -US_therm = 1.054804e8 * joule = 美国热量 -ton_TNT = 1e9 * calorie = tTNT = TNT当量 -tonne_of_oil_equivalent = 1e10 * international_calorie = toe = 吨油当量 -atmosphere_liter = atmosphere * liter = atm_l = 气体升 - -# Power -[power] = [energy] / [time] -watt = joule / second = W = 瓦特 -volt_ampere = volt * ampere = VA = 伏特安培 -horsepower = 550 * foot * force_pound / second = hp = UK_horsepower = hydraulic_horsepower = 马力 -boiler_horsepower = 33475 * Btu / hour = 锅炉马力 -metric_horsepower = 75 * force_kilogram * meter / second = 公制马力 -electrical_horsepower = 746 * watt = 电马力 -refrigeration_ton = 12e3 * Btu / hour = _ = ton_of_refrigeration = 制冷吨 -cooling_tower_ton = 1.25 * refrigeration_ton = 冷却塔吨 -standard_liter_per_minute = atmosphere * liter / minute = slpm = slm = 标准升每分钟 -conventional_watt_90 = K_J90 ** 2 * R_K90 / (K_J ** 2 * R_K) * watt = W_90 = 传统瓦特90 - -# Momentum -[momentum] = [length] * [mass] / [time] - -# Density (as auxiliary for pressure) -[density] = [mass] / [volume] -mercury = 13.5951 * kilogram / liter = Hg = Hg_0C = Hg_32F = conventional_mercury = 水银 -water = 1.0 * kilogram / liter = H2O = conventional_water = 水 -mercury_60F = 13.5568 * kilogram / liter = Hg_60F = 水银60华氏度 -water_39F = 0.999972 * kilogram / liter = water_4C = 水4摄氏度 -water_60F = 0.999001 * kilogram / liter = 水60华氏度 - -# Pressure -[pressure] = [force] / [area] -pascal = newton / meter ** 2 = Pa = 帕斯卡 -barye = dyne / centimeter ** 2 = Ba = barie = barad = barrie = baryd = 微巴 -bar = 1e5 * pascal = 巴 -technical_atmosphere = kilogram * g_0 / centimeter ** 2 = at = 工程大气压 -torr = atm / 760 = 托 -pound_force_per_square_inch = force_pound / inch ** 2 = psi = 磅力每平方英寸 -kip_per_square_inch = kip / inch ** 2 = ksi = 千磅力每平方英寸 -millimeter_Hg_0C = millimeter * Hg * g_0 = mmHg = mm_Hg = 毫米汞柱 -centimeter_Hg_0C = centimeter * Hg * g_0 = cmHg = cm_Hg = 厘米汞柱 -inch_Hg_32F = inch * Hg * g_0 = inHg = in_Hg = 英寸汞柱 -inch_Hg_60F = inch * Hg_60F * g_0 = 60华氏度英寸汞柱 -inch_H2O_39F = inch * water_39F * g_0 = 39华氏度英寸水柱 -inch_H2O_60F = inch * water_60F * g_0 = 60华氏度英寸水柱 -feet_H2O = foot * water * g_0 = ftH2O = 英尺水柱 -centimeter_H2O = cm_H2O = centimeter * water * g_0 = cmH2O = 厘米水柱 -sound_pressure_level = 20e-6 * pascal = SPL = 声压级 - -# Torque -[torque] = [force] * [length] -foot_pound = foot * force_pound = ft_lb = footpound = 英尺磅 - -# Viscosity -[viscosity] = [pressure] * [time] -poise = 0.1 * Pa * second = P = 泊伊斯 -reyn = psi * second = 雷恩 - -# Kinematic viscosity -[kinematic_viscosity] = [area] / [time] -stokes = centimeter ** 2 / second = St = 斯托克斯 - -# Fluidity -[fluidity] = 1 / [viscosity] -rhe = 1 / poise = 莱 - -# Amount of substance -particle = 1 / N_A = _ = molec = molecule = 粒子 - -# Concentration -[concentration] = [substance] / [volume] -molar = mole / liter = M = 体积摩尔 - -# Catalytic activity -[activity] = [substance] / [time] -katal = mole / second = kat = 开特 -enzyme_unit = micromole / minute = U = enzymeunit = 酶单位 - -# Entropy -[entropy] = [energy] / [temperature] -clausius = calorie / kelvin = Cl = 克劳西斯 - -# Molar entropy -[molar_entropy] = [entropy] / [substance] -entropy_unit = calorie / kelvin / mole = eu = 熵单位 - -# Radiation -becquerel = counts_per_second = Bq = 贝克勒尔 = 贝克 -curie = 3.7e10 * becquerel = Ci = 居里 -rutherford = 1e6 * becquerel = Rd = 卢瑟福 -gray = joule / kilogram = Gy = 戈瑞 -sievert = joule / kilogram = Sv = 希沃特 -rads = 0.01 * gray = 拉德斯 -rem = 0.01 * sievert = 雷质 -roentgen = 2.58e-4 * coulomb / kilogram = _ = röntgen = 伦琴 - -# Heat transimission -[heat_transmission] = [energy] / [area] -peak_sun_hour = 1e3 * watt_hour / meter ** 2 = PSH = 峰值太阳小时 -langley = thermochemical_calorie / centimeter ** 2 = Ly = 兰利 - -# Luminance -[luminance] = [luminosity] / [area] -nit = candela / meter ** 2 = 尼特 -stilb = candela / centimeter ** 2 = 斯蒂尔布 -lambert = 1 / π * candela / centimeter ** 2 = 兰伯特 - -# Luminous flux -[luminous_flux] = [luminosity] -lumen = candela * steradian = lm = 流明 - -# Illuminance -[illuminance] = [luminous_flux] / [area] -lux = lumen / meter ** 2 = lx = 勒克斯 - -# Intensity -[intensity] = [power] / [area] -atomic_unit_of_intensity = 0.5 * ε_0 * c * atomic_unit_of_electric_field ** 2 = a_u_intensity = 原子单位光强 - -# Current -biot = 10 * ampere = Bi = 毕奥 -abampere = biot = abA = 绝对安培 -atomic_unit_of_current = e / atomic_unit_of_time = a_u_current = 原子单位电流 -mean_international_ampere = mean_international_volt / mean_international_ohm = A_it = 平均国际安培 -US_international_ampere = US_international_volt / US_international_ohm = A_US = 美国国际安培 -conventional_ampere_90 = K_J90 * R_K90 / (K_J * R_K) * ampere = A_90 = 传统安培90 -planck_current = (c ** 6 / gravitational_constant / k_C) ** 0.5 = 普朗克电流 - -# Charge -[charge] = [current] * [time] -coulomb = ampere * second = C = 库仑 -abcoulomb = 10 * C = abC = 绝对库伦 -faraday = e * N_A * mole = 法拉第 -conventional_coulomb_90 = K_J90 * R_K90 / (K_J * R_K) * coulomb = C_90 = 传统库伦90 -ampere_hour = ampere * hour = Ah = 安培时 - -# Electric potential -[electric_potential] = [energy] / [charge] -volt = joule / coulomb = V = 伏特 = 伏 -abvolt = 1e-8 * volt = abV = 绝对伏特 -mean_international_volt = 1.00034 * volt = V_it = 平均国际伏特 # approximate -US_international_volt = 1.00033 * volt = V_US = 美国国际伏特 # approximate -conventional_volt_90 = K_J90 / K_J * volt = V_90 = 传统伏特90 - -# Electric field -[electric_field] = [electric_potential] / [length] -atomic_unit_of_electric_field = e * k_C / a_0 ** 2 = a_u_electric_field = 原子单位电场 - -# Electric displacement field -[electric_displacement_field] = [charge] / [area] - -# Resistance -[resistance] = [electric_potential] / [current] -ohm = volt / ampere = Ω = 欧姆 = 欧 -abohm = 1e-9 * ohm = abΩ = 绝对欧姆 -mean_international_ohm = 1.00049 * ohm = Ω_it = ohm_it = 平均国际欧姆 # approximate -US_international_ohm = 1.000495 * ohm = Ω_US = ohm_US = 美国国际欧姆 # approximate -conventional_ohm_90 = R_K / R_K90 * ohm = Ω_90 = ohm_90 = 传统欧姆90 - -# Resistivity -[resistivity] = [resistance] * [length] - -# Conductance -[conductance] = [current] / [electric_potential] -siemens = ampere / volt = S = mho = 西门子 = 西门 -absiemens = 1e9 * siemens = abS = abmho = 绝对西门子 - -# Capacitance -[capacitance] = [charge] / [electric_potential] -farad = coulomb / volt = F = 法拉 -abfarad = 1e9 * farad = abF = 绝对法拉 -conventional_farad_90 = R_K90 / R_K * farad = F_90 = 常用法拉_90 - -# Magnetic flux -[magnetic_flux] = [electric_potential] * [time] -weber = volt * second = Wb = 韦伯 -unit_pole = µ_0 * biot * centimeter = 单位极 - -# Inductance -[inductance] = [magnetic_flux] / [current] -henry = weber / ampere = H = 亨利 -abhenry = 1e-9 * henry = abH = 绝对亨利 -conventional_henry_90 = R_K / R_K90 * henry = H_90 = 常用亨利_90 - -# Magnetic field -[magnetic_field] = [magnetic_flux] / [area] -tesla = weber / meter ** 2 = T = 特斯拉 -gamma = 1e-9 * tesla = γ = 伽玛 - -# Magnetomotive force -[magnetomotive_force] = [current] -ampere_turn = ampere = At = 安培匝 -biot_turn = biot = 比奥特匝 -gilbert = 1 / (4 * π) * biot_turn = Gb = 吉尔伯特 - -# Magnetic field strength -[magnetic_field_strength] = [current] / [length] - -# Electric dipole moment -[electric_dipole] = [charge] * [length] -debye = 1e-9 / ζ * coulomb * angstrom = D = 德拜 # formally 1 D = 1e-10 Fr*Å, but we generally want to use it outside the Gaussian context - -# Electric quadrupole moment -[electric_quadrupole] = [charge] * [area] -buckingham = debye * angstrom = 巴金汉姆 - -# Magnetic dipole moment -[magnetic_dipole] = [current] * [area] -bohr_magneton = e * hbar / (2 * m_e) = µ_B = mu_B = 波尔磁子 -nuclear_magneton = e * hbar / (2 * m_p) = µ_N = mu_N = 核磁子 - -# Logaritmic Unit Definition -# Unit = scale; logbase; logfactor -# x_dB = [logfactor] * log( x_lin / [scale] ) / log( [logbase] ) - -# Logaritmic Units of dimensionless quantity: [ https://en.wikipedia.org/wiki/Level_(logarithmic_quantity) ] - -decibelmilliwatt = 1e-3 watt; logbase: 10; logfactor: 10 = dBm -decibelmicrowatt = 1e-6 watt; logbase: 10; logfactor: 10 = dBu - -decibel = 1 ; logbase: 10; logfactor: 10 = dB -# bell = 1 ; logbase: 10; logfactor: = B -## NOTE: B (Bell) symbol conflicts with byte - -decade = 1 ; logbase: 10; logfactor: 1 -## NOTE: decade [time] can conflict with decade [dimensionless] - -octave = 1 ; logbase: 2; logfactor: 1 = oct - -neper = 1 ; logbase: 2.71828182845904523536028747135266249775724709369995; logfactor: 0.5 = Np -# neper = 1 ; logbase: eulers_number; logfactor: 0.5 = Np - -#### UNIT GROUPS #### -# Mostly for length, area, volume, mass, force -# (customary or specialized units) - -@group USCSLengthInternational - thou = 1e-3 * inch = th = mil_length - inch = yard / 36 = in = international_inch = inches = international_inches - hand = 4 * inch - foot = yard / 3 = ft = international_foot = feet = international_feet - yard = 0.9144 * meter = yd = international_yard # since Jul 1959 - mile = 1760 * yard = mi = international_mile - - circular_mil = π / 4 * mil_length ** 2 = cmil - square_inch = inch ** 2 = sq_in = square_inches - square_foot = foot ** 2 = sq_ft = square_feet - square_yard = yard ** 2 = sq_yd - square_mile = mile ** 2 = sq_mi - - cubic_inch = in ** 3 = cu_in - cubic_foot = ft ** 3 = cu_ft = cubic_feet - cubic_yard = yd ** 3 = cu_yd -@end - -@group USCSLengthSurvey - link = 1e-2 * chain = li = survey_link - survey_foot = 1200 / 3937 * meter = sft - fathom = 6 * survey_foot - rod = 16.5 * survey_foot = rd = pole = perch - chain = 4 * rod - furlong = 40 * rod = fur - cables_length = 120 * fathom - survey_mile = 5280 * survey_foot = smi = us_statute_mile - league = 3 * survey_mile - - square_rod = rod ** 2 = sq_rod = sq_pole = sq_perch - acre = 10 * chain ** 2 - square_survey_mile = survey_mile ** 2 = _ = section - square_league = league ** 2 - - acre_foot = acre * survey_foot = _ = acre_feet -@end - -@group USCSDryVolume - dry_pint = bushel / 64 = dpi = US_dry_pint - dry_quart = bushel / 32 = dqt = US_dry_quart - dry_gallon = bushel / 8 = dgal = US_dry_gallon - peck = bushel / 4 = pk - bushel = 2150.42 cubic_inch = bu - dry_barrel = 7056 cubic_inch = _ = US_dry_barrel - board_foot = ft * ft * in = FBM = board_feet = BF = BDFT = super_foot = superficial_foot = super_feet = superficial_feet -@end - -@group USCSLiquidVolume - minim = pint / 7680 - fluid_dram = pint / 128 = fldr = fluidram = US_fluid_dram = US_liquid_dram - fluid_ounce = pint / 16 = floz = US_fluid_ounce = US_liquid_ounce - gill = pint / 4 = gi = liquid_gill = US_liquid_gill - pint = quart / 2 = pt = liquid_pint = US_pint - fifth = gallon / 5 = _ = US_liquid_fifth - quart = gallon / 4 = qt = liquid_quart = US_liquid_quart - gallon = 231 * cubic_inch = gal = liquid_gallon = US_liquid_gallon -@end - -@group USCSVolumeOther - teaspoon = fluid_ounce / 6 = tsp - tablespoon = fluid_ounce / 2 = tbsp - shot = 3 * tablespoon = jig = US_shot - cup = pint / 2 = cp = liquid_cup = US_liquid_cup - barrel = 31.5 * gallon = bbl - oil_barrel = 42 * gallon = oil_bbl - beer_barrel = 31 * gallon = beer_bbl - hogshead = 63 * gallon -@end - -@group Avoirdupois - dram = pound / 256 = dr = avoirdupois_dram = avdp_dram = drachm - ounce = pound / 16 = oz = avoirdupois_ounce = avdp_ounce - pound = 7e3 * grain = lb = avoirdupois_pound = avdp_pound - stone = 14 * pound - quarter = 28 * stone - bag = 94 * pound - hundredweight = 100 * pound = cwt = short_hundredweight - long_hundredweight = 112 * pound - ton = 2e3 * pound = _ = short_ton - long_ton = 2240 * pound - slug = g_0 * pound * second ** 2 / foot - slinch = g_0 * pound * second ** 2 / inch = blob = slugette - - force_ounce = g_0 * ounce = ozf = ounce_force - force_pound = g_0 * pound = lbf = pound_force - force_ton = g_0 * ton = _ = ton_force = force_short_ton = short_ton_force - force_long_ton = g_0 * long_ton = _ = long_ton_force - kip = 1e3 * force_pound - poundal = pound * foot / second ** 2 = pdl -@end - -@group AvoirdupoisUK using Avoirdupois - UK_hundredweight = long_hundredweight = UK_cwt - UK_ton = long_ton - UK_force_ton = force_long_ton = _ = UK_ton_force -@end - -@group AvoirdupoisUS using Avoirdupois - US_hundredweight = hundredweight = US_cwt - US_ton = ton - US_force_ton = force_ton = _ = US_ton_force -@end - -@group Troy - pennyweight = 24 * grain = dwt - troy_ounce = 480 * grain = toz = ozt - troy_pound = 12 * troy_ounce = tlb = lbt -@end - -@group Apothecary - scruple = 20 * grain - apothecary_dram = 3 * scruple = ap_dr - apothecary_ounce = 8 * apothecary_dram = ap_oz - apothecary_pound = 12 * apothecary_ounce = ap_lb -@end - -@group ImperialVolume - imperial_minim = imperial_fluid_ounce / 480 - imperial_fluid_scruple = imperial_fluid_ounce / 24 - imperial_fluid_drachm = imperial_fluid_ounce / 8 = imperial_fldr = imperial_fluid_dram - imperial_fluid_ounce = imperial_pint / 20 = imperial_floz = UK_fluid_ounce - imperial_gill = imperial_pint / 4 = imperial_gi = UK_gill - imperial_cup = imperial_pint / 2 = imperial_cp = UK_cup - imperial_pint = imperial_gallon / 8 = imperial_pt = UK_pint - imperial_quart = imperial_gallon / 4 = imperial_qt = UK_quart - imperial_gallon = 4.54609 * liter = imperial_gal = UK_gallon - imperial_peck = 2 * imperial_gallon = imperial_pk = UK_pk - imperial_bushel = 8 * imperial_gallon = imperial_bu = UK_bushel - imperial_barrel = 36 * imperial_gallon = imperial_bbl = UK_bbl -@end - -@group Printer - pica = inch / 6 = _ = printers_pica - point = pica / 12 = pp = printers_point = big_point = bp - didot = 1 / 2660 * m - cicero = 12 * didot - tex_point = inch / 72.27 - tex_pica = 12 * tex_point - tex_didot = 1238 / 1157 * tex_point - tex_cicero = 12 * tex_didot - scaled_point = tex_point / 65536 - css_pixel = inch / 96 = px - - pixel = [printing_unit] = _ = dot = pel = picture_element - pixels_per_centimeter = pixel / cm = PPCM - pixels_per_inch = pixel / inch = dots_per_inch = PPI = ppi = DPI = printers_dpi - bits_per_pixel = bit / pixel = bpp -@end - -@group Textile - tex = gram / kilometer = Tt - dtex = decitex - denier = gram / (9 * kilometer) = den = Td - jute = pound / (14400 * yard) = Tj - aberdeen = jute = Ta - RKM = gf / tex - - number_english = 840 * yard / pound = Ne = NeC = ECC - number_meter = kilometer / kilogram = Nm -@end - - -#### CGS ELECTROMAGNETIC UNITS #### - -# === Gaussian system of units === -@group Gaussian - franklin = erg ** 0.5 * centimeter ** 0.5 = Fr = statcoulomb = statC = esu - statvolt = erg / franklin = statV - statampere = franklin / second = statA - gauss = dyne / franklin = G - maxwell = gauss * centimeter ** 2 = Mx - oersted = dyne / maxwell = Oe = ørsted - statohm = statvolt / statampere = statΩ - statfarad = franklin / statvolt = statF - statmho = statampere / statvolt -@end -# Note this system is not commensurate with SI, as ε_0 and µ_0 disappear; -# some quantities with different dimensions in SI have the same -# dimensions in the Gaussian system (e.g. [Mx] = [Fr], but [Wb] != [C]), -# and therefore the conversion factors depend on the context (not in pint sense) -[gaussian_charge] = [length] ** 1.5 * [mass] ** 0.5 / [time] -[gaussian_current] = [gaussian_charge] / [time] -[gaussian_electric_potential] = [gaussian_charge] / [length] -[gaussian_electric_field] = [gaussian_electric_potential] / [length] -[gaussian_electric_displacement_field] = [gaussian_charge] / [area] -[gaussian_electric_flux] = [gaussian_charge] -[gaussian_electric_dipole] = [gaussian_charge] * [length] -[gaussian_electric_quadrupole] = [gaussian_charge] * [area] -[gaussian_magnetic_field] = [force] / [gaussian_charge] -[gaussian_magnetic_field_strength] = [gaussian_magnetic_field] -[gaussian_magnetic_flux] = [gaussian_magnetic_field] * [area] -[gaussian_magnetic_dipole] = [energy] / [gaussian_magnetic_field] -[gaussian_resistance] = [gaussian_electric_potential] / [gaussian_current] -[gaussian_resistivity] = [gaussian_resistance] * [length] -[gaussian_capacitance] = [gaussian_charge] / [gaussian_electric_potential] -[gaussian_inductance] = [gaussian_electric_potential] * [time] / [gaussian_current] -[gaussian_conductance] = [gaussian_current] / [gaussian_electric_potential] -@context Gaussian = Gau - [gaussian_charge] -> [charge]: value / k_C ** 0.5 - [charge] -> [gaussian_charge]: value * k_C ** 0.5 - [gaussian_current] -> [current]: value / k_C ** 0.5 - [current] -> [gaussian_current]: value * k_C ** 0.5 - [gaussian_electric_potential] -> [electric_potential]: value * k_C ** 0.5 - [electric_potential] -> [gaussian_electric_potential]: value / k_C ** 0.5 - [gaussian_electric_field] -> [electric_field]: value * k_C ** 0.5 - [electric_field] -> [gaussian_electric_field]: value / k_C ** 0.5 - [gaussian_electric_displacement_field] -> [electric_displacement_field]: value / (4 * π / ε_0) ** 0.5 - [electric_displacement_field] -> [gaussian_electric_displacement_field]: value * (4 * π / ε_0) ** 0.5 - [gaussian_electric_dipole] -> [electric_dipole]: value / k_C ** 0.5 - [electric_dipole] -> [gaussian_electric_dipole]: value * k_C ** 0.5 - [gaussian_electric_quadrupole] -> [electric_quadrupole]: value / k_C ** 0.5 - [electric_quadrupole] -> [gaussian_electric_quadrupole]: value * k_C ** 0.5 - [gaussian_magnetic_field] -> [magnetic_field]: value / (4 * π / µ_0) ** 0.5 - [magnetic_field] -> [gaussian_magnetic_field]: value * (4 * π / µ_0) ** 0.5 - [gaussian_magnetic_flux] -> [magnetic_flux]: value / (4 * π / µ_0) ** 0.5 - [magnetic_flux] -> [gaussian_magnetic_flux]: value * (4 * π / µ_0) ** 0.5 - [gaussian_magnetic_field_strength] -> [magnetic_field_strength]: value / (4 * π * µ_0) ** 0.5 - [magnetic_field_strength] -> [gaussian_magnetic_field_strength]: value * (4 * π * µ_0) ** 0.5 - [gaussian_magnetic_dipole] -> [magnetic_dipole]: value * (4 * π / µ_0) ** 0.5 - [magnetic_dipole] -> [gaussian_magnetic_dipole]: value / (4 * π / µ_0) ** 0.5 - [gaussian_resistance] -> [resistance]: value * k_C - [resistance] -> [gaussian_resistance]: value / k_C - [gaussian_resistivity] -> [resistivity]: value * k_C - [resistivity] -> [gaussian_resistivity]: value / k_C - [gaussian_capacitance] -> [capacitance]: value / k_C - [capacitance] -> [gaussian_capacitance]: value * k_C - [gaussian_inductance] -> [inductance]: value * k_C - [inductance] -> [gaussian_inductance]: value / k_C - [gaussian_conductance] -> [conductance]: value / k_C - [conductance] -> [gaussian_conductance]: value * k_C -@end - -# === ESU system of units === -# (where different from Gaussian) -# See note for Gaussian system too -@group ESU using Gaussian - statweber = statvolt * second = statWb - stattesla = statweber / centimeter ** 2 = statT - stathenry = statweber / statampere = statH -@end -[esu_charge] = [length] ** 1.5 * [mass] ** 0.5 / [time] -[esu_current] = [esu_charge] / [time] -[esu_electric_potential] = [esu_charge] / [length] -[esu_magnetic_flux] = [esu_electric_potential] * [time] -[esu_magnetic_field] = [esu_magnetic_flux] / [area] -[esu_magnetic_field_strength] = [esu_current] / [length] -[esu_magnetic_dipole] = [esu_current] * [area] -@context ESU = esu - [esu_magnetic_field] -> [magnetic_field]: value * k_C ** 0.5 - [magnetic_field] -> [esu_magnetic_field]: value / k_C ** 0.5 - [esu_magnetic_flux] -> [magnetic_flux]: value * k_C ** 0.5 - [magnetic_flux] -> [esu_magnetic_flux]: value / k_C ** 0.5 - [esu_magnetic_field_strength] -> [magnetic_field_strength]: value / (4 * π / ε_0) ** 0.5 - [magnetic_field_strength] -> [esu_magnetic_field_strength]: value * (4 * π / ε_0) ** 0.5 - [esu_magnetic_dipole] -> [magnetic_dipole]: value / k_C ** 0.5 - [magnetic_dipole] -> [esu_magnetic_dipole]: value * k_C ** 0.5 -@end - - -#### CONVERSION CONTEXTS #### - -@context(n=1) spectroscopy = sp - # n index of refraction of the medium. - [length] <-> [frequency]: speed_of_light / n / value - [frequency] -> [energy]: planck_constant * value - [energy] -> [frequency]: value / planck_constant - # allow wavenumber / kayser - [wavenumber] <-> [length]: 1 / value -@end - -@context boltzmann - [temperature] -> [energy]: boltzmann_constant * value - [energy] -> [temperature]: value / boltzmann_constant -@end - -@context energy - [energy] -> [energy] / [substance]: value * N_A - [energy] / [substance] -> [energy]: value / N_A - [energy] -> [mass]: value / c ** 2 - [mass] -> [energy]: value * c ** 2 -@end - -@context(mw=0,volume=0,solvent_mass=0) chemistry = chem - # mw is the molecular weight of the species - # volume is the volume of the solution - # solvent_mass is the mass of solvent in the solution - - # moles -> mass require the molecular weight - [substance] -> [mass]: value * mw - [mass] -> [substance]: value / mw - - # moles/volume -> mass/volume and moles/mass -> mass/mass - # require the molecular weight - [substance] / [volume] -> [mass] / [volume]: value * mw - [mass] / [volume] -> [substance] / [volume]: value / mw - [substance] / [mass] -> [mass] / [mass]: value * mw - [mass] / [mass] -> [substance] / [mass]: value / mw - - # moles/volume -> moles requires the solution volume - [substance] / [volume] -> [substance]: value * volume - [substance] -> [substance] / [volume]: value / volume - - # moles/mass -> moles requires the solvent (usually water) mass - [substance] / [mass] -> [substance]: value * solvent_mass - [substance] -> [substance] / [mass]: value / solvent_mass - - # moles/mass -> moles/volume require the solvent mass and the volume - [substance] / [mass] -> [substance]/[volume]: value * solvent_mass / volume - [substance] / [volume] -> [substance] / [mass]: value / solvent_mass * volume - -@end - -@context textile - # Allow switching between Direct count system (i.e. tex) and - # Indirect count system (i.e. Ne, Nm) - [mass] / [length] <-> [length] / [mass]: 1 / value -@end - - -#### SYSTEMS OF UNITS #### - -@system SI - second - meter - kilogram - ampere - kelvin - mole - candela -@end - -@system mks using international - meter - kilogram - second -@end - -@system cgs using international, Gaussian, ESU - centimeter - gram - second -@end - -@system atomic using international - # based on unit m_e, e, hbar, k_C, k - bohr: meter - electron_mass: gram - atomic_unit_of_time: second - atomic_unit_of_current: ampere - atomic_unit_of_temperature: kelvin -@end - -@system Planck using international - # based on unit c, gravitational_constant, hbar, k_C, k - planck_length: meter - planck_mass: gram - planck_time: second - planck_current: ampere - planck_temperature: kelvin -@end - -@system imperial using ImperialVolume, USCSLengthInternational, AvoirdupoisUK - yard - pound -@end - -@system US using USCSLiquidVolume, USCSDryVolume, USCSVolumeOther, USCSLengthInternational, USCSLengthSurvey, AvoirdupoisUS - yard - pound -@end diff --git a/modules/convert/locales/en_us.json b/modules/convert/locales/en_us.json deleted file mode 100644 index 091ac396ac..0000000000 --- a/modules/convert/locales/en_us.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "convert.help": "单位转换，大小写敏感。", - "convert.help.desc": "全能单位转换。", - "convert.message.error": "发生错误：无法转换单位，请检查输入。" -} \ No newline at end of file diff --git a/modules/convert/locales/zh_cn.json b/modules/convert/locales/zh_cn.json deleted file mode 100644 index 8cf2c430fe..0000000000 --- a/modules/convert/locales/zh_cn.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "convert.help": "单位转换，大小写敏感。", - "convert.help.desc": "全能单位转换。", - "convert.message.error": "发生错误：无法转换单位，请检查输入。" -} \ No newline at end of file diff --git a/modules/convert/locales/zh_tw.json b/modules/convert/locales/zh_tw.json deleted file mode 100644 index 999d3f6b11..0000000000 --- a/modules/convert/locales/zh_tw.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "convert.help": "單位轉換，區分大小寫。", - "convert.help.desc": "全能單位轉換。", - "convert.message.error": "發生錯誤：無法轉換單位，請校對輸入。" -} \ No newline at end of file diff --git a/modules/convert/old/constants_bi_zh-cn_en_old.txt b/modules/convert/old/constants_bi_zh-cn_en_old.txt deleted file mode 100644 index 52105b283a..0000000000 --- a/modules/convert/old/constants_bi_zh-cn_en_old.txt +++ /dev/null @@ -1,75 +0,0 @@ - -# Default Pint constants definition file -# Based on the International System of Units -# Language: english -# Source: https://physics.nist.gov/cuu/Constants/ -# https://physics.nist.gov/PhysRefData/XrayTrans/Html/search.html -# :copyright: 2013,2019 by Pint Authors, see AUTHORS for more details. - -#### MATHEMATICAL CONSTANTS #### -# As computed by Maxima with fpprec:50 - -pi = 3.1415926535897932384626433832795028841971693993751 = π = 派 = 圆周率 # pi -tansec = 4.8481368111333441675396429478852851658848753880815e-6 # tangent of 1 arc-second ~ arc_second/radian -ln10 = 2.3025850929940456840179914546843642076011014886288 # natural logarithm of 10 -wien_x = 4.9651142317442763036987591313228939440555849867973 # solution to (x-5)*exp(x)+5 = 0 => x = W(5/exp(5))+5 -wien_u = 2.8214393721220788934031913302944851953458817440731 # solution to (u-3)*exp(u)+3 = 0 => u = W(3/exp(3))+3 -eulers_number = 2.71828182845904523536028747135266249775724709369995 = 欧拉数 - -#### DEFINED EXACT CONSTANTS #### - -speed_of_light = 299792458 m/s = c = c_0 = 光速 # since 1983 -planck_constant = 6.62607015e-34 J s = ℎ = 普朗克常数 = 普朗克常量 # since May 2019 -elementary_charge = 1.602176634e-19 C = e = 基本电荷 = 基本电量 = 元电荷 # since May 2019 -avogadro_number = 6.02214076e23 = 阿伏伽德罗数 # since May 2019 -boltzmann_constant = 1.380649e-23 J K^-1 = k = k_B = 玻尔兹曼常数 = 玻尔兹曼常量 # since May 2019 -standard_gravity = 9.80665 m/s^2 = g_0 = g0 = g_n = gravity = 标准重力 = 重力 = 重力加速度 # since 1901 -standard_atmosphere = 1.01325e5 Pa = atm = atmosphere = 标准大气压 = 大气压 # since 1954 -conventional_josephson_constant = 4.835979e14 Hz / V = K_J90 = 常规约瑟夫逊常数 = 常规约瑟夫逊常量 # since Jan 1990 -conventional_von_klitzing_constant = 2.5812807e4 ohm = R_K90 = 常规冯克利青常数 = 常规冯克利青常量 # since Jan 1990 - -#### DERIVED EXACT CONSTANTS #### -# Floating-point conversion may introduce inaccuracies - -zeta = c / (cm/s) = ζ -dirac_constant = ℎ / (2 * π) = ħ = hbar = atomic_unit_of_action = a_u_action = 约化普朗克常数 = 约化普朗克常量 = 狄拉克常数 = 狄拉克常量 -avogadro_constant = avogadro_number * mol^-1 = N_A = 阿伏伽德罗常数 = 阿伏伽德罗常量 -molar_gas_constant = k * N_A = R = 摩尔气体常数 = 通用气体常数 = 理想气体常数 = 普适气体常数 = 摩尔气体常量 = 通用气体常量 = 理想气体常量 = 普适气体常量 -faraday_constant = e * N_A = 法拉第常数 = 法拉第常量 -conductance_quantum = 2 * e ** 2 / ℎ = G_0 = 电导量子 -magnetic_flux_quantum = ℎ / (2 * e) = Φ_0 = Phi_0 = 磁通量量子 -josephson_constant = 2 * e / ℎ = K_J= 约瑟夫逊常数 = 约瑟夫逊常量 -von_klitzing_constant = ℎ / e ** 2 = R_K = 冯克利青常数 = 冯克利青常量 -stefan_boltzmann_constant = 2 / 15 * π ** 5 * k ** 4 / (ℎ ** 3 * c ** 2) = σ = sigma = 斯特藩-玻尔兹曼常数 = 斯特藩常数 = 斯特藩常量 = 斯特藩-玻尔兹曼常量 -first_radiation_constant = 2 * π * ℎ * c ** 2 = c_1 = 第一辐射常数 = 第一辐射常量 -second_radiation_constant = ℎ * c / k = c_2 = 第二辐射常数 = 第二辐射常量 -wien_wavelength_displacement_law_constant = ℎ * c / (k * wien_x) = 维恩波长位移常数 = 维恩波长位移常量 -wien_frequency_displacement_law_constant = wien_u * k / ℎ = 维恩频率位移常数 = 维恩频率位移常量 - -#### MEASURED CONSTANTS #### -# Recommended CODATA-2018 values -# To some extent, what is measured and what is derived is a bit arbitrary. -# The choice of measured constants is based on convenience and on available uncertainty. -# The uncertainty in the last significant digits is given in parentheses as a comment. - -newtonian_constant_of_gravitation = 6.67430e-11 m^3/(kg s^2) = _ = gravitational_constant = 牛顿重力常数 = 万有引力常数 = 重力常数 = 牛顿常数 = 牛顿重力常量 = 万有引力常量 = 重力常量 = 牛顿常量 # (15) -rydberg_constant = 1.0973731568160e7 * m^-1 = R_∞ = R_inf = 里德伯常量 = 里德伯常数 # (21) -electron_g_factor = -2.00231930436256 = g_e = 电子g因子 # (35) -atomic_mass_constant = 1.66053906660e-27 kg = m_u = 原子质量常数 = 原子质量常量 # (50) -electron_mass = 9.1093837015e-31 kg = m_e = atomic_unit_of_mass = a_u_mass = 电子质量 # (28) -proton_mass = 1.67262192369e-27 kg = m_p = 质子质量 # (51) -neutron_mass = 1.67492749804e-27 kg = m_n = 中子质量 # (95) -lattice_spacing_of_Si = 1.920155716e-10 m = d_220 = 硅的晶格常数 # (32) -K_alpha_Cu_d_220 = 0.80232719 # (22) -K_alpha_Mo_d_220 = 0.36940604 # (19) -K_alpha_W_d_220 = 0.108852175 # (98) - -#### DERIVED CONSTANTS #### - -fine_structure_constant = (2 * ℎ * R_inf / (m_e * c)) ** 0.5 = α = alpha = 精细结构常数 = 精细结构常量 -vacuum_permeability = 2 * α * ℎ / (e ** 2 * c) = µ_0 = mu_0 = mu0 = magnetic_constant = 真空磁导率 = 自由空间磁导率 = 磁常数 = 磁场常数 = 磁常量 = 磁场常量 -vacuum_permittivity = e ** 2 / (2 * α * ℎ * c) = ε_0 = epsilon_0 = eps_0 = eps0 = electric_constant = 真空电容率 = 真空介电系数 = 电常数 = 电常量 -impedance_of_free_space = 2 * α * ℎ / e ** 2 = Z_0 = characteristic_impedance_of_vacuum = 自由空间阻抗 -coulomb_constant = α * hbar * c / e ** 2 = k_C = 库仑常数 = 库仑常量 -classical_electron_radius = α * hbar / (m_e * c) = r_e = 经典电子半径 -thomson_cross_section = 8 / 3 * π * r_e ** 2 = σ_e = sigma_e = 汤姆逊散射截面 diff --git a/modules/convert/old/default_bi_zh-cn_en_old.txt b/modules/convert/old/default_bi_zh-cn_en_old.txt deleted file mode 100644 index 8ce1a0d6ca..0000000000 --- a/modules/convert/old/default_bi_zh-cn_en_old.txt +++ /dev/null @@ -1,889 +0,0 @@ -# Default Pint units definition file -# Based on the International System of Units -# Language: chinese -# :copyright: 2013,2019 by Pint Authors, see AUTHORS for more details. - -# Syntax -# ====== -# Units -# ----- -# = [= ] [= ] [ = ] [...] -# -# The canonical name and aliases should be expressed in singular form. -# Pint automatically deals with plurals built by adding 's' to the singular form; plural -# forms that don't follow this rule should be instead explicitly listed as aliases. -# -# If a unit has no symbol and one wants to define aliases, then the symbol should be -# conventionally set to _. -# -# Example: -# millennium = 1e3 * year = _ = millennia -# -# -# Prefixes -# -------- -# - = [= ] [= ] [ = ] [...] -# -# Example: -# deca- = 1e+1 = da- = deka- -# -# -# Derived dimensions -# ------------------ -# [dimension name] = -# -# Example: -# [density] = [mass] / [volume] -# -# Note that primary dimensions don't need to be declared; they can be -# defined for the first time in a unit definition. -# E.g. see below `meter = [length]` -# -# -# Additional aliases -# ------------------ -# @alias = [ = ] [...] -# -# Used to add aliases to already existing unit definitions. -# Particularly useful when one wants to enrich definitions -# from defaults_en.txt with custom aliases. -# -# Example: -# @alias meter = my_meter - -# See also: https://pint.readthedocs.io/en/latest/defining.html - -@defaults - group = international - system = mks -@end - - -#### PREFIXES #### - -# decimal prefixes -quecto- = 1e-30 = q- # zh-CN SI name not decided yet -ronto- = 1e-27 = r- # zh-CN SI name not decided yet -yocto- = 1e-24 = y- = 幺科托- = 幺- -zepto- = 1e-21 = z- = 仄普托- = 仄- -atto- = 1e-18 = a- = 阿托- = 阿- -femto- = 1e-15 = f- = 飞母托- = 飞- -pico- = 1e-12 = p- = 皮可- = 皮- -nano- = 1e-9 = n- = 纳诺- = 纳- -# The micro (U+00B5) and Greek mu (U+03BC) are both valid prefixes, -# and they often use the same glyph. -micro- = 1e-6 = µ- = μ- = u- = 微- -milli- = 1e-3 = m- = 毫- -centi- = 1e-2 = c- = 厘- -deci- = 1e-1 = d- = 分- -deca- = 1e+1 = da- = deka- = 十- -hecto- = 1e2 = h- = 百- -kilo- = 1e3 = k- = 千- -mega- = 1e6 = M- = 兆- -giga- = 1e9 = G- = 吉咖- = 吉- -tera- = 1e12 = T- = 太拉- = 太- -peta- = 1e15 = P- = 拍它- = 拍- -exa- = 1e18 = E- = 艾可萨- = 艾- -zetta- = 1e21 = Z- = 泽它- = 泽- -yotta- = 1e24 = Y- = 尧它- = 尧- -ronna- = 1e27 = R- # zh-CN SI name not decided yet -quetta- = 1e30 = Q- # zh-CN SI name not decided yet - -# binary_prefixes -kibi- = 2**10 = Ki- -mebi- = 2**20 = Mi- -gibi- = 2**30 = Gi- -tebi- = 2**40 = Ti- -pebi- = 2**50 = Pi- -exbi- = 2**60 = Ei- -zebi- = 2**70 = Zi- -yobi- = 2**80 = Yi- - -# extra_prefixes -semi- = 0.5 = _ = demi- = 半- -sesqui- = 1.5 - - -#### BASE UNITS #### - -米 = [length] = m = meter = metre -秒 = [time] = s = sec = second -安 = [current] = A = amp = 安培 = ampere -坎 = [luminosity] = cd = candle = 坎德拉 = candela -克 = [mass] = g = gram -摩 = [substance] = mol = 摩尔 = mole -开 = [temperature]; offset: 0 = K = degK = °K = degree_Kelvin = degreeK = 开尔文 = kelvin # older names supported for compatibility -弧度 = [] = rad = radian -比特 = [] = bit -个 = [] = count - - -#### CONSTANTS #### - -@import constants_bi_zh-cn_en.txt - - -#### UNITS #### -# Common and less common, grouped by quantity. -# Conversion factors are exact (except when noted), -# although floating-point conversion may introduce inaccuracies - -# Angle -转 = 2 * π * radian = _ = revolution = cycle = circle = turn -度 = degree = π / 180 * radian = deg = arcdeg = arcdegree = angular_degree = 角度 -角分 = degree / 60 = arcmin = arc_minute = angular_minute = 弧分 = arcminute -角秒 = arcsecond = arcminute / 60 = arcsec = arc_second = angular_second = 角秒 = arcsecond -毫角秒 = 1e-3 * arcsecond = mas = 毫弧秒 = milliarcsecond -梯度 = π / 200 * radian = grad = gon = 百分度 = grade -密位 = π / 32000 * radian = 毫弧度 = mil - -# Solid angle -球面度 = radian ** 2 = sr = steradian -平方度 = (π / 180) ** 2 * sr = sq_deg = sqdeg = square_degree - -# Information -波特 = bit / second = Bd = bps = 比特每秒 = baud - -字节 = 8 * bit = B = octet = byte -# byte = 8 * bit = _ = octet = 字节 -## NOTE: B (byte) symbol can conflict with Bell - -# Ratios -百分 = 0.01 = % = percent -分比 = 1e-6 = ppm - -# Length -埃 = 1e-10 * meter = Å = ångström = Å = 埃格斯特朗 = angstrom -微米 = micrometer = µ = μ = micron -费米 = femtometer = fm = fermi -光年 = speed_of_light * julian_year = ly = lightyear = light_year -天文单位 = 149597870700 * meter = au = astronomical_unit # since Aug 2012 -秒差距 = 1 / tansec * astronomical_unit = pc = parsec -海里 = 1852 * meter = nmi = nautical_mile -波尔 = hbar / (alpha * m_e * c) = a_0 = a0 = bohr_radius = atomic_unit_of_length = a_u_length = bohr -铜的X射线波长 = K_alpha_Cu_d_220 * d_220 / 1537.4 = Xu_Cu = 铜的X单位 = x_unit_Cu -钼的X射线波长 = K_alpha_Mo_d_220 * d_220 / 707.831 = Xu_Mo = 钼的X单位 = x_unit_Mo -埃星 = K_alpha_W_d_220 * d_220 / 0.2090100 = Å_star = angstrom_star -普朗克长度 = (hbar * gravitational_constant / c ** 3) ** 0.5 = planck_length - - -# Mass -公吨 = 1e3 * kilogram = t = tonne = metric_ton -原子质量单位 = atomic_mass_constant = u = amu = unified_atomic_mass_unit -道尔顿 = atomic_mass_constant = Da = dalton -格令 = 64.79891 * milligram = gr = grain -伽玛质量 = microgram = gamma_mass -克拉 = 200 * milligram = ct = karat = carat -普朗克质量 = (hbar * c / gravitational_constant) ** 0.5 = planck_mass - -# Time -分钟 = 60 * second = min = minute -小时 = 60 * minute = h = hr = hour -天 = 24 * hour = d = day -星期 = 7 * day = week -两星期 = 2 * week = fortnight -年 = 365.25 * day = a = yr = julian_year = year -月 = year / 12 = month - -# decade = 10 * year -## NOTE: decade [time] can conflict with decade [dimensionless] - -世纪 = 100 * year = _ = centuries = century -千年 = 1e3 * year = _ = millennia = millennium -宙 = 1e9 * year = eon -抖 = 1e-8 * second = shake -斯维德伯格 = 1e-13 * second = svedberg -原子单位时间 = hbar / E_h = a_u_time = atomic_unit_of_time -公历年 = 365.2425 * day = gregorian_year -恒星年 = 365.256363004 * day = sidereal_year -回归年 = 365.242190402 * day = tropical_year -平年 = 365 * day = common_year -闰年 = 366 * day = leap_year -恒星日 = day / 1.00273790935079524 = sidereal_day -恒星月 = 27.32166155 * day = sidereal_month -回归月 = 27.321582 * day = tropical_month -同步月 = 29.530589 * day = _ = lunar_month = synodic_month -普朗克时间 = (hbar * gravitational_constant / c ** 5) ** 0.5 = planck_time - -# Temperature -摄氏度 = kelvin; offset: 273.15 = °C = celsius = degC = degreeC = degree_Celsius -兰氏度 = 5 / 9 * kelvin; offset: 0 = °R = rankine = degR = degreeR = degree_Rankine -华氏度 = 5 / 9 * kelvin; offset: 233.15 + 200 / 9 = °F = fahrenheit = degF = degreeF = degree_Fahrenheit -列氏度 = 4 / 5 * kelvin; offset: 273.15 = °Re = reaumur = degRe = degreeRe = degree_Réaumur = réaumur -原子单位温度 = E_h / k = a_u_temp = atomic_unit_of_temperature -普朗克温度 = (hbar * c ** 5 / gravitational_constant / k ** 2) ** 0.5 = planck_temperature - -# Area -[area] = [length] ** 2 -are = 100 * meter ** 2 -barn = 1e-28 * meter ** 2 = b -darcy = centipoise * centimeter ** 2 / (second * atmosphere) -hectare = 100 * are = ha - -# Volume -[volume] = [length] ** 3 -公亩 = 100 * meter ** 2 = are -贝纳 = 1e-28 * meter ** 2 = b = barn -达西 = centipoise * centimeter ** 2 / (second * atmosphere) = darcy -公顷 = 100 * are = ha = hectare - -# Frequency -[frequency] = 1 / [time] -赫兹 = 1 / second = Hz = hertz -转每分 = revolution / minute = rpm = revolutions_per_minute -转每秒 = revolution / second = rps = revolutions_per_second -次每秒 = count / second = cps = counts_per_second - -# Wavenumber -[wavenumber] = 1 / [length] -倒数厘米 = 1 / cm = cm_1 = kayser = reciprocal_centimeter - -# Velocity -[velocity] = [length] / [time] -[speed] = [velocity] -节 = nautical_mile / hour = kt = knot_international = international_knot = knot -英里每小时 = mile / hour = mph = MPH = mile_per_hour -千米每小时 = kilometer / hour = kph = KPH = kilometer_per_hour -千米每秒 = kilometer / second = kps = kilometer_per_second -米每秒 = meter / second = mps = meter_per_second -英尺每秒 = foot / second = fps = foot_per_second - -# Volumetric Flow Rate -[volumetric_flow_rate] = [volume] / [time] -斯维德鲁普 = 1e6 * meter ** 3 / second = sv = sverdrup - -# Acceleration -[acceleration] = [velocity] / [time] -伽利略 = centimeter / second ** 2 = Gal = galileo - -# Force -[force] = [mass] * [acceleration] -牛顿 = kilogram * meter / second ** 2 = N = newton -丁 = gram * centimeter / second ** 2 = dyn = dyne -千克力 = g_0 * kilogram = kgf = kilogram_force = pond = force_kilogram -克力 = g_0 * gram = gf = gram_force = force_gram -公吨力 = g_0 * metric_ton = tf = metric_ton_force = force_t = t_force = force_metric_ton -原子单位力 = E_h / a_0 = a_u_force = atomic_unit_of_force - -# Energy -[energy] = [force] * [length] -焦耳 = newton * meter = J = joule -尔格 = dyne * centimeter = erg -瓦时 = watt * hour = Wh = watthour = watt_hour -电子伏特 = e * volt = eV = electron_volt -里德伯格 = ℎ * c * R_inf = Ry = rydberg -哈特里 = 2 * rydberg = E_h = Eh = hartree_energy = atomic_unit_of_energy = a_u_energy = hartree -卡路里 = 4.184 * joule = cal = thermochemical_calorie = cal_th = calorie -国际卡路里 = 4.1868 * joule = cal_it = international_steam_table_calorie = international_calorie -卡路里15度 = 4.1855 * joule = cal_15 = fifteen_degree_calorie -英热单位 = 1055.056 * joule = Btu = BTU = Btu_iso = british_thermal_unit -国际英热单位 = 1e3 * pound / kilogram * degR / kelvin * international_calorie = Btu_it = international_british_thermal_unit -热化学英热单位 = 1e3 * pound / kilogram * degR / kelvin * calorie = Btu_th = thermochemical_british_thermal_unit -兆英热单位 = 1e15 * Btu = quad = quadrillion_Btu -热量 = 1e5 * Btu = thm = EC_therm = therm -美国热量 = 1.054804e8 * joule = US_therm -吨TNT = 1e9 * calorie = tTNT = ton_TNT -吨油当量 = 1e10 * international_calorie = toe = tonne_of_oil_equivalent -气体升 = atmosphere * liter = atm_l = atmosphere_liter - -# Power -[power] = [energy] / [time] -瓦特 = joule / second = W = watt -伏特安培 = volt * ampere = VA = volt_ampere -马力 = 550 * foot * force_pound / second = hp = UK_horsepower = hydraulic_horsepower = horsepower -锅炉马力 = 33475 * Btu / hour = boiler_horsepower -公制马力 = 75 * force_kilogram * meter / second = metric_horsepower -电马力 = 746 * watt = electrical_horsepower -制冷吨 = 12e3 * Btu / hour = _ = ton_of_refrigeration = refrigeration_ton -冷却塔吨 = 1.25 * refrigeration_ton = cooling_tower_ton -标准升每分钟 = atmosphere * liter / minute = slpm = slm = standard_liter_per_minute -传统瓦特90 = K_J90 ** 2 * R_K90 / (K_J ** 2 * R_K) * watt = W_90 = conventional_watt_90 - -# Momentum -[momentum] = [length] * [mass] / [time] - -# Density (as auxiliary for pressure) -[density] = [mass] / [volume] -水银 = 13.5951 * kilogram / liter = Hg = Hg_0C = Hg_32F = conventional_mercury = mercury -水 = 1.0 * kilogram / liter = H2O = conventional_water = water -水银60华氏度 = 13.5568 * kilogram / liter = Hg_60F = mercury_60F -水4摄氏度 = 0.999972 * kilogram / liter = water_4C = water_39F -水60华氏度 = 0.999001 * kilogram / liter = water_60F - -# Pressure -[pressure] = [force] / [area] -帕斯卡 = newton / meter ** 2 = Pa = pascal -微巴 = dyne / centimeter ** 2 = Ba = barie = barad = barrie = baryd = barye -巴 = 1e5 * pascal = bar -技术大气 = kilogram * g_0 / centimeter ** 2 = at = technical_atmosphere -托尔 = atm / 760 = torr -每平方英寸磅力 = force_pound / inch ** 2 = psi = pound_force_per_square_inch -每平方英寸千磅力 = kip / inch ** 2 = ksi = kip_per_square_inch -毫米水银 = millimeter * Hg * g_0 = mmHg = mm_Hg = millimeter_Hg_0C -厘米水银 = centimeter * Hg * g_0 = cmHg = cm_Hg = centimeter_Hg_0C -英寸水银 = inch * Hg * g_0 = inHg = in_Hg = inch_Hg_32F -英寸水银60华氏度 = inch * Hg_60F * g_0 = inch_Hg_60F -英寸水39华氏度 = inch * water_39F * g_0 = inch_H2O_39F -英寸水60华氏度 = inch * water_60F * g_0 = inch_H2O_60F -英尺水 = foot * water * g_0 = ftH2O = feet_H2O -厘米水 = centimeter * water * g_0 = cmH2O = cm_H2O -声压级 = 20e-6 * pascal = SPL = sound_pressure_level - -# Torque -[torque] = [force] * [length] -英尺磅 = foot * force_pound = ft_lb = footpound = foot_pound - -# Viscosity -[viscosity] = [pressure] * [time] -泊伊斯 = 0.1 * Pa * second = P = poise -雷恩 = psi * second = reyn - -# Kinematic viscosity -[kinematic_viscosity] = [area] / [time] -斯托克斯 = centimeter ** 2 / second = St = stokes - -# Fluidity -[fluidity] = 1 / [viscosity] -莱 = 1 / poise = rhe - -# Amount of substance -粒子 = 1 / N_A = _ = molec = molecule = particle - -# Concentration -[concentration] = [substance] / [volume] -体积摩尔 = mole / liter = M = molar - -# Catalytic activity -[activity] = [substance] / [time] -卡塔尔 = mole / second = kat = katal -酶单位 = micromole / minute = U = enzymeunit = enzyme_unit - -# Entropy -[entropy] = [energy] / [temperature] -克劳西斯 = calorie / kelvin = Cl = clausius - -# Molar entropy -[molar_entropy] = [entropy] / [substance] -熵单位 = calorie / kelvin / mole = eu = entropy_unit - -# Radiation -贝可勒尔 = counts_per_second = Bq = becquerel -居里 = 3.7e10 * becquerel = Ci = curie -卢瑟福 = 1e6 * becquerel = Rd = rutherford -格雷 = joule / kilogram = Gy = gray -西弗 = joule / kilogram = Sv = sievert -拉德斯 = 0.01 * gray = rads -雷质 = 0.01 * sievert = rem -伦琴 = 2.58e-4 * coulomb / kilogram = _ = röntgen = roentgen - -# Heat transimission -[heat_transmission] = [energy] / [area] -峰值太阳小时 = 1e3 * watt_hour / meter ** 2 = PSH = peak_sun_hour -兰利 = thermochemical_calorie / centimeter ** 2 = Ly = langley - -# Luminance -[luminance] = [luminosity] / [area] -尼特 = candela / meter ** 2 = nit -斯蒂尔布 = candela / centimeter ** 2 = stilb -兰伯特 = 1 / π * candela / centimeter ** 2 = lambert - -# Luminous flux -[luminous_flux] = [luminosity] -流明 = candela * steradian = lm = lumen - -# Illuminance -[illuminance] = [luminous_flux] / [area] -勒克斯 = lumen / meter ** 2 = lx = lux - -# Intensity -[intensity] = [power] / [area] -原子单位光强 = 0.5 * ε_0 * c * atomic_unit_of_electric_field ** 2 = a_u_intensity = atomic_unit_of_intensity - -# Current -比奥 = 10 * ampere = Bi = biot -绝对安培 = biot = abA = abampere -原子单位电流 = e / atomic_unit_of_time = a_u_current = atomic_unit_of_current -平均国际安培 = mean_international_volt / mean_international_ohm = A_it = mean_international_ampere -美国国际安培 = US_international_volt / US_international_ohm = A_US = US_international_ampere -传统安培90 = K_J90 * R_K90 / (K_J * R_K) * ampere = A_90 = conventional_ampere_90 -普朗克电流 = (c ** 6 / gravitational_constant / k_C) ** 0.5 = planck_current - -# Charge -[charge] = [current] * [time] -库仑 = ampere * second = C = coulomb -绝对库伦 = 10 * C = abC = abcoulomb -法拉第 = e * N_A * mole = faraday -传统库伦90 = K_J90 * R_K90 / (K_J * R_K) * coulomb = C_90 = conventional_coulomb_90 -安培时 = ampere * hour = Ah = ampere_hour - -# Electric potential -[electric_potential] = [energy] / [charge] -伏特 = joule / coulomb = V = volt -绝对伏特 = 1e-8 * volt = abV = abvolt -平均国际伏特 = 1.00034 * volt = V_it = mean_international_volt # approximate -美国国际伏特 = 1.00033 * volt = V_US = US_international_volt # approximate -传统伏特90 = K_J90 / K_J * volt = V_90 = conventional_volt_90 - -# Electric field -[electric_field] = [electric_potential] / [length] -原子单位电场 = e * k_C / a_0 ** 2 = a_u_electric_field = atomic_unit_of_electric_field - -# Electric displacement field -[electric_displacement_field] = [charge] / [area] - -# Resistance -[resistance] = [electric_potential] / [current] -欧姆 = volt / ampere = Ω = ohm -绝对欧姆 = 1e-9 * ohm = abΩ = abohm -平均国际欧姆 = 1.00049 * ohm = Ω_it = ohm_it = mean_international_ohm # approximate -美国国际欧姆 = 1.000495 * ohm = Ω_US = ohm_US = US_international_ohm # approximate -传统欧姆90 = R_K / R_K90 * ohm = Ω_90 = ohm_90 = conventional_ohm_90 - -# Resistivity -[resistivity] = [resistance] * [length] - -# Conductance -[conductance] = [current] / [electric_potential] -西门子 = ampere / volt = S = mho = siemens -绝对西门子 = 1e9 * siemens = abS = abmho = absiemens - -# Capacitance -[capacitance] = [charge] / [electric_potential] -法拉 = coulomb / volt = F = farad -绝对法拉 = 1e9 * farad = abF = abfarad -常用法拉_90 = R_K90 / R_K * farad = F_90 = conventional_farad_90 - -# Magnetic flux -[magnetic_flux] = [electric_potential] * [time] -韦伯 = volt * second = Wb = weber -单位极 = µ_0 * biot * centimeter = unit_pole - -# Inductance -[inductance] = [magnetic_flux] / [current] -亨利 = weber / ampere = H = henry -绝对亨利 = 1e-9 * henry = abH = abhenry -常用亨利_90 = R_K / R_K90 * henry = H_90 = conventional_henry_90 - -# Magnetic field -[magnetic_field] = [magnetic_flux] / [area] -特斯拉 = weber / meter ** 2 = T = tesla -伽玛 = 1e-9 * tesla = γ = gamma - -# Magnetomotive force -[magnetomotive_force] = [current] -安培匝 = ampere = At = ampere_turn -比奥特匝 = biot = biot_turn -吉尔伯特 = 1 / (4 * π) * biot_turn = Gb = gilbert - -# Magnetic field strength -[magnetic_field_strength] = [current] / [length] - -# Electric dipole moment -[electric_dipole] = [charge] * [length] -德拜 = 1e-9 / ζ * coulomb * angstrom = D = debye # formally 1 D = 1e-10 Fr*Å, but we generally want to use it outside the Gaussian context - -# Electric quadrupole moment -[electric_quadrupole] = [charge] * [area] -巴金汉姆 = debye * angstrom = buckingham - -# Magnetic dipole moment -[magnetic_dipole] = [current] * [area] -波尔磁子 = e * hbar / (2 * m_e) = µ_B = mu_B = bohr_magneton -核磁子 = e * hbar / (2 * m_p) = µ_N = mu_N = nuclear_magneton - -# Logaritmic Unit Definition -# Unit = scale; logbase; logfactor -# x_dB = [logfactor] * log( x_lin / [scale] ) / log( [logbase] ) - -# Logaritmic Units of dimensionless quantity: [ https://en.wikipedia.org/wiki/Level_(logarithmic_quantity) ] - -分贝毫瓦 = 1e-3 watt; logbase: 10; logfactor: 10 = dBm = decibelmilliwatt -分贝微瓦 = 1e-6 watt; logbase: 10; logfactor: 10 = dBu = decibelmicrowatt - -decibel = 1 ; logbase: 10; logfactor: 10 = dB -# bell = 1 ; logbase: 10; logfactor: = B -## NOTE: B (Bell) symbol conflicts with byte - -decade = 1 ; logbase: 10; logfactor: 1 -## NOTE: decade [time] can conflict with decade [dimensionless] - -octave = 1 ; logbase: 2; logfactor: 1 = oct - -neper = 1 ; logbase: 2.71828182845904523536028747135266249775724709369995; logfactor: 0.5 = Np -# neper = 1 ; logbase: eulers_number; logfactor: 0.5 = Np - -#### UNIT GROUPS #### -# Mostly for length, area, volume, mass, force -# (customary or specialized units) - -@group USCSLengthInternational - thou = 1e-3 * inch = th = mil_length - inch = yard / 36 = in = international_inch = inches = international_inches - hand = 4 * inch - foot = yard / 3 = ft = international_foot = feet = international_feet - yard = 0.9144 * meter = yd = international_yard # since Jul 1959 - mile = 1760 * yard = mi = international_mile - - circular_mil = π / 4 * mil_length ** 2 = cmil - square_inch = inch ** 2 = sq_in = square_inches - square_foot = foot ** 2 = sq_ft = square_feet - square_yard = yard ** 2 = sq_yd - square_mile = mile ** 2 = sq_mi - - cubic_inch = in ** 3 = cu_in - cubic_foot = ft ** 3 = cu_ft = cubic_feet - cubic_yard = yd ** 3 = cu_yd -@end - -@group USCSLengthSurvey - link = 1e-2 * chain = li = survey_link - survey_foot = 1200 / 3937 * meter = sft - fathom = 6 * survey_foot - rod = 16.5 * survey_foot = rd = pole = perch - chain = 4 * rod - furlong = 40 * rod = fur - cables_length = 120 * fathom - survey_mile = 5280 * survey_foot = smi = us_statute_mile - league = 3 * survey_mile - - square_rod = rod ** 2 = sq_rod = sq_pole = sq_perch - acre = 10 * chain ** 2 - square_survey_mile = survey_mile ** 2 = _ = section - square_league = league ** 2 - - acre_foot = acre * survey_foot = _ = acre_feet -@end - -@group USCSDryVolume - dry_pint = bushel / 64 = dpi = US_dry_pint - dry_quart = bushel / 32 = dqt = US_dry_quart - dry_gallon = bushel / 8 = dgal = US_dry_gallon - peck = bushel / 4 = pk - bushel = 2150.42 cubic_inch = bu - dry_barrel = 7056 cubic_inch = _ = US_dry_barrel - board_foot = ft * ft * in = FBM = board_feet = BF = BDFT = super_foot = superficial_foot = super_feet = superficial_feet -@end - -@group USCSLiquidVolume - minim = pint / 7680 - fluid_dram = pint / 128 = fldr = fluidram = US_fluid_dram = US_liquid_dram - fluid_ounce = pint / 16 = floz = US_fluid_ounce = US_liquid_ounce - gill = pint / 4 = gi = liquid_gill = US_liquid_gill - pint = quart / 2 = pt = liquid_pint = US_pint - fifth = gallon / 5 = _ = US_liquid_fifth - quart = gallon / 4 = qt = liquid_quart = US_liquid_quart - gallon = 231 * cubic_inch = gal = liquid_gallon = US_liquid_gallon -@end - -@group USCSVolumeOther - teaspoon = fluid_ounce / 6 = tsp - tablespoon = fluid_ounce / 2 = tbsp - shot = 3 * tablespoon = jig = US_shot - cup = pint / 2 = cp = liquid_cup = US_liquid_cup - barrel = 31.5 * gallon = bbl - oil_barrel = 42 * gallon = oil_bbl - beer_barrel = 31 * gallon = beer_bbl - hogshead = 63 * gallon -@end - -@group Avoirdupois - dram = pound / 256 = dr = avoirdupois_dram = avdp_dram = drachm - ounce = pound / 16 = oz = avoirdupois_ounce = avdp_ounce - pound = 7e3 * grain = lb = avoirdupois_pound = avdp_pound - stone = 14 * pound - quarter = 28 * stone - bag = 94 * pound - hundredweight = 100 * pound = cwt = short_hundredweight - long_hundredweight = 112 * pound - ton = 2e3 * pound = _ = short_ton - long_ton = 2240 * pound - slug = g_0 * pound * second ** 2 / foot - slinch = g_0 * pound * second ** 2 / inch = blob = slugette - - force_ounce = g_0 * ounce = ozf = ounce_force - force_pound = g_0 * pound = lbf = pound_force - force_ton = g_0 * ton = _ = ton_force = force_short_ton = short_ton_force - force_long_ton = g_0 * long_ton = _ = long_ton_force - kip = 1e3 * force_pound - poundal = pound * foot / second ** 2 = pdl -@end - -@group AvoirdupoisUK using Avoirdupois - UK_hundredweight = long_hundredweight = UK_cwt - UK_ton = long_ton - UK_force_ton = force_long_ton = _ = UK_ton_force -@end - -@group AvoirdupoisUS using Avoirdupois - US_hundredweight = hundredweight = US_cwt - US_ton = ton - US_force_ton = force_ton = _ = US_ton_force -@end - -@group Troy - pennyweight = 24 * grain = dwt - troy_ounce = 480 * grain = toz = ozt - troy_pound = 12 * troy_ounce = tlb = lbt -@end - -@group Apothecary - scruple = 20 * grain - apothecary_dram = 3 * scruple = ap_dr - apothecary_ounce = 8 * apothecary_dram = ap_oz - apothecary_pound = 12 * apothecary_ounce = ap_lb -@end - -@group ImperialVolume - imperial_minim = imperial_fluid_ounce / 480 - imperial_fluid_scruple = imperial_fluid_ounce / 24 - imperial_fluid_drachm = imperial_fluid_ounce / 8 = imperial_fldr = imperial_fluid_dram - imperial_fluid_ounce = imperial_pint / 20 = imperial_floz = UK_fluid_ounce - imperial_gill = imperial_pint / 4 = imperial_gi = UK_gill - imperial_cup = imperial_pint / 2 = imperial_cp = UK_cup - imperial_pint = imperial_gallon / 8 = imperial_pt = UK_pint - imperial_quart = imperial_gallon / 4 = imperial_qt = UK_quart - imperial_gallon = 4.54609 * liter = imperial_gal = UK_gallon - imperial_peck = 2 * imperial_gallon = imperial_pk = UK_pk - imperial_bushel = 8 * imperial_gallon = imperial_bu = UK_bushel - imperial_barrel = 36 * imperial_gallon = imperial_bbl = UK_bbl -@end - -@group Printer - pica = inch / 6 = _ = printers_pica - point = pica / 12 = pp = printers_point = big_point = bp - didot = 1 / 2660 * m - cicero = 12 * didot - tex_point = inch / 72.27 - tex_pica = 12 * tex_point - tex_didot = 1238 / 1157 * tex_point - tex_cicero = 12 * tex_didot - scaled_point = tex_point / 65536 - css_pixel = inch / 96 = px - - pixel = [printing_unit] = _ = dot = pel = picture_element - pixels_per_centimeter = pixel / cm = PPCM - pixels_per_inch = pixel / inch = dots_per_inch = PPI = ppi = DPI = printers_dpi - bits_per_pixel = bit / pixel = bpp -@end - -@group Textile - tex = gram / kilometer = Tt - dtex = decitex - denier = gram / (9 * kilometer) = den = Td - jute = pound / (14400 * yard) = Tj - aberdeen = jute = Ta - RKM = gf / tex - - number_english = 840 * yard / pound = Ne = NeC = ECC - number_meter = kilometer / kilogram = Nm -@end - - -#### CGS ELECTROMAGNETIC UNITS #### - -# === Gaussian system of units === -@group Gaussian - franklin = erg ** 0.5 * centimeter ** 0.5 = Fr = statcoulomb = statC = esu - statvolt = erg / franklin = statV - statampere = franklin / second = statA - gauss = dyne / franklin = G - maxwell = gauss * centimeter ** 2 = Mx - oersted = dyne / maxwell = Oe = ørsted - statohm = statvolt / statampere = statΩ - statfarad = franklin / statvolt = statF - statmho = statampere / statvolt -@end -# Note this system is not commensurate with SI, as ε_0 and µ_0 disappear; -# some quantities with different dimensions in SI have the same -# dimensions in the Gaussian system (e.g. [Mx] = [Fr], but [Wb] != [C]), -# and therefore the conversion factors depend on the context (not in pint sense) -[gaussian_charge] = [length] ** 1.5 * [mass] ** 0.5 / [time] -[gaussian_current] = [gaussian_charge] / [time] -[gaussian_electric_potential] = [gaussian_charge] / [length] -[gaussian_electric_field] = [gaussian_electric_potential] / [length] -[gaussian_electric_displacement_field] = [gaussian_charge] / [area] -[gaussian_electric_flux] = [gaussian_charge] -[gaussian_electric_dipole] = [gaussian_charge] * [length] -[gaussian_electric_quadrupole] = [gaussian_charge] * [area] -[gaussian_magnetic_field] = [force] / [gaussian_charge] -[gaussian_magnetic_field_strength] = [gaussian_magnetic_field] -[gaussian_magnetic_flux] = [gaussian_magnetic_field] * [area] -[gaussian_magnetic_dipole] = [energy] / [gaussian_magnetic_field] -[gaussian_resistance] = [gaussian_electric_potential] / [gaussian_current] -[gaussian_resistivity] = [gaussian_resistance] * [length] -[gaussian_capacitance] = [gaussian_charge] / [gaussian_electric_potential] -[gaussian_inductance] = [gaussian_electric_potential] * [time] / [gaussian_current] -[gaussian_conductance] = [gaussian_current] / [gaussian_electric_potential] -@context Gaussian = Gau - [gaussian_charge] -> [charge]: value / k_C ** 0.5 - [charge] -> [gaussian_charge]: value * k_C ** 0.5 - [gaussian_current] -> [current]: value / k_C ** 0.5 - [current] -> [gaussian_current]: value * k_C ** 0.5 - [gaussian_electric_potential] -> [electric_potential]: value * k_C ** 0.5 - [electric_potential] -> [gaussian_electric_potential]: value / k_C ** 0.5 - [gaussian_electric_field] -> [electric_field]: value * k_C ** 0.5 - [electric_field] -> [gaussian_electric_field]: value / k_C ** 0.5 - [gaussian_electric_displacement_field] -> [electric_displacement_field]: value / (4 * π / ε_0) ** 0.5 - [electric_displacement_field] -> [gaussian_electric_displacement_field]: value * (4 * π / ε_0) ** 0.5 - [gaussian_electric_dipole] -> [electric_dipole]: value / k_C ** 0.5 - [electric_dipole] -> [gaussian_electric_dipole]: value * k_C ** 0.5 - [gaussian_electric_quadrupole] -> [electric_quadrupole]: value / k_C ** 0.5 - [electric_quadrupole] -> [gaussian_electric_quadrupole]: value * k_C ** 0.5 - [gaussian_magnetic_field] -> [magnetic_field]: value / (4 * π / µ_0) ** 0.5 - [magnetic_field] -> [gaussian_magnetic_field]: value * (4 * π / µ_0) ** 0.5 - [gaussian_magnetic_flux] -> [magnetic_flux]: value / (4 * π / µ_0) ** 0.5 - [magnetic_flux] -> [gaussian_magnetic_flux]: value * (4 * π / µ_0) ** 0.5 - [gaussian_magnetic_field_strength] -> [magnetic_field_strength]: value / (4 * π * µ_0) ** 0.5 - [magnetic_field_strength] -> [gaussian_magnetic_field_strength]: value * (4 * π * µ_0) ** 0.5 - [gaussian_magnetic_dipole] -> [magnetic_dipole]: value * (4 * π / µ_0) ** 0.5 - [magnetic_dipole] -> [gaussian_magnetic_dipole]: value / (4 * π / µ_0) ** 0.5 - [gaussian_resistance] -> [resistance]: value * k_C - [resistance] -> [gaussian_resistance]: value / k_C - [gaussian_resistivity] -> [resistivity]: value * k_C - [resistivity] -> [gaussian_resistivity]: value / k_C - [gaussian_capacitance] -> [capacitance]: value / k_C - [capacitance] -> [gaussian_capacitance]: value * k_C - [gaussian_inductance] -> [inductance]: value * k_C - [inductance] -> [gaussian_inductance]: value / k_C - [gaussian_conductance] -> [conductance]: value / k_C - [conductance] -> [gaussian_conductance]: value * k_C -@end - -# === ESU system of units === -# (where different from Gaussian) -# See note for Gaussian system too -@group ESU using Gaussian - statweber = statvolt * second = statWb - stattesla = statweber / centimeter ** 2 = statT - stathenry = statweber / statampere = statH -@end -[esu_charge] = [length] ** 1.5 * [mass] ** 0.5 / [time] -[esu_current] = [esu_charge] / [time] -[esu_electric_potential] = [esu_charge] / [length] -[esu_magnetic_flux] = [esu_electric_potential] * [time] -[esu_magnetic_field] = [esu_magnetic_flux] / [area] -[esu_magnetic_field_strength] = [esu_current] / [length] -[esu_magnetic_dipole] = [esu_current] * [area] -@context ESU = esu - [esu_magnetic_field] -> [magnetic_field]: value * k_C ** 0.5 - [magnetic_field] -> [esu_magnetic_field]: value / k_C ** 0.5 - [esu_magnetic_flux] -> [magnetic_flux]: value * k_C ** 0.5 - [magnetic_flux] -> [esu_magnetic_flux]: value / k_C ** 0.5 - [esu_magnetic_field_strength] -> [magnetic_field_strength]: value / (4 * π / ε_0) ** 0.5 - [magnetic_field_strength] -> [esu_magnetic_field_strength]: value * (4 * π / ε_0) ** 0.5 - [esu_magnetic_dipole] -> [magnetic_dipole]: value / k_C ** 0.5 - [magnetic_dipole] -> [esu_magnetic_dipole]: value * k_C ** 0.5 -@end - - -#### CONVERSION CONTEXTS #### - -@context(n=1) spectroscopy = sp - # n index of refraction of the medium. - [length] <-> [frequency]: speed_of_light / n / value - [frequency] -> [energy]: planck_constant * value - [energy] -> [frequency]: value / planck_constant - # allow wavenumber / kayser - [wavenumber] <-> [length]: 1 / value -@end - -@context boltzmann - [temperature] -> [energy]: boltzmann_constant * value - [energy] -> [temperature]: value / boltzmann_constant -@end - -@context energy - [energy] -> [energy] / [substance]: value * N_A - [energy] / [substance] -> [energy]: value / N_A - [energy] -> [mass]: value / c ** 2 - [mass] -> [energy]: value * c ** 2 -@end - -@context(mw=0,volume=0,solvent_mass=0) chemistry = chem - # mw is the molecular weight of the species - # volume is the volume of the solution - # solvent_mass is the mass of solvent in the solution - - # moles -> mass require the molecular weight - [substance] -> [mass]: value * mw - [mass] -> [substance]: value / mw - - # moles/volume -> mass/volume and moles/mass -> mass/mass - # require the molecular weight - [substance] / [volume] -> [mass] / [volume]: value * mw - [mass] / [volume] -> [substance] / [volume]: value / mw - [substance] / [mass] -> [mass] / [mass]: value * mw - [mass] / [mass] -> [substance] / [mass]: value / mw - - # moles/volume -> moles requires the solution volume - [substance] / [volume] -> [substance]: value * volume - [substance] -> [substance] / [volume]: value / volume - - # moles/mass -> moles requires the solvent (usually water) mass - [substance] / [mass] -> [substance]: value * solvent_mass - [substance] -> [substance] / [mass]: value / solvent_mass - - # moles/mass -> moles/volume require the solvent mass and the volume - [substance] / [mass] -> [substance]/[volume]: value * solvent_mass / volume - [substance] / [volume] -> [substance] / [mass]: value / solvent_mass * volume - -@end - -@context textile - # Allow switching between Direct count system (i.e. tex) and - # Indirect count system (i.e. Ne, Nm) - [mass] / [length] <-> [length] / [mass]: 1 / value -@end - - -#### SYSTEMS OF UNITS #### - -@system SI - second - meter - kilogram - ampere - kelvin - mole - candela -@end - -@system mks using international - meter - kilogram - second -@end - -@system cgs using international, Gaussian, ESU - centimeter - gram - second -@end - -@system atomic using international - # based on unit m_e, e, hbar, k_C, k - bohr: meter - electron_mass: gram - atomic_unit_of_time: second - atomic_unit_of_current: ampere - atomic_unit_of_temperature: kelvin -@end - -@system Planck using international - # based on unit c, gravitational_constant, hbar, k_C, k - planck_length: meter - planck_mass: gram - planck_time: second - planck_current: ampere - planck_temperature: kelvin -@end - -@system imperial using ImperialVolume, USCSLengthInternational, AvoirdupoisUK - yard - pound -@end - -@system US using USCSLiquidVolume, USCSDryVolume, USCSVolumeOther, USCSLengthInternational, USCSLengthSurvey, AvoirdupoisUS - yard - pound -@end diff --git a/modules/core/su_utils.py b/modules/core/su_utils.py index aea693e58a..8c700c4ae2 100644 --- a/modules/core/su_utils.py +++ b/modules/core/su_utils.py @@ -283,6 +283,97 @@ async def _(msg: Bot.MessageSession): await msg.finish(msg.locale.t("core.message.abuse.unban.success", user=user)) +upd = module('update', required_superuser=True, base=True) + + +def pull_repo(): + return os.popen('git pull', 'r').read()[:-1] + + +def update_dependencies(): + poetry_install = os.popen('poetry install').read()[:-1] + if poetry_install != '': + return poetry_install + pip_install = os.popen('pip install -r requirements.txt').read()[:-1] + if len(pip_install) > 500: + return '...' + pip_install[-500:] + return + + +@upd.command() +async def update_bot(msg: Bot.MessageSession): + confirm = await msg.wait_confirm(msg.locale.t("core.message.confirm"), append_instruction=False) + if confirm: + pull_repo_result = pull_repo() + if pull_repo_result != '': + await msg.send_message(pull_repo_result) + else: + await msg.send_message(msg.locale.t("core.message.update.failed")) + await msg.send_message(update_dependencies()) + +if Info.subprocess: + rst = module('restart', required_superuser=True, base=True) + + def restart(): + sys.exit(233) + + def write_version_cache(msg: Bot.MessageSession): + update = os.path.abspath(PrivateAssets.path + '/cache_restart_author') + write_version = open(update, 'w') + write_version.write(json.dumps({'From': msg.target.target_from, 'ID': msg.target.target_id})) + write_version.close() + + restart_time = [] + + async def wait_for_restart(msg: Bot.MessageSession): + get = ExecutionLockList.get() + if datetime.now().timestamp() - restart_time[0] < 60: + if len(get) != 0: + await msg.send_message(msg.locale.t("core.message.restart.wait", count=len(get))) + await asyncio.sleep(10) + return await wait_for_restart(msg) + else: + await msg.send_message(msg.locale.t("core.message.restart.restarting")) + get_wait_list = MessageTaskManager.get() + for x in get_wait_list: + for y in get_wait_list[x]: + for z in get_wait_list[x][y]: + if get_wait_list[x][y][z]['active']: + await z.send_message(z.locale.t("core.message.restart.prompt")) + + else: + await msg.send_message(msg.locale.t("core.message.restart.timeout")) + + @rst.command() + async def restart_bot(msg: Bot.MessageSession): + confirm = await msg.wait_confirm(msg.locale.t("core.message.confirm"), append_instruction=False) + if confirm: + restart_time.append(datetime.now().timestamp()) + await wait_for_restart(msg) + write_version_cache(msg) + restart() + + +if Info.subprocess: + upds = module('update&restart', required_superuser=True, alias='u&r', base=True) + + @upds.command() + async def update_and_restart_bot(msg: Bot.MessageSession): + confirm = await msg.wait_confirm(msg.locale.t("core.message.confirm"), append_instruction=False) + if confirm: + restart_time.append(datetime.now().timestamp()) + await wait_for_restart(msg) + write_version_cache(msg) + pull_repo_result = pull_repo() + if pull_repo_result != '': + await msg.send_message(pull_repo_result) + await msg.send_message(update_dependencies()) + else: + Logger.warn(f'Failed to get Git repository result.') + await msg.send_message(msg.locale.t("core.message.update.failed")) + restart() + + if Bot.FetchTarget.name == 'QQ': resume = module('resume', required_base_superuser=True) diff --git a/modules/core/update.py b/modules/core/update.py deleted file mode 100644 index f568c3aa58..0000000000 --- a/modules/core/update.py +++ /dev/null @@ -1,101 +0,0 @@ -import asyncio -import os -import sys -from datetime import datetime - -import ujson as json - -from core.builtins import Bot, PrivateAssets, ExecutionLockList, MessageTaskManager -from core.component import module -from core.logger import Logger -from core.utils.info import Info - -upd = module('update', required_superuser=True, base=True) - - -def pull_repo(): - return os.popen('git pull', 'r').read()[:-1] - - -def update_dependencies(): - poetry_install = os.popen('poetry install').read()[:-1] - if poetry_install != '': - return poetry_install - pip_install = os.popen('pip install -r requirements.txt').read()[:-1] - if len(pip_install) > 500: - return '...' + pip_install[-500:] - return - - -@upd.command() -async def update_bot(msg: Bot.MessageSession): - confirm = await msg.wait_confirm(msg.locale.t("core.message.confirm"), append_instruction=False) - if confirm: - pull_repo_result = pull_repo() - if pull_repo_result != '': - await msg.send_message(pull_repo_result) - else: - await msg.send_message(msg.locale.t("core.message.update.failed")) - await msg.send_message(update_dependencies()) - -if Info.subprocess: - rst = module('restart', required_superuser=True, base=True) - - def restart(): - sys.exit(233) - - def write_version_cache(msg: Bot.MessageSession): - update = os.path.abspath(PrivateAssets.path + '/cache_restart_author') - write_version = open(update, 'w') - write_version.write(json.dumps({'From': msg.target.target_from, 'ID': msg.target.target_id})) - write_version.close() - - restart_time = [] - - async def wait_for_restart(msg: Bot.MessageSession): - get = ExecutionLockList.get() - if datetime.now().timestamp() - restart_time[0] < 60: - if len(get) != 0: - await msg.send_message(msg.locale.t("core.message.restart.wait", count=len(get))) - await asyncio.sleep(10) - return await wait_for_restart(msg) - else: - await msg.send_message(msg.locale.t("core.message.restart.restarting")) - get_wait_list = MessageTaskManager.get() - for x in get_wait_list: - for y in get_wait_list[x]: - for z in get_wait_list[x][y]: - if get_wait_list[x][y][z]['active']: - await z.send_message(z.locale.t("core.message.restart.prompt")) - - else: - await msg.send_message(msg.locale.t("core.message.restart.timeout")) - - @rst.command() - async def restart_bot(msg: Bot.MessageSession): - confirm = await msg.wait_confirm(msg.locale.t("core.message.confirm"), append_instruction=False) - if confirm: - restart_time.append(datetime.now().timestamp()) - await wait_for_restart(msg) - write_version_cache(msg) - restart() - - -if Info.subprocess: - upds = module('update&restart', required_superuser=True, alias='u&r', base=True) - - @upds.command() - async def update_and_restart_bot(msg: Bot.MessageSession): - confirm = await msg.wait_confirm(msg.locale.t("core.message.confirm"), append_instruction=False) - if confirm: - restart_time.append(datetime.now().timestamp()) - await wait_for_restart(msg) - write_version_cache(msg) - pull_repo_result = pull_repo() - if pull_repo_result != '': - await msg.send_message(pull_repo_result) - await msg.send_message(update_dependencies()) - else: - Logger.warn(f'Failed to get Git repository result.') - await msg.send_message(msg.locale.t("core.message.update.failed")) - restart() diff --git a/modules/core/utils.py b/modules/core/utils.py index a105cd9854..e27544d8b7 100644 --- a/modules/core/utils.py +++ b/modules/core/utils.py @@ -159,15 +159,15 @@ async def reload_locale(msg: Bot.MessageSession): @whoami.command('{{core.help.whoami}}') async def _(msg: Bot.MessageSession): - rights = '' + perm = '' if await msg.check_native_permission(): - rights += '\n' + msg.locale.t("core.message.whoami.admin") + perm += '\n' + msg.locale.t("core.message.whoami.admin") elif await msg.check_permission(): - rights += '\n' + msg.locale.t("core.message.whoami.botadmin") + perm += '\n' + msg.locale.t("core.message.whoami.botadmin") if msg.check_super_user(): - rights += '\n' + msg.locale.t("core.message.whoami.superuser") + perm += '\n' + msg.locale.t("core.message.whoami.superuser") await msg.finish( - msg.locale.t('core.message.whoami', senderid=msg.target.sender_id, targetid=msg.target.target_id) + rights, + msg.locale.t('core.message.whoami', senderid=msg.target.sender_id, targetid=msg.target.target_id) + perm, disable_secret_check=True) diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index 8d207d1c72..0ada77ca3d 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -48,7 +48,7 @@ def get_diff(diff): mai = module('maimai', recommend_modules='maimai_regex', developers=['mai-bot', 'OasisAkari', 'DoroWolf'], - alias='mai', desc='{maimai.help.desc}') + alias='mai', support_languages=['zh_cn'], desc='{maimai.help.desc}') @mai.command('base [] {{maimai.help.base}}') diff --git a/modules/random/__init__.py b/modules/random/__init__.py index ffd2aa76ec..d2b7cb7b14 100644 --- a/modules/random/__init__.py +++ b/modules/random/__init__.py @@ -36,31 +36,6 @@ async def _(msg: Bot.MessageSession): await msg.finish(', '.join(x)) -@r.command('password [-u] [-l] [-n] [-s] {{random.help.password}}', - options_desc={'-u': '{random.help.option.password.u}', - '-l': '{random.help.option.password.l}', - '-n': '{random.help.option.password.n}', - '-s': '{random.help.option.password.s}'}) -async def _(msg: Bot.MessageSession, length: int): - if length < 1 or length > 100: - return await msg.finish(msg.locale.t('random.message.password.error.invalid')) - characters = "" - if msg.parsed_msg.get('-u', False): - characters += string.ascii_uppercase - if msg.parsed_msg.get('-l', False): - characters += string.ascii_lowercase - if msg.parsed_msg.get('-n', False): - characters += string.digits - if msg.parsed_msg.get('-s', False): - characters += "!@#$%^&*-_+=?" - - if not characters: - characters = string.ascii_letters + string.digits - - random = ''.join(secrets.choice(characters) for _ in range(length)) - await msg.finish(random) - - @r.command('uuid {{random.help.uuid}}', ) async def _(msg: Bot.MessageSession): await msg.finish(str(uuid.uuid4())) diff --git a/modules/random/locales/en_us.json b/modules/random/locales/en_us.json index b7744e5f85..86e82d41eb 100644 --- a/modules/random/locales/en_us.json +++ b/modules/random/locales/en_us.json @@ -2,12 +2,6 @@ "random.help.choice": "Select an element from a given set.", "random.help.desc": "Random number generator (cryptographically secure)", "random.help.number": "Generate a random integer within a given range.", - "random.help.option.password.l": "在随机字符串中使用小写字母。", - "random.help.option.password.n": "在随机字符串中使用数字。", - "random.help.option.password.s": "在随机字符串中使用特殊符号。", - "random.help.option.password.u": "在随机字符串中使用大写字母。", "random.help.shuffle": "Shuffle the order of a given set.", - "random.help.password": "生成随机字符串，默认为字母和数字组合。", - "random.help.uuid": "Generate random UUID (v4).", - "random.message.password.error.invalid": "发生错误：长度必须为小于 100 的正整数。" + "random.help.uuid": "Generate random UUID (v4)." } \ No newline at end of file diff --git a/modules/random/locales/zh_cn.json b/modules/random/locales/zh_cn.json index 08c6d0c955..3cb98f5c00 100644 --- a/modules/random/locales/zh_cn.json +++ b/modules/random/locales/zh_cn.json @@ -2,12 +2,6 @@ "random.help.choice": "从集合中选择元素。", "random.help.desc": "随机数生成器（密码学安全）", "random.help.number": "生成区间内的随机整数。", - "random.help.option.password.l": "在随机字符串中使用小写字母。", - "random.help.option.password.n": "在随机字符串中使用数字。", - "random.help.option.password.s": "在随机字符串中使用特殊符号。", - "random.help.option.password.u": "在随机字符串中使用大写字母。", "random.help.shuffle": "打乱集合的顺序。", - "random.help.password": "生成随机字符串，默认为字母和数字组合。", - "random.help.uuid": "生成随机 UUID（v4）。", - "random.message.password.error.invalid": "发生错误：长度必须为小于 100 的正整数。" + "random.help.uuid": "生成随机 UUID（v4）。" } \ No newline at end of file diff --git a/modules/random/locales/zh_tw.json b/modules/random/locales/zh_tw.json index c24f318f75..543d507cba 100644 --- a/modules/random/locales/zh_tw.json +++ b/modules/random/locales/zh_tw.json @@ -2,12 +2,6 @@ "random.help.choice": "從集合中選擇元素。", "random.help.desc": "隨機數產生器（密碼學安全）", "random.help.number": "產生區間內的隨機整數。", - "random.help.option.password.l": "在隨機字串中使用小寫字母。", - "random.help.option.password.n": "在隨機字串中使用數字。", - "random.help.option.password.s": "在隨機字串中使用特殊符號。", - "random.help.option.password.u": "在隨機字串中使用大寫字母。", "random.help.shuffle": "打亂集合的順序。", - "random.help.password": "產生隨機字串，預設為字母或數字組合。", - "random.help.uuid": "產生隨機 UUID（v4）。", - "random.message.password.error.invalid": "發生錯誤：長度必須為小於 100 的正整數。" + "random.help.uuid": "產生隨機 UUID（v4）。" } \ No newline at end of file From 1d3095ef18c2bba36ca71e7fd0798ae0989e668a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 10 Dec 2023 20:27:57 +0800 Subject: [PATCH 003/168] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/core/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/core/__init__.py b/modules/core/__init__.py index 614eddc69e..ba5c9d3a84 100644 --- a/modules/core/__init__.py +++ b/modules/core/__init__.py @@ -2,5 +2,4 @@ from .modules import * from .prefix import * from .su_utils import * -from .update import * from .utils import * From a0e64bf819d776675a58940a5612cbcdf02a4ab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 10 Dec 2023 20:41:14 +0800 Subject: [PATCH 004/168] update bilibili --- modules/bilibili/__init__.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/bilibili/__init__.py b/modules/bilibili/__init__.py index b872cafa81..259ea68ae8 100644 --- a/modules/bilibili/__init__.py +++ b/modules/bilibili/__init__.py @@ -73,7 +73,8 @@ async def _(msg: Bot.MessageSession): async def parse_shorturl(shorturl): async with aiohttp.ClientSession() as session: async with session.get(shorturl, allow_redirects=False) as response: - target_url = urlparse(response.headers.get('Location')) - video = target_url.path.split("/")[-2] - url = f"{api_url}?bvid={video}" - return url \ No newline at end of file + target_url = response.headers.get('Location') + + video = re.search(r'/video/([^/?]+)', target_url) + url = f"{api_url}?bvid={video}" + return url From 410dfcde8e63a325b8070209b0618bb20fe2893d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 10 Dec 2023 20:43:41 +0800 Subject: [PATCH 005/168] fix --- modules/bilibili/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/bilibili/__init__.py b/modules/bilibili/__init__.py index 259ea68ae8..212718e5b3 100644 --- a/modules/bilibili/__init__.py +++ b/modules/bilibili/__init__.py @@ -58,8 +58,7 @@ async def _(msg: Bot.MessageSession): @bili.handle(re.compile(r"https?://b23\.tv/(av\d+|BV[A-Za-z0-9]{10}|[A-Za-z0-9]{7})(?:/.*?|)$"), mode="M", desc="{bilibili.help.regex.shorturl}") async def _(msg: Bot.MessageSession): - res = msg.matched_msg - video = res.groups()[0] + video = msg.matched_msg.groups()[0] if video[:2] == "BV": url = f"{api_url}?bvid={video}" elif video[:2] == "av": @@ -76,5 +75,5 @@ async def parse_shorturl(shorturl): target_url = response.headers.get('Location') video = re.search(r'/video/([^/?]+)', target_url) - url = f"{api_url}?bvid={video}" + url = f"{api_url}?bvid={video.group(1)}" return url From cd5f55b8af1b6dc56d95e7aaffbedca7245211cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 10 Dec 2023 21:30:13 +0800 Subject: [PATCH 006/168] Add arc locale --- .../mai/default_pic/UI_MSS_MBase_Icon_FSD_S.png | Bin 909 -> 0 bytes .../mai/default_pic/UI_MSS_MBase_Icon_FSDp_S.png | Bin 943 -> 0 bytes .../mai/default_pic/UI_MSS_MBase_Icon_FS_S.png | Bin 886 -> 0 bytes .../mai/default_pic/UI_MSS_MBase_Icon_FSp_S.png | Bin 937 -> 0 bytes modules/arcaea/__init__.py | 4 +++- modules/arcaea/locales/zh_cn.json | 1 + 6 files changed, 4 insertions(+), 1 deletion(-) delete mode 100644 assets/maimai/static/mai/default_pic/UI_MSS_MBase_Icon_FSD_S.png delete mode 100644 assets/maimai/static/mai/default_pic/UI_MSS_MBase_Icon_FSDp_S.png delete mode 100644 assets/maimai/static/mai/default_pic/UI_MSS_MBase_Icon_FS_S.png delete mode 100644 assets/maimai/static/mai/default_pic/UI_MSS_MBase_Icon_FSp_S.png diff --git a/assets/maimai/static/mai/default_pic/UI_MSS_MBase_Icon_FSD_S.png b/assets/maimai/static/mai/default_pic/UI_MSS_MBase_Icon_FSD_S.png deleted file mode 100644 index f4721c02e4ef8daf162d6ea1eaafe4104d9d4120..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 909 zcmV;819JR{P)}EQ4iKp57kl-)=>}EQ4rQq57kf()=?1FQV`Zr57ki*)ld%8PYl*l z5Y|!<)=>}EQ4iKq57tl*)lm-BPz}ye4c1Z*)ld%9PYu&h57kf*)KLr1P!RX7G}clO z|L;xLRT1*MIq8}#>!B|5qA%WO81~FQ-)$P~jVI=OAmn%+;c*=8s4?MrAKG0M*j5q# z=}P5@B->>d*;x|%-9`1tKJ=$C@S7~#U={u5N%+%2^{O)NmMZ9kBjbZ2-f0>0zdG)& zGwPl#>4zly;Yaz`L-Dvb;C3DGwKnguH1VD-=aeb<)I;l}FzK8uhSk(?0000YbW%=J z0NA_{;M;oDz~-Dv^2Ls5K`r&`)32wOZeASsY)v>YFA(LhK1Kil0v<_3K~y-)y_IQK z+CUVB3A-R}t=8^s-Wh?A5F~*_WCuY6wafqiFP#gMFq))adQP8D9C)}hcXH=V>L2)) zPZth=gF-rg`gikF77E$pWb-5kz_j}H@wnc%OaR(Rf_enF)3F|MJLSMpoS7*C_ANPz zZ3F4=Q8foX(IZSaw9IR_2&b;cP`g#HrpsczYntI56Yi>>z zxrw)mnn!@~+;Tt+Z1Ep#aX8-Z-NQ{y;v4Xn>)zcAu+gP&mL{MS{(vfz3}D_c;=vr? zify^60$&36SaBUvi7tdIsX`0f61k%`!MltNJ$KW1#D?5;``3!Gj)%ZaliPqXp98UWc(-I2YQ^-7;fhi5Z8}l5P`E^kXGB26BfzL3_@BGQn!;Aas9-_K=nC z8LIn+ywR?C2Z2j1;840b#kBxqF%%ykL${{Zt?c(}fN+J?;ep#=><;JBJ(uSoR2z$H zADHc3EVt`j2IC-IUAL%_;nliBrO0h8X!{TRP56vMSCnNtI^O=djpn#W1t@jV?unwS zCl4*@(i~CQ@E`~pVao0$50H+@5;rbOT;wv*;HkuCR54UlN-^0d_Zp?F$xPM5Of9Dpxs1u` jWWH|S0UzZ%;Q#OkDZlkI00000NkvXXu0mjf9yG5g diff --git a/assets/maimai/static/mai/default_pic/UI_MSS_MBase_Icon_FSDp_S.png b/assets/maimai/static/mai/default_pic/UI_MSS_MBase_Icon_FSDp_S.png deleted file mode 100644 index bf8de1e114b23bf49d72d8c4f3c631a2f8651985..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 943 zcmV;g15o^lP)}CPz}>c4%Sf+)=>}EQV`Wr5Y|!;)>04FQ4iHn4b@T))>07GP!H8n z57kf()=>}EQ4iKp57tr;)lm=BQ4P;f5X@2v&rlHet~AzC5dZH@>!B|4ygBKbEZ0>L z-e(x|qA%ciAJ|tB)8_RBuzd?59xG5FI$^~gQ#s4?V+B;ait-EA4$ zWf$(QGw_=%{pLyWxj5>cE$ogb>x?Jpgd^T*8UE}`@wPVZmMZCnB;$f2;C3DU=}P>t|m}-ppIv2yBy{g3qE>b6K}G2x}MU z!Wu_|Gnh5M%>fgw8ZpqGt@|TQ7GT4=V}hHGjZ^0HbrS2zLBw``2BQ{2n{{axTlV{% zuw7liTa5KRV{t#jLf9Aj<27TyjL5rGgnb5WGJzP~aDY3og#88Zri|6_CKa;3wtc8J zbLSk671#|th?`Yu7lhq!68eO@jJO^+koFJSDDqKzvo()&;?72Buc#CX(oRS05ukPZ zG@MDh7O!31tXqS?AaBY;`<}7yIFj~J&=ZnPbRP|1&e$@rF`$W7$VxjK*s3}dTk4OD30kdvG*EP(ksF4ET8Zvi02}7-yU$-8(P#Wz3nE1irl3zg`#c?k!+qV=D(9w8H0006NNkl2jh#6h>X5aY;)6(W_|ysnM*f_C{(3VmGi494wvq}OXf{{sN{1;z)>z=`Iv4U9%GB+ z!({9H69B_%Pg^a$Z5aTv=LuRJ;DZL+&=_!_zH1#6fVr|F(*g2d<60K{k?rxwkv-V< z3h3!90o_JnOFM;0TB2y8xY4R8Em#V-B~(K%ixJzQGZx0PT#b+mv@@7=(tCjbaX+@< z({oyMY7=M5JHd>;6EDpGQ^0I4`#(Lv@k8T8Y8T)wdc-#^pojIHT>Mz~=tYa;i_9tv z7WZt@B;UaZ12WS^%tG&`>%%=wo4EYt`ZpYTCUrG=v_tP2LI|KqzvKWnRfGjTt6P~y zp2X8Aw8vqOWyW=NGi9*QoAimUz>P*cG;NG!J)o?-hVnL>hf5-HXQLB&HRwB@MdoTk z%cTscqvm^;Sj6|I62qS~ZOGxL7zI@{zOo(Bf$aNu^91;TvYeG%~EJ{MBQG5Jx%SS`fK{KhkUHhYcOvUnoah3 zOuR&Ce{PgeAT3TYX$}=L`&6^RTw{%Ju2nOMTqVxQ^toGBbN5~O4@~xieSW+6Z2$lO M07*qoM6N<$f~3!#tN;K2 diff --git a/assets/maimai/static/mai/default_pic/UI_MSS_MBase_Icon_FSp_S.png b/assets/maimai/static/mai/default_pic/UI_MSS_MBase_Icon_FSp_S.png deleted file mode 100644 index 4150d5219bea59ccd8cc85a849b014cc00ac250c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 937 zcmV;a16KTrP)W>00039P)t-s0000N zO3oKa&KF6}4nD;fNzNBZ&KF6}7f8+)NzNBZ%@;||7fH<)NX!*R$`?t_7D>$)O3fEZ z&K5|_7f8$$M#>mU&KF6}7f8+&Ny-#Q%rdn27)s7Eq zE~fG?x1wCWz-DZ{0B7_b;sVEu!%% znC&8U-ynP38(GvCP0%s1_b$@&E~oP-jp-+f=qIG-B$MPLgyA56-XC+@9B0=VRMIiq z_ASfuD6Q!vd*UN@;2KubFWB}j)blQ-@+r0KDXQxved8*x?kAk+CY|LXiQge{-X3Jx zEog#%0000RbW%=J0NK;N5yJDkn`q|Wc}p*nVk)k2Lm#T8d_NgR)$VHm00K2hL_t(I z%e9p0a@sH$MQt3G5FlxmZn|>464zj}gs=n%kU~NrYuERGlgbheJ6iR>hBH&R47MtNUg4^6 z$MfoA2Z;aYM;I5(#3#CN9e}%)$=MQ>d!S=CF->fZ>W6HnQOz4b~>7L)rLF56cEmf`ybYGa#XP zU1gM2j9VFi-evuFVBT zRM7O`5OQJQL|P{#HWTG48+bqR_{h4rPLaA98!FCmOPIOZl3af diff --git a/modules/arcaea/__init__.py b/modules/arcaea/__init__.py index 8458d98245..c2469b0a1f 100644 --- a/modules/arcaea/__init__.py +++ b/modules/arcaea/__init__.py @@ -95,7 +95,7 @@ async def _(msg: Bot.MessageSession, use_local=True): await msg.finish(msg.locale.t("arcaea.message.get_failed")) -@arc.command('calc ') +@arc.command('calc {{arcaea.help.calc}}') async def _(msg: Bot.MessageSession, score: int, rating: float): ptt = 0 if score >= 10000000: @@ -104,6 +104,8 @@ async def _(msg: Bot.MessageSession, score: int, rating: float): ptt += 1 + (score - 9800000) / 200000 else: ptt += (score - 9500000) / 300000 + if ptt <= 0: + ptt == 0 await msg.finish([Plain(rating + ptt)]) diff --git a/modules/arcaea/locales/zh_cn.json b/modules/arcaea/locales/zh_cn.json index 3d882e6ee3..593d2dab62 100644 --- a/modules/arcaea/locales/zh_cn.json +++ b/modules/arcaea/locales/zh_cn.json @@ -4,6 +4,7 @@ "arcaea.help.random": "随机一首歌曲。", "arcaea.help.rank.free": "查看当前免费包游玩排行。", "arcaea.help.rank.paid": "查看当前付费包游玩排行。", + "arcaea.help.calc": "根据分数与歌曲定数计算对应的潜力值。", "arcaea.message.download": "目前的最新版本为 ${version}。\n下载地址：${url}", "arcaea.message.get_failed": "获取失败。", "arcaea.message.sb616": "根据 Arcaea TOS 3.2.6 规定，无法使用该命令。\nYou also agree not to do any of the following:\n... 6. collect any information through “harvesting” or “scraping” about the service or regarding any user, including yourself, who uses the Services;\nhttps://arcaea.lowiro.com/zh/terms_of_service", From 236788b01eac8af3b38c6599aff7d108101a8c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 10 Dec 2023 21:33:06 +0800 Subject: [PATCH 007/168] fix --- modules/arcaea/__init__.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/arcaea/__init__.py b/modules/arcaea/__init__.py index c2469b0a1f..0c82071bc1 100644 --- a/modules/arcaea/__init__.py +++ b/modules/arcaea/__init__.py @@ -97,15 +97,14 @@ async def _(msg: Bot.MessageSession, use_local=True): @arc.command('calc {{arcaea.help.calc}}') async def _(msg: Bot.MessageSession, score: int, rating: float): - ptt = 0 if score >= 10000000: - ptt += 2 + ptt == 2 elif score >= 9800000: - ptt += 1 + (score - 9800000) / 200000 + ptt == 1 + (score - 9800000) / 200000 else: - ptt += (score - 9500000) / 300000 - if ptt <= 0: - ptt == 0 + ptt == (score - 9500000) / 300000 + if ptt < 0: + ptt = 0 await msg.finish([Plain(rating + ptt)]) From 8885b6291dc39f0daaf97df49af52f70398b629f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 10 Dec 2023 21:37:20 +0800 Subject: [PATCH 008/168] Update locale --- modules/arcaea/__init__.py | 8 ++++---- modules/arcaea/locales/en_us.json | 1 + modules/arcaea/locales/zh_cn.json | 2 +- modules/arcaea/locales/zh_tw.json | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/arcaea/__init__.py b/modules/arcaea/__init__.py index 0c82071bc1..fed34faf4b 100644 --- a/modules/arcaea/__init__.py +++ b/modules/arcaea/__init__.py @@ -98,14 +98,14 @@ async def _(msg: Bot.MessageSession, use_local=True): @arc.command('calc {{arcaea.help.calc}}') async def _(msg: Bot.MessageSession, score: int, rating: float): if score >= 10000000: - ptt == 2 + ptt = rating + 2 elif score >= 9800000: - ptt == 1 + (score - 9800000) / 200000 + ptt = rating + 1 + (score - 9800000) / 200000 else: - ptt == (score - 9500000) / 300000 + ptt = rating + (score - 9500000) / 300000 if ptt < 0: ptt = 0 - await msg.finish([Plain(rating + ptt)]) + await msg.finish([Plain(ptt)]) p = module('ptt', developers=['OasisAkari']) diff --git a/modules/arcaea/locales/en_us.json b/modules/arcaea/locales/en_us.json index 81e3fe40b5..4a7512d212 100644 --- a/modules/arcaea/locales/en_us.json +++ b/modules/arcaea/locales/en_us.json @@ -1,4 +1,5 @@ { + "arcaea.help.calc": "Calculate the single Potential based on scores and rating.", "arcaea.help.desc": "Queries about Arcaea.", "arcaea.help.download": "Get the latest version of game apk.", "arcaea.help.random": "Random a track.", diff --git a/modules/arcaea/locales/zh_cn.json b/modules/arcaea/locales/zh_cn.json index 593d2dab62..071ce383bc 100644 --- a/modules/arcaea/locales/zh_cn.json +++ b/modules/arcaea/locales/zh_cn.json @@ -1,10 +1,10 @@ { + "arcaea.help.calc": "根据分数与歌曲定数计算对应的单曲潜力值。", "arcaea.help.desc": "查询 Arcaea 相关内容。", "arcaea.help.download": "获取最新版本的游戏 Apk。", "arcaea.help.random": "随机一首歌曲。", "arcaea.help.rank.free": "查看当前免费包游玩排行。", "arcaea.help.rank.paid": "查看当前付费包游玩排行。", - "arcaea.help.calc": "根据分数与歌曲定数计算对应的潜力值。", "arcaea.message.download": "目前的最新版本为 ${version}。\n下载地址：${url}", "arcaea.message.get_failed": "获取失败。", "arcaea.message.sb616": "根据 Arcaea TOS 3.2.6 规定，无法使用该命令。\nYou also agree not to do any of the following:\n... 6. collect any information through “harvesting” or “scraping” about the service or regarding any user, including yourself, who uses the Services;\nhttps://arcaea.lowiro.com/zh/terms_of_service", diff --git a/modules/arcaea/locales/zh_tw.json b/modules/arcaea/locales/zh_tw.json index 880c8782c1..fa4256e181 100644 --- a/modules/arcaea/locales/zh_tw.json +++ b/modules/arcaea/locales/zh_tw.json @@ -1,4 +1,5 @@ { + "arcaea.help.calc": "依據分數與歌曲定數計算對應的單曲潛力值。", "arcaea.help.desc": "查詢 Arcaea 相關內容。", "arcaea.help.download": "取得最新版本的遊戲 Apk。", "arcaea.help.random": "隨機一首歌曲。", From 000264dab3af944817aeae0a2bda8a8307692d6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 10 Dec 2023 21:41:20 +0800 Subject: [PATCH 009/168] improve code --- modules/arcaea/__init__.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/arcaea/__init__.py b/modules/arcaea/__init__.py index fed34faf4b..cca28f0e1d 100644 --- a/modules/arcaea/__init__.py +++ b/modules/arcaea/__init__.py @@ -103,9 +103,7 @@ async def _(msg: Bot.MessageSession, score: int, rating: float): ptt = rating + 1 + (score - 9800000) / 200000 else: ptt = rating + (score - 9500000) / 300000 - if ptt < 0: - ptt = 0 - await msg.finish([Plain(ptt)]) + await msg.finish(round(max(0, ptt), 2)) p = module('ptt', developers=['OasisAkari']) From 85b4fd29714fcfe2e5624c9aac90908024fa8fd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 10 Dec 2023 22:00:12 +0800 Subject: [PATCH 010/168] fix --- modules/arcaea/__init__.py | 2 +- modules/ncmusic/__init__.py | 24 ++++++++++++++---------- modules/ncmusic/locales/zh_cn.json | 10 ++++++---- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/modules/arcaea/__init__.py b/modules/arcaea/__init__.py index cca28f0e1d..36fb63bdb7 100644 --- a/modules/arcaea/__init__.py +++ b/modules/arcaea/__init__.py @@ -103,7 +103,7 @@ async def _(msg: Bot.MessageSession, score: int, rating: float): ptt = rating + 1 + (score - 9800000) / 200000 else: ptt = rating + (score - 9500000) / 300000 - await msg.finish(round(max(0, ptt), 2)) + await msg.finish([Plain(round(max(0, ptt), 2))]) p = module('ptt', developers=['OasisAkari']) diff --git a/modules/ncmusic/__init__.py b/modules/ncmusic/__init__.py index 16c8c9b434..477a416a1c 100644 --- a/modules/ncmusic/__init__.py +++ b/modules/ncmusic/__init__.py @@ -6,6 +6,7 @@ ncmusic = module('ncmusic', developers=['bugungu', 'DoroWolf'], + desc='{ncmusic.help.desc}', support_languages=['zh_cn']) @@ -115,13 +116,16 @@ async def info(msg: Bot.MessageSession, sid: str): url = f"https://ncmusic.akari-bot.top/song/detail?ids={sid}" result = await get_url(url, 200, fmt='json') - info = result['songs'][0] - artist = ' / '.join([ar['name'] for ar in info['ar']]) - song_page = f"https://music.163.com/#/song?id={info['id']}" - - send_msg = msg.locale.t('ncmusic.message.info', - name=info['name'], id=info['id'], - album=info['al']['name'], album_id=info['al']['id'], - artists=artist, detail=song_page) - - await msg.finish([Image(info['al']['picUrl']), Plain(send_msg)]) + if result['songs']: + info = result['songs'][0] + artist = ' / '.join([ar['name'] for ar in info['ar']]) + song_page = f"https://music.163.com/#/song?id={info['id']}" + + send_msg = msg.locale.t('ncmusic.message.info', + name=info['name'], id=info['id'], + album=info['al']['name'], album_id=info['al']['id'], + artists=artist, detail=song_page) + + await msg.finish([Image(info['al']['picUrl']), Plain(send_msg)]) + else: + await msg.finish(msg.locale.t('ncmusic.message.info.not_found')) \ No newline at end of file diff --git a/modules/ncmusic/locales/zh_cn.json b/modules/ncmusic/locales/zh_cn.json index 4fabd6a210..5dda211bc0 100644 --- a/modules/ncmusic/locales/zh_cn.json +++ b/modules/ncmusic/locales/zh_cn.json @@ -1,16 +1,18 @@ { + "ncmusic.help.desc": "网易云音乐相关工具。", + "ncmusic.help.info": "获取音乐详细信息。", "ncmusic.help.search": "搜索网易云音乐。", "ncmusic.help.search.legacy": "搜索网易云音乐。（旧版）", - "ncmusic.help.info": "获取音乐详细信息。", "ncmusic.message.info": "歌名：${name}（${id}）\n专辑名：${album}（${album_id}）\n歌手：${artists}\n歌曲详情页：${detail}", + "ncmusic.message.info.not_found": "找不到对应的音乐。", "ncmusic.message.search.collapse": "…仅显示前 10 条内容。", "ncmusic.message.search.invalid.non_digital": "无效的编号，必须为数字。", "ncmusic.message.search.invalid.out_of_range": "编号超出范围。", "ncmusic.message.search.not_found": "未找到结果。", "ncmusic.message.search.prompt": "输入对应的序号以查看歌曲信息。", + "ncmusic.message.search.result": "搜索结果：", "ncmusic.message.search.table.header.album": "专辑名", "ncmusic.message.search.table.header.artists": "歌手", "ncmusic.message.search.table.header.id": "序号", - "ncmusic.message.search.table.header.name": "歌名", - "ncmusic.message.search.result": "搜索结果：" -} + "ncmusic.message.search.table.header.name": "歌名" +} \ No newline at end of file From a32456a11853f0a4a660e7f8312caf06b05a9272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 10 Dec 2023 22:02:45 +0800 Subject: [PATCH 011/168] Upd locale --- modules/exchange_rate/__init__.py | 2 +- modules/exchange_rate/locales/en_us.json | 4 ++-- modules/exchange_rate/locales/zh_cn.json | 4 ++-- modules/exchange_rate/locales/zh_tw.json | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/exchange_rate/__init__.py b/modules/exchange_rate/__init__.py index c9193e6a39..6a4a9d31e8 100644 --- a/modules/exchange_rate/__init__.py +++ b/modules/exchange_rate/__init__.py @@ -54,7 +54,7 @@ async def exchange(base_currency, target_currency, amount: float, msg): else: unsupported_currencies.append(target_currency) if unsupported_currencies: - await msg.finish(f"{msg.locale.t('exchange_rate.message.error.invalid')}{' '.join(unsupported_currencies)}") + await msg.finish(f"{msg.locale.t('exchange_rate.message.error.unit')}{' '.join(unsupported_currencies)}") else: raise Exception(data['error-type']) diff --git a/modules/exchange_rate/locales/en_us.json b/modules/exchange_rate/locales/en_us.json index 31003fd07b..21446f774b 100644 --- a/modules/exchange_rate/locales/en_us.json +++ b/modules/exchange_rate/locales/en_us.json @@ -1,9 +1,9 @@ { "exchange_rate.help": "Convert currency prices according to the exchange rate of the day.", "exchange_rate.help.desc": "Exchange rate conversion tool.", - "exchange_rate.help.regex.desc": "[] (兑|换)", + "exchange_rate.help.regex.desc": "[] (兑|换) Convert currency prices.", "exchange_rate.message": "${amount} ${base} = ${exchange_rate} ${target}\n(${time}, for reference only)", - "exchange_rate.message.error.invalid": "发生错误：无效的货币单位：", + "exchange_rate.message.error.unit": "An error occurred: Invalid currency unit: ", "exchange_rate.message.error.non_digital": "An error occurred: Invalid amount, must be numeric.", "exchange_rate.message.error.non_positive": "An error occurred: The amount must be positive." } \ No newline at end of file diff --git a/modules/exchange_rate/locales/zh_cn.json b/modules/exchange_rate/locales/zh_cn.json index c16592c23e..99cfd08550 100644 --- a/modules/exchange_rate/locales/zh_cn.json +++ b/modules/exchange_rate/locales/zh_cn.json @@ -1,9 +1,9 @@ { "exchange_rate.help": "根据当日汇率转换货币价格。", "exchange_rate.help.desc": "汇率转换工具。", - "exchange_rate.help.regex.desc": "[] (兑|换)", + "exchange_rate.help.regex.desc": "[] (兑|换) 转换货币价格。", "exchange_rate.message": "${amount} ${base} = ${exchange_rate} ${target}\n（${time}，仅供参考）", - "exchange_rate.message.error.invalid": "发生错误：无效的货币单位：", + "exchange_rate.message.error.unit": "发生错误：无效的货币单位：", "exchange_rate.message.error.non_digital": "发生错误：无效的金额，必须为数字。", "exchange_rate.message.error.non_positive": "发生错误：金额必须为正数。" } \ No newline at end of file diff --git a/modules/exchange_rate/locales/zh_tw.json b/modules/exchange_rate/locales/zh_tw.json index 0156590ce0..f2124618a7 100644 --- a/modules/exchange_rate/locales/zh_tw.json +++ b/modules/exchange_rate/locales/zh_tw.json @@ -1,9 +1,9 @@ { "exchange_rate.help": "依據當日匯率轉換貨幣價格。", "exchange_rate.help.desc": "匯率轉換工具。", - "exchange_rate.help.regex.desc": "[] (兌|換)", + "exchange_rate.help.regex.desc": "[] (兌|換) 轉換貨幣價格。", "exchange_rate.message": "${amount} ${base} = ${exchange_rate} ${target}\n（${time}，仅供參考）", - "exchange_rate.message.error.invalid": "發生錯誤：無效的貨幣單位：", + "exchange_rate.message.error.unit": "發生錯誤：無效的貨幣單位：", "exchange_rate.message.error.non_digital": "發生錯誤：無效的金額，必須為數字。", "exchange_rate.message.error.non_positive": "發生錯誤：金額必須為正數。" } \ No newline at end of file From eb76b4c567fee298e8266f8c0de34875f4193a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 10 Dec 2023 22:07:32 +0800 Subject: [PATCH 012/168] fix --- modules/core/su_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/su_utils.py b/modules/core/su_utils.py index 8c700c4ae2..5fbd7550b8 100644 --- a/modules/core/su_utils.py +++ b/modules/core/su_utils.py @@ -11,10 +11,10 @@ from dateutil.relativedelta import relativedelta from config import Config, CFG -from core.builtins import Bot, Image, Plain, Temp +from core.builtins import Bot, PrivateAssets, Image, Plain, ExecutionLockList, Temp, MessageTaskManager from core.component import module from core.loader import ModulesManager -from core.logger import Logger +from core.logger import logger from core.parser.message import remove_temp_ban from core.scheduler import CronTrigger from core.tos import pardon_user, warn_user From 2b08c13c1b79d9c45c74b50468d6c02573bcb0a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 10 Dec 2023 22:38:00 +0800 Subject: [PATCH 013/168] format time --- modules/core/su_utils.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/core/su_utils.py b/modules/core/su_utils.py index 5fbd7550b8..11a2421776 100644 --- a/modules/core/su_utils.py +++ b/modules/core/su_utils.py @@ -63,7 +63,7 @@ async def _(msg: Bot.MessageSession): old = datetime.now().replace(hour=0, minute=0, second=0) get_counts_today = BotDBUtil.Analytics.get_count_by_times(new, old) - await msg.finish(msg.locale.t("core.message.analytics.counts", first_record=first_record.timestamp, + await msg.finish(msg.locale.t("core.message.analytics.counts", first_record=msg.ts2strftime(first_record.timestamp), counts=get_counts, counts_today=get_counts_today)) else: await msg.finish(msg.locale.t("core.message.analytics.disabled")) @@ -77,10 +77,10 @@ async def _(msg: Bot.MessageSession): if '' in msg.parsed_msg: module_ = msg.parsed_msg[''] if module_ is None: - result = msg.locale.t("core.message.analytics.days.total", first_record=first_record.timestamp) + result = msg.locale.t("core.message.analytics.days.total", first_record=msg.ts2strftime(first_record.timestamp)) else: result = msg.locale.t("core.message.analytics.days", module=module_, - first_record=first_record.timestamp) + first_record=msg.ts2strftime(first_record.timestamp)) data_ = {} for d in range(30): new = datetime.now().replace(hour=0, minute=0, second=0) + timedelta(days=1) - timedelta(days=30 - d - 1) @@ -115,10 +115,10 @@ async def _(msg: Bot.MessageSession): if '' in msg.parsed_msg: module_ = msg.parsed_msg[''] if module_ is None: - result = msg.locale.t("core.message.analytics.year.total", first_record=first_record.timestamp) + result = msg.locale.t("core.message.analytics.year.total", first_record=msg.ts2strftime(first_record.timestamp)) else: result = msg.locale.t("core.message.analytics.year", module=module_, - first_record=first_record.timestamp) + first_record=msg.ts2strftime(first_record.timestamp)) data_ = {} for d in range(12): new = datetime.now().replace(month=1, day=1, hour=0, minute=0, second=0) + \ From 6277cccf7316dfb83bb1e5219d5b418ab7dad722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 10 Dec 2023 22:50:07 +0800 Subject: [PATCH 014/168] revert --- modules/core/su_utils.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/core/su_utils.py b/modules/core/su_utils.py index 11a2421776..5fbd7550b8 100644 --- a/modules/core/su_utils.py +++ b/modules/core/su_utils.py @@ -63,7 +63,7 @@ async def _(msg: Bot.MessageSession): old = datetime.now().replace(hour=0, minute=0, second=0) get_counts_today = BotDBUtil.Analytics.get_count_by_times(new, old) - await msg.finish(msg.locale.t("core.message.analytics.counts", first_record=msg.ts2strftime(first_record.timestamp), + await msg.finish(msg.locale.t("core.message.analytics.counts", first_record=first_record.timestamp, counts=get_counts, counts_today=get_counts_today)) else: await msg.finish(msg.locale.t("core.message.analytics.disabled")) @@ -77,10 +77,10 @@ async def _(msg: Bot.MessageSession): if '' in msg.parsed_msg: module_ = msg.parsed_msg[''] if module_ is None: - result = msg.locale.t("core.message.analytics.days.total", first_record=msg.ts2strftime(first_record.timestamp)) + result = msg.locale.t("core.message.analytics.days.total", first_record=first_record.timestamp) else: result = msg.locale.t("core.message.analytics.days", module=module_, - first_record=msg.ts2strftime(first_record.timestamp)) + first_record=first_record.timestamp) data_ = {} for d in range(30): new = datetime.now().replace(hour=0, minute=0, second=0) + timedelta(days=1) - timedelta(days=30 - d - 1) @@ -115,10 +115,10 @@ async def _(msg: Bot.MessageSession): if '' in msg.parsed_msg: module_ = msg.parsed_msg[''] if module_ is None: - result = msg.locale.t("core.message.analytics.year.total", first_record=msg.ts2strftime(first_record.timestamp)) + result = msg.locale.t("core.message.analytics.year.total", first_record=first_record.timestamp) else: result = msg.locale.t("core.message.analytics.year", module=module_, - first_record=msg.ts2strftime(first_record.timestamp)) + first_record=first_record.timestamp) data_ = {} for d in range(12): new = datetime.now().replace(month=1, day=1, hour=0, minute=0, second=0) + \ From d17d634f713cf4480a5d9275270e87e4e55b74ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 11 Dec 2023 12:29:15 +0800 Subject: [PATCH 015/168] Update message.py --- core/parser/message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/parser/message.py b/core/parser/message.py index 59f8621317..7e7ef58a43 100644 --- a/core/parser/message.py +++ b/core/parser/message.py @@ -363,7 +363,7 @@ async def execute_submodule(msg: Bot.MessageSession, command_first_word, command for target in bug_report_targets: if f := await Bot.FetchTarget.fetch_target(target): await f.send_direct_message( - msg.locale.t('error.message.report', module=msg.trigger_msg) + tb) + f.locale.t('error.message.report', module=msg.trigger_msg) + tb) if command_first_word in current_unloaded_modules and msg.check_super_user(): await msg.send_message( msg.locale.t('parser.module.unloaded', module=command_first_word, prefix=msg.prefixes[0])) From 1110db55640c28402ff57537578989c7faa7ec94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 11 Dec 2023 12:48:20 +0800 Subject: [PATCH 016/168] Update message.py --- core/parser/message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/parser/message.py b/core/parser/message.py index 7e7ef58a43..59f8621317 100644 --- a/core/parser/message.py +++ b/core/parser/message.py @@ -363,7 +363,7 @@ async def execute_submodule(msg: Bot.MessageSession, command_first_word, command for target in bug_report_targets: if f := await Bot.FetchTarget.fetch_target(target): await f.send_direct_message( - f.locale.t('error.message.report', module=msg.trigger_msg) + tb) + msg.locale.t('error.message.report', module=msg.trigger_msg) + tb) if command_first_word in current_unloaded_modules and msg.check_super_user(): await msg.send_message( msg.locale.t('parser.module.unloaded', module=command_first_word, prefix=msg.prefixes[0])) From b1f906886f5ad87026eaa63f1103da753d515dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 11 Dec 2023 17:49:25 +0800 Subject: [PATCH 017/168] update --- bots/aiocqhttp/bot.py | 2 +- config/config.toml.example | 1 - core/exceptions.py | 3 +++ modules/core/modules.py | 3 ++- modules/core/su_utils.py | 6 +++++- modules/dice/__init__.py | 6 +++--- modules/dice/locales/en_us.json | 4 ++-- modules/dice/locales/zh_cn.json | 4 ++-- modules/dice/locales/zh_tw.json | 4 ++-- 9 files changed, 20 insertions(+), 13 deletions(-) diff --git a/bots/aiocqhttp/bot.py b/bots/aiocqhttp/bot.py index 35d4527657..edc85b5ec4 100644 --- a/bots/aiocqhttp/bot.py +++ b/bots/aiocqhttp/bot.py @@ -144,7 +144,7 @@ async def _(event: Event): if not Config('allow_bot_auto_approve_group_invite'): await bot.send_private_msg(user_id=event.user_id, message='你好！本机器人暂时不主动同意入群请求。\n' - f'请至{Config("qq_join_group_application_link")}申请入群。') + f'请至https://github.com/Teahouse-Studios/bot/issues/new?assignees=OasisAkari&labels=New&template=add_new_group.yaml&title=%5BNEW%5D%3A+申请入群。') else: return {'approve': True} diff --git a/config/config.toml.example b/config/config.toml.example index c836126b60..85a45122b4 100644 --- a/config/config.toml.example +++ b/config/config.toml.example @@ -47,7 +47,6 @@ qq_host = "127.0.0.1:11451" qq_invite_join_group_notice = true qq_disable_temp_session = false qq_enable_listening_self_message = false -qq_join_group_application_link = "https://github.com/Teahouse-Studios/bot/issues/new?assignees=OasisAkari&labels=New&template=add_new_group.yaml&title=%5BNEW%5D%3A+" allow_request_private_ip = false allow_bot_auto_approve_group_invite = false slower_schedule = false diff --git a/core/exceptions.py b/core/exceptions.py index 13dd7fa3da..538f9d0a14 100644 --- a/core/exceptions.py +++ b/core/exceptions.py @@ -32,3 +32,6 @@ class InvalidTemplatePattern(Exception): class NoReportException(Exception): pass + +class TestException(Exception): + pass diff --git a/modules/core/modules.py b/modules/core/modules.py index 968578ab54..b0d96f0ef0 100644 --- a/modules/core/modules.py +++ b/modules/core/modules.py @@ -49,7 +49,8 @@ async def _(msg: Bot.MessageSession): 'load ...', 'unload ...', 'list {{core.help.module.list}}', - 'list legacy {{core.help.module.list.legacy}}'], options_desc={'-g': '{core.help.option.module.g}'}, + 'list legacy {{core.help.module.list.legacy}}'], + options_desc={'-g': '{core.help.option.module.g}'}, available_for=['QQ|Guild']) async def _(msg: Bot.MessageSession): if msg.parsed_msg.get('list', False): diff --git a/modules/core/su_utils.py b/modules/core/su_utils.py index 5fbd7550b8..3a7f71a114 100644 --- a/modules/core/su_utils.py +++ b/modules/core/su_utils.py @@ -13,6 +13,7 @@ from config import Config, CFG from core.builtins import Bot, PrivateAssets, Image, Plain, ExecutionLockList, Temp, MessageTaskManager from core.component import module +from core.exceptions import TestException from core.loader import ModulesManager from core.logger import logger from core.parser.message import remove_temp_ban @@ -23,6 +24,7 @@ from core.utils.storedata import get_stored_list, update_stored_list from database import BotDBUtil + su = module('superuser', alias='su', required_superuser=True, base=True) @@ -433,6 +435,7 @@ async def _(msg: Bot.MessageSession): else: await msg.finish(msg.locale.t('core.message.forward_msg.disable')) + echo = module('echo', required_superuser=True, base=True) @@ -448,13 +451,14 @@ async def _(msg: Bot.MessageSession): async def _(msg: Bot.MessageSession): await msg.finish(msg.parsed_msg[''], quote=False) + rse = module('raise', required_superuser=True, base=True) @rse.command() async def _(msg: Bot.MessageSession): e = msg.locale.t("core.message.raise") - raise Exception(e) + raise TestException(e) if Config('enable_eval'): diff --git a/modules/dice/__init__.py b/modules/dice/__init__.py index ff0c32179d..3bcd2b1e93 100644 --- a/modules/dice/__init__.py +++ b/modules/dice/__init__.py @@ -18,9 +18,9 @@ }) async def _(msg: Bot.MessageSession, dices, dc='0'): times = '1' - if '#' in dices: - times = dices.partition('#')[0] - dices = dices.partition('#')[2] + if 'x' in dices: + times = dices.partition('x')[0] + dices = dices.partition('x')[2] if not times.isdigit(): await msg.finish(msg.locale.t('dice.message.error.N.invalid') + times) if not dc.isdigit(): diff --git a/modules/dice/locales/en_us.json b/modules/dice/locales/en_us.json index 30dfb1da1b..169adc2d17 100644 --- a/modules/dice/locales/en_us.json +++ b/modules/dice/locales/en_us.json @@ -8,7 +8,7 @@ "dice.help.option.m": "表示骰子数量，输出其所有点数之和（省略则默认 1）。", "dice.help.option.N": "将多项式的操作重复 N 次（投骰 N 次），之后输出 N 个结果。", "dice.help.option.n": "表示骰子面数。", - "dice.help.option.polynomial": "格式为“[#][]d[k(l)][±]...”，如“10d4-2d20”会输出 10 个 4 面骰所有点数之和减去 2 个 20 面骰点数之和。", + "dice.help.option.polynomial": "格式为“[x][]d[k(l)][±]...”，如“10d4-2d20”会输出 10 个 4 面骰所有点数之和减去 2 个 20 面骰点数之和。", "dice.help.option.polynomial.title": "多项式", "dice.help.option.y": "多项式中可以是整数（即调节值），如“d20+5”会输出 1 个 20 面骰的点数加上 5 的结果。", "dice.help.regex.desc": "(扔|投|掷|丢)个[面]骰子 Roll the specified dice.", @@ -16,7 +16,7 @@ "dice.message.dc.check": "▷ 判定成功数量：${success} 判定失败数量：${failed}", "dice.message.dc.failed": "，判定失败！", "dice.message.dc.success": "，判定成功！", - "dice.message.error": "解析骰子多项式时存在以下错误：", + "dice.message.error": "解析骰子多项式时发生以下错误：", "dice.message.error.dc.invalid": "发生错误：无效的 dc：", "dice.message.error.N.invalid": "发生错误：无效的投骰次数：", "dice.message.error.prompt": "第 ${i} 项发生", diff --git a/modules/dice/locales/zh_cn.json b/modules/dice/locales/zh_cn.json index 8f2e9d4c53..58292694a4 100644 --- a/modules/dice/locales/zh_cn.json +++ b/modules/dice/locales/zh_cn.json @@ -8,7 +8,7 @@ "dice.help.option.m": "表示骰子数量，输出其所有点数之和（省略则默认 1）。", "dice.help.option.N": "将多项式的操作重复 N 次（投骰 N 次），之后输出 N 个结果。", "dice.help.option.n": "表示骰子面数。", - "dice.help.option.polynomial": "格式为“[#][]d[k(l)][±]...”，如“10d4-2d20”会输出 10 个 4 面骰所有点数之和减去 2 个 20 面骰点数之和。", + "dice.help.option.polynomial": "格式为“[x][]d[k(l)][±]...”，如“10d4-2d20”会输出 10 个 4 面骰所有点数之和减去 2 个 20 面骰点数之和。", "dice.help.option.polynomial.title": "多项式", "dice.help.option.y": "多项式中可以是整数（即调节值），如“d20+5”会输出 1 个 20 面骰的点数加上 5 的结果。", "dice.help.regex.desc": "(扔|投|掷|丢)个[面]骰子[次] 投掷指定骰子。", @@ -16,7 +16,7 @@ "dice.message.dc.check": "▷ 判定成功数量：${success} 判定失败数量：${failed}", "dice.message.dc.failed": "，判定失败！", "dice.message.dc.success": "，判定成功！", - "dice.message.error": "解析骰子多项式时存在以下错误：", + "dice.message.error": "解析骰子多项式时发生以下错误：", "dice.message.error.dc.invalid": "发生错误：无效的 dc：", "dice.message.error.N.invalid": "发生错误：无效的投骰次数：", "dice.message.error.prompt": "第 ${i} 项发生", diff --git a/modules/dice/locales/zh_tw.json b/modules/dice/locales/zh_tw.json index 8cbe7b9ea3..eb0a98a696 100644 --- a/modules/dice/locales/zh_tw.json +++ b/modules/dice/locales/zh_tw.json @@ -8,7 +8,7 @@ "dice.help.option.m": "表示骰子數量，輸出其所有點數之和（省略則預設 1）。", "dice.help.option.N": "將多項式的行為重複 N 次（投骰 N 次），之後輸出 N 個結果。", "dice.help.option.n": "表示骰子面數。", - "dice.help.option.polynomial": "格式為「[#][]d[k(l)][±]...」，如「10d4-2d20」會輸出 10 個 4 面骰所有點數之和減去 2 個 20 面骰點數之和。", + "dice.help.option.polynomial": "格式為「[x][]d[k(l)][±]...」，如「10d4-2d20」會輸出 10 個 4 面骰所有點數之和減去 2 個 20 面骰點數之和。", "dice.help.option.polynomial.title": "多項式", "dice.help.option.y": "多項式中可以是整數（即調整值），如「d20+5」會輸出 1 個 20 面骰的點數加上 5 的結果。", "dice.help.regex.desc": "(扔|投|擲|丟)個[面]骰子[次] 投擲指定骰子。", @@ -16,7 +16,7 @@ "dice.message.dc.check": "▷ 判定成功數量：${success} 判定失敗數量：${failed}", "dice.message.dc.failed": "，判定失敗！", "dice.message.dc.success": "，判定成功！", - "dice.message.error": "解析骰子多項式時存在以下錯誤：", + "dice.message.error": "解析骰子多項式時發生以下錯誤：", "dice.message.error.dc.invalid": "發生錯誤：無效的 dc：", "dice.message.error.N.invalid": "發生錯誤：無效的投骰次數：", "dice.message.error.prompt": "第 ${i} 項發生", From 0cfd5a4f9052ec5dd3d02a06664a43482960ec31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 11 Dec 2023 18:33:36 +0800 Subject: [PATCH 018/168] Update __init__.py --- modules/chemical_code/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/chemical_code/__init__.py b/modules/chemical_code/__init__.py index 275961ba71..aa42333fed 100644 --- a/modules/chemical_code/__init__.py +++ b/modules/chemical_code/__init__.py @@ -17,9 +17,11 @@ from core.utils.http import get_url, download_to_cache from core.utils.text import remove_prefix +CSID_RANGE_MAX = 200000000 # 数据库增长速度很快，可手动在此修改 ID 区间 + csr_link = 'https://www.chemspider.com' -special_id_path = os.path.abspath(f'./assets/chemical_code/special_id') # 去掉文件扩展名并存储在special_id列表中 +special_id_path = os.path.abspath(f'./assets/chemical_code/special_id') # 去掉文件扩展名并存储在 special_id 列表中 special_id = [os.path.splitext(filename)[0] for filename in os.listdir(special_id_path)] # 可能会导致识别问题的物质（如部分单质）ID，这些 ID 的图片将会在本地调用 element_lists = ['He', 'Li', 'Be', 'Ne', 'Na', 'Mg', 'Al', 'Si', 'Cl', @@ -61,7 +63,7 @@ async def search_csr(id=None): if id is not None: answer_id = id else: - answer_id = random.randint(1, 200000000) # 数据库增长速度很快，可手动在此修改ID区间 + answer_id = random.randint(1, CSID_RANGE_MAX) answer_id = str(answer_id) Logger.info("ChemSpider ID: " + answer_id) get = await get_url(csr_link + '/Search.aspx?q=' + answer_id, 200, fmt='text') From 756ed98d703fc8ae77c3b7c74e5a77d77899ff16 Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Tue, 12 Dec 2023 15:13:40 +0800 Subject: [PATCH 019/168] update --- modules/mcv/locales/zh_cn.json | 4 ++-- modules/mcv/mcv.py | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/mcv/locales/zh_cn.json b/modules/mcv/locales/zh_cn.json index 3b0780d79d..9d1a24634a 100644 --- a/modules/mcv/locales/zh_cn.json +++ b/modules/mcv/locales/zh_cn.json @@ -14,6 +14,6 @@ "mcv.message.mclgv": "最新版：${version}\n（数据来源于 Mojira，可能会比官方发布要早一段时间。信息仅供参考。）", "mcv.message.mcv": "目前启动器内最新版本为：\n${launcher_ver}\nMojira 上所记录最新版本为：\n${jira_ver}\n（以启动器内最新版本为准，Mojira 仅作版本号预览用）", "mcv.message.mcv.jira.failed": "获取 Mojira 信息失败。", - "mcv.message.mcv.launcher": "最新版：${release}，最新快照：${snapshot}，", + "mcv.message.mcv.launcher": "最新版：${release}\n发布于：${release_time}\n最新快照：${snapshot}\n发布于：${snapshot_time}\n", "mcv.message.mcv.launcher.failed": "获取 manifest.json 失败。" -} \ No newline at end of file +} diff --git a/modules/mcv/mcv.py b/modules/mcv/mcv.py index 9a2716bf27..7a51de6a2c 100644 --- a/modules/mcv/mcv.py +++ b/modules/mcv/mcv.py @@ -1,5 +1,6 @@ import json import re +import datetime from google_play_scraper import app as google_play_scraper @@ -18,14 +19,16 @@ async def mcv(msg): time_snapshot = None for v in data['versions']: if v['id'] == release: - time_release = v['releaseTime'] - elif v['id'] == snapshot: - time_snapshot = v['releaseTime'] + time_release = datetime.datetime.fromisoformat(v['releaseTime']).timestamp() + if v['id'] == snapshot: + time_snapshot = datetime.datetime.fromisoformat(v['releaseTime']).timestamp() message1 = msg.locale.t( "mcv.message.mcv.launcher", release=data['latest']['release'], - snapshot=data['latest']['snapshot']) + snapshot=data['latest']['snapshot'], + release_time=msg.ts2strftime(time_release), + snapshot_time=msg.ts2strftime(time_snapshot)) except (ConnectionError, OSError): # Probably... message1 = msg.locale.t("mcv.message.mcv.launcher.failed") try: From 2413abcc633b1d3a6938ce555d5b81f49690b56a Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Wed, 13 Dec 2023 16:59:56 +0800 Subject: [PATCH 020/168] update --- bots/aiocqhttp/message.py | 11 +++++++---- bots/aiogram/message.py | 24 ++++++++++++++---------- bots/discord/message.py | 24 ++++++++++++++---------- bots/kook/message.py | 24 ++++++++++++++---------- bots/matrix/message.py | 23 ++++++++++++++--------- 5 files changed, 63 insertions(+), 43 deletions(-) diff --git a/bots/aiocqhttp/message.py b/bots/aiocqhttp/message.py index c790cf598b..d724f8ba1a 100644 --- a/bots/aiocqhttp/message.py +++ b/bots/aiocqhttp/message.py @@ -343,11 +343,14 @@ async def post_(fetch_: Bot.FetchedSession): Temp.data['waiting_for_send_group_message'].append({'fetch': fetch_, 'message': message, 'i18n': i18n, 'kwargs': kwargs}) else: - if i18n: - await fetch_.send_direct_message(fetch_.parent.locale.t(message, **kwargs)) + msgchain = message + if isinstance(message, str): + if i18n: + msgchain = MessageChain([Plain(fetch_.parent.locale.t(message, **kwargs))]) + else: + msgchain = MessageChain([Plain(message)]) - else: - await fetch_.send_direct_message(message) + await fetch_.send_direct_message(msgchain) if _tsk: _tsk = [] if enable_analytics: diff --git a/bots/aiogram/message.py b/bots/aiogram/message.py index 84c55a5dd8..acbdc8d12b 100644 --- a/bots/aiogram/message.py +++ b/bots/aiogram/message.py @@ -177,11 +177,13 @@ async def post_message(module_name, message, user_list: List[Bot.FetchedSession] if user_list is not None: for x in user_list: try: - if i18n: - await x.send_direct_message(x.parent.locale.t(message, **kwargs)) - - else: - await x.send_direct_message(message) + msgchain = message + if isinstance(message, str): + if i18n: + msgchain = MessageChain([Plain(x.parent.locale.t(message, **kwargs))]) + else: + msgchain = MessageChain([Plain(message)]) + await x.send_direct_message(msgchain) if enable_analytics: BotDBUtil.Analytics(x).add('', module_name, 'schedule') except Exception: @@ -192,11 +194,13 @@ async def post_message(module_name, message, user_list: List[Bot.FetchedSession] fetch = await FetchTarget.fetch_target(x.targetId) if fetch: try: - if i18n: - await fetch.send_direct_message(fetch.parent.locale.t(message, **kwargs)) - - else: - await fetch.send_direct_message(message) + msgchain = message + if isinstance(message, str): + if i18n: + msgchain = MessageChain([Plain(fetch.parent.locale.t(message, **kwargs))]) + else: + msgchain = MessageChain([Plain(message)]) + await fetch.send_direct_message(msgchain) if enable_analytics: BotDBUtil.Analytics(fetch).add('', module_name, 'schedule') except Exception: diff --git a/bots/discord/message.py b/bots/discord/message.py index 9caa03a70f..cfd5643f62 100644 --- a/bots/discord/message.py +++ b/bots/discord/message.py @@ -212,11 +212,13 @@ async def post_message(module_name, message, user_list: List[Bot.FetchedSession] if user_list is not None: for x in user_list: try: - if i18n: - await x.send_direct_message(x.parent.locale.t(message, **kwargs)) - - else: - await x.send_direct_message(message) + msgchain = message + if isinstance(message, str): + if i18n: + msgchain = MessageChain([Plain(x.parent.locale.t(message, **kwargs))]) + else: + msgchain = MessageChain([Plain(message)]) + await x.send_direct_message(msgchain) if enable_analytics: BotDBUtil.Analytics(x).add('', module_name, 'schedule') except Exception: @@ -227,11 +229,13 @@ async def post_message(module_name, message, user_list: List[Bot.FetchedSession] fetch = await FetchTarget.fetch_target(x.targetId) if fetch: try: - if i18n: - await fetch.send_direct_message(fetch.parent.locale.t(message, **kwargs)) - - else: - await fetch.send_direct_message(message) + msgchain = message + if isinstance(message, str): + if i18n: + msgchain = MessageChain([Plain(fetch.parent.locale.t(message, **kwargs))]) + else: + msgchain = MessageChain([Plain(message)]) + await fetch.send_direct_message(msgchain) if enable_analytics: BotDBUtil.Analytics(fetch).add('', module_name, 'schedule') except Exception: diff --git a/bots/kook/message.py b/bots/kook/message.py index 2f3f8e580f..74b7cadf1b 100644 --- a/bots/kook/message.py +++ b/bots/kook/message.py @@ -235,11 +235,13 @@ async def post_message(module_name, message, user_list: List[Bot.FetchedSession] if user_list is not None: for x in user_list: try: - if i18n: - await x.send_direct_message(x.parent.locale.t(message, **kwargs)) - - else: - await x.send_direct_message(message) + msgchain = message + if isinstance(message, str): + if i18n: + msgchain = MessageChain([Plain(x.parent.locale.t(message, **kwargs))]) + else: + msgchain = MessageChain([Plain(message)]) + await x.send_direct_message(msgchain) if enable_analytics: BotDBUtil.Analytics(x).add('', module_name, 'schedule') except Exception: @@ -250,11 +252,13 @@ async def post_message(module_name, message, user_list: List[Bot.FetchedSession] fetch = await FetchTarget.fetch_target(x.targetId) if fetch: try: - if i18n: - await fetch.send_direct_message(fetch.parent.locale.t(message, **kwargs)) - - else: - await fetch.send_direct_message(message) + msgchain = message + if isinstance(message, str): + if i18n: + msgchain = MessageChain([Plain(fetch.parent.locale.t(message, **kwargs))]) + else: + msgchain = MessageChain([Plain(message)]) + await fetch.send_direct_message(msgchain) if enable_analytics: BotDBUtil.Analytics(fetch).add('', module_name, 'schedule') except Exception: diff --git a/bots/matrix/message.py b/bots/matrix/message.py index c45d9d30a2..0de53184c6 100644 --- a/bots/matrix/message.py +++ b/bots/matrix/message.py @@ -286,11 +286,13 @@ async def post_message(module_name, message, user_list: List[FetchedSession] = N if user_list is not None: for x in user_list: try: - if i18n: - await x.send_direct_message(x.parent.locale.t(message, **kwargs)) - - else: - await x.send_direct_message(message) + msgchain = message + if isinstance(message, str): + if i18n: + msgchain = MessageChain([Plain(x.parent.locale.t(message, **kwargs))]) + else: + msgchain = MessageChain([Plain(message)]) + await x.send_direct_message(msgchain) if enable_analytics: BotDBUtil.Analytics(x).add('', module_name, 'schedule') except Exception: @@ -301,10 +303,13 @@ async def post_message(module_name, message, user_list: List[FetchedSession] = N fetch = await FetchTarget.fetch_target(x.targetId) if fetch: try: - if i18n: - await fetch.send_direct_message(fetch.parent.locale.t(message, **kwargs)) - else: - await fetch.send_direct_message(message) + msgchain = message + if isinstance(message, str): + if i18n: + msgchain = MessageChain([Plain(fetch.parent.locale.t(message, **kwargs))]) + else: + msgchain = MessageChain([Plain(message)]) + await fetch.send_direct_message(msgchain) if enable_analytics: BotDBUtil.Analytics(fetch).add('', module_name, 'schedule') except Exception: From 3a8f52e05233803668009c4cbcafe0591bab55d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 13 Dec 2023 18:56:27 +0800 Subject: [PATCH 021/168] Update --- core/builtins/message/__init__.py | 5 ++++- modules/exchange_rate/__init__.py | 16 ++++++++------ modules/exchange_rate/locales/en_us.json | 6 +++--- modules/exchange_rate/locales/zh_cn.json | 6 +++--- modules/exchange_rate/locales/zh_tw.json | 6 +++--- modules/mod_dl/__init__.py | 27 ++++++++---------------- modules/mod_dl/locales/en_us.json | 1 - modules/mod_dl/locales/zh_cn.json | 1 - modules/mod_dl/locales/zh_tw.json | 1 - modules/ncmusic/__init__.py | 5 ++--- modules/tweet/__init__.py | 4 ++-- 11 files changed, 36 insertions(+), 42 deletions(-) diff --git a/core/builtins/message/__init__.py b/core/builtins/message/__init__.py index 20ad7aac26..5daf4ed728 100644 --- a/core/builtins/message/__init__.py +++ b/core/builtins/message/__init__.py @@ -76,8 +76,9 @@ async def wait_next_message(self, message_chain=None, quote=True, delete=False, else: raise WaitCancelException - async def wait_reply(self, message_chain, quote=True, all_=False, append_instruction=True) -> MessageSessionT: + async def wait_reply(self, message_chain, quote=True, delete=False, all_=False, append_instruction=True) -> MessageSessionT: self.tmp['enforce_send_by_master_client'] = True + send = None ExecutionLockList.remove(self) message_chain = MessageChain(message_chain) if append_instruction: @@ -87,6 +88,8 @@ async def wait_reply(self, message_chain, quote=True, all_=False, append_instruc MessageTaskManager.add_task(self, flag, reply=send.message_id, all_=all_) await flag.wait() result = MessageTaskManager.get_result(self) + if delete and send is not None: + await send.delete() if result is not None: return result else: diff --git a/modules/exchange_rate/__init__.py b/modules/exchange_rate/__init__.py index 6a4a9d31e8..7b8ce6423f 100644 --- a/modules/exchange_rate/__init__.py +++ b/modules/exchange_rate/__init__.py @@ -14,9 +14,9 @@ @excr.command(' {{exchange_rate.help}}') -async def _(msg: Bot.MessageSession): - base = msg.parsed_msg[''].upper() - target = msg.parsed_msg[''].upper() +async def _(msg: Bot.MessageSession, base: str, target: str): + base = base.upper() + target = target.upper() amount_str = base[:-3] base_currency = base[-3:] @@ -60,12 +60,16 @@ async def exchange(base_currency, target_currency, amount: float, msg): url = f'https://v6.exchangerate-api.com/v6/{api_key}/pair/{base_currency}/{target_currency}/{amount}' data = await get_url(url, 200, fmt='json') - current_time = datetime.datetime.now().strftime("%Y-%m-%d") + current_time = datetime.datetime.now().timestamp() if data['result'] == "success": exchange_rate = data['conversion_result'] await msg.finish( - msg.locale.t('exchange_rate.message', amount=amount, base=base_currency, exchange_rate=exchange_rate, - target=target_currency, time=current_time)) + msg.locale.t('exchange_rate.message', + amount=amount, + base=base_currency, + exchange_rate=exchange_rate, + target=target_currency, + time=msg.ts2strftime(current_time, seconds=False, timezone=False))) else: raise Exception(data['error-type']) diff --git a/modules/exchange_rate/locales/en_us.json b/modules/exchange_rate/locales/en_us.json index 21446f774b..59aa45bc7f 100644 --- a/modules/exchange_rate/locales/en_us.json +++ b/modules/exchange_rate/locales/en_us.json @@ -3,7 +3,7 @@ "exchange_rate.help.desc": "Exchange rate conversion tool.", "exchange_rate.help.regex.desc": "[] (兑|换) Convert currency prices.", "exchange_rate.message": "${amount} ${base} = ${exchange_rate} ${target}\n(${time}, for reference only)", - "exchange_rate.message.error.unit": "An error occurred: Invalid currency unit: ", - "exchange_rate.message.error.non_digital": "An error occurred: Invalid amount, must be numeric.", - "exchange_rate.message.error.non_positive": "An error occurred: The amount must be positive." + "exchange_rate.message.invalid.unit": "Invalid currency unit: ", + "exchange_rate.message.invalid.non_digital": "Invalid amount, must be numeric.", + "exchange_rate.message.invalid.non_positive": "The amount must be positive." } \ No newline at end of file diff --git a/modules/exchange_rate/locales/zh_cn.json b/modules/exchange_rate/locales/zh_cn.json index 99cfd08550..95eb8dba71 100644 --- a/modules/exchange_rate/locales/zh_cn.json +++ b/modules/exchange_rate/locales/zh_cn.json @@ -3,7 +3,7 @@ "exchange_rate.help.desc": "汇率转换工具。", "exchange_rate.help.regex.desc": "[] (兑|换) 转换货币价格。", "exchange_rate.message": "${amount} ${base} = ${exchange_rate} ${target}\n（${time}，仅供参考）", - "exchange_rate.message.error.unit": "发生错误：无效的货币单位：", - "exchange_rate.message.error.non_digital": "发生错误：无效的金额，必须为数字。", - "exchange_rate.message.error.non_positive": "发生错误：金额必须为正数。" + "exchange_rate.message.invalid.unit": "无效的货币单位：", + "exchange_rate.message.invalid.non_digital": "无效的金额，必须为数字。", + "exchange_rate.message.invalid.non_positive": "金额必须为正数。" } \ No newline at end of file diff --git a/modules/exchange_rate/locales/zh_tw.json b/modules/exchange_rate/locales/zh_tw.json index f2124618a7..fc491ad52f 100644 --- a/modules/exchange_rate/locales/zh_tw.json +++ b/modules/exchange_rate/locales/zh_tw.json @@ -3,7 +3,7 @@ "exchange_rate.help.desc": "匯率轉換工具。", "exchange_rate.help.regex.desc": "[] (兌|換) 轉換貨幣價格。", "exchange_rate.message": "${amount} ${base} = ${exchange_rate} ${target}\n（${time}，仅供參考）", - "exchange_rate.message.error.unit": "發生錯誤：無效的貨幣單位：", - "exchange_rate.message.error.non_digital": "發生錯誤：無效的金額，必須為數字。", - "exchange_rate.message.error.non_positive": "發生錯誤：金額必須為正數。" + "exchange_rate.message.invalid.unit": "無效的貨幣單位：", + "exchange_rate.message.invalid.non_digital": "無效的金額，必須為數字。", + "exchange_rate.message.invalid.non_positive": "金額必須為正數。" } \ No newline at end of file diff --git a/modules/mod_dl/__init__.py b/modules/mod_dl/__init__.py index c361f0a130..3df9d863e0 100644 --- a/modules/mod_dl/__init__.py +++ b/modules/mod_dl/__init__.py @@ -17,16 +17,9 @@ x_api_key = Config("curseforge_api_key") if not x_api_key: # CurseForge API Key 未配置，使用镜像 https://mcim.z0z0r4.top ...(z0z0r4 不想解析网页) - MCIM_MODE = True + enable_mirror = True else: - MCIM_MODE = False - - -def cn_chk(string: str): - for word in string: - if u'\u4e00' <= word <= u'\u9fff': - return True - return False + enable_mirror = False @mod_dl.handle(' [] {{mod_dl.help}}') @@ -37,8 +30,6 @@ async def main(msg: Bot.MessageSession, mod_name: str, version: str = None): if match_ver is None: mod_name += ' ' + version ver = False - if cn_chk(mod_name): - await msg.finish(msg.locale.t("mod_dl.message.unsupport")) async def search_modrinth(name: str, ver: str): url = f'https://api.modrinth.com/v2/search?query={name}&limit=10' @@ -56,7 +47,7 @@ async def search_modrinth(name: str, ver: str): return results async def search_curseforge(name: str, ver: str): - if MCIM_MODE: + if enable_mirror: # https://mcim.z0z0r4.top/docs#/Curseforge/curseforge_search_curseforge_search_get url = f'https://mcim.z0z0r4.top/curseforge/search?gameId=432&searchFilter={name}&sortField=2&sortOrder=desc&pageSize=10&classId=6' headers = None @@ -73,7 +64,7 @@ async def search_curseforge(name: str, ver: str): try: resp = await get_url(url, 200, fmt="json", timeout=5, attempt=3, headers=headers) if resp is not None: - if not MCIM_MODE: # 没提供 pagination + if not enable_mirror: # 没提供 pagination if resp["pagination"]["resultCount"] == 0: return None for mod in resp["data"]: @@ -89,7 +80,7 @@ async def get_modrinth_project_version(project_id: str, ver: str): return resp async def get_curseforge_mod_version_index(modid: str): - if MCIM_MODE: + if enable_mirror: # https://mcim.z0z0r4.top/docs#/Curseforge/get_mod_curseforge_mod__modid_slug__get url = f'https://mcim.z0z0r4.top/curseforge/mod/{modid}' headers = None @@ -104,7 +95,7 @@ async def get_curseforge_mod_version_index(modid: str): return resp["data"]['latestFilesIndexes'] async def get_curseforge_mod_file(modid: str, ver: str): - if MCIM_MODE: + if enable_mirror: url = f'https://mcim.z0z0r4.top/curseforge/mod/{modid}/files?gameVersion={ver}' headers = None else: @@ -148,7 +139,7 @@ async def get_curseforge_mod_file(modid: str, ver: str): reply_text.append(f"{count}. {mod[1]}") cache_result.append(mod) - reply = await msg.wait_reply('\n'.join(reply_text) + '\n' + msg.locale.t("mod_dl.message.prompt")) + reply = await msg.wait_reply('\n'.join(reply_text) + '\n' + msg.locale.t("mod_dl.message.prompt"), delete=True) replied = reply.as_display(text_only=True) # 查找 Mod @@ -165,7 +156,7 @@ async def get_curseforge_mod_file(modid: str, ver: str): if ver is None: reply2 = await msg.wait_reply(f'{msg.locale.t("mod_dl.message.version")}\n' + "\n".join(mod_info[3]) - + f'\n{msg.locale.t("mod_dl.message.version.prompt")}') + + f'\n{msg.locale.t("mod_dl.message.version.prompt")}', delete=True) replied2 = reply2.as_display(text_only=True) if replied2 in mod_info[3]: version_info = await get_modrinth_project_version(mod_info[2], replied2) @@ -188,7 +179,7 @@ async def get_curseforge_mod_file(modid: str, ver: str): if ver is None: reply2 = await msg.wait_reply(f'{msg.locale.t("mod_dl.message.version")}\n' + '\n'.join(ver_list) + - f'\n{msg.locale.t("mod_dl.message.version.prompt")}') + f'\n{msg.locale.t("mod_dl.message.version.prompt")}', delete=True) ver = reply2.as_display(text_only=True) elif ver not in ver_list: await msg.finish(msg.locale.t("mod_dl.message.version.not_found")) diff --git a/modules/mod_dl/locales/en_us.json b/modules/mod_dl/locales/en_us.json index 1c36a83fc8..70b6a91d38 100644 --- a/modules/mod_dl/locales/en_us.json +++ b/modules/mod_dl/locales/en_us.json @@ -11,7 +11,6 @@ "mod_dl.message.modrinth.result": "Modrinth 结果：", "mod_dl.message.not_found": "未找到结果。", "mod_dl.message.prompt": "请回复编号来选择 Mod。", - "mod_dl.message.unsupport": "不支持中文搜索，请检查输入。", "mod_dl.message.version": "此 Mod 拥有以下版本：", "mod_dl.message.version.not_found": "未找到指定版本。", "mod_dl.message.version.prompt": "请回复版本号来选择版本。" diff --git a/modules/mod_dl/locales/zh_cn.json b/modules/mod_dl/locales/zh_cn.json index 1c36a83fc8..70b6a91d38 100644 --- a/modules/mod_dl/locales/zh_cn.json +++ b/modules/mod_dl/locales/zh_cn.json @@ -11,7 +11,6 @@ "mod_dl.message.modrinth.result": "Modrinth 结果：", "mod_dl.message.not_found": "未找到结果。", "mod_dl.message.prompt": "请回复编号来选择 Mod。", - "mod_dl.message.unsupport": "不支持中文搜索，请检查输入。", "mod_dl.message.version": "此 Mod 拥有以下版本：", "mod_dl.message.version.not_found": "未找到指定版本。", "mod_dl.message.version.prompt": "请回复版本号来选择版本。" diff --git a/modules/mod_dl/locales/zh_tw.json b/modules/mod_dl/locales/zh_tw.json index a71302d9d3..9e3af0386f 100644 --- a/modules/mod_dl/locales/zh_tw.json +++ b/modules/mod_dl/locales/zh_tw.json @@ -11,7 +11,6 @@ "mod_dl.message.modrinth.result": "Modrinth 結果：", "mod_dl.message.not_found": "未找到結果。", "mod_dl.message.prompt": "請回覆編號來選擇 Mod。", - "mod_dl.message.unsupport": "不支援中文檢索，請校對輸入。", "mod_dl.message.version": "此 Mod 擁有以下版本：", "mod_dl.message.version.not_found": "未找到指定版本。", "mod_dl.message.version.prompt": "請回覆版本號來選擇版本。" diff --git a/modules/ncmusic/__init__.py b/modules/ncmusic/__init__.py index 477a416a1c..2c6de2f73e 100644 --- a/modules/ncmusic/__init__.py +++ b/modules/ncmusic/__init__.py @@ -50,7 +50,7 @@ async def search(msg: Bot.MessageSession, keyword: str): if len(result['result']['songs']) > 10: send_msg.append(Plain(msg.locale.t('ncmusic.message.search.collapse'))) send_msg.append(Plain(msg.locale.t('ncmusic.message.search.prompt'))) - query = await msg.wait_next_message(send_msg) + query = await msg.wait_reply(send_msg) query = query.as_display(text_only=True) try: query = int(query) @@ -88,7 +88,7 @@ async def search(msg: Bot.MessageSession, keyword: str): send_msg += msg.locale.t('ncmusic.message.search.collapse') send_msg += '\n' send_msg += msg.locale.t('ncmusic.message.search.prompt') - query = await msg.wait_next_message(send_msg) + query = await msg.wait_reply(send_msg) query = query.as_display(text_only=True) try: query = int(query) @@ -96,7 +96,6 @@ async def search(msg: Bot.MessageSession, keyword: str): await msg.finish(msg.locale.t('ncmusic.message.search.invalid.out_of_range')) sid = result['result']['songs'][query - 1]['id'] url = f"https://ncmusic.akari-bot.top/song/detail?ids={sid}" - logger.info(url) info = await get_url(url, 200, fmt='json') info = info['songs'][0] artist = ' / '.join([ar['name'] for ar in info['ar']]) diff --git a/modules/tweet/__init__.py b/modules/tweet/__init__.py index 8b090ed515..a478b2e443 100644 --- a/modules/tweet/__init__.py +++ b/modules/tweet/__init__.py @@ -3,7 +3,7 @@ from config import CFG from core.builtins import Bot -from core.builtins.message import Image +from core.builtins.message import Image, Url from core.component import module from core.dirty_check import check_bool, rickroll from core.logger import Logger @@ -88,4 +88,4 @@ async def _(msg: Bot.MessageSession, tweet: str, use_local=True): {'url': f'https://react-tweet-next.vercel.app/light/{tweet_id}', 'css': css, 'mw': False, 'element': 'article'}), request_private_ip=True) await msg.finish( - [Image(pic), f"https://twitter.com/{res_json['data']['user']['screen_name']}/status/{tweet_id}"]) + [Image(pic), Url(f"https://twitter.com/{res_json['data']['user']['screen_name']}/status/{tweet_id}")]) From 32540eef04c1527262b482a24df59ec8735031ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 13 Dec 2023 19:35:26 +0800 Subject: [PATCH 022/168] rewrite ncmusic --- modules/mod_dl/__init__.py | 4 +- modules/ncmusic/__init__.py | 88 ++++++++++++++++-------------- modules/ncmusic/locales/zh_cn.json | 3 +- modules/ncmusic/locales/zh_tw.json | 2 +- 4 files changed, 51 insertions(+), 46 deletions(-) diff --git a/modules/mod_dl/__init__.py b/modules/mod_dl/__init__.py index 3df9d863e0..1de1812559 100644 --- a/modules/mod_dl/__init__.py +++ b/modules/mod_dl/__init__.py @@ -146,11 +146,11 @@ async def get_curseforge_mod_file(modid: str, ver: str): if replied.isdigit(): replied = int(replied) if replied > len(cache_result): - return await msg.finish(msg.locale.t("mod_dl.message.invalid.out_of_range")) + await msg.finish(msg.locale.t("mod_dl.message.invalid.out_of_range")) else: mod_info = cache_result[replied - 1] else: - return await msg.finish(msg.locale.t("mod_dl.message.invalid.non_digital")) + await msg.finish(msg.locale.t("mod_dl.message.invalid.non_digital")) if mod_info[0] == "modrinth": # modrinth mod if ver is None: diff --git a/modules/ncmusic/__init__.py b/modules/ncmusic/__init__.py index 2c6de2f73e..6cc895032b 100644 --- a/modules/ncmusic/__init__.py +++ b/modules/ncmusic/__init__.py @@ -15,9 +15,10 @@ async def search(msg: Bot.MessageSession, keyword: str): url = f"https://ncmusic.akari-bot.top/search?keywords={keyword}" result = await get_url(url, 200, fmt='json') + song_count = result['result']['songCount'] legacy = True - if result['result']['songCount'] == 0: + if song_count == 0: await msg.finish(msg.locale.t('ncmusic.message.search.not_found')) songs = result['result']['songs'][:10] @@ -47,30 +48,32 @@ async def search(msg: Bot.MessageSession, keyword: str): legacy = False send_msg.append(Image(img)) - if len(result['result']['songs']) > 10: + if song_count > 10: + song_count = 10 send_msg.append(Plain(msg.locale.t('ncmusic.message.search.collapse'))) + + if song_count == 1: + send_msg.append(Plain(msg.locale.t('ncmusic.message.search.confirm'))) + query = await msg.wait_confirm(send_msg, delete=False) + if query: + sid = result['result']['songs'][0]['id'] + + else: send_msg.append(Plain(msg.locale.t('ncmusic.message.search.prompt'))) query = await msg.wait_reply(send_msg) query = query.as_display(text_only=True) - try: + + if query.isdigit(): query = int(query) - if query > 10: - await msg.finish(msg.locale.t('ncmusic.message.search.invalid.out_of_range')) - sid = result['result']['songs'][query - 1]['id'] - url = f"https://ncmusic.akari-bot.top/song/detail?ids={sid}" - info = await get_url(url, 200, fmt='json') - info = info['songs'][0] - artist = ' / '.join([ar['name'] for ar in info['ar']]) - song_page = f"https://music.163.com/#/song?id={info['id']}" - - send_msg = msg.locale.t('ncmusic.message.info', - name=info['name'], id=info['id'], - album=info['al']['name'], album_id=info['al']['id'], - artists=artist, detail=song_page) - await msg.finish([Image(info['al']['picUrl']), Plain(send_msg)]) - except Exception: + if query > song_count: + await msg.finish(msg.locale.t("mod_dl.message.invalid.out_of_range")) + else: + sid = result['result']['songs'][query - 1]['id'] + else: await msg.finish(msg.locale.t('ncmusic.message.search.invalid.non_digital')) + await info(msg, sid) + if legacy: send_msg = msg.locale.t('ncmusic.message.search.result') + '\n' @@ -79,35 +82,36 @@ async def search(msg: Bot.MessageSession, keyword: str): if 'transNames' in song: send_msg += f"（{' / '.join(song['transNames'])}）" send_msg += f"——{' / '.join(artist['name'] for artist in song['artists'])}" - send_msg += f"《{song['album']['name']}》" + if song['album']['name']: + send_msg += f"《{song['album']['name']}》" if 'transNames' in song['album']: send_msg += f"（{' / '.join(song['album']['transNames'])}）" send_msg += f"（{song['id']}）\n" - if len(result['result']['songs']) > 10: + if song_count > 10: + song_count = 10 send_msg += msg.locale.t('ncmusic.message.search.collapse') - send_msg += '\n' - send_msg += msg.locale.t('ncmusic.message.search.prompt') - query = await msg.wait_reply(send_msg) - query = query.as_display(text_only=True) - try: - query = int(query) - if query > 10: - await msg.finish(msg.locale.t('ncmusic.message.search.invalid.out_of_range')) - sid = result['result']['songs'][query - 1]['id'] - url = f"https://ncmusic.akari-bot.top/song/detail?ids={sid}" - info = await get_url(url, 200, fmt='json') - info = info['songs'][0] - artist = ' / '.join([ar['name'] for ar in info['ar']]) - song_page = f"https://music.163.com/#/song?id={info['id']}" - - send_msg = msg.locale.t('ncmusic.message.info', - name=info['name'], id=info['id'], - album=info['al']['name'], album_id=info['al']['id'], - artists=artist, detail=song_page) - await msg.finish([Image(info['al']['picUrl']), Plain(send_msg)]) - except Exception: - await msg.finish(msg.locale.t('ncmusic.message.search.invalid.non_digital')) + + if song_count == 1: + send_msg += '\n' + msg.locale.t('ncmusic.message.search.confirm') + query = await msg.wait_confirm(send_msg, delete=False) + if query: + sid = result['result']['songs'][0]['id'] + else： + send_msg += '\n' + msg.locale.t('ncmusic.message.search.prompt') + query = await msg.wait_reply(send_msg) + query = query.as_display(text_only=True) + + if query.isdigit(): + query = int(query) + if query > song_count: + await msg.finish(msg.locale.t("mod_dl.message.invalid.out_of_range")) + else: + sid = result['result']['songs'][query - 1]['id'] + else: + await msg.finish(msg.locale.t('ncmusic.message.search.invalid.non_digital')) + + await info(msg, sid) @ncmusic.handle('info {{ncmusic.help.info}}') diff --git a/modules/ncmusic/locales/zh_cn.json b/modules/ncmusic/locales/zh_cn.json index 5dda211bc0..48ba099dbf 100644 --- a/modules/ncmusic/locales/zh_cn.json +++ b/modules/ncmusic/locales/zh_cn.json @@ -6,10 +6,11 @@ "ncmusic.message.info": "歌名：${name}（${id}）\n专辑名：${album}（${album_id}）\n歌手：${artists}\n歌曲详情页：${detail}", "ncmusic.message.info.not_found": "找不到对应的音乐。", "ncmusic.message.search.collapse": "…仅显示前 10 条内容。", + "ncmusic.message.search.confirm": "是否查看音乐详细信息？", "ncmusic.message.search.invalid.non_digital": "无效的编号，必须为数字。", "ncmusic.message.search.invalid.out_of_range": "编号超出范围。", "ncmusic.message.search.not_found": "未找到结果。", - "ncmusic.message.search.prompt": "输入对应的序号以查看歌曲信息。", + "ncmusic.message.search.prompt": "回复对应的序号以查看歌曲信息。", "ncmusic.message.search.result": "搜索结果：", "ncmusic.message.search.table.header.album": "专辑名", "ncmusic.message.search.table.header.artists": "歌手", diff --git a/modules/ncmusic/locales/zh_tw.json b/modules/ncmusic/locales/zh_tw.json index f2c8a2778a..d76694ee90 100644 --- a/modules/ncmusic/locales/zh_tw.json +++ b/modules/ncmusic/locales/zh_tw.json @@ -7,7 +7,7 @@ "ncmusic.message.search.invalid.non_digital": "無效的編號，必須為數字。", "ncmusic.message.search.invalid.out_of_range": "編號超出範圍。", "ncmusic.message.search.not_found": "未找到結果。", - "ncmusic.message.search.prompt": "輸入對應編號取得歌曲資訊。", + "ncmusic.message.search.prompt": "回覆對應編號取得歌曲資訊。", "ncmusic.message.search.table.header.album": "專輯名稱", "ncmusic.message.search.table.header.artists": "歌手", "ncmusic.message.search.table.header.id": "編號", From f75522e4b61c6d18878e13f82af44722411e050c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 13 Dec 2023 19:35:40 +0800 Subject: [PATCH 023/168] locale --- modules/ncmusic/locales/zh_tw.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/ncmusic/locales/zh_tw.json b/modules/ncmusic/locales/zh_tw.json index d76694ee90..13a9431c09 100644 --- a/modules/ncmusic/locales/zh_tw.json +++ b/modules/ncmusic/locales/zh_tw.json @@ -1,16 +1,17 @@ { + "ncmusic.help.info": "取得音樂詳細資訊。", "ncmusic.help.search": "搜尋網易雲音樂。", "ncmusic.help.search.legacy": "搜尋網易雲音樂。（舊版）", - "ncmusic.help.info": "取得音樂詳細資訊。", "ncmusic.message.info": "歌名：${name}（${id}）\n專輯名：${album}（${album_id}）\n歌手：${artists}\n歌曲詳情頁：${detail}", "ncmusic.message.search.collapse": "…僅顯示前 10 條內容。", + "ncmusic.message.search.confirm": "是否查看音樂詳細資訊？", "ncmusic.message.search.invalid.non_digital": "無效的編號，必須為數字。", "ncmusic.message.search.invalid.out_of_range": "編號超出範圍。", "ncmusic.message.search.not_found": "未找到結果。", "ncmusic.message.search.prompt": "回覆對應編號取得歌曲資訊。", + "ncmusic.message.search.result": "搜尋結果：", "ncmusic.message.search.table.header.album": "專輯名稱", "ncmusic.message.search.table.header.artists": "歌手", "ncmusic.message.search.table.header.id": "編號", - "ncmusic.message.search.table.header.name": "歌名", - "ncmusic.message.search.result": "搜尋結果：" -} + "ncmusic.message.search.table.header.name": "歌名" +} \ No newline at end of file From 70b02b44db9c58d286ac7a4da9911e8702e91bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 13 Dec 2023 19:37:03 +0800 Subject: [PATCH 024/168] fix --- modules/ncmusic/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ncmusic/__init__.py b/modules/ncmusic/__init__.py index 6cc895032b..46a08df78d 100644 --- a/modules/ncmusic/__init__.py +++ b/modules/ncmusic/__init__.py @@ -97,7 +97,7 @@ async def search(msg: Bot.MessageSession, keyword: str): query = await msg.wait_confirm(send_msg, delete=False) if query: sid = result['result']['songs'][0]['id'] - else： + else: send_msg += '\n' + msg.locale.t('ncmusic.message.search.prompt') query = await msg.wait_reply(send_msg) query = query.as_display(text_only=True) From 66b4f0d04f0a4a489af8d537bce420b265ab8cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 13 Dec 2023 19:49:08 +0800 Subject: [PATCH 025/168] fix --- core/types/message/__init__.py | 2 +- modules/ncmusic/__init__.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/types/message/__init__.py b/core/types/message/__init__.py index bb24b16a1b..2cc722e41f 100644 --- a/core/types/message/__init__.py +++ b/core/types/message/__init__.py @@ -151,7 +151,7 @@ async def wait_next_message(self, message_chain=None, quote=True, delete=False, """ raise NotImplementedError - async def wait_reply(self, message_chain, quote=True, all_=False, append_instruction=True): + async def wait_reply(self, message_chain, quote=True, delete=False, all_=False, append_instruction=True): """ 一次性模板，用于等待触发对象回复消息。 :param message_chain: 需要发送的确认消息，可不填 diff --git a/modules/ncmusic/__init__.py b/modules/ncmusic/__init__.py index 46a08df78d..e9e75f6039 100644 --- a/modules/ncmusic/__init__.py +++ b/modules/ncmusic/__init__.py @@ -57,6 +57,8 @@ async def search(msg: Bot.MessageSession, keyword: str): query = await msg.wait_confirm(send_msg, delete=False) if query: sid = result['result']['songs'][0]['id'] + else: + return else: send_msg.append(Plain(msg.locale.t('ncmusic.message.search.prompt'))) @@ -97,6 +99,8 @@ async def search(msg: Bot.MessageSession, keyword: str): query = await msg.wait_confirm(send_msg, delete=False) if query: sid = result['result']['songs'][0]['id'] + else: + return else: send_msg += '\n' + msg.locale.t('ncmusic.message.search.prompt') query = await msg.wait_reply(send_msg) From 117f2f27132358f2c2e2263159d1f62f474e97f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 13 Dec 2023 19:52:56 +0800 Subject: [PATCH 026/168] Update --- modules/ncmusic/__init__.py | 8 ++++---- modules/ncmusic/locales/en_us.json | 2 +- modules/ncmusic/locales/zh_cn.json | 2 +- modules/ncmusic/locales/zh_tw.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/ncmusic/__init__.py b/modules/ncmusic/__init__.py index e9e75f6039..fbd386ea70 100644 --- a/modules/ncmusic/__init__.py +++ b/modules/ncmusic/__init__.py @@ -1,4 +1,4 @@ -from core.builtins import Bot, Plain, Image +from core.builtins import Bot, Plain, Image, Url from core.component import module from core.utils.image_table import image_table_render, ImageTable from core.utils.http import get_url @@ -126,13 +126,13 @@ async def info(msg: Bot.MessageSession, sid: str): if result['songs']: info = result['songs'][0] artist = ' / '.join([ar['name'] for ar in info['ar']]) - song_page = f"https://music.163.com/#/song?id={info['id']}" + song_url = f"https://music.163.com/#/song?id={info['id']}" send_msg = msg.locale.t('ncmusic.message.info', name=info['name'], id=info['id'], album=info['al']['name'], album_id=info['al']['id'], - artists=artist, detail=song_page) + artists=artist) - await msg.finish([Image(info['al']['picUrl']), Plain(send_msg)]) + await msg.finish([Image(info['al']['picUrl']), Url(song_url), Plain(send_msg)]) else: await msg.finish(msg.locale.t('ncmusic.message.info.not_found')) \ No newline at end of file diff --git a/modules/ncmusic/locales/en_us.json b/modules/ncmusic/locales/en_us.json index 4fabd6a210..fdab30f8dc 100644 --- a/modules/ncmusic/locales/en_us.json +++ b/modules/ncmusic/locales/en_us.json @@ -2,7 +2,7 @@ "ncmusic.help.search": "搜索网易云音乐。", "ncmusic.help.search.legacy": "搜索网易云音乐。（旧版）", "ncmusic.help.info": "获取音乐详细信息。", - "ncmusic.message.info": "歌名：${name}（${id}）\n专辑名：${album}（${album_id}）\n歌手：${artists}\n歌曲详情页：${detail}", + "ncmusic.message.info": "歌名：${name}（${id}）\n专辑名：${album}（${album_id}）\n歌手：${artists}", "ncmusic.message.search.collapse": "…仅显示前 10 条内容。", "ncmusic.message.search.invalid.non_digital": "无效的编号，必须为数字。", "ncmusic.message.search.invalid.out_of_range": "编号超出范围。", diff --git a/modules/ncmusic/locales/zh_cn.json b/modules/ncmusic/locales/zh_cn.json index 48ba099dbf..8c38ad254c 100644 --- a/modules/ncmusic/locales/zh_cn.json +++ b/modules/ncmusic/locales/zh_cn.json @@ -3,7 +3,7 @@ "ncmusic.help.info": "获取音乐详细信息。", "ncmusic.help.search": "搜索网易云音乐。", "ncmusic.help.search.legacy": "搜索网易云音乐。（旧版）", - "ncmusic.message.info": "歌名：${name}（${id}）\n专辑名：${album}（${album_id}）\n歌手：${artists}\n歌曲详情页：${detail}", + "ncmusic.message.info": "歌名：${name}（${id}）\n专辑名：${album}（${album_id}）\n歌手：${artists}", "ncmusic.message.info.not_found": "找不到对应的音乐。", "ncmusic.message.search.collapse": "…仅显示前 10 条内容。", "ncmusic.message.search.confirm": "是否查看音乐详细信息？", diff --git a/modules/ncmusic/locales/zh_tw.json b/modules/ncmusic/locales/zh_tw.json index 13a9431c09..1c5c705e39 100644 --- a/modules/ncmusic/locales/zh_tw.json +++ b/modules/ncmusic/locales/zh_tw.json @@ -2,7 +2,7 @@ "ncmusic.help.info": "取得音樂詳細資訊。", "ncmusic.help.search": "搜尋網易雲音樂。", "ncmusic.help.search.legacy": "搜尋網易雲音樂。（舊版）", - "ncmusic.message.info": "歌名：${name}（${id}）\n專輯名：${album}（${album_id}）\n歌手：${artists}\n歌曲詳情頁：${detail}", + "ncmusic.message.info": "歌名：${name}（${id}）\n專輯名：${album}（${album_id}）\n歌手：${artists}", "ncmusic.message.search.collapse": "…僅顯示前 10 條內容。", "ncmusic.message.search.confirm": "是否查看音樂詳細資訊？", "ncmusic.message.search.invalid.non_digital": "無效的編號，必須為數字。", From 2066682d385e0a34ef592d1b93bb3bf9a34ec49b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 13 Dec 2023 19:54:26 +0800 Subject: [PATCH 027/168] Update locale --- modules/ncmusic/__init__.py | 8 +++++--- modules/ncmusic/locales/en_us.json | 2 +- modules/ncmusic/locales/zh_cn.json | 2 +- modules/ncmusic/locales/zh_tw.json | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/ncmusic/__init__.py b/modules/ncmusic/__init__.py index fbd386ea70..e8b5f4a4af 100644 --- a/modules/ncmusic/__init__.py +++ b/modules/ncmusic/__init__.py @@ -129,9 +129,11 @@ async def info(msg: Bot.MessageSession, sid: str): song_url = f"https://music.163.com/#/song?id={info['id']}" send_msg = msg.locale.t('ncmusic.message.info', - name=info['name'], id=info['id'], - album=info['al']['name'], album_id=info['al']['id'], - artists=artist) + name=info['name'], + id=info['id'], + artists=artist, + album=info['al']['name'], + album_id=info['al']['id']) await msg.finish([Image(info['al']['picUrl']), Url(song_url), Plain(send_msg)]) else: diff --git a/modules/ncmusic/locales/en_us.json b/modules/ncmusic/locales/en_us.json index fdab30f8dc..7d1f6afdca 100644 --- a/modules/ncmusic/locales/en_us.json +++ b/modules/ncmusic/locales/en_us.json @@ -2,7 +2,7 @@ "ncmusic.help.search": "搜索网易云音乐。", "ncmusic.help.search.legacy": "搜索网易云音乐。（旧版）", "ncmusic.help.info": "获取音乐详细信息。", - "ncmusic.message.info": "歌名：${name}（${id}）\n专辑名：${album}（${album_id}）\n歌手：${artists}", + "ncmusic.message.info": "歌名：${name}（${id}）\n歌手：${artists}\n专辑名：${album}（${album_id}）", "ncmusic.message.search.collapse": "…仅显示前 10 条内容。", "ncmusic.message.search.invalid.non_digital": "无效的编号，必须为数字。", "ncmusic.message.search.invalid.out_of_range": "编号超出范围。", diff --git a/modules/ncmusic/locales/zh_cn.json b/modules/ncmusic/locales/zh_cn.json index 8c38ad254c..fbdd5471f8 100644 --- a/modules/ncmusic/locales/zh_cn.json +++ b/modules/ncmusic/locales/zh_cn.json @@ -3,7 +3,7 @@ "ncmusic.help.info": "获取音乐详细信息。", "ncmusic.help.search": "搜索网易云音乐。", "ncmusic.help.search.legacy": "搜索网易云音乐。（旧版）", - "ncmusic.message.info": "歌名：${name}（${id}）\n专辑名：${album}（${album_id}）\n歌手：${artists}", + "ncmusic.message.info": "歌名：${name}（${id}）\n歌手：${artists}\n专辑名：${album}（${album_id}）", "ncmusic.message.info.not_found": "找不到对应的音乐。", "ncmusic.message.search.collapse": "…仅显示前 10 条内容。", "ncmusic.message.search.confirm": "是否查看音乐详细信息？", diff --git a/modules/ncmusic/locales/zh_tw.json b/modules/ncmusic/locales/zh_tw.json index 1c5c705e39..58ce08f66f 100644 --- a/modules/ncmusic/locales/zh_tw.json +++ b/modules/ncmusic/locales/zh_tw.json @@ -2,7 +2,7 @@ "ncmusic.help.info": "取得音樂詳細資訊。", "ncmusic.help.search": "搜尋網易雲音樂。", "ncmusic.help.search.legacy": "搜尋網易雲音樂。（舊版）", - "ncmusic.message.info": "歌名：${name}（${id}）\n專輯名：${album}（${album_id}）\n歌手：${artists}", + "ncmusic.message.info": "歌名：${name}（${id}）\n歌手：${artists}\n專輯名：${album}（${album_id}）", "ncmusic.message.search.collapse": "…僅顯示前 10 條內容。", "ncmusic.message.search.confirm": "是否查看音樂詳細資訊？", "ncmusic.message.search.invalid.non_digital": "無效的編號，必須為數字。", From 768a3fe3244cec8bd949a0828d66275539d94567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 13 Dec 2023 20:25:32 +0800 Subject: [PATCH 028/168] Update cytoid --- modules/cytoid/locales/zh_cn.json | 1 + modules/cytoid/locales/zh_tw.json | 1 + modules/cytoid/rating.py | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/cytoid/locales/zh_cn.json b/modules/cytoid/locales/zh_cn.json index 94c1b91028..461bdc8558 100644 --- a/modules/cytoid/locales/zh_cn.json +++ b/modules/cytoid/locales/zh_cn.json @@ -6,6 +6,7 @@ "cytoid.help.r30": "查询 Cytoid 用户的 R30 列表。", "cytoid.help.unbind": "解绑用户。", "cytoid.message.b30.cooldown": "（据官方人员所述，此 API 的调用十分昂贵，故手动做出此限制，请谅解。）", + "cytoid.message.b30.level": "等级", "cytoid.message.bind.failed": "绑定失败，请检查输入。", "cytoid.message.bind.success": "绑定成功：", "cytoid.message.unbind.success": "解绑成功。", diff --git a/modules/cytoid/locales/zh_tw.json b/modules/cytoid/locales/zh_tw.json index 8195120328..b7384cad1e 100644 --- a/modules/cytoid/locales/zh_tw.json +++ b/modules/cytoid/locales/zh_tw.json @@ -6,6 +6,7 @@ "cytoid.help.r30": "查詢 Cytoid 使用者的 R30 列表。", "cytoid.help.unbind": "解除綁定使用者。", "cytoid.message.b30.cooldown": "（據官方人員所述，此 API 的呼叫非常昂貴，故手動做出此限制，請諒解。）", + "cytoid.message.b30.level": "等級", "cytoid.message.bind.failed": "綁定失敗，請校對輸入。", "cytoid.message.bind.success": "綁定成功：", "cytoid.message.unbind.success": "解除綁定成功。", diff --git a/modules/cytoid/rating.py b/modules/cytoid/rating.py index b7c066efe1..9569051867 100644 --- a/modules/cytoid/rating.py +++ b/modules/cytoid/rating.py @@ -98,7 +98,7 @@ async def mkresources(x, rank): rt = x['rating'] details = x['details'] _date = datetime.strptime(x['date'], "%Y-%m-%dT%H:%M:%S.%fZ") - local_time = _date + timedelta(hours=8) + local_time = _date + timedelta(hours=Config("timezone_offset", 8)) playtime = local_time.timestamp() nowtime = time.time() playtime = playtime - nowtime @@ -162,7 +162,7 @@ async def mkresources(x, rank): drawtext.text((get_img_width - get_name_width - 150, 30), nick, '#ffffff', font=font4) font5 = ImageFont.truetype(os.path.abspath('./assets/Noto Sans CJK DemiLight.otf'), 20) - level_text = f'等级 {profile_level}' + level_text = f'{msg.locale.t("cytoid.message.b30.level")} {profile_level}' level_text_width = font5.getsize(level_text)[0] level_text_height = font5.getsize(level_text)[1] img_level = Image.new("RGBA", (level_text_width + 20, 40), '#050a1a') From f35380c4f56e046af054bc605b66e2f8b19480d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 13 Dec 2023 20:26:35 +0800 Subject: [PATCH 029/168] fix --- modules/cytoid/rating.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cytoid/rating.py b/modules/cytoid/rating.py index 9569051867..7ce91cd2de 100644 --- a/modules/cytoid/rating.py +++ b/modules/cytoid/rating.py @@ -98,7 +98,7 @@ async def mkresources(x, rank): rt = x['rating'] details = x['details'] _date = datetime.strptime(x['date'], "%Y-%m-%dT%H:%M:%S.%fZ") - local_time = _date + timedelta(hours=Config("timezone_offset", 8)) + local_time = _date + timedelta(hours=int(Config("timezone_offset", 8))) playtime = local_time.timestamp() nowtime = time.time() playtime = playtime - nowtime From c80969d390be7e059d8ef14f8928efe572423fa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 13 Dec 2023 20:56:11 +0800 Subject: [PATCH 030/168] Replace send datetime 2 formatted --- core/builtins/message/__init__.py | 11 ++++++----- modules/exchange_rate/__init__.py | 4 ++-- modules/maimai/libraries/maimaidx_project.py | 13 +++++++++---- modules/wiki/audit.py | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/core/builtins/message/__init__.py b/core/builtins/message/__init__.py index 5daf4ed728..428fc2c70c 100644 --- a/core/builtins/message/__init__.py +++ b/core/builtins/message/__init__.py @@ -131,14 +131,15 @@ async def check_permission(self): checkPermission = check_permission checkSuperUser = check_super_user - def ts2strftime(self, timestamp: float, date=True, seconds=True, timezone=True): + def ts2strftime(self, timestamp: float, date=True, time=True, seconds=True, timezone=True): ftime_template = [] if date: ftime_template.append(self.locale.t("time.date.format")) - if seconds: - ftime_template.append(self.locale.t("time.time.format")) - else: - ftime_template.append(self.locale.t("time.time.nosec.format")) + if time: + if seconds: + ftime_template.append(self.locale.t("time.time.format")) + else: + ftime_template.append(self.locale.t("time.time.nosec.format")) if timezone: if self._tz_offset == "+0": ftime_template.append(f"(UTC)") diff --git a/modules/exchange_rate/__init__.py b/modules/exchange_rate/__init__.py index 7b8ce6423f..bfb9ccfaa1 100644 --- a/modules/exchange_rate/__init__.py +++ b/modules/exchange_rate/__init__.py @@ -60,7 +60,7 @@ async def exchange(base_currency, target_currency, amount: float, msg): url = f'https://v6.exchangerate-api.com/v6/{api_key}/pair/{base_currency}/{target_currency}/{amount}' data = await get_url(url, 200, fmt='json') - current_time = datetime.datetime.now().timestamp() + time = msg.ts2strftime(datetime.datetime.now().timestamp(), time=False, timezone=False) if data['result'] == "success": exchange_rate = data['conversion_result'] await msg.finish( @@ -69,7 +69,7 @@ async def exchange(base_currency, target_currency, amount: float, msg): base=base_currency, exchange_rate=exchange_rate, target=target_currency, - time=msg.ts2strftime(current_time, seconds=False, timezone=False))) + time=time)) else: raise Exception(data['error-type']) diff --git a/modules/maimai/libraries/maimaidx_project.py b/modules/maimai/libraries/maimaidx_project.py index 9dfe9e5164..32386a8f61 100644 --- a/modules/maimai/libraries/maimaidx_project.py +++ b/modules/maimai/libraries/maimaidx_project.py @@ -112,14 +112,19 @@ async def get_rank(msg, payload): average_rating = total_rating / total_rank surpassing_rate = (total_rank - rank) / total_rank * 100 - time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") + time = msg.ts2strftime(datetime.now().timestamp(), timezone=False) formatted_average_rating = "{:.4f}".format(average_rating) formatted_surpassing_rate = "{:.2f}".format(surpassing_rate) - await msg.finish(msg.locale.t('maimai.message.rank', time=time, total_rank=total_rank, user=username, - rating=rating, rank=rank, average_rating=formatted_average_rating, - surpassing_rate=formatted_surpassing_rate)) + await msg.finish(msg.locale.t('maimai.message.rank', + time=time, + total_rank=total_rank, + user=username, + rating=rating, + rank=rank, + average_rating=formatted_average_rating, + surpassing_rate=formatted_surpassing_rate)) async def get_player_score(msg, payload, input_id): diff --git a/modules/wiki/audit.py b/modules/wiki/audit.py index b45f2787ec..49a73946fe 100644 --- a/modules/wiki/audit.py +++ b/modules/wiki/audit.py @@ -14,7 +14,7 @@ @aud.command(['trust ', 'block ']) async def _(msg: Bot.MessageSession): - date = datetime.now().strftime("%Y-%m-%d %H:%M:%S") + date = msg.ts2strftime(datetime.now().timestamp(), timezone=False) api = msg.parsed_msg[''] check = await WikiLib(api).check_wiki_available() if check.available: From c13d4df7840bcf9ae898e303969cc4376cb0f1cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 13 Dec 2023 21:39:52 +0800 Subject: [PATCH 031/168] Add timeout --- core/builtins/message/__init__.py | 31 ++++++++++++++++++++++--------- core/types/message/__init__.py | 22 ++++++++++++++-------- modules/chemical_code/__init__.py | 4 ++-- modules/tic_tac_toe/__init__.py | 2 +- modules/twenty_four/__init__.py | 2 +- 5 files changed, 40 insertions(+), 21 deletions(-) diff --git a/core/builtins/message/__init__.py b/core/builtins/message/__init__.py index 428fc2c70c..6f1a5f2050 100644 --- a/core/builtins/message/__init__.py +++ b/core/builtins/message/__init__.py @@ -35,7 +35,7 @@ def __init__(self, 'timezone_offset', Config('timezone_offset', '+8')) self.timezone_offset = parse_time_string(self._tz_offset) - async def wait_confirm(self, message_chain=None, quote=True, delete=True, append_instruction=True) -> bool: + async def wait_confirm(self, message_chain=None, quote=True, delete=True, timeout=120, append_instruction=True) -> bool: send = None ExecutionLockList.remove(self) if message_chain is not None: @@ -45,7 +45,10 @@ async def wait_confirm(self, message_chain=None, quote=True, delete=True, append send = await self.send_message(message_chain, quote) flag = asyncio.Event() MessageTaskManager.add_task(self, flag) - await flag.wait() + try: + await asyncio.wait_for(flag.wait(), timeout=timeout) + except asyncio.TimeoutError: + raise WaitCancelException result = MessageTaskManager.get_result(self) if result is not None: if message_chain is not None and delete: @@ -56,7 +59,7 @@ async def wait_confirm(self, message_chain=None, quote=True, delete=True, append else: raise WaitCancelException - async def wait_next_message(self, message_chain=None, quote=True, delete=False, + async def wait_next_message(self, message_chain=None, quote=True, delete=False, timeout=120, append_instruction=True) -> MessageSessionT: sent = None ExecutionLockList.remove(self) @@ -67,7 +70,10 @@ async def wait_next_message(self, message_chain=None, quote=True, delete=False, sent = await self.send_message(message_chain, quote) flag = asyncio.Event() MessageTaskManager.add_task(self, flag) - await flag.wait() + try: + await asyncio.wait_for(flag.wait(), timeout=timeout) + except asyncio.TimeoutError: + raise WaitCancelException result = MessageTaskManager.get_result(self) if delete and sent is not None: await sent.delete() @@ -76,7 +82,8 @@ async def wait_next_message(self, message_chain=None, quote=True, delete=False, else: raise WaitCancelException - async def wait_reply(self, message_chain, quote=True, delete=False, all_=False, append_instruction=True) -> MessageSessionT: + async def wait_reply(self, message_chain, quote=True, delete=False, timeout=120, + all_=False, append_instruction=True) -> MessageSessionT: self.tmp['enforce_send_by_master_client'] = True send = None ExecutionLockList.remove(self) @@ -86,7 +93,10 @@ async def wait_reply(self, message_chain, quote=True, delete=False, all_=False, send = await self.send_message(message_chain, quote) flag = asyncio.Event() MessageTaskManager.add_task(self, flag, reply=send.message_id, all_=all_) - await flag.wait() + try: + await asyncio.wait_for(flag.wait(), timeout=timeout) + except asyncio.TimeoutError: + raise WaitCancelException result = MessageTaskManager.get_result(self) if delete and send is not None: await send.delete() @@ -95,15 +105,18 @@ async def wait_reply(self, message_chain, quote=True, delete=False, all_=False, else: raise WaitCancelException - async def wait_anyone(self, message_chain=None, delete=False) -> MessageSessionT: + async def wait_anyone(self, message_chain=None, quote=False, delete=False, timeout=120) -> MessageSessionT: send = None ExecutionLockList.remove(self) if message_chain is not None: message_chain = MessageChain(message_chain) - send = await self.send_message(message_chain, quote=False) + send = await self.send_message(message_chain, quote) flag = asyncio.Event() MessageTaskManager.add_task(self, flag, all_=True) - await flag.wait() + try: + await asyncio.wait_for(flag.wait(), timeout=timeout) + except asyncio.TimeoutError: + raise WaitCancelException result = MessageTaskManager.get()[self.target.target_id]['all'][self] if 'result' in result: if send is not None and delete: diff --git a/core/types/message/__init__.py b/core/types/message/__init__.py index 2cc722e41f..2a10734688 100644 --- a/core/types/message/__init__.py +++ b/core/types/message/__init__.py @@ -125,47 +125,53 @@ async def send_direct_message(self, message_chain, disable_secret_check=False, a 用于向消息发送者直接发送消息。 :param message_chain: 消息链，若传入str则自动创建一条带有Plain元素的消息链 :param disable_secret_check: 是否禁用消息检查（默认为False） - :param allow_split_image: 是否允许拆分图片发送（此参数作接口兼容用，仅telegram平台使用了切割） + :param allow_split_image: 是否允许拆分图片发送（此参数作接口兼容用，仅Telegram平台使用了切割） :return: 被发送的消息链 """ await self.send_message(message_chain, disable_secret_check=disable_secret_check, quote=False, allow_split_image=allow_split_image) - async def wait_confirm(self, message_chain=None, quote=True, delete=True): + async def wait_confirm(self, message_chain=None, quote=True, delete=True, timeout=120, append_instruction=True): """ 一次性模板，用于等待触发对象确认。 :param message_chain: 需要发送的确认消息，可不填 :param quote: 是否引用传入dict中的消息（默认为True） - :param delete: 是否在触发后删除消息 + :param delete: 是否在触发后删除消息（默认为True） + :param timeout: 超时时间 :return: 若对象发送confirm_command中的其一文本时返回True，反之则返回False """ raise NotImplementedError - async def wait_next_message(self, message_chain=None, quote=True, delete=False, append_instruction=True): + async def wait_next_message(self, message_chain=None, quote=True, delete=False, timeout=120, append_instruction=True): """ 一次性模板，用于等待对象的下一条消息。 :param message_chain: 需要发送的确认消息，可不填 :param quote: 是否引用传入dict中的消息（默认为True） - :param delete: 是否在触发后删除消息 + :param delete: 是否在触发后删除消息（默认为False） + :param timeout: 超时时间 :return: 下一条消息的MessageChain对象 """ raise NotImplementedError - async def wait_reply(self, message_chain, quote=True, delete=False, all_=False, append_instruction=True): + async def wait_reply(self, message_chain, quote=True, delete=False, timeout=120, all_=False, append_instruction=True): """ 一次性模板，用于等待触发对象回复消息。 :param message_chain: 需要发送的确认消息，可不填 :param quote: 是否引用传入dict中的消息（默认为True） + :param delete: 是否在触发后删除消息（默认为False） + :param timeout: 超时时间 :param all_: 是否设置触发对象为对象内的所有人（默认为False） :return: 回复消息的MessageChain对象 """ raise NotImplementedError - async def wait_anyone(self, message_chain=None, delete=False): + async def wait_anyone(self, message_chain=None, quote=False, delete=False, timeout=120): """ 一次性模板，用于等待触发发送者所属对象内所有成员确认。 :param message_chain: 需要发送的确认消息，可不填 - :param delete: 是否在触发后删除消息 + :param quote: 是否引用传入dict中的消息（默认为False） + :param delete: 是否在触发后删除消息（默认为False） + :param timeout: 超时时间 :return: 任意人的MessageChain对象 """ raise NotImplementedError diff --git a/modules/chemical_code/__init__.py b/modules/chemical_code/__init__.py index aa42333fed..6358622063 100644 --- a/modules/chemical_code/__init__.py +++ b/modules/chemical_code/__init__.py @@ -170,7 +170,7 @@ async def chemical_code(msg: Bot.MessageSession, id=None, random_mode=True, capt set_timeout = 2 async def ans(msg: Bot.MessageSession, answer, random_mode): - wait = await msg.wait_anyone() + wait = await msg.wait_anyone(timeout=3600) if play_state[msg.target.target_id]['active']: if (wait_text := wait.as_display(text_only=True)) != answer: if re.match(r'^[A-Za-z0-9]+$', wait_text): @@ -246,7 +246,7 @@ async def timer(start): else: result = await msg.wait_next_message([Plain(msg.locale.t('chemical_code.message.showid', id=csr["id"])), Image(newpath), Plain(msg.locale.t('chemical_code.message.captcha', - times=set_timeout))], append_instruction=False) + times=set_timeout))], timeout=3600, append_instruction=False) if play_state[msg.target.target_id]['active']: if result.as_display(text_only=True) == csr['name']: send_ = msg.locale.t('chemical_code.message.correct') diff --git a/modules/tic_tac_toe/__init__.py b/modules/tic_tac_toe/__init__.py index 21a4a3ed68..f35b25625d 100644 --- a/modules/tic_tac_toe/__init__.py +++ b/modules/tic_tac_toe/__init__.py @@ -79,7 +79,7 @@ async def callback(board: List[List[int]]): while True: if not play_state[msg.target.target_id]['active']: raise TerminationError - wait = await msg.wait_anyone() + wait = await msg.wait_anyone(timeout=3600) text = wait.as_display(text_only=True) if text == 'stop': raise TerminationError diff --git a/modules/twenty_four/__init__.py b/modules/twenty_four/__init__.py index 0a9a791ecf..1294787bee 100644 --- a/modules/twenty_four/__init__.py +++ b/modules/twenty_four/__init__.py @@ -108,7 +108,7 @@ async def _(msg: Bot.MessageSession): numbers = [random.randint(1, 13) for _ in range(4)] has_solution_flag = await has_solution(numbers) - answer = await msg.wait_next_message(msg.locale.t('twenty_four.message', numbers=numbers), append_instruction=False) + answer = await msg.wait_next_message(msg.locale.t('twenty_four.message', numbers=numbers), timeout=3600, append_instruction=False) expression = answer.as_display(text_only=True) if play_state[msg.target.target_id]['active']: if expression.lower() in no_solution: From e08dbb9678fef627dd20fc1e6e63b4c146df5a6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 13 Dec 2023 22:50:05 +0800 Subject: [PATCH 032/168] Update locale --- locales/en_us.json | 5 +++-- locales/zh_cn.json | 3 ++- locales/zh_tw.json | 3 ++- modules/chemical_code/__init__.py | 4 +--- modules/idlist/__init__.py | 2 +- modules/idlist/locales/en_us.json | 2 +- modules/idlist/locales/zh_cn.json | 2 +- modules/idlist/locales/zh_tw.json | 2 +- modules/ncmusic/__init__.py | 4 ++-- modules/ncmusic/locales/en_us.json | 1 - modules/ncmusic/locales/zh_cn.json | 1 - modules/ncmusic/locales/zh_tw.json | 3 +-- modules/wiki/locales/en_us.json | 1 - modules/wiki/locales/zh_cn.json | 1 - modules/wiki/locales/zh_tw.json | 1 - modules/wiki/utils/ab.py | 6 ++++-- modules/wiki/utils/newbie.py | 4 +++- modules/wiki/utils/rc.py | 6 ++++-- 18 files changed, 26 insertions(+), 25 deletions(-) diff --git a/locales/en_us.json b/locales/en_us.json index 915b672c60..e06179b5ce 100644 --- a/locales/en_us.json +++ b/locales/en_us.json @@ -35,6 +35,7 @@ "game.message.stop.none": "This game is not in progress.", "i18n.prompt.fallback.failed": "(If you're seeing this strange string, it means something we've messed up!\nPlease send the issue back to\n${url}\nso that we can fix it in time.)", "language": "English", + "message.collapse": "...show only the first ${amount} items.", "message.cooldown": "${time} second(s) have passed since the last execution. The cooldown time of this command are ${cd_time} second(s).", "message.delimiter": ", ", "message.end": ".", @@ -58,7 +59,7 @@ "petal.message.lost.limit": "(You can't lose more petals today.)", "petal.message.lost.success": "You lost ${amount} petal(s).", "success": "Success.", - "time.date.format": "%B %d, %Y,", + "time.date.format": "%B %d, %Y", "time.time.format": "%H:%M:%S", "time.time.nosec.format": "%H:%M", "tos.reason": "Reason: ", @@ -73,4 +74,4 @@ "tos.warning.last": "This is the last warning.", "unknown": "Unknown", "yes": "Yes" -} +} \ No newline at end of file diff --git a/locales/zh_cn.json b/locales/zh_cn.json index 95b7d737bd..12c51ccdba 100644 --- a/locales/zh_cn.json +++ b/locales/zh_cn.json @@ -41,6 +41,7 @@ "message.reply.prompt": "（请使用指定的词语回复本条消息）", "message.wait.confirm.prompt.type1": "（发送“是”或符合确认条件的词语来确认）", "message.wait.confirm.prompt.type2": "（发送符合条件的词语来确认）", + "message.collapse": "……仅显示前 ${amount} 条内容。", "no": "否", "none": "无", "parser.admin.module.permission.denied": "“${module}”模块下的命令仅能被该群组的管理员所使用，请联系管理员执行此命令。", @@ -58,7 +59,7 @@ "petal.message.lost.limit": "（本日失去花瓣已达到每日上限。）", "petal.message.lost.success": "失去了 ${amount} 片花瓣。", "success": "成功。", - "time.date.format": "%Y年%m月%d日", + "time.date.format": "%Y 年 %m 月 %d 日", "time.time.format": "%H:%M:%S", "time.time.nosec.format": "%H:%M", "tos.reason": "具体原因：", diff --git a/locales/zh_tw.json b/locales/zh_tw.json index 6ace44983a..ebeac2506e 100644 --- a/locales/zh_tw.json +++ b/locales/zh_tw.json @@ -35,6 +35,7 @@ "game.message.stop.none": "目前此遊戲沒有在進行。", "i18n.prompt.fallback.failed": "（如果你看到了這條奇怪的字串，說明我們又搞錯了什麼！\n請將問題回報至\n${url}\n以便我們快速解決此問題。）", "language": "繁體中文", + "message.collapse": "……僅顯示前 ${amount} 條內容。", "message.cooldown": "距上次執行已過去 ${time} 秒，此指令的冷卻時間為 ${cd_time} 秒。", "message.delimiter": "、", "message.end": "。", @@ -73,4 +74,4 @@ "tos.warning.last": "這是最後警告。", "unknown": "未知", "yes": "是" -} +} \ No newline at end of file diff --git a/modules/chemical_code/__init__.py b/modules/chemical_code/__init__.py index 6358622063..e14e8da533 100644 --- a/modules/chemical_code/__init__.py +++ b/modules/chemical_code/__init__.py @@ -65,7 +65,7 @@ async def search_csr(id=None): else: answer_id = random.randint(1, CSID_RANGE_MAX) answer_id = str(answer_id) - Logger.info("ChemSpider ID: " + answer_id) + Logger.info(f'ChemSpider ID: {answer_id}') get = await get_url(csr_link + '/Search.aspx?q=' + answer_id, 200, fmt='text') # Logger.info(get) soup = BeautifulSoup(get, 'html.parser') @@ -147,11 +147,9 @@ async def chemical_code(msg: Bot.MessageSession, id=None, random_mode=True, capt # print(csr) play_state[msg.target.target_id]['answer'] = csr['name'] Logger.info(f'Answer: {csr["name"]}') - Logger.info(f'Image: {csr["image"]}') download = False if csr["id"] in special_id: # 如果正确答案在 special_id 中 file_path = os.path.abspath(f'./assets/chemicalcode/special_id/{csr["id"]}.png') - Logger.info(f'File path: {file_path}') exists_file = os.path.exists(file_path) if exists_file: download = file_path diff --git a/modules/idlist/__init__.py b/modules/idlist/__init__.py index 81c2f2935e..53ca741702 100644 --- a/modules/idlist/__init__.py +++ b/modules/idlist/__init__.py @@ -21,7 +21,7 @@ async def _(msg: Bot.MessageSession, query: str): for x in result[0:5]: plain_texts.append(f'{x["enumName"]}：{x["key"]} -> {x["value"]}') if resp['data']['count'] > 5: - plain_texts.append(msg.locale.t('idlist.message.collapse')) + plain_texts.append(msg.locale.t('message.collapse', amount='5') + msg.locale.t('idlist.message.collapse')) plain_texts.append('https://ca.projectxero.top/idlist/' + resp['data']['hash']) await msg.finish('\n'.join(plain_texts)) else: diff --git a/modules/idlist/locales/en_us.json b/modules/idlist/locales/en_us.json index 04fd7083eb..d88696aac7 100644 --- a/modules/idlist/locales/en_us.json +++ b/modules/idlist/locales/en_us.json @@ -1,5 +1,5 @@ { "idlist.help": "Query ID table of Minecraft: Bedrock Edition, supported only in Chinese.", - "idlist.message.collapse": "...show only the first 5 results, see more: ", + "idlist.message.collapse": "See more: ", "idlist.message.none": "No results found." } \ No newline at end of file diff --git a/modules/idlist/locales/zh_cn.json b/modules/idlist/locales/zh_cn.json index 6c183a1ea3..efa7023918 100644 --- a/modules/idlist/locales/zh_cn.json +++ b/modules/idlist/locales/zh_cn.json @@ -1,5 +1,5 @@ { "idlist.help": "查询 Minecraft：基岩版的 ID 表。", - "idlist.message.collapse": "...仅显示前 5 条结果，查看更多：", + "idlist.message.collapse": "查看更多：", "idlist.message.none": "没有找到结果。" } \ No newline at end of file diff --git a/modules/idlist/locales/zh_tw.json b/modules/idlist/locales/zh_tw.json index 1dae22979b..ca4f4a7d2a 100644 --- a/modules/idlist/locales/zh_tw.json +++ b/modules/idlist/locales/zh_tw.json @@ -1,5 +1,5 @@ { "idlist.help": "查詢 Minecraft：基岩版的 ID 表。", - "idlist.message.collapse": "...僅顯示前 5 條結果，檢視更多：", + "idlist.message.collapse": "檢視更多：", "idlist.message.none": "沒有找到結果。" } \ No newline at end of file diff --git a/modules/ncmusic/__init__.py b/modules/ncmusic/__init__.py index e8b5f4a4af..a5e6e8d386 100644 --- a/modules/ncmusic/__init__.py +++ b/modules/ncmusic/__init__.py @@ -50,7 +50,7 @@ async def search(msg: Bot.MessageSession, keyword: str): send_msg.append(Image(img)) if song_count > 10: song_count = 10 - send_msg.append(Plain(msg.locale.t('ncmusic.message.search.collapse'))) + send_msg.append(Plain(msg.locale.t("message.collapse", amount="10"))) if song_count == 1: send_msg.append(Plain(msg.locale.t('ncmusic.message.search.confirm'))) @@ -92,7 +92,7 @@ async def search(msg: Bot.MessageSession, keyword: str): if song_count > 10: song_count = 10 - send_msg += msg.locale.t('ncmusic.message.search.collapse') + send_msg += msg.locale.t("message.collapse", amount="10") if song_count == 1: send_msg += '\n' + msg.locale.t('ncmusic.message.search.confirm') diff --git a/modules/ncmusic/locales/en_us.json b/modules/ncmusic/locales/en_us.json index 7d1f6afdca..8f70882a75 100644 --- a/modules/ncmusic/locales/en_us.json +++ b/modules/ncmusic/locales/en_us.json @@ -3,7 +3,6 @@ "ncmusic.help.search.legacy": "搜索网易云音乐。（旧版）", "ncmusic.help.info": "获取音乐详细信息。", "ncmusic.message.info": "歌名：${name}（${id}）\n歌手：${artists}\n专辑名：${album}（${album_id}）", - "ncmusic.message.search.collapse": "…仅显示前 10 条内容。", "ncmusic.message.search.invalid.non_digital": "无效的编号，必须为数字。", "ncmusic.message.search.invalid.out_of_range": "编号超出范围。", "ncmusic.message.search.not_found": "未找到结果。", diff --git a/modules/ncmusic/locales/zh_cn.json b/modules/ncmusic/locales/zh_cn.json index fbdd5471f8..69ef552061 100644 --- a/modules/ncmusic/locales/zh_cn.json +++ b/modules/ncmusic/locales/zh_cn.json @@ -5,7 +5,6 @@ "ncmusic.help.search.legacy": "搜索网易云音乐。（旧版）", "ncmusic.message.info": "歌名：${name}（${id}）\n歌手：${artists}\n专辑名：${album}（${album_id}）", "ncmusic.message.info.not_found": "找不到对应的音乐。", - "ncmusic.message.search.collapse": "…仅显示前 10 条内容。", "ncmusic.message.search.confirm": "是否查看音乐详细信息？", "ncmusic.message.search.invalid.non_digital": "无效的编号，必须为数字。", "ncmusic.message.search.invalid.out_of_range": "编号超出范围。", diff --git a/modules/ncmusic/locales/zh_tw.json b/modules/ncmusic/locales/zh_tw.json index 58ce08f66f..f76f04c5df 100644 --- a/modules/ncmusic/locales/zh_tw.json +++ b/modules/ncmusic/locales/zh_tw.json @@ -3,8 +3,7 @@ "ncmusic.help.search": "搜尋網易雲音樂。", "ncmusic.help.search.legacy": "搜尋網易雲音樂。（舊版）", "ncmusic.message.info": "歌名：${name}（${id}）\n歌手：${artists}\n專輯名：${album}（${album_id}）", - "ncmusic.message.search.collapse": "…僅顯示前 10 條內容。", - "ncmusic.message.search.confirm": "是否查看音樂詳細資訊？", + "ncmusic.message.search.confirm": "是否檢視音樂詳細資訊？", "ncmusic.message.search.invalid.non_digital": "無效的編號，必須為數字。", "ncmusic.message.search.invalid.out_of_range": "編號超出範圍。", "ncmusic.message.search.not_found": "未找到結果。", diff --git a/modules/wiki/locales/en_us.json b/modules/wiki/locales/en_us.json index 6333f9cd36..3d669a7870 100644 --- a/modules/wiki/locales/en_us.json +++ b/modules/wiki/locales/en_us.json @@ -78,7 +78,6 @@ "wiki.message.set.default": "There is no start wiki set. Defaulted to the Chinese Minecraft Wiki. Use \"${prefix}wiki set\" to set a custom start wiki.\nExample: ${prefix}wiki set https://zh.minecraft.wiki/", "wiki.message.set.success": "Successfully set up start wiki: ${name}", "wiki.message.utils.banned": "检测到外来信息介入，请前往滥用日志查看所有消息。", - "wiki.message.utils.collapse": "…show only the first 5 items.", "wiki.message.utils.qq.prompt": "Tips：复制粘贴下面的任一消息到聊天窗口发送可获取此次改动详细信息的截图。", "wiki.message.utils.time.infinity": "Infinity", "wiki.message.utils.wikilib.error.empty": "An error occurred: API returned no contents. Please contact the site administrator for reasons.", diff --git a/modules/wiki/locales/zh_cn.json b/modules/wiki/locales/zh_cn.json index 7d9a2d53a2..1b17a1a782 100644 --- a/modules/wiki/locales/zh_cn.json +++ b/modules/wiki/locales/zh_cn.json @@ -78,7 +78,6 @@ "wiki.message.set.default": "没有设置起始 Wiki，已默认为中文 Minecraft Wiki，使用“${prefix}wiki set”设置自定义起始 Wiki。\n示例：${prefix}wiki set https://zh.minecraft.wiki/", "wiki.message.set.success": "成功设置起始 Wiki：${name}", "wiki.message.utils.banned": "检测到外来信息介入，请前往滥用日志查看所有消息。", - "wiki.message.utils.collapse": "…仅显示前 5 条内容。", "wiki.message.utils.qq.prompt": "Tips：复制粘贴下面的任一消息到聊天窗口发送可获取此次改动详细信息的截图。", "wiki.message.utils.time.infinity": "无限期", "wiki.message.utils.wikilib.error.empty": "发生错误：API 未返回任何内容，请联系此站点管理员获取原因。", diff --git a/modules/wiki/locales/zh_tw.json b/modules/wiki/locales/zh_tw.json index 715d60d322..91ec0751de 100644 --- a/modules/wiki/locales/zh_tw.json +++ b/modules/wiki/locales/zh_tw.json @@ -78,7 +78,6 @@ "wiki.message.set.default": "沒有設定起始 Wiki，已預設為中文 Minecraft Wiki，使用「${prefix}wiki set」設定自訂起始 Wiki。\n示例：${prefix}wiki set https://zh.minecraft.wiki/", "wiki.message.set.success": "成功設定起始 Wiki：${name}", "wiki.message.utils.banned": "檢測到外來訊息介入，請前往過濾器日誌查看所有訊息。", - "wiki.message.utils.collapse": "…僅顯示前 5 條內容。", "wiki.message.utils.qq.prompt": "Tips：複製並貼上下方的任意訊息到聊天視窗並傳送可取得此次改動詳細訊息的截圖。", "wiki.message.utils.time.infinity": "無限期", "wiki.message.utils.wikilib.error.empty": "發生錯誤：API 未返回任何內容，請聯絡此站點管理員取得原因。", diff --git a/modules/wiki/utils/ab.py b/modules/wiki/utils/ab.py index 062c0e60a0..1a8e8e9b6e 100644 --- a/modules/wiki/utils/ab.py +++ b/modules/wiki/utils/ab.py @@ -17,6 +17,8 @@ async def ab(msg: Bot.MessageSession, wiki_url): y = await check(*d) y = '\n'.join(z['content'] for z in y) if y.find("<吃掉了>") != -1 or y.find("<全部吃掉了>") != -1: - return f'{str(Url(pageurl))}\n{y}\n{msg.locale.t("wiki.message.utils.collapse")}\n{msg.locale.t("wiki.message.utils.banned")}' + y = y.replace("<吃掉了>", msg.locale.t("check.redacted")) + y = y.replace("<全部吃掉了>", msg.locale.t("check.redacted.all")) + return f'{str(Url(pageurl))}\n{y}\n{msg.locale.t("message.collapse", amount="5")}\n{msg.locale.t("wiki.message.utils.banned")}' else: - return f'{str(Url(pageurl))}\n{y}\n' + msg.locale.t("wiki.message.utils.collapse") + return f'{str(Url(pageurl))}\n{y}\n' + msg.locale.t("message.collapse", amount="5") diff --git a/modules/wiki/utils/newbie.py b/modules/wiki/utils/newbie.py index 405f3f15ce..c38990127c 100644 --- a/modules/wiki/utils/newbie.py +++ b/modules/wiki/utils/newbie.py @@ -14,7 +14,9 @@ async def newbie(msg: Bot.MessageSession, wiki_url): d.append(x['title']) y = await check(*d) y = '\n'.join(z['content'] for z in y) - g = f'{pageurl}\n{y}\n{msg.locale.t("wiki.message.utils.collapse")}' + g = f'{pageurl}\n{y}\n{msg.locale.t("message.collapse", amount="5")}' if g.find("<吃掉了>") != -1 or g.find("<全部吃掉了>") != -1: + g = g.replace("<吃掉了>", msg.locale.t("check.redacted")) + g = g.replace("<全部吃掉了>", msg.locale.t("check.redacted.all")) g += f'\n{msg.locale.t("wiki.message.utils.banned")}' return g diff --git a/modules/wiki/utils/rc.py b/modules/wiki/utils/rc.py index 3d3acb9391..230baee0ef 100644 --- a/modules/wiki/utils/rc.py +++ b/modules/wiki/utils/rc.py @@ -16,7 +16,9 @@ async def rc(msg: Bot.MessageSession, wiki_url): y = await check(*d) y = '\n'.join(z['content'] for z in y) if y.find("<吃掉了>") != -1 or y.find("<全部吃掉了>") != -1: - msg = f'{str(Url(pageurl))}\n{y}\n{msg.locale.t("wiki.message.utils.collapse")}\n{msg.locale.t("wiki.message.utils.banned")}' + y = y.replace("<吃掉了>", msg.locale.t("check.redacted")) + y = y.replace("<全部吃掉了>", msg.locale.t("check.redacted.all")) + msg = f'{str(Url(pageurl))}\n{y}\n{msg.locale.t("message.collapse", amount="5")}\n{msg.locale.t("wiki.message.utils.banned")}' else: - msg = f'{str(Url(pageurl))}\n{y}\n{msg.locale.t("wiki.message.utils.collapse")}' + msg = f'{str(Url(pageurl))}\n{y}\n{msg.locale.t("message.collapse", amount="5")}' return msg From 06ac05fd6ce0239e6e05059aacbf7b0e9ff43a59 Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Thu, 14 Dec 2023 11:11:00 +0800 Subject: [PATCH 033/168] #1054 --- bots/aiocqhttp/message.py | 9 ++++++--- bots/aiogram/message.py | 6 ++++-- bots/discord/client.py | 4 +++- bots/discord/message.py | 9 ++++++--- bots/kook/message.py | 6 ++++-- bots/lagrange/message.py | 8 ++++++-- bots/matrix/message.py | 9 ++++++--- core/builtins/tasks.py | 10 ++++++++++ core/console/message.py | 4 ++-- core/types/message/__init__.py | 24 ++++++++++++++++-------- 10 files changed, 63 insertions(+), 26 deletions(-) diff --git a/bots/aiocqhttp/message.py b/bots/aiocqhttp/message.py index d724f8ba1a..2ace136b29 100644 --- a/bots/aiocqhttp/message.py +++ b/bots/aiocqhttp/message.py @@ -14,7 +14,7 @@ from bots.aiocqhttp.client import bot from bots.aiocqhttp.info import client_name from config import Config -from core.builtins import Bot, base_superuser_list, command_prefix, ErrorMessage, Image, Plain, Temp, Voice +from core.builtins import Bot, base_superuser_list, command_prefix, ErrorMessage, Image, Plain, Temp, Voice, MessageTaskManager from core.builtins.message import MessageSession as MessageSessionT from core.builtins.message.chain import MessageChain from core.exceptions import SendMessageFailed @@ -88,12 +88,13 @@ class Feature: quote = True async def send_message(self, message_chain, quote=True, disable_secret_check=False, - allow_split_image=True) -> FinishedSession: + allow_split_image=True, + callback=None) -> FinishedSession: message_chain = MessageChain(message_chain) message_chain_assendable = message_chain.as_sendable(self, embed=False) if (self.target.target_from == 'QQ|Group' and Temp.data.get('lagrange_status', False) and not - self.tmp.get('enforce_send_by_master_client', False)): + self.tmp.get('enforce_send_by_master_client', False) and not callback): lagrange_available_groups = Temp.data.get('lagrange_available_groups', []) if int(self.session.target) in lagrange_available_groups: choose = random.randint(0, 1) @@ -170,6 +171,8 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal return FinishedSession(self, 0, [{}]) else: raise e + if callback: + MessageTaskManager.add_callback(send['message_id'], callback) return FinishedSession(self, send['message_id'], [send]) async def check_native_permission(self): diff --git a/bots/aiogram/message.py b/bots/aiogram/message.py index acbdc8d12b..417e9fb244 100644 --- a/bots/aiogram/message.py +++ b/bots/aiogram/message.py @@ -5,7 +5,7 @@ from bots.aiogram.client import dp, bot, token from bots.aiogram.info import client_name from config import Config -from core.builtins import Bot, Plain, Image, Voice, MessageSession as MessageSessionT, ErrorMessage +from core.builtins import Bot, Plain, Image, Voice, MessageSession as MessageSessionT, ErrorMessage, MessageTaskManager from core.builtins.message.chain import MessageChain from core.logger import Logger from core.types import FetchTarget as FetchTargetT, \ @@ -39,7 +39,7 @@ class Feature: wait = True async def send_message(self, message_chain, quote=True, disable_secret_check=False, - allow_split_image=True) -> FinishedSession: + allow_split_image=True, callback=None) -> FinishedSession: message_chain = MessageChain(message_chain) if not message_chain.is_safe and not disable_secret_check: return await self.send_message(Plain(ErrorMessage(self.locale.t("error.message.chain.unsafe")))) @@ -89,6 +89,8 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal msg_ids = [] for x in send: msg_ids.append(x.message_id) + if callback: + MessageTaskManager.add_callback(x.message_id, callback) return FinishedSession(self, msg_ids, send) async def check_native_permission(self): diff --git a/bots/discord/client.py b/bots/discord/client.py index e1ae5130aa..ededf6d3e5 100644 --- a/bots/discord/client.py +++ b/bots/discord/client.py @@ -1,5 +1,7 @@ import discord +from config import Config + intents = discord.Intents.default() intents.message_content = True -client = discord.Bot(intents=intents) +client = discord.Bot(intents=intents, proxy=Config('proxy')) diff --git a/bots/discord/message.py b/bots/discord/message.py index cfd5643f62..f15e5187f4 100644 --- a/bots/discord/message.py +++ b/bots/discord/message.py @@ -9,7 +9,7 @@ from bots.discord.client import client from bots.discord.info import client_name from config import Config -from core.builtins import Bot, Plain, Image, MessageSession as MessageSessionT +from core.builtins import Bot, Plain, Image, MessageSession as MessageSessionT, MessageTaskManager from core.builtins.message.chain import MessageChain from core.builtins.message.internal import Embed, ErrorMessage, Voice from core.logger import Logger @@ -69,7 +69,8 @@ class Feature: quote = True wait = True - async def send_message(self, message_chain, quote=True, disable_secret_check=False, allow_split_image=True + async def send_message(self, message_chain, quote=True, disable_secret_check=False, allow_split_image=True, + callback=None ) -> FinishedSession: message_chain = MessageChain(message_chain) if not message_chain.is_safe and not disable_secret_check: @@ -102,13 +103,15 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal files=files) Logger.info(f'[Bot] -> [{self.target.target_id}]: Embed: {str(x.__dict__)}') else: - send_ = False + send_ = None if send_: send.append(send_) count += 1 msg_ids = [] for x in send: msg_ids.append(x.id) + if callback: + MessageTaskManager.add_callback(x.id, callback) return FinishedSession(self, msg_ids, send) diff --git a/bots/kook/message.py b/bots/kook/message.py index 74b7cadf1b..162c405cba 100644 --- a/bots/kook/message.py +++ b/bots/kook/message.py @@ -9,7 +9,7 @@ from bots.kook.client import bot from bots.kook.info import client_name from config import Config -from core.builtins import Bot, Plain, Image, Voice, MessageSession as MessageSessionT, ErrorMessage +from core.builtins import Bot, Plain, Image, Voice, MessageSession as MessageSessionT, ErrorMessage, MessageTaskManager from core.builtins.message.chain import MessageChain from core.logger import Logger from core.types import FetchTarget as FetchTargetT, \ @@ -68,7 +68,7 @@ class Feature: wait = True async def send_message(self, message_chain, quote=True, disable_secret_check=False, - allow_split_image=True) -> FinishedSession: + allow_split_image=True, callback=None) -> FinishedSession: self.session.message: Message message_chain = MessageChain(message_chain) if not message_chain.is_safe and not disable_secret_check: @@ -102,6 +102,8 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal msg_ids = [] for x in send: msg_ids.append(x['msg_id']) + if callback: + MessageTaskManager.add_callback(x['msg_id'], callback) return FinishedSession(self, msg_ids, {self.session.message.channel_type.name: send}) async def check_native_permission(self): diff --git a/bots/lagrange/message.py b/bots/lagrange/message.py index 63fdca39ea..b23950ccad 100644 --- a/bots/lagrange/message.py +++ b/bots/lagrange/message.py @@ -14,7 +14,8 @@ from bots.lagrange.client import bot from bots.lagrange.info import client_name from config import Config -from core.builtins import Bot, base_superuser_list, command_prefix, ErrorMessage, Image, Plain, Temp, Voice +from core.builtins import Bot, base_superuser_list, command_prefix, ErrorMessage, Image, Plain, Temp, Voice, \ + MessageTaskManager from core.builtins.message import MessageSession as MessageSessionT from core.builtins.message.chain import MessageChain from core.exceptions import SendMessageFailed @@ -86,7 +87,8 @@ class Feature: quote = False async def send_message(self, message_chain, quote=True, disable_secret_check=False, - allow_split_image=True) -> FinishedSession: + allow_split_image=True, + callback=None) -> FinishedSession: msg = [] """ if quote and self.target.target_from == 'QQ|Group' and self.session.message: @@ -143,6 +145,8 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal return FinishedSession(self, 0, [{}]) else: raise e + if callback: + MessageTaskManager.add_callback(send['message_id'], callback) return FinishedSession(self, send['message_id'], [send]) async def check_native_permission(self): diff --git a/bots/matrix/message.py b/bots/matrix/message.py index 0de53184c6..f8aa6c72ee 100644 --- a/bots/matrix/message.py +++ b/bots/matrix/message.py @@ -9,7 +9,7 @@ from bots.matrix.client import bot, homeserver_host from bots.matrix.info import client_name from config import Config -from core.builtins import Bot, Plain, Image, Voice, MessageSession as MessageSessionT, ErrorMessage +from core.builtins import Bot, Plain, Image, Voice, MessageSession as MessageSessionT, ErrorMessage, MessageTaskManager from core.builtins.message.chain import MessageChain from core.logger import Logger from core.types import FetchTarget as FetchedTargetT, \ @@ -43,7 +43,8 @@ class Feature: wait = True async def send_message(self, message_chain, quote=True, disable_secret_check=False, - allow_split_image=True) -> FinishedSession: + allow_split_image=True, + callback=None) -> FinishedSession: message_chain = MessageChain(message_chain) if not message_chain.is_safe and not disable_secret_check: return await self.send_message(Plain(ErrorMessage(self.locale.t("error.message.chain.unsafe")))) @@ -154,7 +155,9 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal Logger.error(f"Error in sending message: {str(resp)}") else: send.append(resp) - + if callback: + for x in send: + MessageTaskManager.add_callback(x.event_id, callback) return FinishedSession(self, [resp.event_id for resp in send], self.session.target) async def check_native_permission(self): diff --git a/core/builtins/tasks.py b/core/builtins/tasks.py index 57cac4424f..75313a2e1a 100644 --- a/core/builtins/tasks.py +++ b/core/builtins/tasks.py @@ -6,6 +6,7 @@ class MessageTaskManager: _list = {} + _callback_list = {} @classmethod def add_task(cls, session: MessageSession, flag, all_=False, reply=None): @@ -22,6 +23,10 @@ def add_task(cls, session: MessageSession, flag, all_=False, reply=None): 'flag': flag, 'active': True, 'type': task_type, 'reply': reply, 'ts': datetime.now().timestamp()} Logger.debug(cls._list) + @classmethod + def add_callback(cls, message_id, callback): + cls._callback_list[message_id] = {'callback': callback, 'ts': datetime.now().timestamp()} + @classmethod def get_result(cls, session: MessageSession): if 'result' in cls._list[session.target.target_id][session.target.sender_id][session]: @@ -42,6 +47,9 @@ async def bg_check(cls): if datetime.now().timestamp() - cls._list[target][sender][session]['ts'] > 3600: cls._list[target][sender][session]['active'] = False cls._list[target][sender][session]['flag'].set() # no result = cancel + for message_id in cls._callback_list: + if datetime.now().timestamp() - cls._callback_list[message_id]['ts'] > 3600: + del cls._callback_list[message_id] @classmethod async def check(cls, session: MessageSession): @@ -72,6 +80,8 @@ async def check(cls, session: MessageSession): get_['result'] = session get_['active'] = False get_['flag'].set() + if session.target.reply_id in cls._callback_list: + await cls._callback_list[session.target.reply_id]['callback'](session) __all__ = ['MessageTaskManager'] diff --git a/core/console/message.py b/core/console/message.py index 2781ba4071..6c937dd2d3 100644 --- a/core/console/message.py +++ b/core/console/message.py @@ -30,7 +30,7 @@ class Feature: wait = True async def send_message(self, message_chain, quote=True, disable_secret_check=False, - allow_split_image=True) -> FinishedSession: + allow_split_image=True, callback=None) -> FinishedSession: message_chain = MessageChain(message_chain) self.sent.append(message_chain) msg_list = [] @@ -44,7 +44,7 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal img = Image.open(image_path) img.show() Logger.info(f'[Bot] -> [{self.target.target_id}]: Image: {image_path}') - return FinishedSession(self, [0], ['There should be a callable here... hmm...']) + return FinishedSession(self, [0], ['Should be a callable here... hmm...']) async def wait_confirm(self, message_chain=None, quote=True, delete=True): send = None diff --git a/core/types/message/__init__.py b/core/types/message/__init__.py index 2a10734688..703c9e0b53 100644 --- a/core/types/message/__init__.py +++ b/core/types/message/__init__.py @@ -1,5 +1,5 @@ import asyncio -from typing import List, Union, Dict +from typing import List, Union, Dict, Coroutine from core.exceptions import FinishedException from .chain import MessageChain @@ -89,13 +89,15 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=False, - allow_split_image=True) -> FinishedSession: + allow_split_image=True, + callback: Coroutine = None) -> FinishedSession: """ 用于向消息发送者回复消息。 :param message_chain: 消息链，若传入str则自动创建一条带有Plain元素的消息链 :param quote: 是否引用传入dict中的消息（默认为True） :param disable_secret_check: 是否禁用消息检查（默认为False） :param allow_split_image: 是否允许拆分图片发送（此参数作接口兼容用，仅telegram平台使用了切割） + :param callback: 回调函数，用于在消息发送完成后回复本消息执行的函数 :return: 被发送的消息链 """ raise NotImplementedError @@ -104,32 +106,36 @@ async def finish(self, message_chain=None, quote=True, disable_secret_check=False, - allow_split_image=True): + allow_split_image=True, + callback: Coroutine = None): """ 用于向消息发送者回复消息并终结会话（模块后续代码不再执行）。 :param message_chain: 消息链，若传入str则自动创建一条带有Plain元素的消息链 :param quote: 是否引用传入dict中的消息（默认为True） :param disable_secret_check: 是否禁用消息检查（默认为False） :param allow_split_image: 是否允许拆分图片发送（此参数作接口兼容用，仅telegram平台使用了切割） + :param callback: 回调函数，用于在消息发送完成后回复本消息执行的函数 :return: 被发送的消息链 """ ... f = None if message_chain is not None: f = await self.send_message(message_chain, disable_secret_check=disable_secret_check, quote=quote, - allow_split_image=allow_split_image) + allow_split_image=allow_split_image, callback=callback) raise FinishedException(f) - async def send_direct_message(self, message_chain, disable_secret_check=False, allow_split_image=True): + async def send_direct_message(self, message_chain, disable_secret_check=False, allow_split_image=True, + callback: Coroutine = None): """ 用于向消息发送者直接发送消息。 :param message_chain: 消息链，若传入str则自动创建一条带有Plain元素的消息链 :param disable_secret_check: 是否禁用消息检查（默认为False） :param allow_split_image: 是否允许拆分图片发送（此参数作接口兼容用，仅Telegram平台使用了切割） + :param callback: 回调函数，用于在消息发送完成后回复本消息执行的函数 :return: 被发送的消息链 """ await self.send_message(message_chain, disable_secret_check=disable_secret_check, quote=False, - allow_split_image=allow_split_image) + allow_split_image=allow_split_image, callback=callback) async def wait_confirm(self, message_chain=None, quote=True, delete=True, timeout=120, append_instruction=True): """ @@ -142,7 +148,8 @@ async def wait_confirm(self, message_chain=None, quote=True, delete=True, timeou """ raise NotImplementedError - async def wait_next_message(self, message_chain=None, quote=True, delete=False, timeout=120, append_instruction=True): + async def wait_next_message(self, message_chain=None, quote=True, delete=False, timeout=120, + append_instruction=True): """ 一次性模板，用于等待对象的下一条消息。 :param message_chain: 需要发送的确认消息，可不填 @@ -153,7 +160,8 @@ async def wait_next_message(self, message_chain=None, quote=True, delete=False, """ raise NotImplementedError - async def wait_reply(self, message_chain, quote=True, delete=False, timeout=120, all_=False, append_instruction=True): + async def wait_reply(self, message_chain, quote=True, delete=False, timeout=120, all_=False, + append_instruction=True): """ 一次性模板，用于等待触发对象回复消息。 :param message_chain: 需要发送的确认消息，可不填 From d6d544dc463f36d2050cc746d5a99feac87d65f6 Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Thu, 14 Dec 2023 14:10:36 +0800 Subject: [PATCH 034/168] test --- core/utils/http.py | 2 +- modules/wiki/locales/zh_cn.json | 5 ++++ modules/wiki/utils/wikilib.py | 36 ++++++++++++++++------- modules/wiki/wiki.py | 51 +++++++++++++++++++++++++++------ 4 files changed, 74 insertions(+), 20 deletions(-) diff --git a/core/utils/http.py b/core/utils/http.py index cba813e081..f5de64257d 100644 --- a/core/utils/http.py +++ b/core/utils/http.py @@ -14,7 +14,7 @@ from core.logger import Logger from .cache import random_cache_path -logging_resp = False +logging_resp = True debug = Config('debug') if not (proxy := Config('proxy')): proxy = '' diff --git a/modules/wiki/locales/zh_cn.json b/modules/wiki/locales/zh_cn.json index 1b17a1a782..bb62c6ce80 100644 --- a/modules/wiki/locales/zh_cn.json +++ b/modules/wiki/locales/zh_cn.json @@ -29,6 +29,8 @@ "wiki.help.wiki_inline.page": "在 [[ ]] 内输入标题以自动查询页面。", "wiki.help.wiki_inline.template": "在 {{ }} 内输入标题以自动查询模板。", "wiki.help.wiki_inline.url": "发送 Wiki 页面的 URL 以生成 Infobox 图片。", + "wiki.message.section": "章节", + "wiki.message.section.rendering": "（章节渲染中）", "wiki.message.ab.qq.title": "滥用过滤器日志", "wiki.message.ab.qq.title.address": "滥用过滤器日志地址", "wiki.message.ab.slice": "•${title} - ${user} 于 ${time}\n 过滤器描述：${filter_name}\n 采取的行动：${result}", @@ -37,6 +39,7 @@ "wiki.message.error.info": "详细信息：", "wiki.message.error.query": "发生错误：无法查询此 Wiki。", "wiki.message.error.set": "发生错误：无法设置此 Wiki。", + "wiki.message.error.unable_to_render_section": "（章节渲染失败，请联系开发者检查原因）", "wiki.message.fandom.disable": "已关闭 Fandom 全局 Interwiki 查询。", "wiki.message.fandom.enable": "已开启 Fandom 全局 Interwiki 查询。", "wiki.message.flies": "此页面包括以下文件：\n", @@ -47,6 +50,8 @@ "wiki.message.id.error": "发生错误：页面 ID 必须为数字。", "wiki.message.id.not_found": "未找到页面 ID 为 ${id} 的页面。", "wiki.message.invalid_namespace": "此 Wiki 上没有名为 ${namespace} 的命名空间，请检查输入。", + "wiki.message.invalid_section": "此章节不存在，以下是可能的章节（回复本条消息序号可选中）：", + "wiki.message.invalid_section.prompt": "（此章节不存在）", "wiki.message.iw.add.success": "已添加自定义 Interwiki：\n${iw} -> ${name}", "wiki.message.iw.get.not_found": "未找到 Interwiki：${iw}", "wiki.message.iw.list": "使用“${prefix}wiki iw get ”可以获取 Interwiki 对应的链接。", diff --git a/modules/wiki/utils/wikilib.py b/modules/wiki/utils/wikilib.py index ca805be144..f219a2ef24 100644 --- a/modules/wiki/utils/wikilib.py +++ b/modules/wiki/utils/wikilib.py @@ -114,7 +114,8 @@ def __init__(self, file: str = None, desc: str = None, args: str = None, - section: str = None, + selected_section: str = None, + sections: List[str] = None, interwiki_prefix: str = '', status: bool = True, templates: List[str] = None, @@ -122,7 +123,7 @@ def __init__(self, page_property: str = 'page', has_template_doc: bool = False, invalid_namespace: Union[str, bool] = False, - possible_research_title: List[str] = None + possible_research_title: List[str] = None, ): self.info = info self.id = id @@ -133,7 +134,8 @@ def __init__(self, self.file = file self.desc = desc self.args = args - self.section = section + self.selected_section = selected_section + self.sections = sections self.interwiki_prefix = interwiki_prefix self.templates = templates self.status = status @@ -142,6 +144,7 @@ def __init__(self, self.has_template_doc = has_template_doc self.invalid_namespace = invalid_namespace self.possible_research_title = possible_research_title + self.invalid_section = False class WikiLib: @@ -437,7 +440,7 @@ async def parse_page_info(self, title: str = None, pageid: int = None, inline=Fa if _tried > 5: if Config('enable_tos'): raise WhatAreUDoingError - section = None + selected_section = None if title is not None: if title == '': return PageInfo(title='', link=self.wiki_info.articlepath.replace("$1", ""), info=self.wiki_info, @@ -471,9 +474,9 @@ async def parse_page_info(self, title: str = None, pageid: int = None, inline=Fa else: title += _arg if len(section_list) > 1: - section = ''.join(section_list)[1:] + selected_section = ''.join(section_list)[1:] page_info = PageInfo(info=self.wiki_info, title=title, args=''.join(arg_list), interwiki_prefix=_prefix) - page_info.section = section + page_info.selected_section = selected_section query_string = {'action': 'query', 'prop': 'info|imageinfo|langlinks|templates', 'llprop': 'url', 'inprop': 'url', 'iiprop': 'url', 'redirects': 'True', 'titles': title} @@ -484,7 +487,7 @@ async def parse_page_info(self, title: str = None, pageid: int = None, inline=Fa else: raise ValueError('title and pageid cannot be both None') use_textextracts = True if 'TextExtracts' in self.wiki_info.extensions else False - if use_textextracts and section is None: + if use_textextracts and selected_section is None: query_string.update({'prop': 'info|imageinfo|langlinks|templates|extracts|pageprops', 'ppprop': 'description|displaytitle|disambiguation|infoboxes', 'explaintext': 'true', 'exsectionformat': 'plain', 'exchars': '200'}) @@ -493,6 +496,17 @@ async def parse_page_info(self, title: str = None, pageid: int = None, inline=Fa if query is None: return PageInfo(title=title, link=None, desc=self.locale.t("wiki.message.utils.wikilib.error.empty"), info=self.wiki_info) + if selected_section: + parse_section_string = {'action': 'parse', 'page': title, 'prop': 'sections'} + parse_section = await self.get_json(**parse_section_string) + section_list = [] + sections = parse_section['parse']['sections'] + for s in sections: + section_list.append(s['anchor']) + page_info.sections = section_list + if urllib.parse.unquote(selected_section) not in section_list: + page_info.invalid_section = True + redirects_: List[Dict[str, str]] = query.get('redirects') if redirects_ is not None: for r in redirects_: @@ -675,12 +689,12 @@ async def search_something(srwhat): page_info.has_template_doc = True page_info.before_page_property = page_info.page_property = 'template' if get_desc: - if use_textextracts and section is None: + if use_textextracts and (selected_section is None or page_info.invalid_section): raw_desc = page_raw.get('extract') if raw_desc is not None: page_desc = self.parse_text(raw_desc) else: - page_desc = self.parse_text(await self.get_html_to_text(title, section)) + page_desc = self.parse_text(await self.get_html_to_text(title, selected_section)) full_url = page_raw['fullurl'] + page_info.args file = None if 'imageinfo' in page_raw: @@ -736,8 +750,8 @@ async def search_something(srwhat): for possible_title in page_info.possible_research_title] - if before_page_info.section is not None: - page_info.section = before_page_info.section + if before_page_info.selected_section is not None: + page_info.selected_section = before_page_info.selected_section if not self.wiki_info.in_allowlist: checklist = [] if page_info.title is not None: diff --git a/modules/wiki/wiki.py b/modules/wiki/wiki.py index 9e314b87c1..6c35753f52 100644 --- a/modules/wiki/wiki.py +++ b/modules/wiki/wiki.py @@ -5,6 +5,7 @@ import filetype from core.builtins import Bot, Plain, Image, Voice, Url, confirm_command +from core.utils.image_table import image_table_render, ImageTable from core.component import module from core.exceptions import AbuseWarning from core.logger import Logger @@ -25,7 +26,7 @@ @wiki.command(' [-l ] {{wiki.help}}', - options_desc={'-l': '{wiki.help.option.l}'}) + options_desc={'-l': '{wiki.help.option.l}'}) async def _(msg: Bot.MessageSession): get_lang = msg.parsed_msg.get('-l', False) if get_lang: @@ -201,8 +202,16 @@ async def query_pages(session: Union[Bot.MessageSession, QueryInfo], title: Unio else: plain_slice.append(session.locale.t('wiki.message.redirect', title=display_before_title, redirected_title=display_title)) - if r.desc is not None and r.desc != '': - plain_slice.append(r.desc) + if (r.link is not None and r.selected_section is not None and r.info.in_allowlist and + not r.invalid_section): + render_section_list.append( + {r.link: {'url': r.info.realurl, 'section': r.selected_section, + 'in_allowlist': r.info.in_allowlist}}) + plain_slice.append('（章节渲染中）') + else: + if r.desc is not None and r.desc != '': + plain_slice.append(r.desc) + if r.link is not None: plain_slice.append( str(Url(r.link, use_mm=not r.info.in_allowlist))) @@ -211,19 +220,39 @@ async def query_pages(session: Union[Bot.MessageSession, QueryInfo], title: Unio dl_list.append(r.file) plain_slice.append(session.locale.t('wiki.message.flies') + r.file) else: - if r.link is not None and r.section is None: + if r.link is not None and r.selected_section is None: render_infobox_list.append( {r.link: {'url': r.info.realurl, 'in_allowlist': r.info.in_allowlist, 'content_mode': r.has_template_doc or r.title.split(':')[0] in ['User'] or (r.templates is not None and ('Template:Disambiguation' in r.templates or 'Template:Version disambiguation' in r.templates))}}) - elif r.link is not None and r.section is not None and r.info.in_allowlist: - render_section_list.append( - {r.link: {'url': r.info.realurl, 'section': r.section, - 'in_allowlist': r.info.in_allowlist}}) if plain_slice: msg_list.append(Plain('\n'.join(plain_slice))) + if r.invalid_section and r.info.in_allowlist: + if isinstance(session, Bot.MessageSession): + + if session.Feature.image: + i_msg_lst = [] + session_data = [[str(i + 1), r.sections[i]] for i in range(len(r.sections))] + i_msg_lst.append(Plain(session.locale.t('wiki.message.invalid_section'))) + i_msg_lst.append(Image(await + image_table_render( + ImageTable(session_data, + ['ID', + session.locale.t('wiki.message.section')])))) + + async def _callback(msg: Bot.MessageSession): + display = msg.as_display(text_only=True) + if display.isdigit(): + display = int(display) + if display <= len(r.sections): + r.selected_section = display - 1 + await query_pages(session, title=r.title + '#' + r.sections[display - 1]) + + await session.send_message(i_msg_lst, callback=_callback) + else: + msg_list.append(Plain(session.locale.t('wiki.message.invalid_section.prompt'))) else: plain_slice = [] wait_plain_slice = [] @@ -323,11 +352,17 @@ async def section(): get_section = await generate_screenshot_v2(ii, section=i[ii]['section']) if get_section: section_msg_list.append(Image(get_section)) + else: + section_msg_list.append(Plain( + session.locale.t("wiki.message.error.unable_to_render_section"))) else: get_section = await generate_screenshot_v1(i[ii]['url'], ii, headers, section=i[ii]['section']) if get_section: section_msg_list.append(Image(get_section)) + else: + section_msg_list.append(Plain( + session.locale.t("wiki.message.error.unable_to_render_section"))) if section_msg_list: await session.send_message(section_msg_list, quote=False) From 6841ba445c13479a0694aa23f7cda718a6f8595a Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Thu, 14 Dec 2023 14:21:48 +0800 Subject: [PATCH 035/168] update --- core/utils/http.py | 2 +- modules/wiki/utils/wikilib.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/utils/http.py b/core/utils/http.py index f5de64257d..cba813e081 100644 --- a/core/utils/http.py +++ b/core/utils/http.py @@ -14,7 +14,7 @@ from core.logger import Logger from .cache import random_cache_path -logging_resp = True +logging_resp = False debug = Config('debug') if not (proxy := Config('proxy')): proxy = '' diff --git a/modules/wiki/utils/wikilib.py b/modules/wiki/utils/wikilib.py index f219a2ef24..da9a5d2ac6 100644 --- a/modules/wiki/utils/wikilib.py +++ b/modules/wiki/utils/wikilib.py @@ -453,11 +453,13 @@ async def parse_page_info(self, title: str = None, pageid: int = None, inline=Fa arg_list = [] _arg_list = [] section_list = [] + used_quote = False quote_code = False for a in split_name[1:]: if len(a) > 0: if a[0] == '#': quote_code = True + used_quote = True if a[0] == '?': quote_code = False if quote_code: @@ -477,6 +479,8 @@ async def parse_page_info(self, title: str = None, pageid: int = None, inline=Fa selected_section = ''.join(section_list)[1:] page_info = PageInfo(info=self.wiki_info, title=title, args=''.join(arg_list), interwiki_prefix=_prefix) page_info.selected_section = selected_section + if selected_section == '' and used_quote: + page_info.invalid_section = True query_string = {'action': 'query', 'prop': 'info|imageinfo|langlinks|templates', 'llprop': 'url', 'inprop': 'url', 'iiprop': 'url', 'redirects': 'True', 'titles': title} From 84ae66ea0d31f2fba9ceb69960e28640ad153512 Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Thu, 14 Dec 2023 14:25:45 +0800 Subject: [PATCH 036/168] Update wiki.py --- modules/wiki/wiki.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/wiki/wiki.py b/modules/wiki/wiki.py index 6c35753f52..15c956dbef 100644 --- a/modules/wiki/wiki.py +++ b/modules/wiki/wiki.py @@ -207,7 +207,7 @@ async def query_pages(session: Union[Bot.MessageSession, QueryInfo], title: Unio render_section_list.append( {r.link: {'url': r.info.realurl, 'section': r.selected_section, 'in_allowlist': r.info.in_allowlist}}) - plain_slice.append('（章节渲染中）') + plain_slice.append(session.locale.t("wiki.message.section.rendering")) else: if r.desc is not None and r.desc != '': plain_slice.append(r.desc) From 8115c11451e6f046ef3d1efbf863e5763a925247 Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Thu, 14 Dec 2023 14:32:52 +0800 Subject: [PATCH 037/168] Update wikilib.py --- modules/wiki/utils/wikilib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/wiki/utils/wikilib.py b/modules/wiki/utils/wikilib.py index da9a5d2ac6..1a2fdb8d4e 100644 --- a/modules/wiki/utils/wikilib.py +++ b/modules/wiki/utils/wikilib.py @@ -479,7 +479,7 @@ async def parse_page_info(self, title: str = None, pageid: int = None, inline=Fa selected_section = ''.join(section_list)[1:] page_info = PageInfo(info=self.wiki_info, title=title, args=''.join(arg_list), interwiki_prefix=_prefix) page_info.selected_section = selected_section - if selected_section == '' and used_quote: + if not selected_section and used_quote: page_info.invalid_section = True query_string = {'action': 'query', 'prop': 'info|imageinfo|langlinks|templates', 'llprop': 'url', 'inprop': 'url', 'iiprop': 'url', From 2f66f56b2852e4587fad32d75b303274a34a1bbe Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Thu, 14 Dec 2023 14:34:50 +0800 Subject: [PATCH 038/168] Update wikilib.py --- modules/wiki/utils/wikilib.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/wiki/utils/wikilib.py b/modules/wiki/utils/wikilib.py index 1a2fdb8d4e..66e524b217 100644 --- a/modules/wiki/utils/wikilib.py +++ b/modules/wiki/utils/wikilib.py @@ -500,7 +500,7 @@ async def parse_page_info(self, title: str = None, pageid: int = None, inline=Fa if query is None: return PageInfo(title=title, link=None, desc=self.locale.t("wiki.message.utils.wikilib.error.empty"), info=self.wiki_info) - if selected_section: + if selected_section or page_info.invalid_section: parse_section_string = {'action': 'parse', 'page': title, 'prop': 'sections'} parse_section = await self.get_json(**parse_section_string) section_list = [] @@ -508,8 +508,9 @@ async def parse_page_info(self, title: str = None, pageid: int = None, inline=Fa for s in sections: section_list.append(s['anchor']) page_info.sections = section_list - if urllib.parse.unquote(selected_section) not in section_list: - page_info.invalid_section = True + if selected_section: + if urllib.parse.unquote(selected_section) not in section_list: + page_info.invalid_section = True redirects_: List[Dict[str, str]] = query.get('redirects') if redirects_ is not None: From 0ca7ac109261052ef4d0508a83ea005368935148 Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Thu, 14 Dec 2023 14:48:11 +0800 Subject: [PATCH 039/168] Update message.py --- bots/aiocqhttp/message.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/bots/aiocqhttp/message.py b/bots/aiocqhttp/message.py index 2ace136b29..e50561b2d4 100644 --- a/bots/aiocqhttp/message.py +++ b/bots/aiocqhttp/message.py @@ -93,6 +93,7 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal message_chain = MessageChain(message_chain) message_chain_assendable = message_chain.as_sendable(self, embed=False) + if (self.target.target_from == 'QQ|Group' and Temp.data.get('lagrange_status', False) and not self.tmp.get('enforce_send_by_master_client', False) and not callback): lagrange_available_groups = Temp.data.get('lagrange_available_groups', []) @@ -100,15 +101,17 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal choose = random.randint(0, 1) Logger.debug(f'choose: {choose}') if choose: - can_sends = [] + cant_sends = [] for x in message_chain_assendable: - if isinstance(x, (Plain, Image)): - can_sends.append(x) + if isinstance(x, Voice): + cant_sends.append(x) message_chain_assendable.remove(x) - if can_sends: + if message_chain_assendable: await JobQueue.send_message('Lagrange', self.target.target_id, - MessageChain(can_sends).to_list()) - if not message_chain_assendable: + MessageChain(message_chain_assendable).to_list()) + if cant_sends: + self.tmp['enforce_send_by_master_client'] = True + await self.send_message(MessageChain(cant_sends)) return FinishedSession(self, 0, [{}]) else: Logger.debug(f'Do not use lagrange since some conditions are not met.\n{self.target.target_from} ' From 43cec8a9192e8177c6067a4bfafd76b5056db56e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Thu, 14 Dec 2023 15:20:45 +0800 Subject: [PATCH 040/168] Update bilibili.py --- modules/bilibili/bilibili.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/modules/bilibili/bilibili.py b/modules/bilibili/bilibili.py index 92f72d8808..b2323f4ea9 100644 --- a/modules/bilibili/bilibili.py +++ b/modules/bilibili/bilibili.py @@ -1,6 +1,6 @@ from datetime import datetime -from core.builtins import Bot, Image, Plain +from core.builtins import Bot, Image, Plain, Url from core.utils.http import get_url @@ -19,10 +19,7 @@ async def get_info(msg: Bot.MessageSession, url, get_detail): video_url = f"https://www.bilibili.com/video/{view['bvid']}\n" title = view['title'] tname = view['tname'] - - timestamp = view['ctime'] - timeobject = datetime.fromtimestamp(timestamp) - time = timeobject.strftime('%Y-%m-%d %H:%M:%S') + time = msg.ts2strftime(view['ctime'], timezone=False) if len(view['pages']) > 1: pages = f" ({len(view['pages'])}P)" @@ -41,15 +38,15 @@ async def get_info(msg: Bot.MessageSession, url, get_detail): fans = format_num(res['data']['Card']['card']['fans']) if not get_detail: - output = video_url + msg.locale.t("bilibili.message", title=title, tname=tname, owner=owner, time=time) + output = msg.locale.t("bilibili.message", title=title, tname=tname, owner=owner, time=time) else: - output = video_url + msg.locale.t("bilibili.message.detail", title=title, pages=pages, tname=tname, + output = msg.locale.t("bilibili.message.detail", title=title, pages=pages, tname=tname, owner=owner, fans=fans, view=stat_view, danmaku=stat_danmaku, reply=stat_reply, like=stat_like, coin=stat_coin, favorite=stat_favorite, share=stat_share, time=time) - await msg.finish([Image(pic), Plain(output)]) + await msg.finish([Image(pic), Url(video_url), Plain(output)]) def format_num(number): From 30c34ef719ab39c9d1fc669f8ff410cac0647e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Thu, 14 Dec 2023 15:22:58 +0800 Subject: [PATCH 041/168] Update bilibili.py --- modules/bilibili/bilibili.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/bilibili/bilibili.py b/modules/bilibili/bilibili.py index b2323f4ea9..7f1ba44342 100644 --- a/modules/bilibili/bilibili.py +++ b/modules/bilibili/bilibili.py @@ -16,7 +16,7 @@ async def get_info(msg: Bot.MessageSession, url, get_detail): stat = view['stat'] pic = view['pic'] - video_url = f"https://www.bilibili.com/video/{view['bvid']}\n" + video_url = f"https://www.bilibili.com/video/{view['bvid']}" title = view['title'] tname = view['tname'] time = msg.ts2strftime(view['ctime'], timezone=False) From dc33df06d7369f4863363d823d6ceac945ed482a Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Thu, 14 Dec 2023 16:44:41 +0800 Subject: [PATCH 042/168] update --- core/builtins/message/chain.py | 11 ++++++++++- core/builtins/message/internal.py | 20 ++++++++++++++++++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/core/builtins/message/chain.py b/core/builtins/message/chain.py index f685ff580b..2350ecdddf 100644 --- a/core/builtins/message/chain.py +++ b/core/builtins/message/chain.py @@ -5,7 +5,7 @@ import ujson as json -from core.builtins.message.internal import Plain, Image, Voice, Embed, Url, ErrorMessage, FormattedTime +from core.builtins.message.internal import Plain, Image, Voice, Embed, Url, ErrorMessage, FormattedTime, I18NText from core.builtins.utils import Secret from core.logger import Logger from core.types.message import MessageChain as MessageChainT, MessageSession @@ -51,6 +51,13 @@ def __init__(self, elements: Union[str, List[Union[Plain, Image, Voice, Embed, U e['data']['timestamp'], e['data']['color'], Image(e['data']['image']), Image(e['data']['thumbnail']), e['data']['author'], e['data']['footer'], e['data']['fields'])) + elif e['type'] == 'url': + self.value.append(Url(e['data']['url'])) + elif e['type'] == 'formatted_time': + self.value.append(FormattedTime(e['data']['time'], e['data']['date'], e['data']['seconds'], + e['data']['timezone'])) + elif e['type'] == 'i18n': + self.value.append(I18NText(e['data']['key'], **e['data']['kwargs'])) elif isinstance(e, str): if e != '': self.value += match_kecode(e) @@ -124,6 +131,8 @@ def as_sendable(self, msg: MessageSession = None, embed=True): value.append(Plain(ErrorMessage('{error.message.chain.plain.empty}', locale=locale))) elif isinstance(x, FormattedTime): value.append(Plain(x.to_str(msg=msg))) + elif isinstance(x, I18NText): + value.append(Plain(msg.locale.t(x.key, **x.kwargs))) else: value.append(x) if not value: diff --git a/core/builtins/message/internal.py b/core/builtins/message/internal.py index f0f4abee2e..1f102cd007 100644 --- a/core/builtins/message/internal.py +++ b/core/builtins/message/internal.py @@ -93,7 +93,23 @@ def __repr__(self): return f'FormattedTime(time={self.timestamp})' def to_dict(self): - return {'type': 'time', 'data': {'time': self.timestamp}} + return {'type': 'formatted_time', 'data': {'time': self.timestamp, 'date': self.date, 'seconds': self.seconds, + 'timezone': self.timezone}} + + +class I18NText: + def __init__(self, key, **kwargs): + self.key = key + self.kwargs = kwargs + + def __str__(self): + return self.key + + def __repr__(self): + return f'I18NText(key="{self.key}", kwargs={self.kwargs})' + + def to_dict(self): + return {'type': 'i18n', 'data': {'key': self.key, 'kwargs': self.kwargs}} class ErrorMessage(EMsg): @@ -269,4 +285,4 @@ def to_dict(self): 'fields': self.fields}} -__all__ = ["Plain", "Image", "Voice", "Embed", "EmbedField", "Url", "ErrorMessage", "FormattedTime"] +__all__ = ["Plain", "Image", "Voice", "Embed", "EmbedField", "Url", "ErrorMessage", "FormattedTime", "I18NText"] From 0c52afaa491a6b80834705baaaada5324b68811e Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Thu, 14 Dec 2023 17:11:20 +0800 Subject: [PATCH 043/168] update --- modules/mcv_rss/locales/zh_cn.json | 6 +++--- schedulers/mcv_rss.py | 33 ++++++++++++++++++++++-------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/modules/mcv_rss/locales/zh_cn.json b/modules/mcv_rss/locales/zh_cn.json index d720c3dc84..211ec484c8 100644 --- a/modules/mcv_rss/locales/zh_cn.json +++ b/modules/mcv_rss/locales/zh_cn.json @@ -11,6 +11,6 @@ "mcv_rss.message.mclgv_jira_rss": "Mojira 已更新 Minecraft Legends ${version}。\n（Mojira 上的信息仅作版本号预览用，不代表启动器/商店已更新此版本）", "mcv_rss.message.mcv_jira_rss": "Mojira 已更新 Java 版 ${version}。\n（Mojira 上的信息仅作版本号预览用，不代表启动器已更新此版本）", "mcv_rss.message.mcv_jira_rss.future": "Mojira 已新增 Java 版 ${version}。\n（Future Version 仅代表与此相关的版本正在规划中，不代表启动器已更新此版本）", - "mcv_rss.message.mcv_rss.release": "启动器已更新 ${version} 正式版。", - "mcv_rss.message.mcv_rss.snapshot": "启动器已更新 ${version} 快照。" -} \ No newline at end of file + "mcv_rss.message.mcv_rss.release": "启动器已更新 ${version} 正式版。\n更新时间：", + "mcv_rss.message.mcv_rss.snapshot": "启动器已更新 ${version} 快照。\n更新时间：" +} diff --git a/schedulers/mcv_rss.py b/schedulers/mcv_rss.py index 9b32ee6c26..9237b06f4e 100644 --- a/schedulers/mcv_rss.py +++ b/schedulers/mcv_rss.py @@ -1,3 +1,4 @@ +import datetime import re import traceback from urllib.parse import quote @@ -7,6 +8,7 @@ from google_play_scraper import app as google_play_scraper from config import CFG, Config +from core.builtins import I18NText, FormattedTime from core.logger import Logger from core.queue import JobQueue from core.scheduler import Scheduler, IntervalTrigger @@ -74,32 +76,47 @@ async def mcv_rss(): file = json.loads(await get_url(url, attempt=1)) release = file['latest']['release'] snapshot = file['latest']['snapshot'] + time_release = 0 + time_snapshot = 0 + for v in file['versions']: + if v['id'] == release: + time_release = datetime.datetime.fromisoformat(v['releaseTime']).timestamp() + if v['id'] == snapshot: + time_snapshot = datetime.datetime.fromisoformat(v['releaseTime']).timestamp() + if release not in verlist: Logger.info(f'huh, we find {release}.') - await JobQueue.trigger_hook_all('mcv_rss', message='mcv_rss.message.mcv_rss.release', - i18n=True, version=file['latest']['release']) + + await JobQueue.trigger_hook_all('mcv_rss', + message=[I18NText('mcv_rss.message.mcv_rss.release', + version=release).to_dict(), + FormattedTime(time_release).to_dict() + ]) verlist.append(release) update_stored_list('scheduler', 'mcv_rss', verlist) article = await get_article(release) if article[0] != '': get_stored_news_title = get_stored_list('scheduler', 'mcnews') if article[1] not in get_stored_news_title: - await JobQueue.trigger_hook_all('minecraft_news', message='minecraft_news.message.update_log', - i18n=True, version=release, article=article[0]) + await JobQueue.trigger_hook_all('minecraft_news', + message=[I18NText('minecraft_news.message.update_log', + version=release, article=article[0]).to_dict()]) get_stored_news_title.append(article[1]) update_stored_list('scheduler', 'mcnews', get_stored_news_title) if snapshot not in verlist: Logger.info(f'huh, we find {snapshot}.') - await JobQueue.trigger_hook_all('mcv_rss', message='mcv_rss.message.mcv_rss.snapshot', i18n=True, - version=file['latest']['snapshot']) + await JobQueue.trigger_hook_all('mcv_rss', message=[I18NText('mcv_rss.message.mcv_rss.snapshot', + version=file['latest']['snapshot']).to_dict(), + FormattedTime(time_snapshot).to_dict()]) verlist.append(snapshot) update_stored_list('scheduler', 'mcv_rss', verlist) article = await get_article(snapshot) if article[0] != '': get_stored_news_title = get_stored_list('scheduler', 'mcnews') if article[1] not in get_stored_news_title: - await JobQueue.trigger_hook_all('minecraft_news', message='minecraft_news.message.update_log', - i18n=True, version=snapshot, article=article[0]) + await JobQueue.trigger_hook_all('minecraft_news', + message=[I18NText('minecraft_news.message.update_log', + version=snapshot, article=article[0]).to_dict()]) get_stored_news_title.append(article[1]) update_stored_list('scheduler', 'mcnews', get_stored_news_title) except Exception: From fe113915d493d4456fc197689ff94736cbe70893 Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Thu, 14 Dec 2023 17:14:23 +0800 Subject: [PATCH 044/168] Update audit.py --- modules/wiki/audit.py | 195 +++++++++++++++++++++--------------------- 1 file changed, 99 insertions(+), 96 deletions(-) diff --git a/modules/wiki/audit.py b/modules/wiki/audit.py index 49a73946fe..f8e5b1ee39 100644 --- a/modules/wiki/audit.py +++ b/modules/wiki/audit.py @@ -8,109 +8,112 @@ from modules.wiki.utils.wikilib import WikiLib -if Config('enable_urlmanager'): - aud = module('wiki_audit', required_superuser=True, - alias='wau') +aud = module('wiki_audit', required_superuser=True, + alias='wau') - @aud.command(['trust ', 'block ']) - async def _(msg: Bot.MessageSession): - date = msg.ts2strftime(datetime.now().timestamp(), timezone=False) - api = msg.parsed_msg[''] - check = await WikiLib(api).check_wiki_available() - if check.available: - api = check.value.api - if msg.parsed_msg.get('trust', False): - res = Audit(api).add_to_AllowList(date) - list_name = msg.locale.t('wiki.message.wiki_audit.list_name.allowlist') - else: - res = Audit(api).add_to_BlockList(date) - list_name = msg.locale.t('wiki.message.wiki_audit.list_name.blocklist') - if not res: - await msg.finish(msg.locale.t('wiki.message.wiki_audit.add.failed', list_name=list_name) + api) - else: - await msg.finish(msg.locale.t('wiki.message.wiki_audit.add.success', list_name=list_name) + api) - else: - result = msg.locale.t('wiki.message.error.add') + \ - ('\n' + msg.locale.t('wiki.message.error.info') + check.message if check.message != '' else '') - await msg.finish(result) - @aud.command(['distrust ', 'unblock ']) - async def _(msg: Bot.MessageSession): - api = msg.parsed_msg[''] # 已关闭的站点无法验证有效性 - if msg.parsed_msg.get('distrust', False): - res = Audit(api).remove_from_AllowList() - if res is None: - await msg.finish(msg.locale.t('wiki.message.wiki_audit.remove.failed.other') + api) +@aud.command(['trust ', 'block ']) +async def _(msg: Bot.MessageSession): + date = msg.ts2strftime(datetime.now().timestamp(), timezone=False) + api = msg.parsed_msg[''] + check = await WikiLib(api).check_wiki_available() + if check.available: + api = check.value.api + if msg.parsed_msg.get('trust', False): + res = Audit(api).add_to_AllowList(date) list_name = msg.locale.t('wiki.message.wiki_audit.list_name.allowlist') else: - res = Audit(api).remove_from_BlockList() + res = Audit(api).add_to_BlockList(date) list_name = msg.locale.t('wiki.message.wiki_audit.list_name.blocklist') if not res: - await msg.finish(msg.locale.t('wiki.message.wiki_audit.remove.failed', list_name=list_name) + api) + await msg.finish(msg.locale.t('wiki.message.wiki_audit.add.failed', list_name=list_name) + api) else: - await msg.finish(msg.locale.t('wiki.message.wiki_audit.remove.success', list_name=list_name) + api) + await msg.finish(msg.locale.t('wiki.message.wiki_audit.add.success', list_name=list_name) + api) + else: + result = msg.locale.t('wiki.message.error.add') + \ + ('\n' + msg.locale.t('wiki.message.error.info') + check.message if check.message != '' else '') + await msg.finish(result) + + +@aud.command(['distrust ', 'unblock ']) +async def _(msg: Bot.MessageSession): + api = msg.parsed_msg[''] # 已关闭的站点无法验证有效性 + if msg.parsed_msg.get('distrust', False): + res = Audit(api).remove_from_AllowList() + if res is None: + await msg.finish(msg.locale.t('wiki.message.wiki_audit.remove.failed.other') + api) + list_name = msg.locale.t('wiki.message.wiki_audit.list_name.allowlist') + else: + res = Audit(api).remove_from_BlockList() + list_name = msg.locale.t('wiki.message.wiki_audit.list_name.blocklist') + if not res: + await msg.finish(msg.locale.t('wiki.message.wiki_audit.remove.failed', list_name=list_name) + api) + else: + await msg.finish(msg.locale.t('wiki.message.wiki_audit.remove.success', list_name=list_name) + api) - @aud.command('query ') - async def _(msg: Bot.MessageSession): - api = msg.parsed_msg[''] - check = await WikiLib(api).check_wiki_available() - if check.available: - api = check.value.api - audit = Audit(api) - allow = audit.inAllowList - block = audit.inBlockList - msg_list = [] - if allow: - msg_list.append(api + msg.locale.t('wiki.message.wiki_audit.query.allowlist')) - if block: - msg_list.append(api + msg.locale.t('wiki.message.wiki_audit.query.blocklist')) - if msg_list: - msg_list.append(msg.locale.t('wiki.message.wiki_audit.query.conflict')) - await msg.finish('\n'.join(msg_list)) - else: - await msg.finish(api + msg.locale.t('wiki.message.wiki_audit.query.none')) + +@aud.command('query ') +async def _(msg: Bot.MessageSession): + api = msg.parsed_msg[''] + check = await WikiLib(api).check_wiki_available() + if check.available: + api = check.value.api + audit = Audit(api) + allow = audit.inAllowList + block = audit.inBlockList + msg_list = [] + if allow: + msg_list.append(api + msg.locale.t('wiki.message.wiki_audit.query.allowlist')) + if block: + msg_list.append(api + msg.locale.t('wiki.message.wiki_audit.query.blocklist')) + if msg_list: + msg_list.append(msg.locale.t('wiki.message.wiki_audit.query.conflict')) + await msg.finish('\n'.join(msg_list)) else: - result = msg.locale.t('wiki.message.error.query') + \ - ('\n' + msg.locale.t('wiki.message.error.info') + check.message if check.message != '' else '') - await msg.finish(result) + await msg.finish(api + msg.locale.t('wiki.message.wiki_audit.query.none')) + else: + result = msg.locale.t('wiki.message.error.query') + \ + ('\n' + msg.locale.t('wiki.message.error.info') + check.message if check.message != '' else '') + await msg.finish(result) + - @aud.command(['list', 'list legacy']) - async def _(msg: Bot.MessageSession): - allow_list = Audit.get_allow_list() - block_list = Audit.get_block_list() - legacy = True - if not msg.parsed_msg.get('legacy', False) and msg.Feature.image: - send_msgs = [] - allow_columns = [[x[0], x[1]] for x in allow_list] - if allow_columns: - allow_table = ImageTable(data=allow_columns, headers=[ - msg.locale.t('wiki.message.wiki_audit.list.table.header.apilink'), - msg.locale.t('wiki.message.wiki_audit.list.table.header.date') - ]) - if allow_table: - allow_image = await image_table_render(allow_table) - if allow_image: - send_msgs.append(Plain(msg.locale.t('wiki.message.wiki_audit.list.allowlist'))) - send_msgs.append(Image(allow_image)) - block_columns = [[x[0], x[1]] for x in block_list] - if block_columns: - block_table = ImageTable(data=block_columns, headers=[ - msg.locale.t('wiki.message.wiki_audit.list.table.header.apilink'), - msg.locale.t('wiki.message.wiki_audit.list.table.header.date') - ]) - if block_table: - block_image = await image_table_render(block_table) - if block_image: - send_msgs.append(Plain(msg.locale.t('wiki.message.wiki_audit.list.blocklist'))) - send_msgs.append(Image(block_image)) - if send_msgs: - await msg.finish(send_msgs) - legacy = False - if legacy: - wikis = [msg.locale.t('wiki.message.wiki_audit.list.allowlist')] - for al in allow_list: - wikis.append(f'{al[0]} ({al[1]})') - wikis.append(msg.locale.t('wiki.message.wiki_audit.list.blocklist')) - for bl in block_list: - wikis.append(f'{bl[0]} ({bl[1]})') - await msg.finish('\n'.join(wikis)) +@aud.command(['list', 'list legacy']) +async def _(msg: Bot.MessageSession): + allow_list = Audit.get_allow_list() + block_list = Audit.get_block_list() + legacy = True + if not msg.parsed_msg.get('legacy', False) and msg.Feature.image: + send_msgs = [] + allow_columns = [[x[0], x[1]] for x in allow_list] + if allow_columns: + allow_table = ImageTable(data=allow_columns, headers=[ + msg.locale.t('wiki.message.wiki_audit.list.table.header.apilink'), + msg.locale.t('wiki.message.wiki_audit.list.table.header.date') + ]) + if allow_table: + allow_image = await image_table_render(allow_table) + if allow_image: + send_msgs.append(Plain(msg.locale.t('wiki.message.wiki_audit.list.allowlist'))) + send_msgs.append(Image(allow_image)) + block_columns = [[x[0], x[1]] for x in block_list] + if block_columns: + block_table = ImageTable(data=block_columns, headers=[ + msg.locale.t('wiki.message.wiki_audit.list.table.header.apilink'), + msg.locale.t('wiki.message.wiki_audit.list.table.header.date') + ]) + if block_table: + block_image = await image_table_render(block_table) + if block_image: + send_msgs.append(Plain(msg.locale.t('wiki.message.wiki_audit.list.blocklist'))) + send_msgs.append(Image(block_image)) + if send_msgs: + await msg.finish(send_msgs) + legacy = False + if legacy: + wikis = [msg.locale.t('wiki.message.wiki_audit.list.allowlist')] + for al in allow_list: + wikis.append(f'{al[0]} ({al[1]})') + wikis.append(msg.locale.t('wiki.message.wiki_audit.list.blocklist')) + for bl in block_list: + wikis.append(f'{bl[0]} ({bl[1]})') + await msg.finish('\n'.join(wikis)) From 60d83cbbb8f7b2b53e55161dc37b0495aae511e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Thu, 14 Dec 2023 17:59:52 +0800 Subject: [PATCH 045/168] Add LOCALES.md (#1055) --- LOCALES.md | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 4 +- 2 files changed, 159 insertions(+), 2 deletions(-) create mode 100644 LOCALES.md diff --git a/LOCALES.md b/LOCALES.md new file mode 100644 index 0000000000..02c69a6424 --- /dev/null +++ b/LOCALES.md @@ -0,0 +1,157 @@ +# 简介 +本规范文件旨在确保项目中的多语言文本一致性和格式规范。请遵循以下内容以保持代码库中的多语言资源的统一性。 + +# 文件位置 +请将语言文件放置在 `/locales` 目录中，并以语言代码命名为 JSON 文件。 + +根路径下的目录用于放置全局字符串，模块下的目录用于放置对应模块专用的字符串。 + +# 语言文件格式 +请确保键名与字符串一一对应，不得嵌套。 + +**全局字符串的命名方式**：`字符串类别.用途` + +**模块字符串的命名方式**：`模块名称.字符串类别.命令名称.用途` + +使用 `${变量名}` 表示变量，变量名必须使用英文，不能使用空格，如需则使用下划线代替。 + +# 排版 +> 本文部分参照[中文文案排版指北](https://github.com/sparanoid/chinese-copywriting-guidelines)，内容可能有出入。 + +## 空格 +### 中英文之间需要增加空格 +正确： +> 在 IBM 的研究中，他们利用 AI 技术开发了一种先进的语音识别系统。 + +错误： +> 在IBM的研究中，他们利用AI技术开发了一种先进的语音识别系统。 + +例外：专有名词、商品名等词语，按照约定俗成的格式书写。 + +### 中文与数字之间需要增加空格 +正确： + > 今年的全球汽车销售量达到了 8000 万辆。 + +错误： + > 今年的全球汽车销售量达到了8000万辆。 + +### 数字与单位之间的空格 +不要在数字和单个字符构成的单位之间添加空格，因为会显得过于稀疏，否则应增加空格。 + +正确： +> +> +> 角度为 90° 的角，就是直角。 +> + +错误： +> +> +> 角度为 90 ° 的角，就是直角。 + +### 全角标点与其他字符之间不加空格 +正确： +> + +错误： +> + +### 变量与中文之间增加增加空格 +一般情况下，变量的输入为英文或数字，故在变量前后加入空格。 + +正确： +> + +错误： +> + +例外：如果变量的输入一定为中文，则不加空格。 + +## 标点符号 +### 不要重复使用标点符号 +虽然允许重复使用标点符号，但是请别这样做。 + +正确： +> + +错误： +> + +### 简体中文不得使用直角引号 +直角引号并不符合简体中文使用者的使用习惯。 + +正确： +> + +错误： +> + +### 英文不得使用弯引号 +中文弯引号和英文弯引号属于同一个字符，如果使用弯引号反而会造成阅读问题，请使用直引号 `"`。 + +正确： +> + +错误： +> + +### 英文省略号使用三个点 +问题同上。 + +正确： +> + +错误： +> + +## 全角和半角 +### 使用全角中文标点 +正确： +> + +错误： +> + +### 数字使用半角字符 +正确： +> + +错误： +> + +### 遇到完整的英文整句、特殊名词，其内容使用半角标点 +正确： +> + +错误： +> + +## 名词 +### 专有名词使用正确的大小写 +正确： +> + +错误： +> + +### 不要使用非官方的缩写 +正确： +> + +错误： +> + + +### 不同地区的中文使用对应的地区词 +不要在繁体中文中使用“视频”等错误的地区词，认真的。 + +正确： +> + +错误： +> + +# 报告问题 +与简体中文翻译有关的问题可直接使用 [Issue](https://github.com/Teahouse-Studios/akari-bot/issues/new) 报告。 + +简体中文以外的所有语言由机器人 @Hldbot 维护，相关问题请移步 [Crowdin](https://crowdin.com/project/akari-bot) 报告。 \ No newline at end of file diff --git a/README.md b/README.md index 0bcef1897a..7b05e9192b 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ #### QQ -~~目前 QQ 上稳定运行的小可实例为小可三号机。由于腾讯风控问题，请[在此提交](https://github.com/Teahouse-Studios/bot/issues/new?assignees=OasisAkari&labels=New&template=add_new_group.yaml&title=%5BNEW%5D%3A+)入群申请。~~ +~~目前 QQ 上稳定运行的小可实例为小可三号机。由于腾讯风控问题，请[在此提交](https://github.com/Teahouse-Studios/akari-bot/issues/new?assignees=OasisAkari&labels=New&template=add_new_group.yaml&title=%5BNEW%5D%3A+)入群申请。~~ ~~QQ 频道的测试版支持也请在上方链接申请。~~ 我们正在进行 QQ 频道官方机器人入驻，未来可能会成为官方认证的机器人。 @@ -51,7 +51,7 @@ 你可以[参考这里](./DEPLOY.md)来进行尝试搭建。 -若遇到问题，可以通过 [Issue](https://github.com/Teahouse-Studios/bot/issues/new) 或其他方式咨询开发者。 +若遇到问题，可以通过 [Issue](https://github.com/Teahouse-Studios/akari-bot/issues/new) 或其他方式咨询开发者。 ### 多语言 From 3f2bcc1cbeba40d3f7efa71f1d2b8723d09300bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Thu, 14 Dec 2023 18:07:29 +0800 Subject: [PATCH 046/168] Update LOCALES.md --- LOCALES.md | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/LOCALES.md b/LOCALES.md index 02c69a6424..e0b58b6db1 100644 --- a/LOCALES.md +++ b/LOCALES.md @@ -1,3 +1,29 @@ +# 目录 +- [简介](#简介) +- [文件位置](#文件位置) +- [语言文件格式](#语言文件格式) +- [排版](#排版) + - [空格](#空格) + - [中英文之间需要增加空格](#中英文之间需要增加空格) + - [中文与数字之间需要增加空格](#中文与数字之间需要增加空格) + - [数字与单位之间的空格](#数字与单位之间的空格) + - [全角标点与其他字符之间不加空格](#全角标点与其他字符之间不加空格) + - [变量与中文之间增加增加空格](#变量与中文之间增加增加空格) + - [标点符号](#标点符号) + - [不要重复使用标点符号](#不要重复使用标点符号) + - [简体中文不得使用直角引号](#简体中文不得使用直角引号) + - [英文不得使用弯引号](#英文不得使用弯引号) + - [英文省略号使用三个点](#英文省略号使用三个点) + - [全角和半角](#全角和半角) + - [使用全角中文标点](#使用全角中文标点) + - [数字和英文使用半角字符](#数字和英文使用半角字符) + - [遇到完整的英文整句、特殊名词，其内容使用半角标点](#遇到完整的英文整句、特殊名词，其内容使用半角标点) + - [名词](#名词) + - [专有名词使用正确的大小写](#专有名词使用正确的大小写) + - [不要使用非官方的缩写](#不要使用非官方的缩写) + - [不同地区的中文使用对应的地区词](#不同地区的中文使用对应的地区词) +- [报告问题](#报告问题) + # 简介 本规范文件旨在确保项目中的多语言文本一致性和格式规范。请遵循以下内容以保持代码库中的多语言资源的统一性。 @@ -13,7 +39,7 @@ **模块字符串的命名方式**：`模块名称.字符串类别.命令名称.用途` -使用 `${变量名}` 表示变量，变量名必须使用英文，不能使用空格，如需则使用下划线代替。 +使用 `${变量名}` 表示变量，变量名必须使用英文，不能使用空格和特殊符号，如需分隔则使用下划线代替。 # 排版 > 本文部分参照[中文文案排版指北](https://github.com/sparanoid/chinese-copywriting-guidelines)，内容可能有出入。 @@ -96,7 +122,7 @@ > ### 英文省略号使用三个点 -问题同上。 +同上，请使用三个点 `...`。 正确： > @@ -112,7 +138,7 @@ 错误： > -### 数字使用半角字符 +### 数字和英文使用半角字符 正确： > @@ -154,4 +180,4 @@ # 报告问题 与简体中文翻译有关的问题可直接使用 [Issue](https://github.com/Teahouse-Studios/akari-bot/issues/new) 报告。 -简体中文以外的所有语言由机器人 @Hldbot 维护，相关问题请移步 [Crowdin](https://crowdin.com/project/akari-bot) 报告。 \ No newline at end of file +简体中文以外的所有语言由机器人 @Hldbot 维护，相关问题请移步 [Crowdin](https://crowdin.com/project/akari-bot) 报告。 From f5d3bb133d4de939ce01b5924f625d2b1a84529a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Thu, 14 Dec 2023 18:13:11 +0800 Subject: [PATCH 047/168] Update LOCALES.md --- LOCALES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LOCALES.md b/LOCALES.md index e0b58b6db1..47f36aa5db 100644 --- a/LOCALES.md +++ b/LOCALES.md @@ -8,7 +8,7 @@ - [中文与数字之间需要增加空格](#中文与数字之间需要增加空格) - [数字与单位之间的空格](#数字与单位之间的空格) - [全角标点与其他字符之间不加空格](#全角标点与其他字符之间不加空格) - - [变量与中文之间增加增加空格](#变量与中文之间增加增加空格) + - [变量与中文之间增加空格](#变量与中文之间增加空格) - [标点符号](#标点符号) - [不要重复使用标点符号](#不要重复使用标点符号) - [简体中文不得使用直角引号](#简体中文不得使用直角引号) @@ -82,7 +82,7 @@ 错误： > -### 变量与中文之间增加增加空格 +### 变量与中文之间增加空格 一般情况下，变量的输入为英文或数字，故在变量前后加入空格。 正确： From ce3981fc5b4476546dfa3f5bf560a77a71ba9ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Thu, 14 Dec 2023 19:20:48 +0800 Subject: [PATCH 048/168] Update locale --- LOCALES.md | 68 ++++++++++++++++------------- core/builtins/message/__init__.py | 7 ++- locales/zh_cn.json | 1 + modules/bilibili/locales/zh_cn.json | 4 +- modules/calc/locales/en_us.json | 2 +- modules/calc/locales/zh_cn.json | 2 +- modules/calc/locales/zh_tw.json | 2 +- modules/langconv/locales/en_us.json | 2 +- modules/langconv/locales/zh_cn.json | 2 +- 9 files changed, 51 insertions(+), 39 deletions(-) diff --git a/LOCALES.md b/LOCALES.md index 47f36aa5db..21723089c0 100644 --- a/LOCALES.md +++ b/LOCALES.md @@ -6,7 +6,7 @@ - [空格](#空格) - [中英文之间需要增加空格](#中英文之间需要增加空格) - [中文与数字之间需要增加空格](#中文与数字之间需要增加空格) - - [数字与单位之间的空格](#数字与单位之间的空格) + - [数字与单位之间不加空格](#数数字与单位之间不加空格) - [全角标点与其他字符之间不加空格](#全角标点与其他字符之间不加空格) - [变量与中文之间增加空格](#变量与中文之间增加空格) - [标点符号](#标点符号) @@ -30,7 +30,9 @@ # 文件位置 请将语言文件放置在 `/locales` 目录中，并以语言代码命名为 JSON 文件。 -根路径下的目录用于放置全局字符串，模块下的目录用于放置对应模块专用的字符串。 +根路径下的目录用于放置全局字符串，模块下的目录用于放置对应专用的模块字符串。 + +原则上，模块字符串和对应模块须对应，若模块之间存在关联则可以例外，否则请考虑转为全局字符串。 # 语言文件格式 请确保键名与字符串一一对应，不得嵌套。 @@ -61,35 +63,36 @@ 错误： > 今年的全球汽车销售量达到了8000万辆。 -### 数字与单位之间的空格 -不要在数字和单个字符构成的单位之间添加空格，因为会显得过于稀疏，否则应增加空格。 - +### 数字与单位之间不加空格 正确： -> +> 我家的光纤入户宽带有 10Gbps，SSD 一共有 10TB。 + +> 这个城市每年平均降雨量为 1200mm。 > > 角度为 90° 的角，就是直角。 -> 错误： -> +>我家的光纤入户宽带有 10 Gbps，SSD 一共有 20 TB。 + +> 这个城市每年平均降雨量为 1200 mm。 > > 角度为 90 ° 的角，就是直角。 ### 全角标点与其他字符之间不加空格 正确： -> +> 刚刚买了一部 iPhone，好开心！ 错误： -> +> 刚刚买了一部 iPhone ，好开心！ ### 变量与中文之间增加空格 -一般情况下，变量的输入为英文或数字，故在变量前后加入空格。 +一般情况下，变量的输入为英文或数字，故变量与中文之间加入空格。 正确： -> +> 你扔了一块石头，漂了 ${count} 下。 错误： -> +> 你扔了一块石头，漂了${count}下。 例外：如果变量的输入一定为中文，则不加空格。 @@ -98,19 +101,19 @@ 虽然允许重复使用标点符号，但是请别这样做。 正确： -> +> 德国队竟然战胜了巴西队！ 错误： -> +> 德国队竟然战胜了巴西队！！ ### 简体中文不得使用直角引号 直角引号并不符合简体中文使用者的使用习惯。 正确： -> +> “老师，‘有条不紊’的‘紊’是什么意思？” 错误： -> +> 「老师，『有条不紊』的『紊』是什么意思？」 ### 英文不得使用弯引号 中文弯引号和英文弯引号属于同一个字符，如果使用弯引号反而会造成阅读问题，请使用直引号 `"`。 @@ -133,49 +136,54 @@ ## 全角和半角 ### 使用全角中文标点 正确： -> +> 嗨！你知道嘛？今天前台的小妹跟我说“喵”了哎！ 错误： -> +> 嗨! 你知道嘛? 今天前台的小妹跟我说 "喵" 了哎! +> +> 嗨!你知道嘛?今天前台的小妹跟我说"喵"了哎! ### 数字和英文使用半角字符 正确： -> +> 这件蛋糕只卖 1000 元。 错误： -> +> 这件蛋糕只卖 １０００ 元。 ### 遇到完整的英文整句、特殊名词，其内容使用半角标点 正确： -> +> 乔布斯那句话是怎么说的？“Stay hungry, stay foolish.” 错误： -> +> 乔布斯那句话是怎么说的？“Stay hungry, stay foolish。” ## 名词 ### 专有名词使用正确的大小写 正确： -> +> 使用 GitHub 登录 错误： -> +> 使用 Github 登录 +> 使用 gitHub 登录 +> 使用 github 登录 +> 使用 GITHUB 登录 -### 不要使用非官方的缩写 +### 不要使用非正式的缩写 正确： -> +> 我们需要一位熟悉 JavaScript、HTML5，至少理解一种框架（如 Backbone.js、AngularJS、React 等）的前端开发者。 错误： -> +> 我们需要一位熟悉 Js、h5，至少理解一种框架（如 backbone、angular、RJS 等）的 FED。 ### 不同地区的中文使用对应的地区词 不要在繁体中文中使用“视频”等错误的地区词，认真的。 正确： -> +> 輸入影片編號取得對應資訊。 错误： -> +> 輸入視頻編號獲得相應信息。 # 报告问题 与简体中文翻译有关的问题可直接使用 [Issue](https://github.com/Teahouse-Studios/akari-bot/issues/new) 报告。 diff --git a/core/builtins/message/__init__.py b/core/builtins/message/__init__.py index 6f1a5f2050..1af47ce5b9 100644 --- a/core/builtins/message/__init__.py +++ b/core/builtins/message/__init__.py @@ -144,10 +144,13 @@ async def check_permission(self): checkPermission = check_permission checkSuperUser = check_super_user - def ts2strftime(self, timestamp: float, date=True, time=True, seconds=True, timezone=True): + def ts2strftime(self, timestamp: float, date=True, iso=False, time=True, seconds=True, timezone=True): ftime_template = [] if date: - ftime_template.append(self.locale.t("time.date.format")) + if iso: + ftime_template.append(self.locale.t("time.date.iso.format")) + else: + ftime_template.append(self.locale.t("time.date.format")) if time: if seconds: ftime_template.append(self.locale.t("time.time.format")) diff --git a/locales/zh_cn.json b/locales/zh_cn.json index 12c51ccdba..e670193ca7 100644 --- a/locales/zh_cn.json +++ b/locales/zh_cn.json @@ -59,6 +59,7 @@ "petal.message.lost.limit": "（本日失去花瓣已达到每日上限。）", "petal.message.lost.success": "失去了 ${amount} 片花瓣。", "success": "成功。", + "time.date.iso.format": "%Y-%m-%d", "time.date.format": "%Y 年 %m 月 %d 日", "time.time.format": "%H:%M:%S", "time.time.nosec.format": "%H:%M", diff --git a/modules/bilibili/locales/zh_cn.json b/modules/bilibili/locales/zh_cn.json index f1c33a093c..5e92eb17c2 100644 --- a/modules/bilibili/locales/zh_cn.json +++ b/modules/bilibili/locales/zh_cn.json @@ -6,8 +6,8 @@ "bilibili.help.regex.bv": "发送 BV 号获取视频信息。", "bilibili.help.regex.shorturl": "发送 b23.tv 短连接获取视频信息。", "bilibili.help.regex.url": "发送 URL 获取视频信息。", - "bilibili.message": "标题：${title}\n类型：${tname}\nUP 主：${owner}\n日期：${time}", - "bilibili.message.detail": "标题：${title}${pages} | 类型：${tname}\nUP 主：${owner} | 粉丝：${fans}\n观看：${view} | 弹幕：${danmaku} | 评论：${reply}\n喜欢：${like} | 投币：${coin} | 收藏：${favorite} | 分享：${share}\n日期：${time}", + "bilibili.message": "标题：${title}\n类型：${tname}\nUP主：${owner}\n日期：${time}", + "bilibili.message.detail": "标题：${title}${pages} | 类型：${tname}\nUP主：${owner} | 粉丝：${fans}\n观看：${view} | 弹幕：${danmaku} | 评论：${reply}\n喜欢：${like} | 投币：${coin} | 收藏：${favorite} | 分享：${share}\n日期：${time}", "bilibili.message.error.invalid": "发生错误：视频编号无效，请检查输入。", "bilibili.message.not_found": "未找到对应的视频。" } diff --git a/modules/calc/locales/en_us.json b/modules/calc/locales/en_us.json index cc69ad11c2..d66eb01de4 100644 --- a/modules/calc/locales/en_us.json +++ b/modules/calc/locales/en_us.json @@ -26,6 +26,6 @@ "calc.help.option.str": "转换为字符串：str(1) -> \"1\"", "calc.help.option.xor": "Bitwise xor: 1 ^ 1 -> 0", "calc.message.invalid": "Invalid expression: ${expr}", - "calc.message.running_time": "Calculating time: ${time} ms / 10000 ms. ", + "calc.message.running_time": "Calculating time: ${time}ms / 10000ms. ", "calc.message.time_out": "Calculation timeout." } \ No newline at end of file diff --git a/modules/calc/locales/zh_cn.json b/modules/calc/locales/zh_cn.json index 577849a835..523707bf97 100644 --- a/modules/calc/locales/zh_cn.json +++ b/modules/calc/locales/zh_cn.json @@ -26,6 +26,6 @@ "calc.help.option.str": "转换为字符串：str(1) -> \"1\"", "calc.help.option.xor": "按位异或：1 ^ 1 -> 0", "calc.message.invalid": "表达式无效：${expr}", - "calc.message.running_time": "计算花费时间：${time} ms / 10000 ms。", + "calc.message.running_time": "计算花费时间：${time}ms / 10000ms。", "calc.message.time_out": "计算超时。" } \ No newline at end of file diff --git a/modules/calc/locales/zh_tw.json b/modules/calc/locales/zh_tw.json index 9eeec64fd5..11571818e9 100644 --- a/modules/calc/locales/zh_tw.json +++ b/modules/calc/locales/zh_tw.json @@ -26,6 +26,6 @@ "calc.help.option.str": "轉換為字串：str(1) -> \"1\"", "calc.help.option.xor": "按位元互斥或：1 ^ 1 -> 0", "calc.message.invalid": "運算式無效：${expr}", - "calc.message.running_time": "計算耗費時間：${time} ms / 10000 ms。", + "calc.message.running_time": "計算耗費時間：${time}ms / 10000ms。", "calc.message.time_out": "計算逾時。" } \ No newline at end of file diff --git a/modules/langconv/locales/en_us.json b/modules/langconv/locales/en_us.json index 79fccb265e..57bad53748 100644 --- a/modules/langconv/locales/en_us.json +++ b/modules/langconv/locales/en_us.json @@ -1,5 +1,5 @@ { "langconv.help": "简繁转换。", "langconv.message.unsupported_language": "不支持此语言。支持的语言：zh_cn、zh_tw、zh_hk", - "langconv.message.running_time": "花费时间：${time} ms。" + "langconv.message.running_time": "花费时间：${time}ms。" } diff --git a/modules/langconv/locales/zh_cn.json b/modules/langconv/locales/zh_cn.json index 79fccb265e..57bad53748 100644 --- a/modules/langconv/locales/zh_cn.json +++ b/modules/langconv/locales/zh_cn.json @@ -1,5 +1,5 @@ { "langconv.help": "简繁转换。", "langconv.message.unsupported_language": "不支持此语言。支持的语言：zh_cn、zh_tw、zh_hk", - "langconv.message.running_time": "花费时间：${time} ms。" + "langconv.message.running_time": "花费时间：${time}ms。" } From 448b32eddddf270331c99899a854befe0f5f9f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Thu, 14 Dec 2023 19:22:47 +0800 Subject: [PATCH 049/168] update LOCALES.md --- LOCALES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/LOCALES.md b/LOCALES.md index 21723089c0..e8385917c9 100644 --- a/LOCALES.md +++ b/LOCALES.md @@ -143,6 +143,8 @@ > > 嗨!你知道嘛?今天前台的小妹跟我说"喵"了哎! +例外：如果括号内为没有中文且难以多语言化，则可以使用半角括号。 + ### 数字和英文使用半角字符 正确： > 这件蛋糕只卖 1000 元。 From b34297eba7706b15096745ec4fd1baa09982be8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Thu, 14 Dec 2023 19:39:37 +0800 Subject: [PATCH 050/168] Update locale --- LOCALES.md | 10 ++++------ core/builtins/message/__init__.py | 4 ++-- locales/en_us.json | 1 + locales/zh_cn.json | 7 ++++--- locales/zh_tw.json | 1 + modules/bilibili/bilibili.py | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/LOCALES.md b/LOCALES.md index e8385917c9..05f63baf7d 100644 --- a/LOCALES.md +++ b/LOCALES.md @@ -119,19 +119,19 @@ 中文弯引号和英文弯引号属于同一个字符，如果使用弯引号反而会造成阅读问题，请使用直引号 `"`。 正确： -> +> "Success is not final, failure is not fatal: It is the courage to continue that counts." 错误： -> +> “Success is not final, failure is not fatal: It is the courage to continue that counts.” ### 英文省略号使用三个点 同上，请使用三个点 `...`。 正确： -> +> In the serene moonlit night, whispers of ancient tales lingered, echoing through the stillness of time... 错误： -> +> In the serene moonlit night, whispers of ancient tales lingered, echoing through the stillness of time… ## 全角和半角 ### 使用全角中文标点 @@ -143,8 +143,6 @@ > > 嗨!你知道嘛?今天前台的小妹跟我说"喵"了哎! -例外：如果括号内为没有中文且难以多语言化，则可以使用半角括号。 - ### 数字和英文使用半角字符 正确： > 这件蛋糕只卖 1000 元。 diff --git a/core/builtins/message/__init__.py b/core/builtins/message/__init__.py index 1af47ce5b9..879841bfc1 100644 --- a/core/builtins/message/__init__.py +++ b/core/builtins/message/__init__.py @@ -158,9 +158,9 @@ def ts2strftime(self, timestamp: float, date=True, iso=False, time=True, seconds ftime_template.append(self.locale.t("time.time.nosec.format")) if timezone: if self._tz_offset == "+0": - ftime_template.append(f"(UTC)") + ftime_template.append(self.locale.t("message.brackets", msg="UTC")) else: - ftime_template.append(f"(UTC{self._tz_offset})") + ftime_template.append(self.locale.t("message.brackets", msg=f"UTC{self._tz_offset}")) return (datetime.utcfromtimestamp(timestamp) + self.timezone_offset).strftime(' '.join(ftime_template)) diff --git a/locales/en_us.json b/locales/en_us.json index e06179b5ce..9168c7c338 100644 --- a/locales/en_us.json +++ b/locales/en_us.json @@ -35,6 +35,7 @@ "game.message.stop.none": "This game is not in progress.", "i18n.prompt.fallback.failed": "(If you're seeing this strange string, it means something we've messed up!\nPlease send the issue back to\n${url}\nso that we can fix it in time.)", "language": "English", + "message.brackets": " (${msg})", "message.collapse": "...show only the first ${amount} items.", "message.cooldown": "${time} second(s) have passed since the last execution. The cooldown time of this command are ${cd_time} second(s).", "message.delimiter": ", ", diff --git a/locales/zh_cn.json b/locales/zh_cn.json index e670193ca7..97e83da2f0 100644 --- a/locales/zh_cn.json +++ b/locales/zh_cn.json @@ -35,13 +35,14 @@ "game.message.stop.none": "当前此游戏未在进行。", "i18n.prompt.fallback.failed": "（如果你看到了这条奇怪的字符串，说明我们又搞错了什么东西！\n请将问题反馈至\n${url}\n以便我们快速解决此问题。）", "language": "简体中文", + "message.brackets": "（${msg}）", + "message.collapse": "……仅显示前 ${amount} 条内容。", "message.cooldown": "距离上次执行已过去 ${time} 秒，本命令的冷却时间为 ${cd_time} 秒。", "message.delimiter": "、", "message.end": "。", "message.reply.prompt": "（请使用指定的词语回复本条消息）", "message.wait.confirm.prompt.type1": "（发送“是”或符合确认条件的词语来确认）", "message.wait.confirm.prompt.type2": "（发送符合条件的词语来确认）", - "message.collapse": "……仅显示前 ${amount} 条内容。", "no": "否", "none": "无", "parser.admin.module.permission.denied": "“${module}”模块下的命令仅能被该群组的管理员所使用，请联系管理员执行此命令。", @@ -59,8 +60,8 @@ "petal.message.lost.limit": "（本日失去花瓣已达到每日上限。）", "petal.message.lost.success": "失去了 ${amount} 片花瓣。", "success": "成功。", - "time.date.iso.format": "%Y-%m-%d", "time.date.format": "%Y 年 %m 月 %d 日", + "time.date.iso.format": "%Y-%m-%d", "time.time.format": "%H:%M:%S", "time.time.nosec.format": "%H:%M", "tos.reason": "具体原因：", @@ -75,4 +76,4 @@ "tos.warning.last": "这是最后一次警告。", "unknown": "未知", "yes": "是" -} +} \ No newline at end of file diff --git a/locales/zh_tw.json b/locales/zh_tw.json index ebeac2506e..7e5950cf2c 100644 --- a/locales/zh_tw.json +++ b/locales/zh_tw.json @@ -35,6 +35,7 @@ "game.message.stop.none": "目前此遊戲沒有在進行。", "i18n.prompt.fallback.failed": "（如果你看到了這條奇怪的字串，說明我們又搞錯了什麼！\n請將問題回報至\n${url}\n以便我們快速解決此問題。）", "language": "繁體中文", + "message.brackets": "（${msg}）", "message.collapse": "……僅顯示前 ${amount} 條內容。", "message.cooldown": "距上次執行已過去 ${time} 秒，此指令的冷卻時間為 ${cd_time} 秒。", "message.delimiter": "、", diff --git a/modules/bilibili/bilibili.py b/modules/bilibili/bilibili.py index 7f1ba44342..0d68d6fbd7 100644 --- a/modules/bilibili/bilibili.py +++ b/modules/bilibili/bilibili.py @@ -22,7 +22,7 @@ async def get_info(msg: Bot.MessageSession, url, get_detail): time = msg.ts2strftime(view['ctime'], timezone=False) if len(view['pages']) > 1: - pages = f" ({len(view['pages'])}P)" + pages = msg.locale.t("message.brackets", msg=f"{len(view['pages'])}P") else: pages = '' From 9be2af13c4cb20a15aab973267940c2783b2d79a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Thu, 14 Dec 2023 19:46:37 +0800 Subject: [PATCH 051/168] Update __init__.py --- core/builtins/message/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/builtins/message/__init__.py b/core/builtins/message/__init__.py index 879841bfc1..daebcd886d 100644 --- a/core/builtins/message/__init__.py +++ b/core/builtins/message/__init__.py @@ -158,9 +158,9 @@ def ts2strftime(self, timestamp: float, date=True, iso=False, time=True, seconds ftime_template.append(self.locale.t("time.time.nosec.format")) if timezone: if self._tz_offset == "+0": - ftime_template.append(self.locale.t("message.brackets", msg="UTC")) + ftime_template.append(self.locale.t("(UTC)") else: - ftime_template.append(self.locale.t("message.brackets", msg=f"UTC{self._tz_offset}")) + ftime_template.append(self.locale.t("(UTC{self._tz_offset})") return (datetime.utcfromtimestamp(timestamp) + self.timezone_offset).strftime(' '.join(ftime_template)) From 7eeddc8fda67e2d4c358ededdb597a433196df35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Thu, 14 Dec 2023 19:49:12 +0800 Subject: [PATCH 052/168] fix --- core/builtins/message/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/builtins/message/__init__.py b/core/builtins/message/__init__.py index daebcd886d..dca5eb93da 100644 --- a/core/builtins/message/__init__.py +++ b/core/builtins/message/__init__.py @@ -160,7 +160,7 @@ def ts2strftime(self, timestamp: float, date=True, iso=False, time=True, seconds if self._tz_offset == "+0": ftime_template.append(self.locale.t("(UTC)") else: - ftime_template.append(self.locale.t("(UTC{self._tz_offset})") + ftime_template.append(self.locale.t(f"(UTC{self._tz_offset})") return (datetime.utcfromtimestamp(timestamp) + self.timezone_offset).strftime(' '.join(ftime_template)) From 3345bc220495b049322dcf9b9f69f5897270d4d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Thu, 14 Dec 2023 19:50:44 +0800 Subject: [PATCH 053/168] Update __init__.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🙃 --- core/builtins/message/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/builtins/message/__init__.py b/core/builtins/message/__init__.py index dca5eb93da..bc67a081ab 100644 --- a/core/builtins/message/__init__.py +++ b/core/builtins/message/__init__.py @@ -158,9 +158,9 @@ def ts2strftime(self, timestamp: float, date=True, iso=False, time=True, seconds ftime_template.append(self.locale.t("time.time.nosec.format")) if timezone: if self._tz_offset == "+0": - ftime_template.append(self.locale.t("(UTC)") + ftime_template.append("(UTC)") else: - ftime_template.append(self.locale.t(f"(UTC{self._tz_offset})") + ftime_template.append(f"(UTC{self._tz_offset})") return (datetime.utcfromtimestamp(timestamp) + self.timezone_offset).strftime(' '.join(ftime_template)) From ee6f7c0fbba00a02baccdcfcff3a4b870607adb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Thu, 14 Dec 2023 20:05:28 +0800 Subject: [PATCH 054/168] Update cytoid --- modules/bilibili/bilibili.py | 2 +- modules/cytoid/__init__.py | 4 ++-- modules/cytoid/rating.py | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/bilibili/bilibili.py b/modules/bilibili/bilibili.py index 0d68d6fbd7..c03d42e95a 100644 --- a/modules/bilibili/bilibili.py +++ b/modules/bilibili/bilibili.py @@ -19,7 +19,7 @@ async def get_info(msg: Bot.MessageSession, url, get_detail): video_url = f"https://www.bilibili.com/video/{view['bvid']}" title = view['title'] tname = view['tname'] - time = msg.ts2strftime(view['ctime'], timezone=False) + time = msg.ts2strftime(view['ctime'], iso=True, timezone=False) if len(view['pages']) > 1: pages = msg.locale.t("message.brackets", msg=f"{len(view['pages'])}P") diff --git a/modules/cytoid/__init__.py b/modules/cytoid/__init__.py index fce4a541f6..94b03bbf12 100644 --- a/modules/cytoid/__init__.py +++ b/modules/cytoid/__init__.py @@ -24,7 +24,7 @@ async def _(msg: Bot.MessageSession): elif 'r30' in msg.parsed_msg: query = 'r30' else: - raise + return pat = msg.parsed_msg.get('', False) if pat: query_id = pat @@ -39,7 +39,7 @@ async def _(msg: Bot.MessageSession): qc = CoolDown('cytoid_rank', msg) c = qc.check(150) if c == 0: - img = await get_rating(query_id, query, msg) + img = await get_rating(msg, query_id, query) if 'path' in img: await msg.send_message([Image(path=img['path'])], allow_split_image=False) if 'text' in img: diff --git a/modules/cytoid/rating.py b/modules/cytoid/rating.py index 7ce91cd2de..8c9c8d54e5 100644 --- a/modules/cytoid/rating.py +++ b/modules/cytoid/rating.py @@ -20,7 +20,7 @@ from core.utils.html2text import html2text -async def get_rating(uid, query_type, msg: Bot.MessageSession): +async def get_rating(msg: Bot.MessageSession, uid, query_type): try: if query_type == 'b30': query_type = 'bestRecords' @@ -88,7 +88,7 @@ async def get_rating(uid, query_type, msg: Bot.MessageSession): resources = [] songcards = [] - async def mkresources(x, rank): + async def mkresources(msg: Bot.MessageSession, x, rank): thumbpath = await download_cover_thumb(x['chart']['level']['uid']) chart_type = x['chart']['type'] difficulty = x['chart']['difficulty'] @@ -98,7 +98,7 @@ async def mkresources(x, rank): rt = x['rating'] details = x['details'] _date = datetime.strptime(x['date'], "%Y-%m-%dT%H:%M:%S.%fZ") - local_time = _date + timedelta(hours=int(Config("timezone_offset", 8))) + local_time = _date + timedelta(hours=int(msg.options.get('timezone_offset', Config('timezone_offset', '+8')))) playtime = local_time.timestamp() nowtime = time.time() playtime = playtime - nowtime @@ -125,7 +125,7 @@ async def mkresources(x, rank): for x in best_records: rank += 1 - resources.append(mkresources(x, rank)) + resources.append(mkresources(msg, x, rank)) await asyncio.gather(*resources) cards_ = await asyncio.gather(*songcards) From 2a52b0b507f8ba5f60f7d72140d1b933108f867c Mon Sep 17 00:00:00 2001 From: Dorobot <128296202+Hldbot@users.noreply.github.com> Date: Thu, 14 Dec 2023 21:14:49 +0800 Subject: [PATCH 055/168] New Crowdin updates (#1056) --- locales/en_us.json | 1 + locales/zh_tw.json | 3 ++- modules/bilibili/locales/zh_tw.json | 2 +- modules/cytoid/locales/en_us.json | 1 + modules/langconv/locales/zh_tw.json | 2 +- modules/mcv/locales/en_us.json | 4 ++-- modules/mcv/locales/zh_tw.json | 4 ++-- modules/mcv_rss/locales/en_us.json | 2 +- modules/mcv_rss/locales/zh_tw.json | 8 ++++---- modules/ncmusic/locales/en_us.json | 13 ++++++++----- modules/ncmusic/locales/zh_tw.json | 2 ++ modules/wiki/locales/en_us.json | 5 +++++ modules/wiki/locales/zh_cn.json | 2 +- modules/wiki/locales/zh_tw.json | 5 +++++ 14 files changed, 36 insertions(+), 18 deletions(-) diff --git a/locales/en_us.json b/locales/en_us.json index 9168c7c338..05ceee6ef3 100644 --- a/locales/en_us.json +++ b/locales/en_us.json @@ -61,6 +61,7 @@ "petal.message.lost.success": "You lost ${amount} petal(s).", "success": "Success.", "time.date.format": "%B %d, %Y", + "time.date.iso.format": "%Y-%m-%d", "time.time.format": "%H:%M:%S", "time.time.nosec.format": "%H:%M", "tos.reason": "Reason: ", diff --git a/locales/zh_tw.json b/locales/zh_tw.json index 7e5950cf2c..e9ab542940 100644 --- a/locales/zh_tw.json +++ b/locales/zh_tw.json @@ -60,7 +60,8 @@ "petal.message.lost.limit": "（本日失去花瓣已達到每日上限。）", "petal.message.lost.success": "失去了 ${amount} 片花瓣。", "success": "成功。", - "time.date.format": "%Y年%m月%d日", + "time.date.format": "%Y 年 %m 月 %d 日", + "time.date.iso.format": "%Y-%m-%d", "time.time.format": "%H:%M:%S", "time.time.nosec.format": "%H:%M", "tos.reason": "原因：", diff --git a/modules/bilibili/locales/zh_tw.json b/modules/bilibili/locales/zh_tw.json index a7d562aa27..1ffab802d5 100644 --- a/modules/bilibili/locales/zh_tw.json +++ b/modules/bilibili/locales/zh_tw.json @@ -6,7 +6,7 @@ "bilibili.help.regex.bv": "傳送 BV 號取得影片資訊。", "bilibili.help.regex.shorturl": "傳送 b23.tv 短網址取得影片資訊。", "bilibili.help.regex.url": "傳送 URL 取得影片資訊。", - "bilibili.message": "標題：${title}\n類型：${tname}\nUP 主：${owner}\n日期：${time}", + "bilibili.message": "標題：${title}\n類型：${tname}\nUP主：${owner}\n日期：${time}", "bilibili.message.detail": "標題：${title}${pages} | 類型：${tname}\nUP 主：${owner} | 追隨者：${fans}\n觀看：${view} | 彈幕：${danmaku} | 留言：${reply}\n喜歡：${like} | 投幣：${coin} | 收藏：${favorite} | 分享：${share}\n日期：${time}", "bilibili.message.error.invalid": "發生錯誤：影片編號無效，請校對輸入。", "bilibili.message.not_found": "未找到對應的影片。" diff --git a/modules/cytoid/locales/en_us.json b/modules/cytoid/locales/en_us.json index 94c1b91028..461bdc8558 100644 --- a/modules/cytoid/locales/en_us.json +++ b/modules/cytoid/locales/en_us.json @@ -6,6 +6,7 @@ "cytoid.help.r30": "查询 Cytoid 用户的 R30 列表。", "cytoid.help.unbind": "解绑用户。", "cytoid.message.b30.cooldown": "（据官方人员所述，此 API 的调用十分昂贵，故手动做出此限制，请谅解。）", + "cytoid.message.b30.level": "等级", "cytoid.message.bind.failed": "绑定失败，请检查输入。", "cytoid.message.bind.success": "绑定成功：", "cytoid.message.unbind.success": "解绑成功。", diff --git a/modules/langconv/locales/zh_tw.json b/modules/langconv/locales/zh_tw.json index d25aaa96f6..0dba8448a2 100644 --- a/modules/langconv/locales/zh_tw.json +++ b/modules/langconv/locales/zh_tw.json @@ -1,5 +1,5 @@ { "langconv.help": "繁簡轉換。", "langconv.message.unsupported_language": "不支援此語言。已支援的語言：zh_cn、zh_tw、zh_hk", - "langconv.message.running_time": "花費時間：${time} ms。" + "langconv.message.running_time": "花費時間：${time}ms。" } diff --git a/modules/mcv/locales/en_us.json b/modules/mcv/locales/en_us.json index a2a89361d7..f4a38fd73d 100644 --- a/modules/mcv/locales/en_us.json +++ b/modules/mcv/locales/en_us.json @@ -14,6 +14,6 @@ "mcv.message.mclgv": "The latest version: ${version}\n(The data from Mojira may be earlier than the official release. Information is for reference purposes only).", "mcv.message.mcv": "The latest version in the launcher is: \n${launcher_ver}\nThe latest version recorded on Mojira is: \n${jira_ver}\n(The latest version in the launcher shall prevail, Mojira is only for previewing the version)", "mcv.message.mcv.jira.failed": "Failed to get Mojira information.", - "mcv.message.mcv.launcher": "The latest release: ${release}, the latest snapshot: ${snapshot},", + "mcv.message.mcv.launcher": "The latest release: ${release}\nRelease time: ${release_time}\nThe latest snapshot: ${snapshot}\nRelease time: ${snapshot_time}", "mcv.message.mcv.launcher.failed": "Failed to get manifest.json." -} \ No newline at end of file +} diff --git a/modules/mcv/locales/zh_tw.json b/modules/mcv/locales/zh_tw.json index 28e2ecb27b..1bc6f7f870 100644 --- a/modules/mcv/locales/zh_tw.json +++ b/modules/mcv/locales/zh_tw.json @@ -14,6 +14,6 @@ "mcv.message.mclgv": "最新版：${version}\n（資訊來源於 Mojira，可能會比官方發布要早一段時間。資訊僅供參考。）", "mcv.message.mcv": "目前啟動器內最新版本為：\n${launcher_ver}\nMojira 上所記錄最新版本為：\n${jira_ver}\n（以啟動器內最新版本為準，Mojira 僅作版本號預覽用）", "mcv.message.mcv.jira.failed": "取得 Mojira 資訊失敗。", - "mcv.message.mcv.launcher": "最新版：${release}，最新快照：${snapshot}，", + "mcv.message.mcv.launcher": "最新版：${release}\n發佈於：${release_time}\n最新快照：${snapshot}\n發佈於：${snapshot_time}\n", "mcv.message.mcv.launcher.failed": "取得 manifest.json 失敗。" -} \ No newline at end of file +} diff --git a/modules/mcv_rss/locales/en_us.json b/modules/mcv_rss/locales/en_us.json index 52d1e3b12e..d4bb6045c0 100644 --- a/modules/mcv_rss/locales/en_us.json +++ b/modules/mcv_rss/locales/en_us.json @@ -13,4 +13,4 @@ "mcv_rss.message.mcv_jira_rss.future": "Java Edition ${version} is added to Mojira.\n(“Future Version” only indicates that a new version is planned; you will have to wait for Mojang to release it in the Launcher.)", "mcv_rss.message.mcv_rss.release": "${version} is now released in Minecraft Launcher.", "mcv_rss.message.mcv_rss.snapshot": "Snapshot ${version} is now released in Minecraft Launcher." -} \ No newline at end of file +} diff --git a/modules/mcv_rss/locales/zh_tw.json b/modules/mcv_rss/locales/zh_tw.json index 972bf85250..b5a8982f45 100644 --- a/modules/mcv_rss/locales/zh_tw.json +++ b/modules/mcv_rss/locales/zh_tw.json @@ -2,7 +2,7 @@ "mcv_rss.help.mcbv_jira_rss.desc": "啟用後 Mojira 更新基岩版時會自動推播訊息。", "mcv_rss.help.mcbv_rss.desc": "啟用後商店更新 Minecraft 基岩版時會自動推播訊息。", "mcv_rss.help.mcdv_jira_rss.desc": "啟用後 Mojira 更新 Minecraft Dungeons 時會自動推播訊息。", - "mcv_rss.help.mclgv_jira_rss.desc": "开启后 Mojira 更新 Minecraft Legends 时会自动推送消息。", + "mcv_rss.help.mclgv_jira_rss.desc": "啟用後 Mojira 更新 Minecraft Legends 時會自動推播訊息。", "mcv_rss.help.mcv_jira_rss.desc": "啟用後 Mojira 更新 Java 版時會自動推播訊息。", "mcv_rss.help.mcv_rss.desc": "啟用後 Minecraft 啟動器更新 Minecraft：Java 版時會自動推播訊息。", "mcv_rss.message.mcbv_jira_rss": "Mojira 已更新基岩版 ${version}。 \n（Mojira 上的資訊僅作版本號預覽用，不代表啟動器已更新此版本）", @@ -11,6 +11,6 @@ "mcv_rss.message.mclgv_jira_rss": "Mojira 已更新 Minecraft Legends ${version}。 \n（Mojira 上的資訊僅作版本號預覽用，不代表啟動器/商店已更新此版本）", "mcv_rss.message.mcv_jira_rss": "Mojira 已更新 Java 版 ${version}。 \n（Mojira 上的資訊僅作版本號預覽用，不代表啟動器已更新此版本）", "mcv_rss.message.mcv_jira_rss.future": "Mojira 已新增 Java 版 ${version}。 \n（Future Version 僅代表與此相關的版本正在規劃中，不代表啟動器已更新此版本）", - "mcv_rss.message.mcv_rss.release": "啟動器已更新 ${version} 正式版。", - "mcv_rss.message.mcv_rss.snapshot": "啟動器已更新 ${version} 快照。" -} \ No newline at end of file + "mcv_rss.message.mcv_rss.release": "啟動器已更新 ${version} 正式版。\n更新時間：", + "mcv_rss.message.mcv_rss.snapshot": "啟動器已更新 ${version} 快照。\n更新時間：" +} diff --git a/modules/ncmusic/locales/en_us.json b/modules/ncmusic/locales/en_us.json index 8f70882a75..316a5cc62a 100644 --- a/modules/ncmusic/locales/en_us.json +++ b/modules/ncmusic/locales/en_us.json @@ -1,15 +1,18 @@ { + "ncmusic.help.desc": "网易云音乐相关工具。", + "ncmusic.help.info": "获取音乐详细信息。", "ncmusic.help.search": "搜索网易云音乐。", "ncmusic.help.search.legacy": "搜索网易云音乐。（旧版）", - "ncmusic.help.info": "获取音乐详细信息。", - "ncmusic.message.info": "歌名：${name}（${id}）\n歌手：${artists}\n专辑名：${album}（${album_id}）", + "ncmusic.message.info": "歌名：${name}（${id}）\n专辑名：${album}（${album_id}）\n歌手：${artists}", + "ncmusic.message.info.not_found": "找不到对应的音乐。", + "ncmusic.message.search.confirm": "是否查看音乐详细信息？", "ncmusic.message.search.invalid.non_digital": "无效的编号，必须为数字。", "ncmusic.message.search.invalid.out_of_range": "编号超出范围。", "ncmusic.message.search.not_found": "未找到结果。", "ncmusic.message.search.prompt": "输入对应的序号以查看歌曲信息。", + "ncmusic.message.search.result": "搜索结果：", "ncmusic.message.search.table.header.album": "专辑名", "ncmusic.message.search.table.header.artists": "歌手", "ncmusic.message.search.table.header.id": "序号", - "ncmusic.message.search.table.header.name": "歌名", - "ncmusic.message.search.result": "搜索结果：" -} + "ncmusic.message.search.table.header.name": "歌名" +} \ No newline at end of file diff --git a/modules/ncmusic/locales/zh_tw.json b/modules/ncmusic/locales/zh_tw.json index f76f04c5df..c6d9b821c0 100644 --- a/modules/ncmusic/locales/zh_tw.json +++ b/modules/ncmusic/locales/zh_tw.json @@ -1,8 +1,10 @@ { + "ncmusic.help.desc": "网易云音乐相关工具。", "ncmusic.help.info": "取得音樂詳細資訊。", "ncmusic.help.search": "搜尋網易雲音樂。", "ncmusic.help.search.legacy": "搜尋網易雲音樂。（舊版）", "ncmusic.message.info": "歌名：${name}（${id}）\n歌手：${artists}\n專輯名：${album}（${album_id}）", + "ncmusic.message.info.not_found": "找不到对应的音乐。", "ncmusic.message.search.confirm": "是否檢視音樂詳細資訊？", "ncmusic.message.search.invalid.non_digital": "無效的編號，必須為數字。", "ncmusic.message.search.invalid.out_of_range": "編號超出範圍。", diff --git a/modules/wiki/locales/en_us.json b/modules/wiki/locales/en_us.json index 3d669a7870..70386d5652 100644 --- a/modules/wiki/locales/en_us.json +++ b/modules/wiki/locales/en_us.json @@ -29,6 +29,8 @@ "wiki.help.wiki_inline.page": "Enter a title within [[ ]] to automatically query the page.", "wiki.help.wiki_inline.template": "Enter a title within {{ }} to automatically query the template.", "wiki.help.wiki_inline.url": "Send the URL of the wiki page to generate the Infobox image.", + "wiki.message.section": "章节", + "wiki.message.section.rendering": "（章节渲染中）", "wiki.message.ab.qq.title": "滥用过滤器日志", "wiki.message.ab.qq.title.address": "滥用过滤器日志地址", "wiki.message.ab.slice": "•${title} - ${user} at ${time}\n Filter description: ${filter_name}\n Actions taken: ${result}", @@ -37,6 +39,7 @@ "wiki.message.error.info": "Detail: ", "wiki.message.error.query": "An error occurred: Unable to query this wiki.", "wiki.message.error.set": "An error occurred: Unable to set up this wiki.", + "wiki.message.error.unable_to_render_section": "（章节渲染失败，请联系开发者检查原因）", "wiki.message.fandom.disable": "Disabled to use Fandom global Interwiki queries.", "wiki.message.fandom.enable": "Enabled to use Fandom global Interwiki queries.", "wiki.message.flies": "This page includes the following files:", @@ -47,6 +50,8 @@ "wiki.message.id.error": "An error occurred: Page ID must be numeric.", "wiki.message.id.not_found": "Page with page ID ${id} not found.", "wiki.message.invalid_namespace": "There is no namespace named ${namespace} on this wiki. Please check your input.", + "wiki.message.invalid_section": "此章节不存在，以下是可能的章节（回复对应序号以选中）：", + "wiki.message.invalid_section.prompt": "（此章节不存在）", "wiki.message.iw.add.success": "Custom Interwiki added:\n ${iw} -> ${name}", "wiki.message.iw.get.not_found": "Interwiki not found: ${iw}", "wiki.message.iw.list": "Use \"${prefix}wiki iw get \" to get the corresponding link to Interwiki.", diff --git a/modules/wiki/locales/zh_cn.json b/modules/wiki/locales/zh_cn.json index bb62c6ce80..1871ac8f02 100644 --- a/modules/wiki/locales/zh_cn.json +++ b/modules/wiki/locales/zh_cn.json @@ -50,7 +50,7 @@ "wiki.message.id.error": "发生错误：页面 ID 必须为数字。", "wiki.message.id.not_found": "未找到页面 ID 为 ${id} 的页面。", "wiki.message.invalid_namespace": "此 Wiki 上没有名为 ${namespace} 的命名空间，请检查输入。", - "wiki.message.invalid_section": "此章节不存在，以下是可能的章节（回复本条消息序号可选中）：", + "wiki.message.invalid_section": "此章节不存在，以下是可能的章节（回复对应序号以选中）：", "wiki.message.invalid_section.prompt": "（此章节不存在）", "wiki.message.iw.add.success": "已添加自定义 Interwiki：\n${iw} -> ${name}", "wiki.message.iw.get.not_found": "未找到 Interwiki：${iw}", diff --git a/modules/wiki/locales/zh_tw.json b/modules/wiki/locales/zh_tw.json index 91ec0751de..d3e155adff 100644 --- a/modules/wiki/locales/zh_tw.json +++ b/modules/wiki/locales/zh_tw.json @@ -29,6 +29,8 @@ "wiki.help.wiki_inline.page": "在 [[ ]] 內輸入標題以自動查詢頁面。", "wiki.help.wiki_inline.template": "在 {{ }} 內輸入標題以自動查詢模板。", "wiki.help.wiki_inline.url": "傳送 Wiki 頁面的 URL 以生成 Infobox 圖片。", + "wiki.message.section": "章節", + "wiki.message.section.rendering": "（章節成像中）", "wiki.message.ab.qq.title": "防濫用過濾器日誌", "wiki.message.ab.qq.title.address": "防濫用過濾器位址", "wiki.message.ab.slice": "•${title} - ${user} 於 ${time}\n 過濾器描述：${filter_name}\n 採取的動作：${result}", @@ -37,6 +39,7 @@ "wiki.message.error.info": "詳細訊息：", "wiki.message.error.query": "發生錯誤：無法查詢此 Wiki。", "wiki.message.error.set": "發生錯誤：無法設定此 Wiki。", + "wiki.message.error.unable_to_render_section": "（章節成像失敗，請聯絡開發人員檢查原因）", "wiki.message.fandom.disable": "已停用 Fandom 全域 Interwiki 查詢。", "wiki.message.fandom.enable": "已啟用 Fandom 全域 Interwiki 查詢。", "wiki.message.flies": "此頁面含有以下檔案：", @@ -47,6 +50,8 @@ "wiki.message.id.error": "發生錯誤：頁面 ID 必須為數字。", "wiki.message.id.not_found": "未找到頁面 ID 為 ${id} 的頁面。", "wiki.message.invalid_namespace": "此 Wiki 上沒有名為 ${namespace} 的命名空間，请校對輸入。", + "wiki.message.invalid_section": "此章節不存在，以下是可能的章節（回覆對應序號以選中）：", + "wiki.message.invalid_section.prompt": "（此章節不存在）", "wiki.message.iw.add.success": "已新增自訂 Interwiki：\n${iw} -> ${name}", "wiki.message.iw.get.not_found": "未找到 Interwiki：${iw}", "wiki.message.iw.list": "使用 「${prefix}wiki iw get 」可以取得 Interwiki 對應的連結。", From 583d3c37182ac077a50514bb02a7d4c2cd7a37ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Thu, 14 Dec 2023 21:23:35 +0800 Subject: [PATCH 056/168] Update LOCALES.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改语病 --- LOCALES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LOCALES.md b/LOCALES.md index 05f63baf7d..d1ad74f0ce 100644 --- a/LOCALES.md +++ b/LOCALES.md @@ -98,7 +98,7 @@ ## 标点符号 ### 不要重复使用标点符号 -虽然允许重复使用标点符号，但是请别这样做。 +虽然重复使用标点符号是被允许的行为，但是请别这样做。 正确： > 德国队竟然战胜了巴西队！ From ecfcb6f6c7b33e7cb5d0cd07c056d91d441a9adf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Thu, 14 Dec 2023 21:30:02 +0800 Subject: [PATCH 057/168] fix --- LOCALES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/LOCALES.md b/LOCALES.md index d1ad74f0ce..e641e189d0 100644 --- a/LOCALES.md +++ b/LOCALES.md @@ -164,8 +164,11 @@ 错误： > 使用 Github 登录 +> > 使用 gitHub 登录 +> > 使用 github 登录 +> > 使用 GITHUB 登录 ### 不要使用非正式的缩写 From df5ee8563f0f5babde1391893e8c81b31995a4ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Thu, 14 Dec 2023 21:37:57 +0800 Subject: [PATCH 058/168] Update LOCALES.md --- LOCALES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LOCALES.md b/LOCALES.md index e641e189d0..85a0c495d4 100644 --- a/LOCALES.md +++ b/LOCALES.md @@ -20,7 +20,7 @@ - [遇到完整的英文整句、特殊名词，其内容使用半角标点](#遇到完整的英文整句、特殊名词，其内容使用半角标点) - [名词](#名词) - [专有名词使用正确的大小写](#专有名词使用正确的大小写) - - [不要使用非官方的缩写](#不要使用非官方的缩写) + - [不要使用非正式的缩写](#不要使用非正式的缩写) - [不同地区的中文使用对应的地区词](#不同地区的中文使用对应的地区词) - [报告问题](#报告问题) From 50a62f43e1e156b9ebbabd0e745fc947f1d453cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Thu, 14 Dec 2023 21:47:46 +0800 Subject: [PATCH 059/168] Update LOCALES.md --- LOCALES.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/LOCALES.md b/LOCALES.md index 85a0c495d4..c4e21514c5 100644 --- a/LOCALES.md +++ b/LOCALES.md @@ -6,18 +6,18 @@ - [空格](#空格) - [中英文之间需要增加空格](#中英文之间需要增加空格) - [中文与数字之间需要增加空格](#中文与数字之间需要增加空格) - - [数字与单位之间不加空格](#数数字与单位之间不加空格) + - [数字与单位之间不加空格](#数字与单位之间不加空格) - [全角标点与其他字符之间不加空格](#全角标点与其他字符之间不加空格) - - [变量与中文之间增加空格](#变量与中文之间增加空格) + - [变量与中文之间需要增加空格](#变量与中文之间需要增加空格) - [标点符号](#标点符号) - [不要重复使用标点符号](#不要重复使用标点符号) - - [简体中文不得使用直角引号](#简体中文不得使用直角引号) - - [英文不得使用弯引号](#英文不得使用弯引号) + - [简体中文不要使用直角引号](#简体中文不要使用直角引号) + - [英文不要使用弯引号](#英文不要使用弯引号) - [英文省略号使用三个点](#英文省略号使用三个点) - [全角和半角](#全角和半角) - [使用全角中文标点](#使用全角中文标点) - [数字和英文使用半角字符](#数字和英文使用半角字符) - - [遇到完整的英文整句、特殊名词，其内容使用半角标点](#遇到完整的英文整句、特殊名词，其内容使用半角标点) + - [遇到完整的英文成句内容中使用半角标点](#遇到完整的英文成句内容中使用半角标点) - [名词](#名词) - [专有名词使用正确的大小写](#专有名词使用正确的大小写) - [不要使用非正式的缩写](#不要使用非正式的缩写) @@ -85,7 +85,7 @@ 错误： > 刚刚买了一部 iPhone ，好开心！ -### 变量与中文之间增加空格 +### 变量与中文之间需要增加空格 一般情况下，变量的输入为英文或数字，故变量与中文之间加入空格。 正确： @@ -104,9 +104,9 @@ > 德国队竟然战胜了巴西队！ 错误： -> 德国队竟然战胜了巴西队！！ +> 德国队竟然战胜了巴西队！！！ -### 简体中文不得使用直角引号 +### 简体中文不要使用直角引号 直角引号并不符合简体中文使用者的使用习惯。 正确： @@ -115,7 +115,7 @@ 错误： > 「老师，『有条不紊』的『紊』是什么意思？」 -### 英文不得使用弯引号 +### 英文不要使用弯引号 中文弯引号和英文弯引号属于同一个字符，如果使用弯引号反而会造成阅读问题，请使用直引号 `"`。 正确： @@ -145,12 +145,12 @@ ### 数字和英文使用半角字符 正确： -> 这件蛋糕只卖 1000 元。 +> 这件蛋糕只卖 200 元。 错误： -> 这件蛋糕只卖 １０００ 元。 +> 这件蛋糕只卖 ２００ 元。 -### 遇到完整的英文整句、特殊名词，其内容使用半角标点 +### 遇到完整的英文成句内容中使用半角标点 正确： > 乔布斯那句话是怎么说的？“Stay hungry, stay foolish.” From d2b2ee540a5239d6b85482fb15cf09f7a4059aa1 Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Thu, 14 Dec 2023 22:34:59 +0800 Subject: [PATCH 060/168] Update message.py --- bots/lagrange/message.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/lagrange/message.py b/bots/lagrange/message.py index b23950ccad..bfc6185c03 100644 --- a/bots/lagrange/message.py +++ b/bots/lagrange/message.py @@ -104,7 +104,7 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal msg.append({ "type": "text", "data": { - "text": x.text + "text": ('\n' if count != 0 else '') + x.text } }) elif isinstance(x, Image): @@ -124,7 +124,7 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal self.locale.t("error.message.timeout"))) except aiocqhttp.exceptions.ActionFailed: message_chain.insert(0, Plain(self.locale.t("error.message.limited.msg2img"))) - msg2img = MessageSegment.image(Path(await msgchain2image(self, message_chain)).as_uri()) + msg2img = MessageSegment.image(Path(await msgchain2image(message_chain, self)).as_uri()) try: send = await bot.send_group_msg(group_id=int(self.session.target), message=msg2img) except aiocqhttp.exceptions.ActionFailed as e: From 11a0c6a084ea9174bef6daf6832920d713b947e4 Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Thu, 14 Dec 2023 22:55:24 +0800 Subject: [PATCH 061/168] Update wikilib.py --- modules/wiki/utils/wikilib.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/wiki/utils/wikilib.py b/modules/wiki/utils/wikilib.py index 66e524b217..0172283f41 100644 --- a/modules/wiki/utils/wikilib.py +++ b/modules/wiki/utils/wikilib.py @@ -500,17 +500,6 @@ async def parse_page_info(self, title: str = None, pageid: int = None, inline=Fa if query is None: return PageInfo(title=title, link=None, desc=self.locale.t("wiki.message.utils.wikilib.error.empty"), info=self.wiki_info) - if selected_section or page_info.invalid_section: - parse_section_string = {'action': 'parse', 'page': title, 'prop': 'sections'} - parse_section = await self.get_json(**parse_section_string) - section_list = [] - sections = parse_section['parse']['sections'] - for s in sections: - section_list.append(s['anchor']) - page_info.sections = section_list - if selected_section: - if urllib.parse.unquote(selected_section) not in section_list: - page_info.invalid_section = True redirects_: List[Dict[str, str]] = query.get('redirects') if redirects_ is not None: @@ -617,6 +606,17 @@ async def search_something(srwhat): else: page_info.status = True templates = page_info.templates = [t['title'] for t in page_raw.get('templates', [])] + if selected_section or page_info.invalid_section: + parse_section_string = {'action': 'parse', 'page': title, 'prop': 'sections'} + parse_section = await self.get_json(**parse_section_string) + section_list = [] + sections = parse_section['parse']['sections'] + for s in sections: + section_list.append(s['anchor']) + page_info.sections = section_list + if selected_section: + if urllib.parse.unquote(selected_section) not in section_list: + page_info.invalid_section = True if 'special' in page_raw: full_url = re.sub(r'\$1', urllib.parse.quote(title.encode('UTF-8')), From b931ce3ff16911bc57911dd24589d395051e5db4 Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Thu, 14 Dec 2023 23:08:43 +0800 Subject: [PATCH 062/168] Update inline.py --- modules/wiki/inline.py | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/modules/wiki/inline.py b/modules/wiki/inline.py index cf126de6d8..ac59920ac5 100644 --- a/modules/wiki/inline.py +++ b/modules/wiki/inline.py @@ -9,6 +9,7 @@ from core.dirty_check import check from core.logger import Logger from core.utils.http import download_to_cache +from core.utils.image_table import image_table_render, ImageTable from modules.wiki.utils.dbutils import WikiTargetInfo from modules.wiki.utils.screenshot_image import generate_screenshot_v1, generate_screenshot_v2 from modules.wiki.utils.wikilib import WikiLib @@ -20,7 +21,7 @@ @wiki_inline.regex(re.compile(r'\[\[(.*?)]]', flags=re.I), mode='A', - desc="{wiki.help.wiki_inline.page}") + desc="{wiki.help.wiki_inline.page}") async def _(msg: Bot.MessageSession): query_list = [] for x in msg.matched_msg: @@ -31,7 +32,7 @@ async def _(msg: Bot.MessageSession): @wiki_inline.regex(re.compile(r'\{\{(.*?)}}', flags=re.I), mode='A', - desc='{wiki.help.wiki_inline.template}') + desc='{wiki.help.wiki_inline.template}') async def _(msg: Bot.MessageSession): query_list = [] for x in msg.matched_msg: @@ -42,7 +43,7 @@ async def _(msg: Bot.MessageSession): @wiki_inline.regex(re.compile(r'≺(.*?)≻|⧼(.*?)⧽', flags=re.I), mode='A', show_typing=False, - desc='{wiki.help.wiki_inline.mediawiki}') + desc='{wiki.help.wiki_inline.mediawiki}') async def _(msg: Bot.MessageSession): query_list = [] for x in msg.matched_msg: @@ -130,6 +131,27 @@ async def bgtask(): get_infobox = await generate_screenshot_v1(q[qq].realurl, qq, headers) if get_infobox: await msg.send_message(Image(get_infobox), quote=False) + if get_page.selected_section and get_page.invalid_section and wiki_.wiki_info.in_allowlist: + i_msg_lst = [] + session_data = [[str(i + 1), get_page.sections[i]] for i in + range(len(get_page.sections))] + i_msg_lst.append(Plain(msg.locale.t('wiki.message.invalid_section'))) + i_msg_lst.append(Image(await + image_table_render( + ImageTable(session_data, + ['ID', + msg.locale.t('wiki.message.section')])))) + + async def _callback(msg: Bot.MessageSession): + display = msg.as_display(text_only=True) + if display.isdigit(): + display = int(display) + if display <= len(get_page.sections): + get_page.selected_section = display - 1 + await query_pages(msg, title=get_page.title + '#' + + get_page.sections[display - 1]) + + await msg.send_message(i_msg_lst, callback=_callback) if len(query_list) == 1 and img_send: return if msg.Feature.image: From 3b0bc364d20bdc41bc8075c893aca6ccb1a32196 Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Thu, 14 Dec 2023 23:16:54 +0800 Subject: [PATCH 063/168] Update inline.py --- modules/wiki/inline.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/wiki/inline.py b/modules/wiki/inline.py index ac59920ac5..d726d9a4c7 100644 --- a/modules/wiki/inline.py +++ b/modules/wiki/inline.py @@ -131,7 +131,7 @@ async def bgtask(): get_infobox = await generate_screenshot_v1(q[qq].realurl, qq, headers) if get_infobox: await msg.send_message(Image(get_infobox), quote=False) - if get_page.selected_section and get_page.invalid_section and wiki_.wiki_info.in_allowlist: + if get_page.invalid_section and wiki_.wiki_info.in_allowlist: i_msg_lst = [] session_data = [[str(i + 1), get_page.sections[i]] for i in range(len(get_page.sections))] From ccb9872715d095c1fc6ea2d3881c074e53594e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Fri, 15 Dec 2023 15:48:46 +0800 Subject: [PATCH 064/168] test --- modules/maimai/__init__.py | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index 0ada77ca3d..ff52ef5ffa 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -4,6 +4,7 @@ from config import Config from core.builtins import Bot, command_prefix, Plain, Image as BImage from core.scheduler import CronTrigger +from core.utils.http import get_url from core.utils.image import msgchain2image from modules.maimai.libraries.maimai_best_50 import generate from modules.maimai.libraries.maimaidx_api_data import get_alias, search_by_alias, update_alias, update_covers @@ -23,10 +24,19 @@ diff_label_zht = ['綠', '黃', '紅'] -def song_txt(music: Music): - return [Plain(f"{music.id}\u200B. {music.title}{' (DX)' if music['type'] == 'DX' else ''}\n"), - BImage(f"https://www.diving-fish.com/covers/{get_cover_len5_id(music.id)}.png"), - Plain(f"\n{'/'.join(str(ds) for ds in music.ds)}")] +async def song_txt(music: Music, detail=None): + info = [Plain(f"{music.id}\u200B. {music.title}{' (DX)' if music['type'] == 'DX' else ''}\n")] + try: + img = f"https://www.diving-fish.com/covers/{get_cover_len5_id(music.id)}.png" + await get_url(img, 200) + info.append(BImage(img)) + except: + pass + + if detail: + info.append(Plain(detail)) + + return info def get_diff(diff): @@ -409,16 +419,19 @@ async def _(msg: Bot.MessageSession, dx_type: str = None): if len(music_data) == 0: rand_result = msg.locale.t("maimai.message.music_not_found") else: - rand_result = song_txt(music_data.random()) + music = music_data.random() + detail = f"\n{'/'.join(str(ds) for ds in music.ds)}" + rand_result = await song_txt(music, detail) await msg.finish(rand_result) - except Exception: - Logger.error(traceback.format_exc()) + except ValueError: await msg.finish(msg.locale.t("maimai.message.random.error")) @mai.command('random {{maimai.help.random}}') async def _(msg: Bot.MessageSession): - await msg.finish(song_txt((await total_list.get()).random())) + music = (await total_list.get()).random() + detail = f"\n{'/'.join(str(ds) for ds in music.ds)}" + await msg.finish(await song_txt(music, detail)) @mai.command('scoreline {{maimai.help.scoreline}}') @@ -471,7 +484,8 @@ async def _(msg: Bot.MessageSession): else: await msg.finish(msg.locale.t("failed")) -@mai.schedule(CronTrigger.from_crontab('0 0 * * *')) + +@mai.schedule(CronTrigger.from_crontab('0 */6 * * *')) async def _(): Logger.info('Updating maimai alias...') try: From b03e481f4a1134d6767c5b12210f9f894d42bf4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Fri, 15 Dec 2023 15:50:44 +0800 Subject: [PATCH 065/168] . --- modules/maimai/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index ff52ef5ffa..d69c506a1e 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -28,7 +28,7 @@ async def song_txt(music: Music, detail=None): info = [Plain(f"{music.id}\u200B. {music.title}{' (DX)' if music['type'] == 'DX' else ''}\n")] try: img = f"https://www.diving-fish.com/covers/{get_cover_len5_id(music.id)}.png" - await get_url(img, 200) + await get_url(img, 200, fmt='read') info.append(BImage(img)) except: pass From 24e64c24020dec29b7cc6bb66d1b556c7d803141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Fri, 15 Dec 2023 16:24:22 +0800 Subject: [PATCH 066/168] Update maimai --- modules/maimai/__init__.py | 53 ++++++------------- modules/maimai/libraries/maimaidx_api_data.py | 13 +++++ modules/maimai/regex.py | 37 +++++-------- 3 files changed, 42 insertions(+), 61 deletions(-) diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index d69c506a1e..2f059a9d51 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -4,10 +4,9 @@ from config import Config from core.builtins import Bot, command_prefix, Plain, Image as BImage from core.scheduler import CronTrigger -from core.utils.http import get_url from core.utils.image import msgchain2image from modules.maimai.libraries.maimai_best_50 import generate -from modules.maimai.libraries.maimaidx_api_data import get_alias, search_by_alias, update_alias, update_covers +from modules.maimai.libraries.maimaidx_api_data import get_alias, get_info, search_by_alias, update_alias, update_covers from modules.maimai.libraries.maimaidx_music import get_cover_len5_id, Music, TotalList from modules.maimai.libraries.maimaidx_project import get_level_process, \ get_plate_process, get_player_score, get_rank, get_score_list @@ -24,21 +23,6 @@ diff_label_zht = ['綠', '黃', '紅'] -async def song_txt(music: Music, detail=None): - info = [Plain(f"{music.id}\u200B. {music.title}{' (DX)' if music['type'] == 'DX' else ''}\n")] - try: - img = f"https://www.diving-fish.com/covers/{get_cover_len5_id(music.id)}.png" - await get_url(img, 200, fmt='read') - info.append(BImage(img)) - except: - pass - - if detail: - info.append(Plain(detail)) - - return info - - def get_diff(diff): diff = diff.lower() diff_label_lower = [label.lower() for label in diff_label] @@ -161,10 +145,12 @@ async def _(msg: Bot.MessageSession, sid: str): sid = sid[2:] else: await msg.finish(msg.locale.t('maimai.message.error.non_digital')) + music = (await total_list.get()).by_id(sid) if not music: await msg.finish(msg.locale.t("maimai.message.music_not_found")) - title = f"{music['id']}\u200B. {music['title']}{' (DX)' if music['type'] == 'DX' else ''}" + + title = await get_info(music, cover=False) alias = await get_alias(msg, sid) if len(alias) == 0: await msg.finish(msg.locale.t("maimai.message.alias.alias_not_found")) @@ -239,17 +225,15 @@ async def _(msg: Bot.MessageSession, id_or_alias: str, diff: str = None): touch=chart['notes'][3], brk=chart['notes'][4], charter=chart['charter']) - await msg.finish( - [Plain(f"{music['id']}\u200B. {music['title']}{' (DX)' if music['type'] == 'DX' else ''}\n"), - BImage(f"https://www.diving-fish.com/covers/{get_cover_len5_id(music['id'])}.png"), Plain(message)]) + await msg.finish(await get_info(music, Plain(message)) else: - await msg.finish( - [Plain(f"{music['id']}\u200B. {music['title']}{' (DX)' if music['type'] == 'DX' else ''}\n"), - BImage(f"https://www.diving-fish.com/covers/{get_cover_len5_id(music['id'])}.png"), - Plain(msg.locale.t("maimai.message.song", - artist=music['basic_info']['artist'], genre=music['basic_info']['genre'], - bpm=music['basic_info']['bpm'], version=music['basic_info']['from'], - level='/'.join((str(ds) for ds in music['ds']))))]) + await msg.finish(await get_info(music, Plain(msg.locale.t( + "maimai.message.song", + artist=music['basic_info']['artist'], + genre=music['basic_info']['genre'], + bpm=music['basic_info']['bpm'], + version=music['basic_info']['from'], + level='/'.join((str(ds) for ds in music['ds'])))))) @mai.command('info [] {{maimai.help.info}}') @@ -283,9 +267,7 @@ async def _(msg: Bot.MessageSession, id_or_alias: str, username: str = None): output = await get_player_score(msg, payload, sid) - await msg.finish( - [Plain(f"{music['id']}\u200B. {music['title']}{' (DX)' if music['type'] == 'DX' else ''}\n"), - BImage(f"https://www.diving-fish.com/covers/{get_cover_len5_id(music['id'])}.png"), Plain(output)]) + await msg.finish(await get_info(music, Plain(output)) @mai.command('plate [] {{maimai.help.plate}}') @@ -417,12 +399,10 @@ async def _(msg: Bot.MessageSession, dx_type: str = None): music_data = (await total_list.get()).filter(level=level, diff=[get_diff(diff)], type=dx_type) if len(music_data) == 0: - rand_result = msg.locale.t("maimai.message.music_not_found") + await msg.finish(msg.locale.t("maimai.message.music_not_found")) else: music = music_data.random() - detail = f"\n{'/'.join(str(ds) for ds in music.ds)}" - rand_result = await song_txt(music, detail) - await msg.finish(rand_result) + await msg.finish(await get_info(music, Plain(f"\n{'/'.join(str(ds) for ds in music.ds)}"))) except ValueError: await msg.finish(msg.locale.t("maimai.message.random.error")) @@ -430,8 +410,7 @@ async def _(msg: Bot.MessageSession, dx_type: str = None): @mai.command('random {{maimai.help.random}}') async def _(msg: Bot.MessageSession): music = (await total_list.get()).random() - detail = f"\n{'/'.join(str(ds) for ds in music.ds)}" - await msg.finish(await song_txt(music, detail)) + await msg.finish(await get_info(music, Plain(f"\n{'/'.join(str(ds) for ds in music.ds)}"))) @mai.command('scoreline {{maimai.help.scoreline}}') diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index 6843b77c92..ad52853574 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -56,6 +56,19 @@ async def update_covers(): return True +async def get_info(music: Music, *details): + info = [Plain(f"{music.id}\u200B. {music.title}{' (DX)' if music['type'] == 'DX' else ''}")] + try: + img = f"https://www.diving-fish.com/covers/{get_cover_len5_id(music.id)}.png" + await get_url(img, 200, fmt='read') + info.append(BImage(img)) + except: + pass + if details: + info.extend(details) + return info + + async def get_alias(msg, input_): file_path = os.path.join(assets_path, "mai_alias.json") diff --git a/modules/maimai/regex.py b/modules/maimai/regex.py index 05fc718890..72856cce2e 100644 --- a/modules/maimai/regex.py +++ b/modules/maimai/regex.py @@ -5,7 +5,7 @@ from core.component import module from core.logger import Logger from core.utils.image import msgchain2image -from modules.maimai.libraries.maimaidx_api_data import get_alias, search_by_alias +from modules.maimai.libraries.maimaidx_api_data import get_alias, get_info, search_by_alias from modules.maimai.libraries.maimaidx_music import get_cover_len5_id, Music, TotalList from modules.maimai.libraries.maimaidx_project import get_level_process, get_plate_process, get_player_score @@ -71,13 +71,13 @@ async def _(msg: Bot.MessageSession): if not music: await msg.finish(msg.locale.t("maimai.message.music_not_found")) - await msg.finish( - [Plain(f"{music['id']}\u200B. {music['title']} {' (DX)' if music['type'] == 'DX' else ''}\n"), - BImage(f"https://www.diving-fish.com/covers/{get_cover_len5_id(music['id'])}.png"), - Plain(msg.locale.t("maimai.message.song", - artist=music['basic_info']['artist'], genre=music['basic_info']['genre'], - bpm=music['basic_info']['bpm'], version=music['basic_info']['from'], - level='/'.join((str(ds) for ds in music['ds']))))]) + await msg.finish(await get_info(music, Plain(msg.locale.t( + "maimai.message.song", + artist=music['basic_info']['artist'], + genre=music['basic_info']['genre'], + bpm=music['basic_info']['bpm'], + version=music['basic_info']['from'], + level='/'.join((str(ds) for ds in music['ds'])))))) @mai_regex.regex(re.compile(r"(.+)\s?有什[么麼]分\s?(.+)?"), desc='{maimai.help.maimai_regex.info}') @@ -112,9 +112,7 @@ async def _(msg: Bot.MessageSession): output = await get_player_score(msg, payload, sid) - await msg.finish( - [Plain(f"{music['id']}\u200B. {music['title']}{' (DX)' if music['type'] == 'DX' else ''}\n"), - BImage(f"https://www.diving-fish.com/covers/{get_cover_len5_id(music['id'])}.png"), Plain(output)]) + await msg.finish(await get_info(music, Plain(output))) @mai_regex.regex(re.compile(r"(?:id)?(\d+)\s?有什(?:么别|麼別)名", flags=re.I), desc='{maimai.help.maimai_regex.alias}') @@ -132,14 +130,6 @@ async def _(msg: Bot.MessageSession): result += "\n".join(alias) await msg.finish([Plain(result.strip())]) - await msg.finish( - [Plain(f"{music['id']}\u200B. {music['title']} {' (DX)' if music['type'] == 'DX' else ''}\n"), - BImage(f"https://www.diving-fish.com/covers/{get_cover_len5_id(music['id'])}.png"), - Plain(msg.locale.t("maimai.message.song", - artist=music['basic_info']['artist'], genre=music['basic_info']['genre'], - bpm=music['basic_info']['bpm'], version=music['basic_info']['from'], - level='/'.join((str(ds) for ds in music['ds']))))]) - @mai_regex.regex(re.compile(r"(?:随个|隨個)\s?((?:dx|DX|sd|SD|标准|標準)\s?)?([绿綠黄黃红紅紫白]?)\s?([0-9]+\+?)"), desc="{maimai.help.maimai_regex.random}") @@ -160,12 +150,11 @@ async def _(msg: Bot.MessageSession): music_data = (await total_list.get()).filter(level=level, diff=[get_diff(res.groups()[1])], type=tp) if len(music_data) == 0: - rand_result = msg.locale.t("maimai.message.music_not_found") + await msg.finish(msg.locale.t("maimai.message.music_not_found")) else: - rand_result = song_txt(music_data.random()) - await msg.finish(rand_result) - except Exception as e: - Logger.error(traceback.format_exc()) + music = music_data.random() + await msg.finish(await get_info(music, Plain(f"\n{'/'.join(str(ds) for ds in music.ds)}"))) + except ValueError: await msg.finish(msg.locale.t("maimai.message.random.error")) From 6eff564516271c53b79244d76477e98fc09cbb6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Fri, 15 Dec 2023 16:27:20 +0800 Subject: [PATCH 067/168] fix --- modules/maimai/__init__.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index 2f059a9d51..62ca9ebb44 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -225,15 +225,16 @@ async def _(msg: Bot.MessageSession, id_or_alias: str, diff: str = None): touch=chart['notes'][3], brk=chart['notes'][4], charter=chart['charter']) - await msg.finish(await get_info(music, Plain(message)) + await msg.finish(await get_info(music, Plain(message))) else: - await msg.finish(await get_info(music, Plain(msg.locale.t( - "maimai.message.song", - artist=music['basic_info']['artist'], - genre=music['basic_info']['genre'], - bpm=music['basic_info']['bpm'], - version=music['basic_info']['from'], - level='/'.join((str(ds) for ds in music['ds'])))))) + message = msg.locale.t( + "maimai.message.song", + artist=music['basic_info']['artist'], + genre=music['basic_info']['genre'], + bpm=music['basic_info']['bpm'], + version=music['basic_info']['from'], + level='/'.join((str(ds) for ds in music['ds']))) + await msg.finish(await get_info(music, Plain(message))) @mai.command('info [] {{maimai.help.info}}') From 480fcc02479cc80340ec2d16f9ac3d623c8e95c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Fri, 15 Dec 2023 16:29:25 +0800 Subject: [PATCH 068/168] . --- modules/maimai/__init__.py | 2 +- modules/maimai/regex.py | 20 ++++++-------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index 62ca9ebb44..a7c82d6672 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -268,7 +268,7 @@ async def _(msg: Bot.MessageSession, id_or_alias: str, username: str = None): output = await get_player_score(msg, payload, sid) - await msg.finish(await get_info(music, Plain(output)) + await msg.finish(await get_info(music, Plain(output))) @mai.command('plate [] {{maimai.help.plate}}') diff --git a/modules/maimai/regex.py b/modules/maimai/regex.py index 72856cce2e..7a69bd5119 100644 --- a/modules/maimai/regex.py +++ b/modules/maimai/regex.py @@ -19,13 +19,6 @@ diff_label_zhs = ['绿', '黄', '红', '紫', '白'] diff_label_zht = ['綠', '黃', '紅'] - -def song_txt(music: Music): - return [Plain(f"{music.id}\u200B. {music.title}{' (DX)' if music['type'] == 'DX' else ''}\n"), - BImage(f"https://www.diving-fish.com/covers/{get_cover_len5_id(music.id)}.png"), - Plain(f"\n{'/'.join(str(ds) for ds in music.ds)}")] - - def get_diff(diff): diff = diff.lower() diff_label_lower = [label.lower() for label in diff_label] @@ -71,13 +64,12 @@ async def _(msg: Bot.MessageSession): if not music: await msg.finish(msg.locale.t("maimai.message.music_not_found")) - await msg.finish(await get_info(music, Plain(msg.locale.t( - "maimai.message.song", - artist=music['basic_info']['artist'], - genre=music['basic_info']['genre'], - bpm=music['basic_info']['bpm'], - version=music['basic_info']['from'], - level='/'.join((str(ds) for ds in music['ds'])))))) + await msg.finish(await get_info(music, Plain(msg.locale.t("maimai.message.song", + artist=music['basic_info']['artist'], + genre=music['basic_info']['genre'], + bpm=music['basic_info']['bpm'], + version=music['basic_info']['from'], + level='/'.join((str(ds) for ds in music['ds'])))))) @mai_regex.regex(re.compile(r"(.+)\s?有什[么麼]分\s?(.+)?"), desc='{maimai.help.maimai_regex.info}') From 2dea1a1b8567cb7da0b4319cf37ca11b85bac212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Fri, 15 Dec 2023 16:29:34 +0800 Subject: [PATCH 069/168] fix From b5a5f296da7a6045998a3621c7312294f9658ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Fri, 15 Dec 2023 16:32:05 +0800 Subject: [PATCH 070/168] import Music --- modules/maimai/__init__.py | 2 +- modules/maimai/libraries/maimaidx_api_data.py | 3 ++- modules/maimai/regex.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index a7c82d6672..f35b28d95a 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -7,7 +7,7 @@ from core.utils.image import msgchain2image from modules.maimai.libraries.maimai_best_50 import generate from modules.maimai.libraries.maimaidx_api_data import get_alias, get_info, search_by_alias, update_alias, update_covers -from modules.maimai.libraries.maimaidx_music import get_cover_len5_id, Music, TotalList +from modules.maimai.libraries.maimaidx_music import get_cover_len5_id, TotalList from modules.maimai.libraries.maimaidx_project import get_level_process, \ get_plate_process, get_player_score, get_rank, get_score_list from .regex import * diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index ad52853574..399f37b146 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -6,7 +6,8 @@ from core.logger import Logger from core.utils.cache import random_cache_path from core.utils.http import get_url, post_url, download_to_cache -from .maimaidx_music import get_cover_len5_id, TotalList + +from .maimaidx_music import get_cover_len5_id, Music, TotalList total_list = TotalList() diff --git a/modules/maimai/regex.py b/modules/maimai/regex.py index 7a69bd5119..7d7aaa0004 100644 --- a/modules/maimai/regex.py +++ b/modules/maimai/regex.py @@ -6,7 +6,7 @@ from core.logger import Logger from core.utils.image import msgchain2image from modules.maimai.libraries.maimaidx_api_data import get_alias, get_info, search_by_alias -from modules.maimai.libraries.maimaidx_music import get_cover_len5_id, Music, TotalList +from modules.maimai.libraries.maimaidx_music import get_cover_len5_id, TotalList from modules.maimai.libraries.maimaidx_project import get_level_process, get_plate_process, get_player_score total_list = TotalList() From 37ca19f8067abcc55043e0cb2bf29c795d004e01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Fri, 15 Dec 2023 16:34:49 +0800 Subject: [PATCH 071/168] .. --- modules/maimai/libraries/maimaidx_api_data.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index 399f37b146..ff640927c8 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -3,6 +3,7 @@ import ujson as json +from core.builtins import Plain, Image from core.logger import Logger from core.utils.cache import random_cache_path from core.utils.http import get_url, post_url, download_to_cache @@ -62,7 +63,7 @@ async def get_info(music: Music, *details): try: img = f"https://www.diving-fish.com/covers/{get_cover_len5_id(music.id)}.png" await get_url(img, 200, fmt='read') - info.append(BImage(img)) + info.append(Image(img)) except: pass if details: From 551f804c7461b308f79fbc149d654eb31a180d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Fri, 15 Dec 2023 16:54:35 +0800 Subject: [PATCH 072/168] Update update_alias --- modules/maimai/libraries/maimaidx_api_data.py | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index ff640927c8..fcd8458c0c 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -18,22 +18,12 @@ async def update_alias(): url = "https://download.fanyu.site/maimai/alias.json" - input_data = await get_url(url, 200, fmt='json') - - output_data = {} - for key, values in input_data.items(): - for value in values: - if value == "未找到": - continue - if value not in output_data: - output_data[value] = [] - output_data[value].append(key) - - output_data = {k: output_data[k] for k in sorted(output_data)} + data = await get_url(url, 200, fmt='json') + data = json.loads(data) file_path = os.path.join(assets_path, "mai_alias.json") with open(file_path, 'w') as file: - json.dump(output_data, file) + json.dump(data, file) return True @@ -65,13 +55,13 @@ async def get_info(music: Music, *details): await get_url(img, 200, fmt='read') info.append(Image(img)) except: - pass + info.append('\n') if details: info.extend(details) return info -async def get_alias(msg, input_): +async def get_alias(msg, sid): file_path = os.path.join(assets_path, "mai_alias.json") if not os.path.exists(file_path): @@ -80,7 +70,7 @@ async def get_alias(msg, input_): data = json.load(file) result = [] - if input_ in data: + if sid in data: result = data[input_] # 此处的列表是歌曲别名列表 return result From 7584df86155c0f7cf1b7546b0d49aca93040260f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Fri, 15 Dec 2023 17:06:23 +0800 Subject: [PATCH 073/168] Update --- modules/maimai/libraries/maimaidx_api_data.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index fcd8458c0c..3d34b06aee 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -19,7 +19,6 @@ async def update_alias(): url = "https://download.fanyu.site/maimai/alias.json" data = await get_url(url, 200, fmt='json') - data = json.loads(data) file_path = os.path.join(assets_path, "mai_alias.json") with open(file_path, 'w') as file: @@ -91,11 +90,11 @@ async def search_by_alias(msg, input_): with open(file_path, 'r') as file: data = json.load(file) - for alias, ids in data.items(): - if input_ in ids: - if alias in result: - result.remove(alias) - result.append(alias) # 此处的列表是歌曲 ID 列表 + for sid, alias in data.items(): + if input_ in alias: + if sid in result: + result.remove(sid) + result.append(sid) # 此处的列表是歌曲 ID 列表 return result From b6e0c009f82e38f17db13e11efdd7c8542f53b62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Fri, 15 Dec 2023 17:09:58 +0800 Subject: [PATCH 074/168] upd --- modules/maimai/libraries/maimaidx_api_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index 3d34b06aee..e7febd2741 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -51,7 +51,7 @@ async def get_info(music: Music, *details): info = [Plain(f"{music.id}\u200B. {music.title}{' (DX)' if music['type'] == 'DX' else ''}")] try: img = f"https://www.diving-fish.com/covers/{get_cover_len5_id(music.id)}.png" - await get_url(img, 200, fmt='read') + await get_url(img, 200, attempt=1, fmt='read') info.append(Image(img)) except: info.append('\n') From 42a119a295cd1c6be3255c23320dfa83441b29ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Fri, 15 Dec 2023 17:10:24 +0800 Subject: [PATCH 075/168] . --- modules/maimai/libraries/maimaidx_api_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index e7febd2741..a2c57b0763 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -54,7 +54,7 @@ async def get_info(music: Music, *details): await get_url(img, 200, attempt=1, fmt='read') info.append(Image(img)) except: - info.append('\n') + info.append('') if details: info.extend(details) return info From 35d4f04bb2eaa243f6253688f2ec9edc65376175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Fri, 15 Dec 2023 17:11:37 +0800 Subject: [PATCH 076/168] orz --- modules/maimai/libraries/maimaidx_api_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index a2c57b0763..a91fb48e1e 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -54,7 +54,7 @@ async def get_info(music: Music, *details): await get_url(img, 200, attempt=1, fmt='read') info.append(Image(img)) except: - info.append('') + info.append(Plain()) if details: info.extend(details) return info From 9c7e265df37f51f2f36aa198322961a85f6cfe65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Fri, 15 Dec 2023 17:12:58 +0800 Subject: [PATCH 077/168] =?UTF-8?q?fix=20=E7=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/maimai/libraries/maimaidx_api_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index a91fb48e1e..3a29c440df 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -54,7 +54,7 @@ async def get_info(music: Music, *details): await get_url(img, 200, attempt=1, fmt='read') info.append(Image(img)) except: - info.append(Plain()) + info.append('\u200B') if details: info.extend(details) return info From e022451b2bcf649fede8daf7edf1171b1ff162ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Fri, 15 Dec 2023 17:24:49 +0800 Subject: [PATCH 078/168] Update maimaidx_api_data.py --- modules/maimai/libraries/maimaidx_api_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index 3a29c440df..bdf4b83b1d 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -70,7 +70,7 @@ async def get_alias(msg, sid): result = [] if sid in data: - result = data[input_] # 此处的列表是歌曲别名列表 + result = data[sid] # 此处的列表是歌曲别名列表 return result From 03467197a6142a7f20217d549d5557c72987db1d Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Fri, 15 Dec 2023 19:39:24 +0800 Subject: [PATCH 079/168] Update message.py --- bots/aiocqhttp/message.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/aiocqhttp/message.py b/bots/aiocqhttp/message.py index e50561b2d4..deeb072c04 100644 --- a/bots/aiocqhttp/message.py +++ b/bots/aiocqhttp/message.py @@ -128,12 +128,12 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal if isinstance(x, Plain): msg = msg + MessageSegment.text(('\n' if count != 0 else '') + x.text) elif isinstance(x, Image): - msg = msg + MessageSegment.image(Path(await x.get()).as_uri()) + msg = msg + MessageSegment.image('base64://' + await x.get_base64()) elif isinstance(x, Voice): if self.target.target_from != 'QQ|Guild': msg = msg + MessageSegment.record(file=Path(x.path).as_uri()) count += 1 - Logger.info(f'[Bot] -> [{self.target.target_id}]: {msg}') + Logger.info(f'[Bot] -> [{self.target.target_id}]: {message_chain_assendable}') if self.target.target_from == 'QQ|Group': try: send = await bot.send_group_msg(group_id=self.session.target, message=msg) From 2fbaf788ca7b329af0ed0b59709e3357d0473b59 Mon Sep 17 00:00:00 2001 From: Dorobot <128296202+Hldbot@users.noreply.github.com> Date: Fri, 15 Dec 2023 21:07:50 +0800 Subject: [PATCH 080/168] New Crowdin updates (#1058) --- modules/cytoid/locales/en_us.json | 24 ++++++++++++------------ modules/cytoid/locales/zh_cn.json | 2 +- modules/github/locales/zh_tw.json | 2 +- modules/maimai/locales/en_us.json | 3 --- modules/maimai/locales/zh_cn.json | 3 --- modules/maimai/locales/zh_tw.json | 3 --- modules/ncmusic/locales/en_us.json | 2 +- modules/ncmusic/locales/zh_cn.json | 2 +- modules/ncmusic/locales/zh_tw.json | 4 ++-- 9 files changed, 18 insertions(+), 27 deletions(-) diff --git a/modules/cytoid/locales/en_us.json b/modules/cytoid/locales/en_us.json index 461bdc8558..c4d08391a7 100644 --- a/modules/cytoid/locales/en_us.json +++ b/modules/cytoid/locales/en_us.json @@ -1,15 +1,15 @@ { - "cytoid.help.b30": "查询 Cytoid 用户的 B30 列表。", - "cytoid.help.bind": "绑定 Cytoid 用户。", - "cytoid.help.desc": "查询 Cytoid 相关内容。", - "cytoid.help.profile": "查询一个用户的基本信息。", - "cytoid.help.r30": "查询 Cytoid 用户的 R30 列表。", - "cytoid.help.unbind": "解绑用户。", + "cytoid.help.b30": "Query the Best 30 list of Cytoid user. ", + "cytoid.help.bind": "Bind Cytoid user.", + "cytoid.help.desc": "Query Cytoid related content.", + "cytoid.help.profile": "Query user profile.", + "cytoid.help.r30": "Query the Recent 30 list of Cytoid user. ", + "cytoid.help.unbind": "Unbind user.", "cytoid.message.b30.cooldown": "（据官方人员所述，此 API 的调用十分昂贵，故手动做出此限制，请谅解。）", - "cytoid.message.b30.level": "等级", - "cytoid.message.bind.failed": "绑定失败，请检查输入。", - "cytoid.message.bind.success": "绑定成功：", - "cytoid.message.unbind.success": "解绑成功。", - "cytoid.message.user_not_found": "用户不存在。", - "cytoid.message.user_unbound": "未绑定用户，请使用“${prefix}cytoid bind”绑定一个用户。" + "cytoid.message.b30.level": "Level", + "cytoid.message.bind.failed": "Binding failed. Please check input.", + "cytoid.message.bind.success": "Binding successful: ", + "cytoid.message.unbind.success": "Unbinding successful.", + "cytoid.message.user_not_found": "User not found.", + "cytoid.message.user_unbound": "The user is not bound. Please bind user by \"${prefix}cytoid bind\"." } \ No newline at end of file diff --git a/modules/cytoid/locales/zh_cn.json b/modules/cytoid/locales/zh_cn.json index 461bdc8558..8b7f1d506d 100644 --- a/modules/cytoid/locales/zh_cn.json +++ b/modules/cytoid/locales/zh_cn.json @@ -10,6 +10,6 @@ "cytoid.message.bind.failed": "绑定失败，请检查输入。", "cytoid.message.bind.success": "绑定成功：", "cytoid.message.unbind.success": "解绑成功。", - "cytoid.message.user_not_found": "用户不存在。", + "cytoid.message.user_not_found": "未找到用户。", "cytoid.message.user_unbound": "未绑定用户，请使用“${prefix}cytoid bind”绑定一个用户。" } \ No newline at end of file diff --git a/modules/github/locales/zh_tw.json b/modules/github/locales/zh_tw.json index 739ab9b880..90bb1b0821 100644 --- a/modules/github/locales/zh_tw.json +++ b/modules/github/locales/zh_tw.json @@ -8,5 +8,5 @@ "github.message.search.none": "搜尋成功，未找到結果。", "github.message.search.more_information": "另有 ${more_result} 條結果未顯示。", "github.message.search.not_found": "未找到儲存庫，請校對輸入。", - "github.message.user.not_found": "找不到使用者，請校對輸入。" + "github.message.user.not_found": "未找到使用者，請校對輸入。" } \ No newline at end of file diff --git a/modules/maimai/locales/en_us.json b/modules/maimai/locales/en_us.json index 963261807a..124a9fcee3 100644 --- a/modules/maimai/locales/en_us.json +++ b/modules/maimai/locales/en_us.json @@ -30,9 +30,6 @@ "maimai.message.chart_not_found": "未找到符合要求的谱面。", "maimai.message.error.non_digital": "发生错误：歌曲 ID 必须为数字！", "maimai.message.forbidden": "此用户禁止了其他人获取数据。", - "maimai.message.global": "游玩次数：${count}\n拟合难度：${fit_diff}\n平均达成率：${avg_score}\n平均 DX 分数：${avg_dx}\n谱面成绩标准差：${std_dev}", - "maimai.message.global.music_not_found": "未找到该曲目的统计信息。", - "maimai.message.global.level_not_found": "未找到该难度的统计信息。", "maimai.message.info.no_record": "未游玩过此谱面", "maimai.message.level": "以下为 ${level} 级的曲目列表：", "maimai.message.music_not_found": "未找到符合要求的歌曲。", diff --git a/modules/maimai/locales/zh_cn.json b/modules/maimai/locales/zh_cn.json index 1f51986032..1ce3253c8f 100644 --- a/modules/maimai/locales/zh_cn.json +++ b/modules/maimai/locales/zh_cn.json @@ -30,9 +30,6 @@ "maimai.message.chart_not_found": "未找到符合要求的谱面。", "maimai.message.error.non_digital": "发生错误：歌曲 ID 必须为数字！", "maimai.message.forbidden": "此用户禁止了其他人获取数据。", - "maimai.message.global": "游玩次数：${count}\n拟合难度：${fit_diff}\n平均达成率：${avg_score}\n平均 DX 分数：${avg_dx}\n谱面成绩标准差：${std_dev}", - "maimai.message.global.music_not_found": "未找到该曲目的统计信息。", - "maimai.message.global.level_not_found": "未找到该难度的统计信息。", "maimai.message.info.no_record": "未游玩过此谱面", "maimai.message.level": "以下为 ${level} 级的曲目列表：", "maimai.message.music_not_found": "未找到符合要求的歌曲。", diff --git a/modules/maimai/locales/zh_tw.json b/modules/maimai/locales/zh_tw.json index 0948d7c176..6c753b7a7a 100644 --- a/modules/maimai/locales/zh_tw.json +++ b/modules/maimai/locales/zh_tw.json @@ -30,9 +30,6 @@ "maimai.message.chart_not_found": "未找到符合要求的譜面。", "maimai.message.error.non_digital": "發生錯誤：歌曲 ID 必須為數字！", "maimai.message.forbidden": "此使用者禁止了其他人取得資料。", - "maimai.message.global": "游玩次数：${count}\n拟合难度：${fit_diff}\n平均达成率：${avg_score}\n平均 DX 分数：${avg_dx}\n谱面成绩标准差：${std_dev}", - "maimai.message.global.music_not_found": "未找到该曲目的统计信息。", - "maimai.message.global.level_not_found": "未找到该难度的统计信息。", "maimai.message.info.no_record": "未遊玩過此譜面", "maimai.message.level": "以下為難度 ${level} 的曲目列表：", "maimai.message.music_not_found": "未找到符合要求的歌曲。", diff --git a/modules/ncmusic/locales/en_us.json b/modules/ncmusic/locales/en_us.json index 316a5cc62a..6d4c3be51d 100644 --- a/modules/ncmusic/locales/en_us.json +++ b/modules/ncmusic/locales/en_us.json @@ -4,7 +4,7 @@ "ncmusic.help.search": "搜索网易云音乐。", "ncmusic.help.search.legacy": "搜索网易云音乐。（旧版）", "ncmusic.message.info": "歌名：${name}（${id}）\n专辑名：${album}（${album_id}）\n歌手：${artists}", - "ncmusic.message.info.not_found": "找不到对应的音乐。", + "ncmusic.message.info.not_found": "未找到对应的音乐。", "ncmusic.message.search.confirm": "是否查看音乐详细信息？", "ncmusic.message.search.invalid.non_digital": "无效的编号，必须为数字。", "ncmusic.message.search.invalid.out_of_range": "编号超出范围。", diff --git a/modules/ncmusic/locales/zh_cn.json b/modules/ncmusic/locales/zh_cn.json index 69ef552061..595930c300 100644 --- a/modules/ncmusic/locales/zh_cn.json +++ b/modules/ncmusic/locales/zh_cn.json @@ -4,7 +4,7 @@ "ncmusic.help.search": "搜索网易云音乐。", "ncmusic.help.search.legacy": "搜索网易云音乐。（旧版）", "ncmusic.message.info": "歌名：${name}（${id}）\n歌手：${artists}\n专辑名：${album}（${album_id}）", - "ncmusic.message.info.not_found": "找不到对应的音乐。", + "ncmusic.message.info.not_found": "未找到对应的音乐。", "ncmusic.message.search.confirm": "是否查看音乐详细信息？", "ncmusic.message.search.invalid.non_digital": "无效的编号，必须为数字。", "ncmusic.message.search.invalid.out_of_range": "编号超出范围。", diff --git a/modules/ncmusic/locales/zh_tw.json b/modules/ncmusic/locales/zh_tw.json index c6d9b821c0..0656e53aae 100644 --- a/modules/ncmusic/locales/zh_tw.json +++ b/modules/ncmusic/locales/zh_tw.json @@ -1,10 +1,10 @@ { - "ncmusic.help.desc": "网易云音乐相关工具。", + "ncmusic.help.desc": "網易云音樂相關工具。", "ncmusic.help.info": "取得音樂詳細資訊。", "ncmusic.help.search": "搜尋網易雲音樂。", "ncmusic.help.search.legacy": "搜尋網易雲音樂。（舊版）", "ncmusic.message.info": "歌名：${name}（${id}）\n歌手：${artists}\n專輯名：${album}（${album_id}）", - "ncmusic.message.info.not_found": "找不到对应的音乐。", + "ncmusic.message.info.not_found": "未找到對應的音樂。", "ncmusic.message.search.confirm": "是否檢視音樂詳細資訊？", "ncmusic.message.search.invalid.non_digital": "無效的編號，必須為數字。", "ncmusic.message.search.invalid.out_of_range": "編號超出範圍。", From 6961fa69f6de8e478cbf9431aa540de4858d4bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Fri, 15 Dec 2023 21:54:52 +0800 Subject: [PATCH 081/168] Update maimaidx_api_data.py --- modules/maimai/libraries/maimaidx_api_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index bdf4b83b1d..943b6dd50e 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -54,7 +54,7 @@ async def get_info(music: Music, *details): await get_url(img, 200, attempt=1, fmt='read') info.append(Image(img)) except: - info.append('\u200B') + info.append(Image("https://www.diving-fish.com/covers/00000.png")) if details: info.extend(details) return info From 02cb4b1d46956c0e66f4704462fd790e7fa1ead0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Fri, 15 Dec 2023 22:23:56 +0800 Subject: [PATCH 082/168] format --- modules/maimai/libraries/maimaidx_api_data.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index 943b6dd50e..99d37ee60b 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -7,13 +7,10 @@ from core.logger import Logger from core.utils.cache import random_cache_path from core.utils.http import get_url, post_url, download_to_cache - from .maimaidx_music import get_cover_len5_id, Music, TotalList total_list = TotalList() - assets_path = os.path.abspath('./assets/maimai') -cover_dir = f"{assets_path}/static/mai/cover" async def update_alias(): @@ -28,6 +25,7 @@ async def update_alias(): async def update_covers(): + cover_dir = f"{assets_path}/static/mai/cover" url = f"https://www.diving-fish.com/maibot/static.zip" download_file = await download_to_cache(url, timeout=60) From 287a78d3899bde0516b852e9d88736d776505ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sat, 16 Dec 2023 00:12:07 +0800 Subject: [PATCH 083/168] revert changes --- modules/maimai/libraries/maimaidx_api_data.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index 99d37ee60b..1d603649dd 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -15,11 +15,19 @@ async def update_alias(): url = "https://download.fanyu.site/maimai/alias.json" - data = await get_url(url, 200, fmt='json') - + input_data = await get_url(url, 200, fmt='json') + output_data = {} + for key, values in input_data.items(): + for value in values: + if value == "未找到": + continue + if value not in output_data: + output_data[value] = [] + output_data[value].append(key) + output_data = {k: output_data[k] for k in sorted(output_data)} file_path = os.path.join(assets_path, "mai_alias.json") with open(file_path, 'w') as file: - json.dump(data, file) + json.dump(output_data, file) return True From 39e39e63b1f3d9f71382da1538d10ae03bbafc02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sat, 16 Dec 2023 00:40:08 +0800 Subject: [PATCH 084/168] revert revert changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 结构改来改去真的很头疼好吗 --- modules/maimai/libraries/maimaidx_api_data.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index 1d603649dd..21f707b689 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -15,19 +15,11 @@ async def update_alias(): url = "https://download.fanyu.site/maimai/alias.json" - input_data = await get_url(url, 200, fmt='json') - output_data = {} - for key, values in input_data.items(): - for value in values: - if value == "未找到": - continue - if value not in output_data: - output_data[value] = [] - output_data[value].append(key) - output_data = {k: output_data[k] for k in sorted(output_data)} + data = await get_url(url, 200, fmt='json') + file_path = os.path.join(assets_path, "mai_alias.json") with open(file_path, 'w') as file: - json.dump(output_data, file) + json.dump(data, file) return True From f5af149a63830a3cbc81d430a33c0937c59446b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sat, 16 Dec 2023 01:02:36 +0800 Subject: [PATCH 085/168] Replace update alias time to 12h --- modules/maimai/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index f35b28d95a..b5ada1ef08 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -465,11 +465,11 @@ async def _(msg: Bot.MessageSession): await msg.finish(msg.locale.t("failed")) -@mai.schedule(CronTrigger.from_crontab('0 */6 * * *')) +@mai.schedule(CronTrigger.from_crontab('0 */12 * * *')) async def _(): Logger.info('Updating maimai alias...') try: await update_alias() except Exception: if Config('debug'): - Logger.error(traceback.format_exc()) \ No newline at end of file + Logger.error(traceback.format_exc()) From a736347826340cdb430dba93a2460a756637af12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sat, 16 Dec 2023 16:01:00 +0800 Subject: [PATCH 086/168] mai alias case insensitive --- modules/maimai/libraries/maimaidx_api_data.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index 21f707b689..3d82bbd44d 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -75,7 +75,7 @@ async def get_alias(msg, sid): async def search_by_alias(msg, input_): result = [] - input_ = input_.replace("_", " ").strip() + input_ = input_.replace("_", " ").strip().lower() res = (await total_list.get()).filter(title=input_) for s in res: result.append(s['id']) @@ -89,7 +89,7 @@ async def search_by_alias(msg, input_): data = json.load(file) for sid, alias in data.items(): - if input_ in alias: + if input_ in alias.lower(): if sid in result: result.remove(sid) result.append(sid) # 此处的列表是歌曲 ID 列表 From ca02e08106b2b8e11fc14d42f1bf7f11e7f12623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sat, 16 Dec 2023 16:03:46 +0800 Subject: [PATCH 087/168] fix --- modules/maimai/libraries/maimaidx_api_data.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index 3d82bbd44d..55fd41f625 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -88,8 +88,9 @@ async def search_by_alias(msg, input_): with open(file_path, 'r') as file: data = json.load(file) - for sid, alias in data.items(): - if input_ in alias.lower(): + for sid, aliases in data.items(): + if input_ in aliases: + aliases = [alias.lower() for alias in aliases] if sid in result: result.remove(sid) result.append(sid) # 此处的列表是歌曲 ID 列表 From 423cb2a0a7663dd3805413b7513c888c809f346e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sat, 16 Dec 2023 16:06:01 +0800 Subject: [PATCH 088/168] . --- modules/maimai/libraries/maimaidx_api_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index 55fd41f625..3c512f19cb 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -89,8 +89,8 @@ async def search_by_alias(msg, input_): data = json.load(file) for sid, aliases in data.items(): + aliases = [alias.lower() for alias in aliases] if input_ in aliases: - aliases = [alias.lower() for alias in aliases] if sid in result: result.remove(sid) result.append(sid) # 此处的列表是歌曲 ID 列表 From 26346effc143803cfec431ad2680a59a68f1ed05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sat, 16 Dec 2023 16:19:02 +0800 Subject: [PATCH 089/168] rename toggle 2 setup --- modules/core/locales/en_us.json | 18 +++++++++--------- modules/core/locales/zh_cn.json | 18 +++++++++--------- modules/core/locales/zh_tw.json | 18 +++++++++--------- modules/core/utils.py | 20 ++++++++++---------- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/modules/core/locales/en_us.json b/modules/core/locales/en_us.json index 40e838d354..fb35d06db4 100644 --- a/modules/core/locales/en_us.json +++ b/modules/core/locales/en_us.json @@ -30,9 +30,9 @@ "core.help.prefix.list": "View custom command prefixes.", "core.help.prefix.remove": "Remove custom command prefix.", "core.help.prefix.reset": "Reset custom command prefix.", - "core.help.toggle.check": "Toggles whether to display command check prompts.", - "core.help.toggle.typing": "Toggle whether to display input prompts.", - "core.help.toggle.timeoffset": "Set the time offset.", + "core.help.setup.check": "setups whether to display command check prompts.", + "core.help.setup.typing": "setup whether to display input prompts.", + "core.help.setup.timeoffset": "Set the time offset.", "core.help.version": "View bot version.", "core.help.whoami": "Get the ID of the user account that sent the command inside the bot.", "core.message.abuse.ban.success": "Successfully banned ${user}.", @@ -154,12 +154,12 @@ "core.message.set.invalid": "Invalid ID format.", "core.message.set.module.success": "The following modules were successfully configured for the object: ", "core.message.superuser.invalid": "Invalid ID format. The format should be \"${target}|\".", - "core.message.toggle.check.disable": "Check prompt disabled.", - "core.message.toggle.check.enable": "Check prompt enabled.", - "core.message.toggle.timeoffset.invalid": "Invalid time offset.", - "core.message.toggle.timeoffset.success": "The time offset has been set to UTC${offset}.", - "core.message.toggle.typing.disable": "Input prompt disabled.", - "core.message.toggle.typing.enable": "Input prompt enabled.", + "core.message.setup.check.disable": "Check prompt disabled.", + "core.message.setup.check.enable": "Check prompt enabled.", + "core.message.setup.timeoffset.invalid": "Invalid time offset.", + "core.message.setup.timeoffset.success": "The time offset has been set to UTC${offset}.", + "core.message.setup.typing.disable": "Input prompt disabled.", + "core.message.setup.typing.enable": "Input prompt enabled.", "core.message.update.failed": "Failed to fetch update from GitHub. Please try again later.", "core.message.version": "Current bot version: ${commit}", "core.message.version.unknown": "Unable to get version. This instance may not be deployed using Git.", diff --git a/modules/core/locales/zh_cn.json b/modules/core/locales/zh_cn.json index df8dbe1238..d9066d00d4 100644 --- a/modules/core/locales/zh_cn.json +++ b/modules/core/locales/zh_cn.json @@ -30,9 +30,9 @@ "core.help.prefix.list": "查看自定义命令前缀列表。", "core.help.prefix.remove": "移除自定义命令前缀。", "core.help.prefix.reset": "重置自定义命令前缀。", - "core.help.toggle.check": "切换是否展示命令错字检查提示。", - "core.help.toggle.typing": "切换是否展示输入提示。", - "core.help.toggle.timeoffset": "设置时间偏移量。", + "core.help.setup.check": "切换是否展示命令错字检查提示。", + "core.help.setup.typing": "切换是否展示输入提示。", + "core.help.setup.timeoffset": "设置时间偏移量。", "core.help.version": "查看机器人的版本号。", "core.help.whoami": "获取发送命令的账号在机器人内部的 ID。", "core.message.abuse.ban.success": "成功封禁 ${user}。", @@ -154,12 +154,12 @@ "core.message.set.invalid": "ID 格式错误。", "core.message.set.module.success": "成功为对象配置了以下模块：", "core.message.superuser.invalid": "ID 格式错误，格式应为“${target}|<用户 ID>”。", - "core.message.toggle.check.disable": "已关闭错字检查提示。", - "core.message.toggle.check.enable": "已开启错字检查提示。", - "core.message.toggle.timeoffset.invalid": "无效的时间偏移量。", - "core.message.toggle.timeoffset.success": "已将时间偏移量设定为 UTC${offset}。", - "core.message.toggle.typing.disable": "已关闭输入提示。", - "core.message.toggle.typing.enable": "已开启输入提示。", + "core.message.setup.check.disable": "已关闭错字检查提示。", + "core.message.setup.check.enable": "已开启错字检查提示。", + "core.message.setup.timeoffset.invalid": "无效的时间偏移量。", + "core.message.setup.timeoffset.success": "已将时间偏移量设定为 UTC${offset}。", + "core.message.setup.typing.disable": "已关闭输入提示。", + "core.message.setup.typing.enable": "已开启输入提示。", "core.message.update.failed": "尝试从 GitHub 获取更新失败，请稍后重试。", "core.message.version": "当前机器人版本号：${commit}", "core.message.version.unknown": "无法获取版本号。此实例可能没有使用 Git 进行部署。", diff --git a/modules/core/locales/zh_tw.json b/modules/core/locales/zh_tw.json index d8cdda6611..0d508f3c9e 100644 --- a/modules/core/locales/zh_tw.json +++ b/modules/core/locales/zh_tw.json @@ -30,9 +30,9 @@ "core.help.prefix.list": "檢視自訂指令前綴列表。", "core.help.prefix.remove": "移除自訂指令前綴。", "core.help.prefix.reset": "重設自訂指令前綴。", - "core.help.toggle.check": "切換是否顯示指令錯誤檢查提醒。", - "core.help.toggle.typing": "切換是否顯示輸入提醒。", - "core.help.toggle.timeoffset": "設定時間偏移量。", + "core.help.setup.check": "切換是否顯示指令錯誤檢查提醒。", + "core.help.setup.typing": "切換是否顯示輸入提醒。", + "core.help.setup.timeoffset": "設定時間偏移量。", "core.help.version": "檢視機器人的版本號。", "core.help.whoami": "取得傳送指令的帳戶在機器人內部的 ID。", "core.message.abuse.ban.success": "成功封鎖 ${user}。", @@ -154,12 +154,12 @@ "core.message.set.invalid": "ID 格式錯誤。", "core.message.set.module.success": "成功為物件配置了以下模組：", "core.message.superuser.invalid": "ID 格式錯誤，格式應為「${target}|<使用者 ID>」。", - "core.message.toggle.check.disable": "已停用指令錯誤檢查提醒。", - "core.message.toggle.check.enable": "已啟用指令錯誤檢查提醒。", - "core.message.toggle.timeoffset.invalid": "無效的時間偏移量。", - "core.message.toggle.timeoffset.success": "已將時間偏移量設定為 UTC${offset}。", - "core.message.toggle.typing.disable": "已停用輸入提醒。", - "core.message.toggle.typing.enable": "已啟用輸入提醒。", + "core.message.setup.check.disable": "已停用指令錯誤檢查提醒。", + "core.message.setup.check.enable": "已啟用指令錯誤檢查提醒。", + "core.message.setup.timeoffset.invalid": "無效的時間偏移量。", + "core.message.setup.timeoffset.success": "已將時間偏移量設定為 UTC${offset}。", + "core.message.setup.typing.disable": "已停用輸入提醒。", + "core.message.setup.typing.enable": "已啟用輸入提醒。", "core.message.update.failed": "嘗試從 GitHub 取得更新失敗，請稍後重試。", "core.message.version": "目前機器人版本號：${commit}", "core.message.version.unknown": "無法取得版本號。此實例可能沒有使用 Git 進行部署。", diff --git a/modules/core/utils.py b/modules/core/utils.py index e27544d8b7..e9daf0c141 100644 --- a/modules/core/utils.py +++ b/modules/core/utils.py @@ -171,33 +171,33 @@ async def _(msg: Bot.MessageSession): disable_secret_check=True) -tog = module('toggle', base=True, required_admin=True) +setup = module('setup', base=True, required_admin=True, desc=) -@tog.command('typing {{core.help.toggle.typing}}') +@setup.command('typing {{core.help.setup.typing}}') async def _(msg: Bot.MessageSession): target = BotDBUtil.SenderInfo(msg.target.sender_id) state = target.query.disable_typing if not state: target.edit('disable_typing', True) - await msg.finish(msg.locale.t('core.message.toggle.typing.disable')) + await msg.finish(msg.locale.t('core.message.setup.typing.disable')) else: target.edit('disable_typing', False) - await msg.finish(msg.locale.t('core.message.toggle.typing.enable')) + await msg.finish(msg.locale.t('core.message.setup.typing.enable')) -@tog.command('check {{core.help.toggle.check}}') +@setup.command('check {{core.help.setup.check}}') async def _(msg: Bot.MessageSession): state = msg.options.get('typo_check') if state: msg.data.edit_option('typo_check', False) - await msg.finish(msg.locale.t('core.message.toggle.check.enable')) + await msg.finish(msg.locale.t('core.message.setup.check.enable')) else: msg.data.edit_option('typo_check', True) - await msg.finish(msg.locale.t('core.message.toggle.check.disable')) + await msg.finish(msg.locale.t('core.message.setup.check.disable')) -@tog.command('timeoffset {{core.help.toggle.timeoffset}}') +@setup.command('timeoffset {{core.help.setup.timeoffset}}') async def _(msg: Bot.MessageSession, offset: str): try: tstr_split = [int(part) for part in offset.split(':')] @@ -211,9 +211,9 @@ async def _(msg: Bot.MessageSession, offset: str): if hour > 12 or minute >= 60: raise ValueError except ValueError: - await msg.finish(msg.locale.t('core.message.toggle.timeoffset.invalid')) + await msg.finish(msg.locale.t('core.message.setup.timeoffset.invalid')) msg.data.edit_option('timezone_offset', offset) - await msg.finish(msg.locale.t('core.message.toggle.timeoffset.success', offset=offset)) + await msg.finish(msg.locale.t('core.message.setup.timeoffset.success', offset=offset)) mute = module('mute', base=True, required_admin=True, desc='{core.help.mute}') From 201513f6b121feba7c0a2da40acd669f1c93c865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sat, 16 Dec 2023 16:33:30 +0800 Subject: [PATCH 090/168] fix --- modules/core/locales/en_us.json | 2 +- modules/core/locales/zh_cn.json | 2 +- modules/core/locales/zh_tw.json | 2 +- modules/core/utils.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/core/locales/en_us.json b/modules/core/locales/en_us.json index fb35d06db4..486b8b7c9b 100644 --- a/modules/core/locales/en_us.json +++ b/modules/core/locales/en_us.json @@ -1,5 +1,5 @@ { - "core.help.admin": "Commands available to group administrators.", + "core.help.admin.desc": "Commands available to group administrators.", "core.help.admin.add": "Set members as bot administrators, implement the function of managing the robot without setting members as group administrators. It's no longer needed to set up it when you are already a group administrator.", "core.help.admin.ban": "Limit someone to use bot in the group.", "core.help.admin.list": "View all bot administrators.", diff --git a/modules/core/locales/zh_cn.json b/modules/core/locales/zh_cn.json index d9066d00d4..ace8cf6bba 100644 --- a/modules/core/locales/zh_cn.json +++ b/modules/core/locales/zh_cn.json @@ -1,5 +1,5 @@ { - "core.help.admin": "一些群组管理员可使用的命令。", + "core.help.admin.desc": "一些群组管理员可使用的命令。", "core.help.admin.add": "设置成员为机器人管理员。以实现不设置成员为群组管理员的状況下管理机器人的效果。已是群组管理员无需设置此项目。", "core.help.admin.ban": "限制某人在本群使用机器人。", "core.help.admin.list": "查看所有机器人管理员。", diff --git a/modules/core/locales/zh_tw.json b/modules/core/locales/zh_tw.json index 0d508f3c9e..d901588e26 100644 --- a/modules/core/locales/zh_tw.json +++ b/modules/core/locales/zh_tw.json @@ -1,5 +1,5 @@ { - "core.help.admin": "一些群組管理員可使用的指令。", + "core.help.admin.desc": "一些群組管理員可使用的指令。", "core.help.admin.add": "設定成員為機器人管理員，以實現不設定成員為群組管理員的狀況下管理機器人的效果。已是群組管理員無須設定此指令。", "core.help.admin.ban": "限制某人在此群組使用機器人。", "core.help.admin.list": "檢視所有機器人管理員。", diff --git a/modules/core/utils.py b/modules/core/utils.py index e9daf0c141..5211b3166a 100644 --- a/modules/core/utils.py +++ b/modules/core/utils.py @@ -70,7 +70,7 @@ async def _(msg: Bot.MessageSession): await msg.finish(result) -admin = module('admin', base=True, required_admin=True, desc='{core.help.admin}') +admin = module('admin', base=True, required_admin=True, desc='{core.help.admin.desc}') @admin.command([ @@ -171,7 +171,7 @@ async def _(msg: Bot.MessageSession): disable_secret_check=True) -setup = module('setup', base=True, required_admin=True, desc=) +setup = module('setup', base=True, required_admin=True, desc='{core.help.setup.desc}') @setup.command('typing {{core.help.setup.typing}}') From 3e57f9d4fd388c3b1a1f8a5505c55029bf1d132e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sat, 16 Dec 2023 16:50:02 +0800 Subject: [PATCH 091/168] update core locales --- modules/core/locales/en_us.json | 9 +++++---- modules/core/locales/zh_cn.json | 9 +++++---- modules/core/locales/zh_tw.json | 7 ++++--- modules/core/utils.py | 21 ++++++++++----------- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/modules/core/locales/en_us.json b/modules/core/locales/en_us.json index 486b8b7c9b..d6a7e53c42 100644 --- a/modules/core/locales/en_us.json +++ b/modules/core/locales/en_us.json @@ -1,7 +1,7 @@ { - "core.help.admin.desc": "Commands available to group administrators.", "core.help.admin.add": "Set members as bot administrators, implement the function of managing the robot without setting members as group administrators. It's no longer needed to set up it when you are already a group administrator.", "core.help.admin.ban": "Limit someone to use bot in the group.", + "core.help.admin.desc": "Commands available to group administrators.", "core.help.admin.list": "View all bot administrators.", "core.help.admin.remove": "Remove bot administrator from member.", "core.help.admin.unban": "Remove limit someone to use bot in the group.", @@ -11,7 +11,7 @@ "core.help.alias.remove": "Remove custom command alias.", "core.help.alias.reset": "Reset custom command alias.", "core.help.leave": "Let the bot leave the group.", - "core.help.locale": "View bot running language.", + "core.help.locale.l": "View & Set the bot running language.", "core.help.locale.set": "Set bot running language.", "core.help.module.disable": "Disable single/multiple module(s).", "core.help.module.disable_all": "Disable all modules.", @@ -31,8 +31,9 @@ "core.help.prefix.remove": "Remove custom command prefix.", "core.help.prefix.reset": "Reset custom command prefix.", "core.help.setup.check": "setups whether to display command check prompts.", - "core.help.setup.typing": "setup whether to display input prompts.", + "core.help.setup.desc": "Set up bot actions.", "core.help.setup.timeoffset": "Set the time offset.", + "core.help.setup.typing": "setup whether to display input prompts.", "core.help.version": "View bot version.", "core.help.whoami": "Get the ID of the user account that sent the command inside the bot.", "core.message.abuse.ban.success": "Successfully banned ${user}.", @@ -153,13 +154,13 @@ "core.message.set.help.option.success": "The following parameters were set for the object: ${k} -> ${v}", "core.message.set.invalid": "Invalid ID format.", "core.message.set.module.success": "The following modules were successfully configured for the object: ", - "core.message.superuser.invalid": "Invalid ID format. The format should be \"${target}|\".", "core.message.setup.check.disable": "Check prompt disabled.", "core.message.setup.check.enable": "Check prompt enabled.", "core.message.setup.timeoffset.invalid": "Invalid time offset.", "core.message.setup.timeoffset.success": "The time offset has been set to UTC${offset}.", "core.message.setup.typing.disable": "Input prompt disabled.", "core.message.setup.typing.enable": "Input prompt enabled.", + "core.message.superuser.invalid": "Invalid ID format. The format should be \"${target}|\".", "core.message.update.failed": "Failed to fetch update from GitHub. Please try again later.", "core.message.version": "Current bot version: ${commit}", "core.message.version.unknown": "Unable to get version. This instance may not be deployed using Git.", diff --git a/modules/core/locales/zh_cn.json b/modules/core/locales/zh_cn.json index ace8cf6bba..477f8dc8a9 100644 --- a/modules/core/locales/zh_cn.json +++ b/modules/core/locales/zh_cn.json @@ -1,7 +1,7 @@ { - "core.help.admin.desc": "一些群组管理员可使用的命令。", "core.help.admin.add": "设置成员为机器人管理员。以实现不设置成员为群组管理员的状況下管理机器人的效果。已是群组管理员无需设置此项目。", "core.help.admin.ban": "限制某人在本群使用机器人。", + "core.help.admin.desc": "一些群组管理员可使用的命令。", "core.help.admin.list": "查看所有机器人管理员。", "core.help.admin.remove": "取消成员的机器人管理员。", "core.help.admin.unban": "解除对某人在本群使用机器人的限制。", @@ -11,7 +11,7 @@ "core.help.alias.remove": "移除自定义命令别名。", "core.help.alias.reset": "重置自定义命令别名。", "core.help.leave": "使机器人离开群组。", - "core.help.locale": "查看机器人运行语言。", + "core.help.locale": "查看或设置机器人运行语言。", "core.help.locale.set": "设置机器人运行语言。", "core.help.module.disable": "关闭一个/多个模块。", "core.help.module.disable_all": "关闭所有模块。", @@ -31,8 +31,9 @@ "core.help.prefix.remove": "移除自定义命令前缀。", "core.help.prefix.reset": "重置自定义命令前缀。", "core.help.setup.check": "切换是否展示命令错字检查提示。", - "core.help.setup.typing": "切换是否展示输入提示。", + "core.help.setup.desc": "设置机器人行为。", "core.help.setup.timeoffset": "设置时间偏移量。", + "core.help.setup.typing": "切换是否展示输入提示。", "core.help.version": "查看机器人的版本号。", "core.help.whoami": "获取发送命令的账号在机器人内部的 ID。", "core.message.abuse.ban.success": "成功封禁 ${user}。", @@ -153,13 +154,13 @@ "core.message.set.help.option.success": "成功为对象设置了以下参数：${k} -> ${v}", "core.message.set.invalid": "ID 格式错误。", "core.message.set.module.success": "成功为对象配置了以下模块：", - "core.message.superuser.invalid": "ID 格式错误，格式应为“${target}|<用户 ID>”。", "core.message.setup.check.disable": "已关闭错字检查提示。", "core.message.setup.check.enable": "已开启错字检查提示。", "core.message.setup.timeoffset.invalid": "无效的时间偏移量。", "core.message.setup.timeoffset.success": "已将时间偏移量设定为 UTC${offset}。", "core.message.setup.typing.disable": "已关闭输入提示。", "core.message.setup.typing.enable": "已开启输入提示。", + "core.message.superuser.invalid": "ID 格式错误，格式应为“${target}|<用户 ID>”。", "core.message.update.failed": "尝试从 GitHub 获取更新失败，请稍后重试。", "core.message.version": "当前机器人版本号：${commit}", "core.message.version.unknown": "无法获取版本号。此实例可能没有使用 Git 进行部署。", diff --git a/modules/core/locales/zh_tw.json b/modules/core/locales/zh_tw.json index d901588e26..faec99bc11 100644 --- a/modules/core/locales/zh_tw.json +++ b/modules/core/locales/zh_tw.json @@ -1,7 +1,7 @@ { - "core.help.admin.desc": "一些群組管理員可使用的指令。", "core.help.admin.add": "設定成員為機器人管理員，以實現不設定成員為群組管理員的狀況下管理機器人的效果。已是群組管理員無須設定此指令。", "core.help.admin.ban": "限制某人在此群組使用機器人。", + "core.help.admin.desc": "一些群組管理員可使用的指令。", "core.help.admin.list": "檢視所有機器人管理員。", "core.help.admin.remove": "取消成員的機器人管理員。", "core.help.admin.unban": "解除對某人在此群組使用機器人的限制。", @@ -31,8 +31,9 @@ "core.help.prefix.remove": "移除自訂指令前綴。", "core.help.prefix.reset": "重設自訂指令前綴。", "core.help.setup.check": "切換是否顯示指令錯誤檢查提醒。", - "core.help.setup.typing": "切換是否顯示輸入提醒。", + "core.help.setup.desc": "設定機器人行動", "core.help.setup.timeoffset": "設定時間偏移量。", + "core.help.setup.typing": "切換是否顯示輸入提醒。", "core.help.version": "檢視機器人的版本號。", "core.help.whoami": "取得傳送指令的帳戶在機器人內部的 ID。", "core.message.abuse.ban.success": "成功封鎖 ${user}。", @@ -153,13 +154,13 @@ "core.message.set.help.option.success": "成功為物件設定了以下參數：${k} -> ${v}", "core.message.set.invalid": "ID 格式錯誤。", "core.message.set.module.success": "成功為物件配置了以下模組：", - "core.message.superuser.invalid": "ID 格式錯誤，格式應為「${target}|<使用者 ID>」。", "core.message.setup.check.disable": "已停用指令錯誤檢查提醒。", "core.message.setup.check.enable": "已啟用指令錯誤檢查提醒。", "core.message.setup.timeoffset.invalid": "無效的時間偏移量。", "core.message.setup.timeoffset.success": "已將時間偏移量設定為 UTC${offset}。", "core.message.setup.typing.disable": "已停用輸入提醒。", "core.message.setup.typing.enable": "已啟用輸入提醒。", + "core.message.superuser.invalid": "ID 格式錯誤，格式應為「${target}|<使用者 ID>」。", "core.message.update.failed": "嘗試從 GitHub 取得更新失敗，請稍後重試。", "core.message.version": "目前機器人版本號：${commit}", "core.message.version.unknown": "無法取得版本號。此實例可能沒有使用 Git 進行部署。", diff --git a/modules/core/utils.py b/modules/core/utils.py index 5211b3166a..a37ac9c9c2 100644 --- a/modules/core/utils.py +++ b/modules/core/utils.py @@ -15,10 +15,10 @@ jwt_secret = Config('jwt_secret') -ver = module('version', base=True, desc='{core.help.version}') +ver = module('version', base=True) -@ver.command() +@ver.command('{{core.help.version}}') async def bot_version(msg: Bot.MessageSession): if Info.version: await msg.finish(msg.locale.t('core.message.version', commit=Info.version[0:6])) @@ -26,12 +26,12 @@ async def bot_version(msg: Bot.MessageSession): await msg.finish(msg.locale.t('core.message.version.unknown')) -ping = module('ping', base=True, desc='{core.help.ping}') +ping = module('ping', base=True) started_time = datetime.now() -@ping.command() +@ping.command('{{core.help.ping}}') async def _(msg: Bot.MessageSession): checkpermisson = msg.check_super_user() result = "Pong!" @@ -216,10 +216,10 @@ async def _(msg: Bot.MessageSession, offset: str): await msg.finish(msg.locale.t('core.message.setup.timeoffset.success', offset=offset)) -mute = module('mute', base=True, required_admin=True, desc='{core.help.mute}') +mute = module('mute', base=True, required_admin=True) -@mute.command() +@mute.command('{{core.help.mute}}') async def _(msg: Bot.MessageSession): state = msg.data.switch_mute() if state: @@ -233,11 +233,10 @@ async def _(msg: Bot.MessageSession): base=True, required_admin=True, available_for='QQ|Group', - alias='dismiss', - desc='{core.help.leave}') + alias='dismiss') -@leave.command() +@leave.command('{{core.help.leave}}') async def _(msg: Bot.MessageSession): confirm = await msg.wait_confirm(msg.locale.t('core.message.confirm')) if confirm: @@ -245,10 +244,10 @@ async def _(msg: Bot.MessageSession): await msg.call_api('set_group_leave', group_id=msg.session.target) -token = module('token', base=True, desc='{core.help.token}') +token = module('token', base=True) -@token.command('') +@token.command(' {{core.help.token}}') async def _(msg: Bot.MessageSession): await msg.finish(jwt.encode({ 'exp': datetime.utcnow() + timedelta(seconds=60 * 60 * 24 * 7), # 7 days From f3ffde25448e5c4c48ea7c1244c0914d5944e044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sat, 16 Dec 2023 19:24:36 +0800 Subject: [PATCH 092/168] Update --- modules/maimai/__init__.py | 14 +++++++------- modules/maimai/libraries/maimaidx_api_data.py | 2 +- modules/maimai/libraries/maimaidx_project.py | 8 ++++---- modules/maimai/regex.py | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index b5ada1ef08..4b303309ab 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -1,4 +1,4 @@ -from core.builtins import command_prefix +from core.builtins import command_prefix import traceback from config import Config @@ -59,7 +59,7 @@ async def _(msg: Bot.MessageSession, constant: float, constant_max: float = None result_set = await base_level_q(constant) s = msg.locale.t("maimai.message.base", constant=round(constant, 1)) + "\n" for elem in result_set: - s += f"{elem[0]}\u200B. {elem[1]}{' (DX)' if elem[5] == 'DX' else ''} {elem[3]} {elem[4]} ({elem[2]})\n" + s += f"{elem[0]}\u200B. {elem[1]}{msg.locale.t('message.brackets', msg='DX') if elem[5] == 'DX' else ''} {elem[3]} {elem[4]} ({elem[2]})\n" if len(result_set) == 0: await msg.finish(msg.locale.t("maimai.message.music_not_found")) elif len(result_set) > 200: @@ -94,7 +94,7 @@ async def _(msg: Bot.MessageSession, level: str): result_set = await diff_level_q(level) s = msg.locale.t("maimai.message.level", level=level) + "\n" for elem in result_set: - s += f"{elem[0]}\u200B. {elem[1]}{' (DX)' if elem[5] == 'DX' else ''} {elem[3]} {elem[4]} ({elem[2]})\n" + s += f"{elem[0]}\u200B. {elem[1]}{msg.locale.t('message.brackets', msg='DX') if elem[5] == 'DX' else ''} {elem[3]} {elem[4]} ({elem[2]})\n" if len(result_set) == 0: await msg.finish(msg.locale.t("maimai.message.music_not_found")) elif len(result_set) <= 10: @@ -130,7 +130,7 @@ async def _(msg: Bot.MessageSession, keyword: str): else: search_result = msg.locale.t("maimai.message.search", keyword=name) + "\n" for music in sorted(res, key=lambda i: int(i['id'])): - search_result += f"{music['id']}\u200B. {music['title']}{' (DX)' if music['type'] == 'DX' else ''}\n" + search_result += f"{music['id']}\u200B. {music['title']}{msg.locale.t('message.brackets', msg='DX') if music['type'] == 'DX' else ''}\n" if len(res) <= 10: await msg.finish([Plain(search_result.strip())]) else: @@ -187,7 +187,7 @@ async def _(msg: Bot.MessageSession, id_or_alias: str, diff: str = None): res = msg.locale.t("maimai.message.song.prompt") + "\n" for sid in sorted(sid_list, key=int): s = (await total_list.get()).by_id(sid) - res += f"{s['id']}\u200B. {s['title']}{' (DX)' if s['type'] == 'DX' else ''}\n" + res += f"{s['id']}\u200B. {s['title']}{msg.locale.t('message.brackets', msg='DX') if s['type'] == 'DX' else ''}\n" await msg.finish(res.strip()) else: sid = str(sid_list[0]) @@ -250,7 +250,7 @@ async def _(msg: Bot.MessageSession, id_or_alias: str, username: str = None): res = msg.locale.t("maimai.message.song.prompt") + "\n" for sid in sorted(sid_list, key=int): s = (await total_list.get()).by_id(sid) - res += f"{s['id']}\u200B. {s['title']}{' (DX)' if s['type'] == 'DX' else ''}\n" + res += f"{s['id']}\u200B. {s['title']}{msg.locale.t('message.brackets', msg='DX') if s['type'] == 'DX' else ''}\n" await msg.finish(res.strip()) else: sid = str(sid_list[0]) @@ -443,7 +443,7 @@ async def _(msg: Bot.MessageSession, diff: str, sid: str, scoreline: float): b2t_2550_great_prop = "{:.4f}".format(break_2550_reduce / total_score * 100) b2t_2000_great = "{:.3f}".format(break_2000_reduce / 100) # 一个 TAP GREAT 减少 100 分 b2t_2000_great_prop = "{:.4f}".format(break_2000_reduce / total_score * 100) - await msg.finish(f'''{music['title']}{' (DX)' if music['type'] == 'DX' else ''} {diff_label[diff_index]} + await msg.finish(f'''{music['title']}{msg.locale.t('message.brackets', msg='DX') if music['type'] == 'DX' else ''} {diff_label[diff_index]} {msg.locale.t('maimai.message.scoreline', scoreline=scoreline, tap_great=tap_great, diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index 3c512f19cb..94fcbe1068 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -46,7 +46,7 @@ async def update_covers(): async def get_info(music: Music, *details): - info = [Plain(f"{music.id}\u200B. {music.title}{' (DX)' if music['type'] == 'DX' else ''}")] + info = [Plain(f"{music.id}\u200B. {music.title}{msg.locale.t('message.brackets', msg='DX') if music['type'] == 'DX' else ''}")] try: img = f"https://www.diving-fish.com/covers/{get_cover_len5_id(music.id)}.png" await get_url(img, 200, attempt=1, fmt='read') diff --git a/modules/maimai/libraries/maimaidx_project.py b/modules/maimai/libraries/maimaidx_project.py index 32386a8f61..678dc89923 100644 --- a/modules/maimai/libraries/maimaidx_project.py +++ b/modules/maimai/libraries/maimaidx_project.py @@ -233,7 +233,7 @@ async def get_level_process(msg, payload, process, goal): elif goal in syncRank: if verlist[record_index]['fs']: self_record = syncRank[sync_rank.index(verlist[record_index]['fs'])] - output += f"{s[0]}\u200B. {s[1]}{' (DX)' if s[5] == 'DX' else ''} {s[2]} {s[3]} {self_record}\n" + output += f"{s[0]}\u200B. {s[1]}{msg.locale.t('message.brackets', msg='DX') if s[5] == 'DX' else ''} {s[2]} {s[3]} {self_record}\n" if len(song_remain) > 10: # 若剩余歌曲大于10个则使用图片形式 get_img = True else: @@ -260,7 +260,7 @@ async def get_score_list(msg, payload, level): output_lines = [] for s in enumerate(sorted(song_list, key=lambda i: i['achievements'], reverse=True)): # 根据成绩排序 music = (await total_list.get()).by_id(str(s[1]['id'])) - output = f"{music.id}\u200B. {music.title}{' (DX)' if music.type == 'DX' else ''} {diffs[s[1]['level_index']]} {music.ds[s[1]['level_index']]} {s[1]['achievements']}%" + output = f"{music.id}\u200B. {music.title}{msg.locale.t('message.brackets', msg='DX') if music.type == 'DX' else ''} {diffs[s[1]['level_index']]} {music.ds[s[1]['level_index']]} {s[1]['achievements']}%" if s[1]["fc"] and s[1]["fs"]: output += f" {combo_conversion.get(s[1]['fc'], '')} {sync_conversion.get(s[1]['fs'], '')}" elif s[1]["fc"] or s[1]["fs"]: @@ -425,7 +425,7 @@ async def get_plate_process(msg, payload, plate): elif goal == '舞舞': if verlist[record_index]['fs']: self_record = syncRank[sync_rank.index(verlist[record_index]['fs'])] - output += f"{s[0]}\u200B. {s[1]}{' (DX)' if s[5] == 'DX' else ''} {s[2]} {s[3]} {self_record}".strip() + '\n' + output += f"{s[0]}\u200B. {s[1]}{msg.locale.t('message.brackets', msg='DX') if s[5] == 'DX' else ''} {s[2]} {s[3]} {self_record}".strip() + '\n' if len(song_remain_difficult) > 10: # 若剩余歌曲大于10个则使用图片形式 get_img = True else: @@ -450,7 +450,7 @@ async def get_plate_process(msg, payload, plate): elif goal == '舞舞': if verlist[record_index]['fs']: self_record = syncRank[sync_rank.index(verlist[record_index]['fs'])] - output += f"{m.id}\u200B. {m.title}{' (DX)' if m.type == 'DX' else ''} {diffs[s[1]]} {m.ds[s[1]]} {self_record}".strip( + output += f"{m.id}\u200B. {m.title}{msg.locale.t('message.brackets', msg='DX') if m.type == 'DX' else ''} {diffs[s[1]]} {m.ds[s[1]]} {self_record}".strip( ) + '\n' if len(song_remain) > 10: # 若剩余歌曲大于10个则使用图片形式 get_img = True diff --git a/modules/maimai/regex.py b/modules/maimai/regex.py index 7d7aaa0004..50153dcddb 100644 --- a/modules/maimai/regex.py +++ b/modules/maimai/regex.py @@ -57,7 +57,7 @@ async def _(msg: Bot.MessageSession): res = msg.locale.t("maimai.message.song.prompt") + "\n" for sid in sorted(sid_list, key=int): s = (await total_list.get()).by_id(sid) - res += f"{s['id']}\u200B. {s['title']}{' (DX)' if s['type'] == 'DX' else ''}\n" + res += f"{s['id']}\u200B. {s['title']}{msg.locale.t('message.brackets', msg='DX') if s['type'] == 'DX' else ''}\n" await msg.finish(res.strip()) else: music = (await total_list.get()).by_id(str(sid_list[0])) @@ -86,7 +86,7 @@ async def _(msg: Bot.MessageSession): res = msg.locale.t("maimai.message.song.prompt") + "\n" for sid in sorted(sid_list, key=int): s = (await total_list.get()).by_id(sid) - res += f"{s['id']}\u200B. {s['title']}{' (DX)' if s['type'] == 'DX' else ''}\n" + res += f"{s['id']}\u200B. {s['title']}{msg.locale.t('message.brackets', msg='DX') if s['type'] == 'DX' else ''}\n" await msg.finish(res.strip()) else: sid = str(sid_list[0]) @@ -113,7 +113,7 @@ async def _(msg: Bot.MessageSession): music = (await total_list.get()).by_id(sid) if not music: await msg.finish(msg.locale.t("maimai.message.music_not_found")) - title = f"{music['id']}\u200B. {music['title']}{' (DX)' if music['type'] == 'DX' else ''}" + title = f"{music['id']}\u200B. {music['title']}{msg.locale.t('message.brackets', msg='DX') if music['type'] == 'DX' else ''}" alias = await get_alias(msg, sid) if len(alias) == 0: await msg.finish(msg.locale.t("maimai.message.alias.alias_not_found")) From 6f90915a2c83beda759509df0a683fad5bc6b1b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sat, 16 Dec 2023 19:34:50 +0800 Subject: [PATCH 093/168] fix --- modules/maimai/__init__.py | 12 ++++++------ modules/maimai/libraries/maimaidx_api_data.py | 4 ++-- modules/maimai/regex.py | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index 4b303309ab..bca3ffe63e 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -150,7 +150,7 @@ async def _(msg: Bot.MessageSession, sid: str): if not music: await msg.finish(msg.locale.t("maimai.message.music_not_found")) - title = await get_info(music, cover=False) + title = await get_info(msg, music, cover=False) alias = await get_alias(msg, sid) if len(alias) == 0: await msg.finish(msg.locale.t("maimai.message.alias.alias_not_found")) @@ -225,7 +225,7 @@ async def _(msg: Bot.MessageSession, id_or_alias: str, diff: str = None): touch=chart['notes'][3], brk=chart['notes'][4], charter=chart['charter']) - await msg.finish(await get_info(music, Plain(message))) + await msg.finish(await get_info(msg, music, Plain(message))) else: message = msg.locale.t( "maimai.message.song", @@ -234,7 +234,7 @@ async def _(msg: Bot.MessageSession, id_or_alias: str, diff: str = None): bpm=music['basic_info']['bpm'], version=music['basic_info']['from'], level='/'.join((str(ds) for ds in music['ds']))) - await msg.finish(await get_info(music, Plain(message))) + await msg.finish(await get_info(msg, music, Plain(message))) @mai.command('info [] {{maimai.help.info}}') @@ -268,7 +268,7 @@ async def _(msg: Bot.MessageSession, id_or_alias: str, username: str = None): output = await get_player_score(msg, payload, sid) - await msg.finish(await get_info(music, Plain(output))) + await msg.finish(await get_info(msg, music, Plain(output))) @mai.command('plate [] {{maimai.help.plate}}') @@ -403,7 +403,7 @@ async def _(msg: Bot.MessageSession, dx_type: str = None): await msg.finish(msg.locale.t("maimai.message.music_not_found")) else: music = music_data.random() - await msg.finish(await get_info(music, Plain(f"\n{'/'.join(str(ds) for ds in music.ds)}"))) + await msg.finish(await get_info(msg, music, Plain(f"\n{'/'.join(str(ds) for ds in music.ds)}"))) except ValueError: await msg.finish(msg.locale.t("maimai.message.random.error")) @@ -411,7 +411,7 @@ async def _(msg: Bot.MessageSession, dx_type: str = None): @mai.command('random {{maimai.help.random}}') async def _(msg: Bot.MessageSession): music = (await total_list.get()).random() - await msg.finish(await get_info(music, Plain(f"\n{'/'.join(str(ds) for ds in music.ds)}"))) + await msg.finish(await get_info(msg, music, Plain(f"\n{'/'.join(str(ds) for ds in music.ds)}"))) @mai.command('scoreline {{maimai.help.scoreline}}') diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index 94fcbe1068..384050c217 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -3,7 +3,7 @@ import ujson as json -from core.builtins import Plain, Image +from core.builtins import Bot, Plain, Image from core.logger import Logger from core.utils.cache import random_cache_path from core.utils.http import get_url, post_url, download_to_cache @@ -45,7 +45,7 @@ async def update_covers(): return True -async def get_info(music: Music, *details): +async def get_info(msg: Bot.MessageSession, music: Music, *details): info = [Plain(f"{music.id}\u200B. {music.title}{msg.locale.t('message.brackets', msg='DX') if music['type'] == 'DX' else ''}")] try: img = f"https://www.diving-fish.com/covers/{get_cover_len5_id(music.id)}.png" diff --git a/modules/maimai/regex.py b/modules/maimai/regex.py index 50153dcddb..3ba975dcb3 100644 --- a/modules/maimai/regex.py +++ b/modules/maimai/regex.py @@ -64,7 +64,7 @@ async def _(msg: Bot.MessageSession): if not music: await msg.finish(msg.locale.t("maimai.message.music_not_found")) - await msg.finish(await get_info(music, Plain(msg.locale.t("maimai.message.song", + await msg.finish(await get_info(msg, music, Plain(msg.locale.t("maimai.message.song", artist=music['basic_info']['artist'], genre=music['basic_info']['genre'], bpm=music['basic_info']['bpm'], @@ -104,7 +104,7 @@ async def _(msg: Bot.MessageSession): output = await get_player_score(msg, payload, sid) - await msg.finish(await get_info(music, Plain(output))) + await msg.finish(await get_info(msg, music, Plain(output))) @mai_regex.regex(re.compile(r"(?:id)?(\d+)\s?有什(?:么别|麼別)名", flags=re.I), desc='{maimai.help.maimai_regex.alias}') @@ -145,7 +145,7 @@ async def _(msg: Bot.MessageSession): await msg.finish(msg.locale.t("maimai.message.music_not_found")) else: music = music_data.random() - await msg.finish(await get_info(music, Plain(f"\n{'/'.join(str(ds) for ds in music.ds)}"))) + await msg.finish(await get_info(msg, music, Plain(f"\n{'/'.join(str(ds) for ds in music.ds)}"))) except ValueError: await msg.finish(msg.locale.t("maimai.message.random.error")) From 9d21227ce57027659673754142c675870d459383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 12:25:24 +0800 Subject: [PATCH 094/168] update --- modules/bugtracker/bugtracker.py | 2 +- modules/cytoid/profile.py | 2 +- modules/cytoid/rating.py | 2 +- modules/github/repo.py | 2 +- modules/github/user.py | 2 +- modules/maimai/libraries/maimai_best_50.py | 4 ++-- modules/maimai/libraries/maimaidx_api_data.py | 8 ++++---- modules/wolframalpha/__init__.py | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/bugtracker/bugtracker.py b/modules/bugtracker/bugtracker.py index ec75e1cc41..ff985d47bf 100644 --- a/modules/bugtracker/bugtracker.py +++ b/modules/bugtracker/bugtracker.py @@ -60,7 +60,7 @@ async def bugtracker_get(session, mojira_id: str, nolink=False): json_url = 'https://bugs.mojang.com/rest/api/2/issue/' + id_ get_json = await get_url(json_url, 200) except ValueError as e: - if str(e).startswith('401'): + if e.args == (401,): await session.finish(session.locale.t("bugtracker.message.get_failed")) if mojira_id not in spx_cache: get_spx = await get_url('https://bugs.guangyaostore.com/translations', 200) diff --git a/modules/cytoid/profile.py b/modules/cytoid/profile.py index 2464ca24cb..0f163db66e 100644 --- a/modules/cytoid/profile.py +++ b/modules/cytoid/profile.py @@ -17,7 +17,7 @@ async def cytoid_profile(msg: Bot.MessageSession): try: profile = json.loads(await get_url(profile_url, status_code=200)) except ValueError as e: - if str(e).startswith('404'): + if e.args == (404,): await msg.finish(msg.locale.t('cytoid.message.user_not_found')) raise e uid = profile['user']['uid'] diff --git a/modules/cytoid/rating.py b/modules/cytoid/rating.py index 8c9c8d54e5..7b1a5d62d0 100644 --- a/modules/cytoid/rating.py +++ b/modules/cytoid/rating.py @@ -210,7 +210,7 @@ async def mkresources(msg: Bot.MessageSession, x, rank): # shutil.rmtree(workdir) return {'status': True, 'path': savefilename} except Exception as e: - if str(e).startswith('404'): + if e.args == (404,): await msg.finish(msg.locale.t("cytoid.message.user_not_found")) traceback.print_exc() return {'status': False, 'text': msg.locale.t("error") + str(e)} diff --git a/modules/github/repo.py b/modules/github/repo.py index 773800fc0f..c0e87b9632 100644 --- a/modules/github/repo.py +++ b/modules/github/repo.py @@ -66,6 +66,6 @@ async def download(): asyncio.create_task(download()) except ValueError as e: - if str(e).startswith('404'): + if e.args == (404,): await msg.finish(msg.locale.t("github.message.repo.not_found")) traceback.print_exc() diff --git a/modules/github/user.py b/modules/github/user.py index 2ef88adb29..4c6413b487 100644 --- a/modules/github/user.py +++ b/modules/github/user.py @@ -43,6 +43,6 @@ async def user(msg: Bot.MessageSession): await msg.finish(message) except ValueError as e: - if str(e).startswith('404'): + if e.args == (404,): await msg.finish(msg.locale.t("github.message.repo.not_found")) traceback.print_exc() diff --git a/modules/maimai/libraries/maimai_best_50.py b/modules/maimai/libraries/maimai_best_50.py index ac3d7ad48c..5cdcf1daf3 100644 --- a/modules/maimai/libraries/maimai_best_50.py +++ b/modules/maimai/libraries/maimai_best_50.py @@ -400,12 +400,12 @@ async def generate(msg, payload) -> Tuple[Optional[Image.Image], bool]: status_code=200, headers={'Content-Type': 'application/json', 'accept': '*/*'}, fmt='json') except ValueError as e: - if str(e).startswith('400'): + if e.args == (400,): if "qq" in payload: await msg.finish(msg.locale.t("maimai.message.user_unbound")) else: await msg.finish(msg.locale.t("maimai.message.user_not_found")) - elif str(e).startswith('403'): + elif e.args == (403,): await msg.finish(msg.locale.t("maimai.message.forbidden")) else: raise diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index 384050c217..b9621f82b6 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -106,12 +106,12 @@ async def get_record(msg, payload): status_code=200, headers={'Content-Type': 'application/json', 'accept': '*/*'}, fmt='json') except Exception as e: - if str(e).startswith('400'): + if e.args == (400,): if "qq" in payload: await msg.finish(msg.locale.t("maimai.message.user_unbound")) else: await msg.finish(msg.locale.t("maimai.message.user_not_found")) - elif str(e).startswith('403'): + elif e.args == (403,): await msg.finish(msg.locale.t("maimai.message.forbidden")) else: raise @@ -126,12 +126,12 @@ async def get_plate(msg, payload): status_code=200, headers={'Content-Type': 'application/json', 'accept': '*/*'}, fmt='json') except Exception as e: - if str(e).startswith('400'): + if e.args == (400,): if "qq" in payload: await msg.finish(msg.locale.t("maimai.message.user_unbound")) else: await msg.finish(msg.locale.t("maimai.message.user_not_found")) - elif str(e).startswith('403'): + elif e.args == (403,): await msg.finish(msg.locale.t("maimai.message.forbidden")) else: raise diff --git a/modules/wolframalpha/__init__.py b/modules/wolframalpha/__init__.py index 3d7f8ac1a3..802b1f70f5 100644 --- a/modules/wolframalpha/__init__.py +++ b/modules/wolframalpha/__init__.py @@ -38,7 +38,7 @@ async def _(msg: Bot.MessageSession): os.remove(img_path) await msg.finish([BImage(output)]) except ValueError as e: - if str(e).startswith('501'): + if e.args == (501,): await msg.finish(msg.locale.t('wolframalpha.message.incomprehensible')) @@ -57,5 +57,5 @@ async def _(msg: Bot.MessageSession): await msg.finish(rickroll(msg)) await msg.finish(data) except ValueError as e: - if str(e).startswith('501'): + if e.args == (501'): await msg.finish(msg.locale.t('wolframalpha.message.incomprehensible')) From d9d1934686de23567bf5a035e8a628682a672dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 12:40:56 +0800 Subject: [PATCH 095/168] update --- modules/bugtracker/bugtracker.py | 2 +- modules/core/locales/en_us.json | 4 ++-- modules/core/locales/zh_cn.json | 2 +- modules/core/locales/zh_tw.json | 2 +- modules/core/utils.py | 11 +++-------- modules/cytoid/profile.py | 4 +--- modules/github/repo.py | 5 ++--- modules/github/user.py | 4 ++-- modules/maimai/libraries/maimai_best_50.py | 4 ++-- modules/maimai/libraries/maimaidx_api_data.py | 8 ++++---- modules/wolframalpha/__init__.py | 4 ++-- 11 files changed, 21 insertions(+), 29 deletions(-) diff --git a/modules/bugtracker/bugtracker.py b/modules/bugtracker/bugtracker.py index ff985d47bf..ec75e1cc41 100644 --- a/modules/bugtracker/bugtracker.py +++ b/modules/bugtracker/bugtracker.py @@ -60,7 +60,7 @@ async def bugtracker_get(session, mojira_id: str, nolink=False): json_url = 'https://bugs.mojang.com/rest/api/2/issue/' + id_ get_json = await get_url(json_url, 200) except ValueError as e: - if e.args == (401,): + if str(e).startswith('401'): await session.finish(session.locale.t("bugtracker.message.get_failed")) if mojira_id not in spx_cache: get_spx = await get_url('https://bugs.guangyaostore.com/translations', 200) diff --git a/modules/core/locales/en_us.json b/modules/core/locales/en_us.json index d6a7e53c42..13f0fbdd8f 100644 --- a/modules/core/locales/en_us.json +++ b/modules/core/locales/en_us.json @@ -11,8 +11,8 @@ "core.help.alias.remove": "Remove custom command alias.", "core.help.alias.reset": "Reset custom command alias.", "core.help.leave": "Let the bot leave the group.", - "core.help.locale.l": "View & Set the bot running language.", - "core.help.locale.set": "Set bot running language.", + "core.help.locale.desc": "Control bot language.", + "core.help.locale.set": "Set the bot running languages.", "core.help.module.disable": "Disable single/multiple module(s).", "core.help.module.disable_all": "Disable all modules.", "core.help.module.enable": "Enable single/multiple module(s).", diff --git a/modules/core/locales/zh_cn.json b/modules/core/locales/zh_cn.json index 477f8dc8a9..c4a92dd4ef 100644 --- a/modules/core/locales/zh_cn.json +++ b/modules/core/locales/zh_cn.json @@ -11,7 +11,7 @@ "core.help.alias.remove": "移除自定义命令别名。", "core.help.alias.reset": "重置自定义命令别名。", "core.help.leave": "使机器人离开群组。", - "core.help.locale": "查看或设置机器人运行语言。", + "core.help.locale.desc": "控制机器人语言。", "core.help.locale.set": "设置机器人运行语言。", "core.help.module.disable": "关闭一个/多个模块。", "core.help.module.disable_all": "关闭所有模块。", diff --git a/modules/core/locales/zh_tw.json b/modules/core/locales/zh_tw.json index faec99bc11..ae8d7ec307 100644 --- a/modules/core/locales/zh_tw.json +++ b/modules/core/locales/zh_tw.json @@ -11,7 +11,7 @@ "core.help.alias.remove": "移除自訂指令別名。", "core.help.alias.reset": "重設自訂指令別名。", "core.help.leave": "使機器人離開群組。", - "core.help.locale": "檢視機器人使用的語言。", + "core.help.locale.desc": "控制機器人語言。", "core.help.locale.set": "設定機器人使用的語言。", "core.help.module.disable": "停用一個/多個模組。", "core.help.module.disable_all": "停用所有模組。", diff --git a/modules/core/utils.py b/modules/core/utils.py index a37ac9c9c2..e185e1f9cb 100644 --- a/modules/core/utils.py +++ b/modules/core/utils.py @@ -125,10 +125,10 @@ async def config_ban(msg: Bot.MessageSession): await msg.finish(msg.locale.t("core.message.admin.ban.not_yet")) -locale = module('locale', base=True) +locale = module('locale', base=True, desc='{core.help.locale.desc}') -@locale.command('{{core.help.locale}}') +@locale.command() async def _(msg: Bot.MessageSession): avaliable_lang = msg.locale.t("message.delimiter").join(get_available_locales()) await msg.finish( @@ -228,12 +228,7 @@ async def _(msg: Bot.MessageSession): await msg.finish(msg.locale.t('core.message.mute.disable')) -leave = module( - 'leave', - base=True, - required_admin=True, - available_for='QQ|Group', - alias='dismiss') +leave = module('leave', base=True, required_admin=True, available_for='QQ|Group', alias='dismiss') @leave.command('{{core.help.leave}}') diff --git a/modules/cytoid/profile.py b/modules/cytoid/profile.py index 0f163db66e..e0cafe3cc1 100644 --- a/modules/cytoid/profile.py +++ b/modules/cytoid/profile.py @@ -1,5 +1,3 @@ -import ujson as json - from core.builtins import Bot, Image, Plain from core.utils.http import get_url from .dbutils import CytoidBindInfoManager @@ -17,7 +15,7 @@ async def cytoid_profile(msg: Bot.MessageSession): try: profile = json.loads(await get_url(profile_url, status_code=200)) except ValueError as e: - if e.args == (404,): + if str(e).startswith('404'): await msg.finish(msg.locale.t('cytoid.message.user_not_found')) raise e uid = profile['user']['uid'] diff --git a/modules/github/repo.py b/modules/github/repo.py index c0e87b9632..cd4eba1403 100644 --- a/modules/github/repo.py +++ b/modules/github/repo.py @@ -1,5 +1,4 @@ -import asyncio -import traceback +traceback from core.builtins import Bot, Image, Plain, Url from core.dirty_check import rickroll @@ -66,6 +65,6 @@ async def download(): asyncio.create_task(download()) except ValueError as e: - if e.args == (404,): + if str(e).startswith('404'): await msg.finish(msg.locale.t("github.message.repo.not_found")) traceback.print_exc() diff --git a/modules/github/user.py b/modules/github/user.py index 4c6413b487..795de68033 100644 --- a/modules/github/user.py +++ b/modules/github/user.py @@ -1,4 +1,4 @@ -import traceback +eback from core.builtins import Url, Bot from core.dirty_check import rickroll @@ -43,6 +43,6 @@ async def user(msg: Bot.MessageSession): await msg.finish(message) except ValueError as e: - if e.args == (404,): + if str(e).startswith('404'): await msg.finish(msg.locale.t("github.message.repo.not_found")) traceback.print_exc() diff --git a/modules/maimai/libraries/maimai_best_50.py b/modules/maimai/libraries/maimai_best_50.py index 5cdcf1daf3..ac3d7ad48c 100644 --- a/modules/maimai/libraries/maimai_best_50.py +++ b/modules/maimai/libraries/maimai_best_50.py @@ -400,12 +400,12 @@ async def generate(msg, payload) -> Tuple[Optional[Image.Image], bool]: status_code=200, headers={'Content-Type': 'application/json', 'accept': '*/*'}, fmt='json') except ValueError as e: - if e.args == (400,): + if str(e).startswith('400'): if "qq" in payload: await msg.finish(msg.locale.t("maimai.message.user_unbound")) else: await msg.finish(msg.locale.t("maimai.message.user_not_found")) - elif e.args == (403,): + elif str(e).startswith('403'): await msg.finish(msg.locale.t("maimai.message.forbidden")) else: raise diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index b9621f82b6..384050c217 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -106,12 +106,12 @@ async def get_record(msg, payload): status_code=200, headers={'Content-Type': 'application/json', 'accept': '*/*'}, fmt='json') except Exception as e: - if e.args == (400,): + if str(e).startswith('400'): if "qq" in payload: await msg.finish(msg.locale.t("maimai.message.user_unbound")) else: await msg.finish(msg.locale.t("maimai.message.user_not_found")) - elif e.args == (403,): + elif str(e).startswith('403'): await msg.finish(msg.locale.t("maimai.message.forbidden")) else: raise @@ -126,12 +126,12 @@ async def get_plate(msg, payload): status_code=200, headers={'Content-Type': 'application/json', 'accept': '*/*'}, fmt='json') except Exception as e: - if e.args == (400,): + if str(e).startswith('400'): if "qq" in payload: await msg.finish(msg.locale.t("maimai.message.user_unbound")) else: await msg.finish(msg.locale.t("maimai.message.user_not_found")) - elif e.args == (403,): + elif str(e).startswith('403'): await msg.finish(msg.locale.t("maimai.message.forbidden")) else: raise diff --git a/modules/wolframalpha/__init__.py b/modules/wolframalpha/__init__.py index 802b1f70f5..3d7f8ac1a3 100644 --- a/modules/wolframalpha/__init__.py +++ b/modules/wolframalpha/__init__.py @@ -38,7 +38,7 @@ async def _(msg: Bot.MessageSession): os.remove(img_path) await msg.finish([BImage(output)]) except ValueError as e: - if e.args == (501,): + if str(e).startswith('501'): await msg.finish(msg.locale.t('wolframalpha.message.incomprehensible')) @@ -57,5 +57,5 @@ async def _(msg: Bot.MessageSession): await msg.finish(rickroll(msg)) await msg.finish(data) except ValueError as e: - if e.args == (501'): + if str(e).startswith('501'): await msg.finish(msg.locale.t('wolframalpha.message.incomprehensible')) From 1acdec57b4b295decac46944d00e23ca4dc67f7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 12:45:16 +0800 Subject: [PATCH 096/168] update locale --- modules/github/__init__.py | 2 +- modules/github/locales/en_us.json | 3 ++- modules/github/locales/zh_cn.json | 3 ++- modules/github/locales/zh_tw.json | 1 + modules/github/repo.py | 2 -- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/github/__init__.py b/modules/github/__init__.py index 9c254ef7ba..5726a1d3d6 100644 --- a/modules/github/__init__.py +++ b/modules/github/__init__.py @@ -2,7 +2,7 @@ from core.component import module from modules.github import repo, user, search -github = module('github', alias='gh', developers=['Dianliang233']) +github = module('github', alias='gh', developers=['Dianliang233'], desc='{github.help.desc}') @github.handle(' {{github.help}}') diff --git a/modules/github/locales/en_us.json b/modules/github/locales/en_us.json index 18a4153e5a..56d599241d 100644 --- a/modules/github/locales/en_us.json +++ b/modules/github/locales/en_us.json @@ -1,11 +1,12 @@ { + "github.help.desc": "Github query tool.", "github.help": "Trying to automatically identifying and distinguishing repo/user.", "github.help.repo": "Getting GitHub repository information.", "github.help.search": "Searching repositories on GitHub.", "github.help.user": "Getting GitHub user or organization information.", "github.message.repo.not_found": "The repository does not exist, please check your input.", "github.message.search": "Successfully to search for ${result} results:", - "github.message.search.none": "搜索成功，未找到结果。", + "github.message.search.none": "No results found.", "github.message.search.more_information": "Truncated due to chat limits; ${more_result} more results may not be shown.", "github.message.search.not_found": "The repository cannot be found; please check your input.", "github.message.user.not_found": "The user cannot be found; please check your input." diff --git a/modules/github/locales/zh_cn.json b/modules/github/locales/zh_cn.json index 9375af76dd..d9a047803a 100644 --- a/modules/github/locales/zh_cn.json +++ b/modules/github/locales/zh_cn.json @@ -1,12 +1,13 @@ { "github.help": "尝试自动识别并区分 repo/user。", + "github.help.desc": "GitHub 查询工具。", "github.help.repo": "获取 GitHub 存储库信息。", "github.help.search": "搜索 GitHub 上的存储库。", "github.help.user": "获取 GitHub 用户或组织信息。", "github.message.repo.not_found": "此存储库不存在，请检查输入。", "github.message.search": "搜索成功，共 ${result} 条结果：", - "github.message.search.none": "搜索成功，未找到结果。", "github.message.search.more_information": "另有 ${more_result} 条结果未显示。", + "github.message.search.none": "搜索成功，未找到结果。", "github.message.search.not_found": "未找到存储库，请检查输入。", "github.message.user.not_found": "查无此人，请检查输入。" } \ No newline at end of file diff --git a/modules/github/locales/zh_tw.json b/modules/github/locales/zh_tw.json index 90bb1b0821..92bb1374bd 100644 --- a/modules/github/locales/zh_tw.json +++ b/modules/github/locales/zh_tw.json @@ -1,4 +1,5 @@ { + "github.help.desc": "GitHub 查詢工具。", "github.help": "嘗試自動辨識並區分 repo/user。", "github.help.repo": "取得 Github 儲存庫資訊。", "github.help.search": "搜尋 Github 上的儲存庫。", diff --git a/modules/github/repo.py b/modules/github/repo.py index cd4eba1403..e3bb5a2725 100644 --- a/modules/github/repo.py +++ b/modules/github/repo.py @@ -1,5 +1,3 @@ -traceback - from core.builtins import Bot, Image, Plain, Url from core.dirty_check import rickroll from core.utils.http import get_url, download_to_cache From 969ae525d39154ffdd294c779f9a588c143ab2ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 12:56:21 +0800 Subject: [PATCH 097/168] fix --- modules/github/locales/zh_cn.json | 1 - modules/github/repo.py | 2 ++ modules/github/user.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/github/locales/zh_cn.json b/modules/github/locales/zh_cn.json index d9a047803a..08ad53e9bd 100644 --- a/modules/github/locales/zh_cn.json +++ b/modules/github/locales/zh_cn.json @@ -6,7 +6,6 @@ "github.help.user": "获取 GitHub 用户或组织信息。", "github.message.repo.not_found": "此存储库不存在，请检查输入。", "github.message.search": "搜索成功，共 ${result} 条结果：", - "github.message.search.more_information": "另有 ${more_result} 条结果未显示。", "github.message.search.none": "搜索成功，未找到结果。", "github.message.search.not_found": "未找到存储库，请检查输入。", "github.message.user.not_found": "查无此人，请检查输入。" diff --git a/modules/github/repo.py b/modules/github/repo.py index e3bb5a2725..bed4fea703 100644 --- a/modules/github/repo.py +++ b/modules/github/repo.py @@ -1,3 +1,5 @@ +import traceback + from core.builtins import Bot, Image, Plain, Url from core.dirty_check import rickroll from core.utils.http import get_url, download_to_cache diff --git a/modules/github/user.py b/modules/github/user.py index 795de68033..2ef88adb29 100644 --- a/modules/github/user.py +++ b/modules/github/user.py @@ -1,4 +1,4 @@ -eback +import traceback from core.builtins import Url, Bot from core.dirty_check import rickroll From e0540d33bc3fd621e690beed9e910322c3b4bc9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 12:56:45 +0800 Subject: [PATCH 098/168] . --- modules/github/locales/zh_cn.json | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/github/locales/zh_cn.json b/modules/github/locales/zh_cn.json index 08ad53e9bd..d9a047803a 100644 --- a/modules/github/locales/zh_cn.json +++ b/modules/github/locales/zh_cn.json @@ -6,6 +6,7 @@ "github.help.user": "获取 GitHub 用户或组织信息。", "github.message.repo.not_found": "此存储库不存在，请检查输入。", "github.message.search": "搜索成功，共 ${result} 条结果：", + "github.message.search.more_information": "另有 ${more_result} 条结果未显示。", "github.message.search.none": "搜索成功，未找到结果。", "github.message.search.not_found": "未找到存储库，请检查输入。", "github.message.user.not_found": "查无此人，请检查输入。" From e253aee131753de928fb2b46b26ea019ea8063c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 13:59:18 +0800 Subject: [PATCH 099/168] Update mai rating --- modules/maimai/__init__.py | 78 ++++++++++++++----- modules/maimai/libraries/maimai_best_50.py | 33 +------- modules/maimai/libraries/maimaidx_api_data.py | 11 ++- modules/maimai/libraries/maimaidx_project.py | 20 +++-- modules/maimai/locales/en_us.json | 4 +- modules/maimai/locales/zh_cn.json | 6 +- modules/maimai/locales/zh_tw.json | 6 +- modules/maimai/regex.py | 2 +- 8 files changed, 88 insertions(+), 72 deletions(-) diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index bca3ffe63e..a9440c11f9 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -1,4 +1,4 @@ -from core.builtins import command_prefix +import math import traceback from config import Config @@ -162,10 +162,10 @@ async def _(msg: Bot.MessageSession, sid: str): @mai.command('b50 [] {{maimai.help.b50}}') async def _(msg: Bot.MessageSession, username: str = None): - if username is None and msg.target.sender_from == "QQ": + if not username and msg.target.sender_from == "QQ": payload = {'qq': msg.session.sender, 'b50': True} else: - if username is None: + if not username: await msg.finish(msg.locale.t("maimai.message.no_username")) payload = {'username': username, 'b50': True} img = await generate(msg, payload) @@ -273,10 +273,10 @@ async def _(msg: Bot.MessageSession, id_or_alias: str, username: str = None): @mai.command('plate [] {{maimai.help.plate}}') async def _(msg: Bot.MessageSession, plate: str, username: str = None): - if username is None and msg.target.sender_from == "QQ": + if not username and msg.target.sender_from == "QQ": payload = {'qq': msg.session.sender} else: - if username is None: + if not username: await msg.finish(msg.locale.t("maimai.message.no_username")) payload = {'username': username} @@ -313,10 +313,10 @@ async def _(msg: Bot.MessageSession, level: str, goal: str, username: str = None "FDX", "FDX+"] - if username is None and msg.target.sender_from == "QQ": + if not username and msg.target.sender_from == "QQ": payload = {'qq': msg.session.sender} else: - if username is None: + if not username: await msg.finish(msg.locale.t("maimai.message.no_username")) payload = {'username': username} @@ -325,10 +325,10 @@ async def _(msg: Bot.MessageSession, level: str, goal: str, username: str = None if level_num < 8: await msg.finish(msg.locale.t("maimai.message.process.less_than_8")) else: - await msg.finish(msg.locale.t("maimai.message.process.error.goal_invalid")) + await msg.finish(msg.locale.t("maimai.message.level_invalid")) if goal.upper() not in goal_list: - await msg.finish(msg.locale.t("maimai.message.process.error.goal_invalid")) + await msg.finish(msg.locale.t("maimai.message.goal_invalid")) output, get_img = await get_level_process(msg, payload, level, goal) @@ -341,10 +341,10 @@ async def _(msg: Bot.MessageSession, level: str, goal: str, username: str = None @mai.command('rank [] {{maimai.help.rank}}') async def _(msg: Bot.MessageSession, username: str = None): - if username is None and msg.target.sender_from == "QQ": + if not username and msg.target.sender_from == "QQ": payload = {'qq': msg.session.sender} else: - if username is None: + if not username: await msg.finish(msg.locale.t("maimai.message.no_username")) payload = {'username': username} @@ -353,10 +353,10 @@ async def _(msg: Bot.MessageSession, username: str = None): @mai.command('scorelist [] {{maimai.help.scorelist}}') async def _(msg: Bot.MessageSession, level: str, username: str = None): - if username is None and msg.target.sender_from == "QQ": + if not username and msg.target.sender_from == "QQ": payload = {'qq': msg.session.sender} else: - if username is None: + if not username: await msg.finish(msg.locale.t("maimai.message.no_username")) payload = {'username': username} @@ -414,8 +414,8 @@ async def _(msg: Bot.MessageSession): await msg.finish(await get_info(msg, music, Plain(f"\n{'/'.join(str(ds) for ds in music.ds)}"))) -@mai.command('scoreline {{maimai.help.scoreline}}') -async def _(msg: Bot.MessageSession, diff: str, sid: str, scoreline: float): +@mai.command('scoreline {{maimai.help.scoreline}}') +async def _(msg: Bot.MessageSession, diff: str, sid: str, score: float): try: if not sid.isdigit(): if sid[:2].lower() == "id": @@ -434,7 +434,7 @@ async def _(msg: Bot.MessageSession, diff: str, sid: str, scoreline: float): bonus_score = total_score * 0.01 / brk # 奖励分 break_2550_reduce = bonus_score * 0.25 # 一个 BREAK 2550 减少 25% 奖励分 break_2000_reduce = bonus_score * 0.6 + 500 # 一个 BREAK 2000 减少 500 基础分和 60% 奖励分 - reduce = 101 - scoreline # 理论值与给定完成率的差，以百分比计 + reduce = 101 - score # 理论值与给定完成率的差，以百分比计 if reduce <= 0 or reduce >= 101: raise ValueError tap_great = "{:.2f}".format(total_score * reduce / 10000) # 一个 TAP GREAT 减少 100 分 @@ -445,7 +445,7 @@ async def _(msg: Bot.MessageSession, diff: str, sid: str, scoreline: float): b2t_2000_great_prop = "{:.4f}".format(break_2000_reduce / total_score * 100) await msg.finish(f'''{music['title']}{msg.locale.t('message.brackets', msg='DX') if music['type'] == 'DX' else ''} {diff_label[diff_index]} {msg.locale.t('maimai.message.scoreline', - scoreline=scoreline, + scoreline=score, tap_great=tap_great, tap_great_prop=tap_great_prop, brk=brk, @@ -457,6 +457,48 @@ async def _(msg: Bot.MessageSession, diff: str, sid: str, scoreline: float): await msg.finish(msg.locale.t('maimai.message.scoreline.error', prefix=command_prefix[0])) +@mai.command('rating [] {{maimai.help.rating}}') +async def _(msg: Bot.MessageSession, base: float, score: float): + if base > 15 or base < 0: + await msg.finish(msg.locale.t('maimai.message.base_invalid')) + if score: + await msg.finish(computeRa(base, score)) +# else: +# ... + +def computeRa(base: float, achievement: float) -> int: + if achievement < 50: + baseRa = 7.0 + elif achievement < 60: + baseRa = 8.0 + elif achievement < 70: + baseRa = 9.6 + elif achievement < 75: + baseRa = 11.2 + elif achievement < 80: + baseRa = 12.0 + elif achievement < 90: + baseRa = 13.6 + elif achievement < 94: + baseRa = 15.2 + elif achievement < 97: + baseRa = 16.8 + elif achievement < 98: + baseRa = 20.0 + elif achievement < 99: + baseRa = 20.3 + elif achievement < 99.5: + baseRa = 20.8 + elif achievement < 100: + baseRa = 21.1 + elif achievement < 100.5: + baseRa = 21.6 + else: + baseRa = 22.4 + + return math.floor(base * (min(100.5, achievement) / 100) * baseRa) + + @mai.command('update', required_superuser=True) async def _(msg: Bot.MessageSession): if await update_alias() and await update_covers(): @@ -465,7 +507,7 @@ async def _(msg: Bot.MessageSession): await msg.finish(msg.locale.t("failed")) -@mai.schedule(CronTrigger.from_crontab('0 */12 * * *')) +@mai.schedule(CronTrigger.from_crontab('0 0 * * *')) async def _(): Logger.info('Updating maimai alias...') try: diff --git a/modules/maimai/libraries/maimai_best_50.py b/modules/maimai/libraries/maimai_best_50.py index ac3d7ad48c..bfdb40e116 100644 --- a/modules/maimai/libraries/maimai_best_50.py +++ b/modules/maimai/libraries/maimai_best_50.py @@ -7,6 +7,7 @@ from core.builtins import ErrorMessage from core.utils.http import post_url +from modules.maimai import computeRa from .maimaidx_music import get_cover_len5_id, TotalList total_list = TotalList() @@ -361,38 +362,6 @@ def getDir(self): return self.img -def computeRa(ds: float, achievement: float) -> int: - baseRa = 22.4 - if achievement < 50: - baseRa = 7.0 - elif achievement < 60: - baseRa = 8.0 - elif achievement < 70: - baseRa = 9.6 - elif achievement < 75: - baseRa = 11.2 - elif achievement < 80: - baseRa = 12.0 - elif achievement < 90: - baseRa = 13.6 - elif achievement < 94: - baseRa = 15.2 - elif achievement < 97: - baseRa = 16.8 - elif achievement < 98: - baseRa = 20.0 - elif achievement < 99: - baseRa = 20.3 - elif achievement < 99.5: - baseRa = 20.8 - elif achievement < 100: - baseRa = 21.1 - elif achievement < 100.5: - baseRa = 21.6 - - return math.floor(ds * (min(100.5, achievement) / 100) * baseRa) - - async def generate(msg, payload) -> Tuple[Optional[Image.Image], bool]: try: resp = await post_url('https://www.diving-fish.com/api/maimaidxprober/query/player', diff --git a/modules/maimai/libraries/maimaidx_api_data.py b/modules/maimai/libraries/maimaidx_api_data.py index 384050c217..ae2e2c57c2 100644 --- a/modules/maimai/libraries/maimaidx_api_data.py +++ b/modules/maimai/libraries/maimaidx_api_data.py @@ -1,5 +1,6 @@ import os import shutil +import traceback import ujson as json @@ -105,7 +106,7 @@ async def get_record(msg, payload): data=json.dumps(payload), status_code=200, headers={'Content-Type': 'application/json', 'accept': '*/*'}, fmt='json') - except Exception as e: + except ValueError as e: if str(e).startswith('400'): if "qq" in payload: await msg.finish(msg.locale.t("maimai.message.user_unbound")) @@ -114,7 +115,8 @@ async def get_record(msg, payload): elif str(e).startswith('403'): await msg.finish(msg.locale.t("maimai.message.forbidden")) else: - raise + traceback.print_exc() + return data @@ -125,7 +127,7 @@ async def get_plate(msg, payload): data=json.dumps(payload), status_code=200, headers={'Content-Type': 'application/json', 'accept': '*/*'}, fmt='json') - except Exception as e: + except ValueError as e: if str(e).startswith('400'): if "qq" in payload: await msg.finish(msg.locale.t("maimai.message.user_unbound")) @@ -134,5 +136,6 @@ async def get_plate(msg, payload): elif str(e).startswith('403'): await msg.finish(msg.locale.t("maimai.message.forbidden")) else: - raise + traceback.print_exc() + return data diff --git a/modules/maimai/libraries/maimaidx_project.py b/modules/maimai/libraries/maimaidx_project.py index 678dc89923..5b44f2b5f7 100644 --- a/modules/maimai/libraries/maimaidx_project.py +++ b/modules/maimai/libraries/maimaidx_project.py @@ -89,19 +89,21 @@ async def get_rank(msg, payload): - player_data = await get_record(msg, payload) + time = msg.ts2strftime(datetime.now().timestamp(), timezone=False) - username = player_data['username'] url = f"https://www.diving-fish.com/api/maimaidxprober/rating_ranking" rank_data = await get_url(url, 200, fmt='json') - sorted_data = sorted(rank_data, key=lambda x: x['ra'], reverse=True) # 根据rating排名并倒序 + rank_data = sorted(rank_data, key=lambda x: x['ra'], reverse=True) # 根据rating排名并倒序 + + player_data = await get_record(msg, payload) + username = player_data['username'] rating = 0 rank = None total_rating = 0 - total_rank = len(sorted_data) + total_rank = len(rank_data) - for i, scoreboard in enumerate(sorted_data): + for i, scoreboard in enumerate(rank_data): if scoreboard['username'] == username: rank = i + 1 rating = scoreboard['ra'] @@ -112,10 +114,6 @@ async def get_rank(msg, payload): average_rating = total_rating / total_rank surpassing_rate = (total_rank - rank) / total_rank * 100 - time = msg.ts2strftime(datetime.now().timestamp(), timezone=False) - - formatted_average_rating = "{:.4f}".format(average_rating) - formatted_surpassing_rate = "{:.2f}".format(surpassing_rate) await msg.finish(msg.locale.t('maimai.message.rank', time=time, @@ -123,8 +121,8 @@ async def get_rank(msg, payload): user=username, rating=rating, rank=rank, - average_rating=formatted_average_rating, - surpassing_rate=formatted_surpassing_rate)) + average_rating="{:.4f}".format(average_rating), + surpassing_rate="{:.2f}".format(surpassing_rate))) async def get_player_score(msg, payload, input_id): diff --git a/modules/maimai/locales/en_us.json b/modules/maimai/locales/en_us.json index 124a9fcee3..157f70f1b3 100644 --- a/modules/maimai/locales/en_us.json +++ b/modules/maimai/locales/en_us.json @@ -30,8 +30,10 @@ "maimai.message.chart_not_found": "未找到符合要求的谱面。", "maimai.message.error.non_digital": "发生错误：歌曲 ID 必须为数字！", "maimai.message.forbidden": "此用户禁止了其他人获取数据。", + "maimai.message.goal_invalid": "无效的目标评级，请检查输入。", "maimai.message.info.no_record": "未游玩过此谱面", "maimai.message.level": "以下为 ${level} 级的曲目列表：", + "maimai.message.level_invalid": "无效的等级，请检查输入。", "maimai.message.music_not_found": "未找到符合要求的歌曲。", "maimai.message.no_username": "请提供用户名！", "maimai.message.plate": "您的${plate}剩余进度如下：\nBasic 剩余 ${song_remain_basic} 首，\nAdvanced 剩余 ${song_remain_advanced} 首，\nExpert 剩余 ${song_remain_expert} 首，\nMaster 剩余 ${song_remain_master} 首", @@ -44,8 +46,6 @@ "maimai.message.plate.remaster": "，\nRe:MASTER 剩余 ${song_remain_remaster} 首", "maimai.message.process": "您还有 ${song_remain} 首 ${process} 级曲目没有达成 ${goal}。", "maimai.message.process.completed": "您已达成 ${process} 级曲目全谱面 ${goal}。", - "maimai.message.process.error.goal_invalid": "发生错误：无效的目标评级，请检查输入。", - "maimai.message.process.error.level_invalid": "发生错误：无效的等级，请检查输入。", "maimai.message.process.last": "您的 ${process} 级歌曲全谱面 ${goal} 剩余曲目如下：", "maimai.message.process.less_than_8": "歌曲等级必须大于 8 级。", "maimai.message.random.error": "发生错误：随机歌曲失败，请检查输入。", diff --git a/modules/maimai/locales/zh_cn.json b/modules/maimai/locales/zh_cn.json index 1ce3253c8f..79ae1c8299 100644 --- a/modules/maimai/locales/zh_cn.json +++ b/modules/maimai/locales/zh_cn.json @@ -18,6 +18,7 @@ "maimai.help.random": "随机一首歌曲。", "maimai.help.random.filter": "随机一首指定条件的歌曲，输入为“*”则表示无条件。", "maimai.help.rank": "查看用户在查分器上的分数排行。", + "maimai.help.rating": "根据定数计算 Rating。", "maimai.help.scoreline": "查询歌曲的分数线。", "maimai.help.scorelist": "查看用户在对应等级的分数列表。", "maimai.help.search": "根据歌名（或一部分）搜索歌曲。", @@ -27,11 +28,14 @@ "maimai.message.alias.file_not_found": "未找到别名文件，请使用“${prefix}maimai update”初始化文件。", "maimai.message.base": "以下为定数 ${constant} 的曲目列表：", "maimai.message.base.range": "以下为定数 ${constant}-${constant_max} 的曲目列表：", + "maimai.message.base_invalid": "无效的定数，请检查输入。", "maimai.message.chart_not_found": "未找到符合要求的谱面。", "maimai.message.error.non_digital": "发生错误：歌曲 ID 必须为数字！", "maimai.message.forbidden": "此用户禁止了其他人获取数据。", + "maimai.message.goal_invalid": "无效的目标评级，请检查输入。", "maimai.message.info.no_record": "未游玩过此谱面", "maimai.message.level": "以下为 ${level} 级的曲目列表：", + "maimai.message.level_invalid": "无效的等级，请检查输入。", "maimai.message.music_not_found": "未找到符合要求的歌曲。", "maimai.message.no_username": "请提供用户名！", "maimai.message.plate": "您的${plate}剩余进度如下：\nBasic 剩余 ${song_remain_basic} 首，\nAdvanced 剩余 ${song_remain_advanced} 首，\nExpert 剩余 ${song_remain_expert} 首，\nMaster 剩余 ${song_remain_master} 首", @@ -44,8 +48,6 @@ "maimai.message.plate.remaster": "，\nRe:MASTER 剩余 ${song_remain_remaster} 首", "maimai.message.process": "您还有 ${song_remain} 首 ${process} 级曲目没有达成 ${goal}。", "maimai.message.process.completed": "您已达成 ${process} 级曲目全谱面 ${goal}。", - "maimai.message.process.error.goal_invalid": "发生错误：无效的目标评级，请检查输入。", - "maimai.message.process.error.level_invalid": "发生错误：无效的等级，请检查输入。", "maimai.message.process.last": "您的 ${process} 级歌曲全谱面 ${goal} 剩余曲目如下：", "maimai.message.process.less_than_8": "歌曲等级必须大于 8 级。", "maimai.message.random.error": "发生错误：随机歌曲失败，请检查输入。", diff --git a/modules/maimai/locales/zh_tw.json b/modules/maimai/locales/zh_tw.json index 6c753b7a7a..87feee005d 100644 --- a/modules/maimai/locales/zh_tw.json +++ b/modules/maimai/locales/zh_tw.json @@ -18,6 +18,7 @@ "maimai.help.random": "隨機一首歌曲。", "maimai.help.random.filter": "隨機一首指定條件的歌曲，輸入「*」則表示無條件。", "maimai.help.rank": "查看使用者在查分器上的分數排行。", + "maimai.help.rating": "依據定數計算 Rating。", "maimai.help.scoreline": "查詢歌曲的分數線。", "maimai.help.scorelist": "查看使用者在對應等級的分數列表。", "maimai.help.search": "依據歌名（或一部分）搜尋歌曲。", @@ -27,11 +28,14 @@ "maimai.message.alias.file_not_found": "未找到別名檔案，請使用「${prefix}maimai update」初始化檔案。", "maimai.message.base": "以下為定數 ${constant} 的曲目列表：", "maimai.message.base.range": "以下為定數 ${constant}-${constant_max} 的曲目列表：", + "maimai.message.base_invalid": "無效的定數，請校對輸入。", "maimai.message.chart_not_found": "未找到符合要求的譜面。", "maimai.message.error.non_digital": "發生錯誤：歌曲 ID 必須為數字！", "maimai.message.forbidden": "此使用者禁止了其他人取得資料。", + "maimai.message.goal_invalid": "無效的目標評級，請校對輸入。", "maimai.message.info.no_record": "未遊玩過此譜面", "maimai.message.level": "以下為難度 ${level} 的曲目列表：", + "maimai.message.level_invalid": "無效的等級，請校對輸入。", "maimai.message.music_not_found": "未找到符合要求的歌曲。", "maimai.message.no_username": "請提供使用者名稱！", "maimai.message.plate": "您的${plate}剩餘進度如下：\nBasic 剩餘 ${song_remain_basic} 首，\nAdvanced 剩餘 ${song_remain_advanced} 首，\nExpert 剩餘 ${song_remain_expert} 首，\nMaster 剩餘 ${song_remain_master} 首", @@ -44,8 +48,6 @@ "maimai.message.plate.remaster": "，Re:MASTER 剩餘 ${song_remain_remaster} 首", "maimai.message.process": "您還有 ${song_remain} 首 ${process} 級曲目沒有達成 ${goal}。", "maimai.message.process.completed": "您已達成 ${process} 級曲目全譜面 ${goal}。", - "maimai.message.process.error.goal_invalid": "發生錯誤：無效的目標評級，請校對輸入。", - "maimai.message.process.error.level_invalid": "發生錯誤：無效的等級，請校對輸入。", "maimai.message.process.last": "您的 ${process} 級歌曲全譜面 ${goal} 剩餘曲目如下：", "maimai.message.process.less_than_8": "歌曲等級必須大於 8 級。", "maimai.message.random.error": "發生錯誤：無法隨機歌曲，請校對輸入。", diff --git a/modules/maimai/regex.py b/modules/maimai/regex.py index 3ba975dcb3..aa63ef4558 100644 --- a/modules/maimai/regex.py +++ b/modules/maimai/regex.py @@ -213,7 +213,7 @@ async def _(msg: Bot.MessageSession): return if goal.upper() not in goal_list: - await msg.finish(msg.locale.t("maimai.message.process.error.goal_invalid")) + await msg.finish(msg.locale.t("maimai.message.goal_invalid")) output, get_img = await get_level_process(msg, payload, level, goal) From fe1ab784c0d6de9c224e7e43fa3fb401af79a830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 14:02:51 +0800 Subject: [PATCH 100/168] fix --- modules/maimai/__init__.py | 67 +++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index a9440c11f9..5da4a2d476 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -40,6 +40,39 @@ def get_diff(diff): return level +def computeRa(base: float, achievement: float) -> int: + if achievement < 50: + baseRa = 7.0 + elif achievement < 60: + baseRa = 8.0 + elif achievement < 70: + baseRa = 9.6 + elif achievement < 75: + baseRa = 11.2 + elif achievement < 80: + baseRa = 12.0 + elif achievement < 90: + baseRa = 13.6 + elif achievement < 94: + baseRa = 15.2 + elif achievement < 97: + baseRa = 16.8 + elif achievement < 98: + baseRa = 20.0 + elif achievement < 99: + baseRa = 20.3 + elif achievement < 99.5: + baseRa = 20.8 + elif achievement < 100: + baseRa = 21.1 + elif achievement < 100.5: + baseRa = 21.6 + else: + baseRa = 22.4 + + return math.floor(base * (min(100.5, achievement) / 100) * baseRa) + + mai = module('maimai', recommend_modules='maimai_regex', developers=['mai-bot', 'OasisAkari', 'DoroWolf'], alias='mai', support_languages=['zh_cn'], desc='{maimai.help.desc}') @@ -457,7 +490,7 @@ async def _(msg: Bot.MessageSession, diff: str, sid: str, score: float): await msg.finish(msg.locale.t('maimai.message.scoreline.error', prefix=command_prefix[0])) -@mai.command('rating [] {{maimai.help.rating}}') +@mai.command('rating {{maimai.help.rating}}') async def _(msg: Bot.MessageSession, base: float, score: float): if base > 15 or base < 0: await msg.finish(msg.locale.t('maimai.message.base_invalid')) @@ -466,38 +499,6 @@ async def _(msg: Bot.MessageSession, base: float, score: float): # else: # ... -def computeRa(base: float, achievement: float) -> int: - if achievement < 50: - baseRa = 7.0 - elif achievement < 60: - baseRa = 8.0 - elif achievement < 70: - baseRa = 9.6 - elif achievement < 75: - baseRa = 11.2 - elif achievement < 80: - baseRa = 12.0 - elif achievement < 90: - baseRa = 13.6 - elif achievement < 94: - baseRa = 15.2 - elif achievement < 97: - baseRa = 16.8 - elif achievement < 98: - baseRa = 20.0 - elif achievement < 99: - baseRa = 20.3 - elif achievement < 99.5: - baseRa = 20.8 - elif achievement < 100: - baseRa = 21.1 - elif achievement < 100.5: - baseRa = 21.6 - else: - baseRa = 22.4 - - return math.floor(base * (min(100.5, achievement) / 100) * baseRa) - @mai.command('update', required_superuser=True) async def _(msg: Bot.MessageSession): From d8de389335aa0f92c7a1a2e6bece3636c909804b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 14:05:26 +0800 Subject: [PATCH 101/168] fix --- modules/maimai/__init__.py | 65 +++++++++++----------- modules/maimai/libraries/maimai_best_50.py | 34 ++++++++++- 2 files changed, 65 insertions(+), 34 deletions(-) diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index 5da4a2d476..822d7db850 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -40,39 +40,6 @@ def get_diff(diff): return level -def computeRa(base: float, achievement: float) -> int: - if achievement < 50: - baseRa = 7.0 - elif achievement < 60: - baseRa = 8.0 - elif achievement < 70: - baseRa = 9.6 - elif achievement < 75: - baseRa = 11.2 - elif achievement < 80: - baseRa = 12.0 - elif achievement < 90: - baseRa = 13.6 - elif achievement < 94: - baseRa = 15.2 - elif achievement < 97: - baseRa = 16.8 - elif achievement < 98: - baseRa = 20.0 - elif achievement < 99: - baseRa = 20.3 - elif achievement < 99.5: - baseRa = 20.8 - elif achievement < 100: - baseRa = 21.1 - elif achievement < 100.5: - baseRa = 21.6 - else: - baseRa = 22.4 - - return math.floor(base * (min(100.5, achievement) / 100) * baseRa) - - mai = module('maimai', recommend_modules='maimai_regex', developers=['mai-bot', 'OasisAkari', 'DoroWolf'], alias='mai', support_languages=['zh_cn'], desc='{maimai.help.desc}') @@ -499,6 +466,38 @@ async def _(msg: Bot.MessageSession, base: float, score: float): # else: # ... +def computeRa(base: float, achievement: float) -> int: + if achievement < 50: + baseRa = 7.0 + elif achievement < 60: + baseRa = 8.0 + elif achievement < 70: + baseRa = 9.6 + elif achievement < 75: + baseRa = 11.2 + elif achievement < 80: + baseRa = 12.0 + elif achievement < 90: + baseRa = 13.6 + elif achievement < 94: + baseRa = 15.2 + elif achievement < 97: + baseRa = 16.8 + elif achievement < 98: + baseRa = 20.0 + elif achievement < 99: + baseRa = 20.3 + elif achievement < 99.5: + baseRa = 20.8 + elif achievement < 100: + baseRa = 21.1 + elif achievement < 100.5: + baseRa = 21.6 + else: + baseRa = 22.4 + + return math.floor(base * (min(100.5, achievement) / 100) * baseRa) + @mai.command('update', required_superuser=True) async def _(msg: Bot.MessageSession): diff --git a/modules/maimai/libraries/maimai_best_50.py b/modules/maimai/libraries/maimai_best_50.py index bfdb40e116..87727f1465 100644 --- a/modules/maimai/libraries/maimai_best_50.py +++ b/modules/maimai/libraries/maimai_best_50.py @@ -7,7 +7,6 @@ from core.builtins import ErrorMessage from core.utils.http import post_url -from modules.maimai import computeRa from .maimaidx_music import get_cover_len5_id, TotalList total_list = TotalList() @@ -362,6 +361,39 @@ def getDir(self): return self.img +def computeRa(ds: float, achievement: float) -> int: + if achievement < 50: + baseRa = 7.0 + elif achievement < 60: + baseRa = 8.0 + elif achievement < 70: + baseRa = 9.6 + elif achievement < 75: + baseRa = 11.2 + elif achievement < 80: + baseRa = 12.0 + elif achievement < 90: + baseRa = 13.6 + elif achievement < 94: + baseRa = 15.2 + elif achievement < 97: + baseRa = 16.8 + elif achievement < 98: + baseRa = 20.0 + elif achievement < 99: + baseRa = 20.3 + elif achievement < 99.5: + baseRa = 20.8 + elif achievement < 100: + baseRa = 21.1 + elif achievement < 100.5: + baseRa = 21.6 + else: + baseRa = 22.4 + + return math.floor(ds * (min(100.5, achievement) / 100) * baseRa) + + async def generate(msg, payload) -> Tuple[Optional[Image.Image], bool]: try: resp = await post_url('https://www.diving-fish.com/api/maimaidxprober/query/player', From 33e0cb528ec8cd35437904f461043006a0ba2c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 14:07:48 +0800 Subject: [PATCH 102/168] update --- modules/maimai/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index 822d7db850..a30b0858a2 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -462,7 +462,7 @@ async def _(msg: Bot.MessageSession, base: float, score: float): if base > 15 or base < 0: await msg.finish(msg.locale.t('maimai.message.base_invalid')) if score: - await msg.finish(computeRa(base, score)) + await msg.finish(Plain[computeRa(base, score)]) # else: # ... From e4e776e21e84539aca95cb3558d529e0f8ff7a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 14:11:18 +0800 Subject: [PATCH 103/168] fix wssb --- modules/maimai/__init__.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index a30b0858a2..98885e664b 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -462,9 +462,7 @@ async def _(msg: Bot.MessageSession, base: float, score: float): if base > 15 or base < 0: await msg.finish(msg.locale.t('maimai.message.base_invalid')) if score: - await msg.finish(Plain[computeRa(base, score)]) -# else: -# ... + await msg.finish([Plain(computeRa(base, score))]) def computeRa(base: float, achievement: float) -> int: if achievement < 50: From 8b15fe4d7bf813c7b8b74eee7f687957a146f751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 14:22:16 +0800 Subject: [PATCH 104/168] . --- modules/maimai/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index 98885e664b..87e66ddbf5 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -459,7 +459,7 @@ async def _(msg: Bot.MessageSession, diff: str, sid: str, score: float): @mai.command('rating {{maimai.help.rating}}') async def _(msg: Bot.MessageSession, base: float, score: float): - if base > 15 or base < 0: + if base > 15 or base < 1: await msg.finish(msg.locale.t('maimai.message.base_invalid')) if score: await msg.finish([Plain(computeRa(base, score))]) From ed3cb8d630113ed50850edd29a76d94f8259cdb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 14:27:36 +0800 Subject: [PATCH 105/168] upd --- modules/maimai/__init__.py | 4 +--- modules/maimai/locales/zh_cn.json | 3 +-- modules/maimai/locales/zh_tw.json | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index 87e66ddbf5..21263c25e8 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -459,10 +459,8 @@ async def _(msg: Bot.MessageSession, diff: str, sid: str, score: float): @mai.command('rating {{maimai.help.rating}}') async def _(msg: Bot.MessageSession, base: float, score: float): - if base > 15 or base < 1: - await msg.finish(msg.locale.t('maimai.message.base_invalid')) if score: - await msg.finish([Plain(computeRa(base, score))]) + await msg.finish([Plain(max(0, computeRa(base, score)))]) def computeRa(base: float, achievement: float) -> int: if achievement < 50: diff --git a/modules/maimai/locales/zh_cn.json b/modules/maimai/locales/zh_cn.json index 79ae1c8299..d2183f5135 100644 --- a/modules/maimai/locales/zh_cn.json +++ b/modules/maimai/locales/zh_cn.json @@ -28,7 +28,6 @@ "maimai.message.alias.file_not_found": "未找到别名文件，请使用“${prefix}maimai update”初始化文件。", "maimai.message.base": "以下为定数 ${constant} 的曲目列表：", "maimai.message.base.range": "以下为定数 ${constant}-${constant_max} 的曲目列表：", - "maimai.message.base_invalid": "无效的定数，请检查输入。", "maimai.message.chart_not_found": "未找到符合要求的谱面。", "maimai.message.error.non_digital": "发生错误：歌曲 ID 必须为数字！", "maimai.message.forbidden": "此用户禁止了其他人获取数据。", @@ -54,7 +53,7 @@ "maimai.message.rank": "截至 ${time}，\n查分器共有 ${total_rank} 名用户，平均分数为 ${average_rating}。\n${user} 的分数为 ${rating}，排名为 #${rank}，\n已经超越了 ${surpassing_rate}% 的玩家。", "maimai.message.scoreline": "分数线 ${scoreline}% 允许的最多 TAP GREAT 数量为 ${tap_great}（每个-${tap_great_prop}%），\nBREAK 2550（一共 ${brk} 个）等价于 ${b2t_2550_great} 个 TAP GREAT（-${b2t_2550_great_prop}%），\nBREAK 2000（一共 ${brk} 个）等价于 ${b2t_2000_great} 个 TAP GREAT（-${b2t_2000_great_prop}%）", "maimai.message.scoreline.error": "发生错误：计算结果失败，请检查输入。", - "maimai.message.scorelist": "以下为 ${user} 的 ${level} 级分数列表：", + "maimai.message.scorelist": "以下为 ${user} 的 ${level} 级成绩列表：", "maimai.message.search": "“${keyword}”的搜索结果：", "maimai.message.song": "艺术家：${artist}\n分类：${genre}\nBPM：${bpm}\n版本：${version}\n难度：${level}", "maimai.message.song.dx": "${diff} ${level} (${ds})\nTAP：${tap}\nHOLD：${hold}\nSLIDE：${slide}\nTOUCH：${touch}\nBREAK：${brk}\n谱师：${charter}", diff --git a/modules/maimai/locales/zh_tw.json b/modules/maimai/locales/zh_tw.json index 87feee005d..40c8dd1920 100644 --- a/modules/maimai/locales/zh_tw.json +++ b/modules/maimai/locales/zh_tw.json @@ -28,7 +28,6 @@ "maimai.message.alias.file_not_found": "未找到別名檔案，請使用「${prefix}maimai update」初始化檔案。", "maimai.message.base": "以下為定數 ${constant} 的曲目列表：", "maimai.message.base.range": "以下為定數 ${constant}-${constant_max} 的曲目列表：", - "maimai.message.base_invalid": "無效的定數，請校對輸入。", "maimai.message.chart_not_found": "未找到符合要求的譜面。", "maimai.message.error.non_digital": "發生錯誤：歌曲 ID 必須為數字！", "maimai.message.forbidden": "此使用者禁止了其他人取得資料。", @@ -54,7 +53,7 @@ "maimai.message.rank": "截至 ${time}，\n查分器共有 ${total_rank} 名使用者，平均分數為 ${average_rating}，\n${user} 的分數為 ${rating}，排名為 #${rank}，\n已經超越了 ${surpassing_rate}% 的玩家。", "maimai.message.scoreline": "分數線 ${scoreline}% 允許的最多 TAP GREAT 數量為 ${tap_great}（每個-${tap_great_prop}%）。\nBREAK 2550（一共 ${brk} 個）相當於 ${b2t_2550_great} 個 TAP GREAT（-${b2t_2550_great_prop}%），\nBREAK 2000（一共 ${brk} 個）相當於 ${b2t_2000_great} 個 TAP GREAT（-${b2t_2000_great_prop}%）", "maimai.message.scoreline.error": "發生錯誤：無法計算結果，請校對輸入。", - "maimai.message.scorelist": "以下為 ${user} 的 ${level} 級分數列表：", + "maimai.message.scorelist": "以下為 ${user} 的 ${level} 級成績列表：", "maimai.message.search": "「${keyword}」的搜尋結果：", "maimai.message.song": "藝術家：${artist}\n分類：${genre}\nBPM：${bpm}\n版本：${version}\n難度：${level}", "maimai.message.song.dx": "${diff} ${level} (${ds})\nTAP：${tap}\nHOLD：${hold}\nSLIDE：${slide}\nTOUCH：${touch}\nBREAK：${brk}\n譜師：${charter}", From b9499faaf96ad7601b8c608342e972de51f1c995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 21:17:18 +0800 Subject: [PATCH 106/168] Update slash commands --- bots/discord/slash/arcaea.py | 34 ++++---------------- bots/discord/slash/{bug.py => bugtracker.py} | 7 ++-- bots/discord/slash/cytoid.py | 14 ++++---- bots/discord/slash/mcplayer.py | 8 ++--- bots/discord/slash/mcv.py | 13 +++++--- bots/discord/slash/server.py | 4 +-- bots/discord/slash/tweet.py | 8 ++--- modules/arcaea/locales/en_us.json | 2 +- modules/cytoid/locales/en_us.json | 2 +- modules/github/__init__.py | 2 +- modules/github/locales/en_us.json | 12 +++---- modules/server/__init__.py | 6 ++-- 12 files changed, 47 insertions(+), 65 deletions(-) rename bots/discord/slash/{bug.py => bugtracker.py} (57%) diff --git a/bots/discord/slash/arcaea.py b/bots/discord/slash/arcaea.py index 1eca2d4eca..5ef7b7e3bb 100644 --- a/bots/discord/slash/arcaea.py +++ b/bots/discord/slash/arcaea.py @@ -3,48 +3,26 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser -arcaea = client.create_group("arcaea", "查询arcaea的相关信息") +arcaea = client.create_group("arcaea", "Queries about Arcaea.") - -@arcaea.command(description="查询best30列表") -async def b30(ctx: discord.ApplicationContext): - await slash_parser(ctx, "b30") - - -@arcaea.command(description="查询最近游玩记录") -async def info(ctx: discord.ApplicationContext): - await slash_parser(ctx, "info") - - -@arcaea.command(description="绑定账户") -@discord.option(name="friendcode", description="好友代码") -async def bind(ctx: discord.ApplicationContext, friendcode: str): - await slash_parser(ctx, f"bind {friendcode}") - - -@arcaea.command(description="取消绑定账户") -async def unbind(ctx: discord.ApplicationContext): - await slash_parser(ctx, "unbind") - - -@arcaea.command(description="获取最新版本的arcaea安卓版链接") +@arcaea.command(description="Get the latest version of game apk.") async def download(ctx: discord.ApplicationContext): await slash_parser(ctx, "download") -@arcaea.command(description="随机一首歌曲") +@arcaea.command(description="Random a song.") async def random(ctx: discord.ApplicationContext): await slash_parser(ctx, "random") -rank = arcaea.create_subgroup("rank", "查询arcaea日排行榜的相关信息") +rank = arcaea.create_subgroup("rank", "View the current daily rank of Arcaea songs.") -@rank.command(description="查询arcaea免费包当前日排行榜") +@rank.command(description="View the current rank of the free packs.") async def free(ctx: discord.ApplicationContext): await slash_parser(ctx, "rank free") -@rank.command(description="查询arcaea收费包当前日排行榜") +@rank.command(description="View the current rank of the paid packs.") async def paid(ctx: discord.ApplicationContext): await slash_parser(ctx, "rank paid") diff --git a/bots/discord/slash/bug.py b/bots/discord/slash/bugtracker.py similarity index 57% rename from bots/discord/slash/bug.py rename to bots/discord/slash/bugtracker.py index a44b9162ef..1050bfd5ae 100644 --- a/bots/discord/slash/bug.py +++ b/bots/discord/slash/bugtracker.py @@ -6,10 +6,9 @@ async def auto_search(ctx: discord.AutocompleteContext): if ctx.options["mojiraid"] == '': - return ['MC-', 'MCPE-', 'MCD-', 'MCL-', 'REALMS-', 'WEB-', 'MCCE-'] + return ['BDS-', 'MCPE-', 'MCD-', 'MCL-', 'MCLG-', 'REALMS-', 'MC-', 'WEB-'] - -@client.command(description="查询一个已记录在Mojira上的bug信息") +@client.command(description="Query the corresponding ticket on Mojira.") @discord.option(name="mojiraid", autocomplete=auto_search) -async def bug(ctx: discord.ApplicationContext, mojiraid: str): +async def bugtracker(ctx: discord.ApplicationContext, mojiraid: str): await slash_parser(ctx, mojiraid) diff --git a/bots/discord/slash/cytoid.py b/bots/discord/slash/cytoid.py index 40545a528f..f0bc3b8c61 100644 --- a/bots/discord/slash/cytoid.py +++ b/bots/discord/slash/cytoid.py @@ -3,30 +3,30 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser -cytoid = client.create_group("cytoid", "查询Cytoid的相关信息") +cytoid = client.create_group("cytoid", "Query about Cytoid.") -@cytoid.command(description="查询Best30列表") +@cytoid.command(description="Query the Best 30 list.") async def b30(ctx: discord.ApplicationContext): await slash_parser(ctx, "b30") -@cytoid.command(description="查询Recent30列表") +@cytoid.command(description="Query the Recent 30 list.") async def r30(ctx: discord.ApplicationContext): await slash_parser(ctx, "r30") -@cytoid.command(description="查询个人信息") +@cytoid.command(description="Query user profile.") async def profile(ctx: discord.ApplicationContext): await slash_parser(ctx, "profile") -@cytoid.command(description="绑定用户") -@discord.option(name="username", description="用户名") +@cytoid.command(description="Bind user.") +@discord.option(name="username", description="Your Cytoid username.") async def bind(ctx: discord.ApplicationContext, username: str): await slash_parser(ctx, f"bind {username}") -@cytoid.command(description="取消绑定用户") +@cytoid.command(description="Unbind user.") async def unbind(ctx: discord.ApplicationContext): await slash_parser(ctx, "unbind") diff --git a/bots/discord/slash/mcplayer.py b/bots/discord/slash/mcplayer.py index 7be0d94850..babaeed3d8 100644 --- a/bots/discord/slash/mcplayer.py +++ b/bots/discord/slash/mcplayer.py @@ -4,7 +4,7 @@ from bots.discord.slash_parser import slash_parser -@client.slash_command(description="获取一个Minecraft玩家的信息") -@discord.option(name="player", description="玩家名") -async def mcplayer(ctx: discord.ApplicationContext, player: str): - await slash_parser(ctx, player) +@client.slash_command(description="Get Minecraft player information.") +@discord.option(name="username_or_uuid", description="The name or UUID of Minecraft player.") +async def mcplayer(ctx: discord.ApplicationContext, username_or_uuid: str): + await slash_parser(ctx, username_or_uuid) diff --git a/bots/discord/slash/mcv.py b/bots/discord/slash/mcv.py index f1a0fbbf7e..b41cd91a98 100644 --- a/bots/discord/slash/mcv.py +++ b/bots/discord/slash/mcv.py @@ -4,21 +4,26 @@ from bots.discord.slash_parser import slash_parser -@client.slash_command(description="获取Minecraft Java版的最新版本信息") +@client.slash_command(description="Get the latest version of Minecraft: Java Edition in the launcher.") async def mcv(ctx: discord.ApplicationContext): await slash_parser(ctx, '') -@client.slash_command(description="获取Minecraft基岩版的最新版本信息") +@client.slash_command(description="Get the latest version of Minecraft: Bedrock Edition on Mojira.") async def mcbv(ctx: discord.ApplicationContext): await slash_parser(ctx, '') -@client.slash_command(description="获取Minecraft Dungeons的最新版本信息") +@client.slash_command(description="Get the latest version of Minecraft Dungeons on Mojira.") async def mcdv(ctx: discord.ApplicationContext): await slash_parser(ctx, '') -@client.slash_command(description="获取Minecraft教育版的最新版本信息") +@client.slash_command(description="Get the latest version of Minecraft: Education Edition in Windows Edition.") async def mcev(ctx: discord.ApplicationContext): await slash_parser(ctx, '') + + +@client.slash_command(description="Get the latest version of Minecraft Legends on Mojira.") +async def mclgv(ctx: discord.ApplicationContext): + await slash_parser(ctx, '') \ No newline at end of file diff --git a/bots/discord/slash/server.py b/bots/discord/slash/server.py index b3dbb12b04..02ea118c1d 100644 --- a/bots/discord/slash/server.py +++ b/bots/discord/slash/server.py @@ -10,7 +10,7 @@ async def auto_search(ctx: discord.AutocompleteContext): return [ctx.options["address"]] -@client.slash_command(description="获取一个Minecraft服务器的信息") -@discord.option(name="address", description="服务器地址", autocomplete=auto_search) +@client.slash_command(description="Get Minecraft: Java/Bedrock Edition server motd.") +@discord.option(name="address", description="The server address.", autocomplete=auto_search) async def server(ctx: discord.ApplicationContext, address: str): await slash_parser(ctx, address) diff --git a/bots/discord/slash/tweet.py b/bots/discord/slash/tweet.py index e6ce7841c6..e889384154 100644 --- a/bots/discord/slash/tweet.py +++ b/bots/discord/slash/tweet.py @@ -3,10 +3,10 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser -tweet = client.create_group("tweet", "获取推文摘要") +tweet = client.create_group("tweet", "Get tweet image from tweet ID or link.") @tweet.command() -@discord.option(name="tweetid", description="推文ID") -async def get(ctx: discord.ApplicationContext, tweetid: str): - await slash_parser(ctx, tweetid) +@discord.option(name="tweet", description="The tweet ID or tweet link.") +async def get(ctx: discord.ApplicationContext, tweet: str): + await slash_parser(ctx, tweet) diff --git a/modules/arcaea/locales/en_us.json b/modules/arcaea/locales/en_us.json index 4a7512d212..5927004cd0 100644 --- a/modules/arcaea/locales/en_us.json +++ b/modules/arcaea/locales/en_us.json @@ -2,7 +2,7 @@ "arcaea.help.calc": "Calculate the single Potential based on scores and rating.", "arcaea.help.desc": "Queries about Arcaea.", "arcaea.help.download": "Get the latest version of game apk.", - "arcaea.help.random": "Random a track.", + "arcaea.help.random": "Random a song.", "arcaea.help.rank.free": "View the current rank of the free packs.", "arcaea.help.rank.paid": "View the current rank of the paid packs.", "arcaea.message.download": "Current latest version is ${version}.\nDownload: ${url}", diff --git a/modules/cytoid/locales/en_us.json b/modules/cytoid/locales/en_us.json index c4d08391a7..19b67f9ae9 100644 --- a/modules/cytoid/locales/en_us.json +++ b/modules/cytoid/locales/en_us.json @@ -1,7 +1,7 @@ { "cytoid.help.b30": "Query the Best 30 list of Cytoid user. ", "cytoid.help.bind": "Bind Cytoid user.", - "cytoid.help.desc": "Query Cytoid related content.", + "cytoid.help.desc": "Query about Cytoid.", "cytoid.help.profile": "Query user profile.", "cytoid.help.r30": "Query the Recent 30 list of Cytoid user. ", "cytoid.help.unbind": "Unbind user.", diff --git a/modules/github/__init__.py b/modules/github/__init__.py index 5726a1d3d6..e68b54bc31 100644 --- a/modules/github/__init__.py +++ b/modules/github/__init__.py @@ -18,7 +18,7 @@ async def _(msg: Bot.MessageSession): await repo.repo(msg) -@github.handle(('user {{github.help.user}}')) +@github.handle('user {{github.help.user}}') async def _(msg: Bot.MessageSession): await user.user(msg) diff --git a/modules/github/locales/en_us.json b/modules/github/locales/en_us.json index 56d599241d..ac7f9c3962 100644 --- a/modules/github/locales/en_us.json +++ b/modules/github/locales/en_us.json @@ -1,13 +1,13 @@ { "github.help.desc": "Github query tool.", "github.help": "Trying to automatically identifying and distinguishing repo/user.", - "github.help.repo": "Getting GitHub repository information.", - "github.help.search": "Searching repositories on GitHub.", - "github.help.user": "Getting GitHub user or organization information.", - "github.message.repo.not_found": "The repository does not exist, please check your input.", + "github.help.repo": "Get GitHub repository information.", + "github.help.search": "Search repositories on GitHub.", + "github.help.user": "Get GitHub user or organization information.", + "github.message.repo.not_found": "The repository does not exist. Please check your input.", "github.message.search": "Successfully to search for ${result} results:", "github.message.search.none": "No results found.", "github.message.search.more_information": "Truncated due to chat limits; ${more_result} more results may not be shown.", - "github.message.search.not_found": "The repository cannot be found; please check your input.", - "github.message.user.not_found": "The user cannot be found; please check your input." + "github.message.search.not_found": "The repository cannot be found. Please check your input.", + "github.message.user.not_found": "The user cannot be found. Please check your input." } \ No newline at end of file diff --git a/modules/server/__init__.py b/modules/server/__init__.py index f3509512ae..96d188ae0f 100644 --- a/modules/server/__init__.py +++ b/modules/server/__init__.py @@ -9,13 +9,13 @@ s = module('server', alias='s', developers=['_LittleC_', 'OasisAkari']) -@s.command(' [-r] [-p] {{server.help}}', +@s.command(' [-r] [-p] {{server.help}}', options_desc={'-r': '{server.help.option.r}', '-p': '{server.help.option.p}'}) async def main(msg: Bot.MessageSession): gather_list = [] - match_object = re.match(r'(.*)[\s:](.*)', msg.parsed_msg[""], re.M | re.I) + match_object = re.match(r'(.*)[\s:](.*)', msg.parsed_msg[""], re.M | re.I) is_local_ip = False - server_address = msg.parsed_msg[""] + server_address = msg.parsed_msg[""] if match_object: server_address = match_object.group(1) From d246bf8d358b85d8f2d8e2a1deb02b63fd5add7e Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Sun, 17 Dec 2023 21:27:14 +0800 Subject: [PATCH 107/168] fix slash --- bots/discord/slash_message.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bots/discord/slash_message.py b/bots/discord/slash_message.py index f850234a06..49bebb2ac0 100644 --- a/bots/discord/slash_message.py +++ b/bots/discord/slash_message.py @@ -4,7 +4,7 @@ from bots.discord.message import convert_embed from config import Config -from core.builtins import Plain, Image, MessageSession as MessageSessionT +from core.builtins import Plain, Image, MessageSession as MessageSessionT, MessageTaskManager from core.builtins.message.chain import MessageChain from core.builtins.message.internal import Embed, ErrorMessage from core.logger import Logger @@ -37,7 +37,8 @@ class Feature: quote = False wait = True - async def send_message(self, message_chain, quote=True, disable_secret_check=False, allow_split_image=True + async def send_message(self, message_chain, quote=True, disable_secret_check=False, allow_split_image=True, + callback=None ) -> FinishedSession: message_chain = MessageChain(message_chain) if not message_chain.is_safe and not disable_secret_check: @@ -67,7 +68,7 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal send_ = await self.session.message.send(embed=embeds) Logger.info(f'[Bot] -> [{self.target.target_id}]: Embed: {str(x.__dict__)}') else: - send_ = False + send_ = None if send_: send.append(send_) count += 1 @@ -75,6 +76,8 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal msg_ids = [] for x in send: msg_ids.append(x.id) + if callback: + MessageTaskManager.add_callback(x.id, callback) return FinishedSession(self, msg_ids, send) From 954bfdbbc3a570954a2dc1db83427ca8e8ca437f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 21:28:30 +0800 Subject: [PATCH 108/168] fix --- modules/mcbbs_news/mcbbs_news.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mcbbs_news/mcbbs_news.py b/modules/mcbbs_news/mcbbs_news.py index 8a1f07ab34..0563689352 100644 --- a/modules/mcbbs_news/mcbbs_news.py +++ b/modules/mcbbs_news/mcbbs_news.py @@ -15,7 +15,7 @@ async def news(msg): if web_render: use_local = True if web_render_local else False api = (web_render_local if use_local else web_render) + 'source?url=' + api - html = await get_url(api, 200) + html = await get_url(api, 200, request_private_ip=True) Logger.debug(html) bs = BeautifulSoup(html, 'html.parser') results = bs.select('#threadlisttableid > tbody[id^="normalthread_"]') From 202409609781e707343ab2b4dee45d46d9f881a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 21:49:20 +0800 Subject: [PATCH 109/168] Update slash commands --- bots/discord/slash/core.py | 62 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 bots/discord/slash/core.py diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py new file mode 100644 index 0000000000..875fea85a7 --- /dev/null +++ b/bots/discord/slash/core.py @@ -0,0 +1,62 @@ +import discord + +from bots.discord.client import client +from bots.discord.slash_parser import slash_parser +from core.utils.i18n import get_available_locales + +@client.slash_command(description="Set the bot running languages.") +@discord.option(name="lang", description="Supported language codes.") +async def locale(ctx: discord.ApplicationContext): + await slash_parser(ctx, lang) + + +@client.slash_command(description="Make the bot stop sending message.") +async def mute(ctx: discord.ApplicationContext): + await slash_parser(ctx, '') + + +@client.slash_command(description="Get bot status.") +async def ping(ctx: discord.ApplicationContext): + await slash_parser(ctx, '') + + +@client.slash_command(description="View bot version.") +async def version(ctx: discord.ApplicationContext): + await slash_parser(ctx, '') + + +@client.slash_command(description="Get the ID of the user account that sent the command inside the bot.") +async def whoami(ctx: discord.ApplicationContext): + await slash_parser(ctx, '') + + +admin = client.create_group("admin", "Commands available to bot administrators.") + + +@admin.slash_command(description="Set members as bot administrators.") +@discord.option(name="user_id", description="The user ID.") +async def add(ctx: discord.ApplicationContext): + await slash_parser(ctx, f'add {user_id}') + + +@admin.slash_command(description="Remove bot administrator from member.") +@discord.option(name="user_id", description="The user ID.") +async def remove(ctx: discord.ApplicationContext): + await slash_parser(ctx, f'remove {user_id}') + + +@admin.slash_command(description="View all bot administrators.") +async def show(ctx: discord.ApplicationContext): + await slash_parser(ctx, f'list') + + +@admin.slash_command(description="Limit someone to use bot in the channel.") +@discord.option(name="user_id", description="The user ID.") +async def ban(ctx: discord.ApplicationContext): + await slash_parser(ctx, f'ban {user_id}') + + +@admin.slash_command(description="Remove limit someone to use bot in the channel.") +@discord.option(name="user_id", description="The user ID.") +async def ban(ctx: discord.ApplicationContext): + await slash_parser(ctx, f'unban {user_id}') From 61070513b86a7553c08fffa35e783c74f9bf73b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 22:01:08 +0800 Subject: [PATCH 110/168] update --- bots/discord/slash/arcaea.py | 1 + bots/discord/slash/core.py | 36 +++++++++++++++++++++++---------- modules/core/locales/en_us.json | 4 ++-- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/bots/discord/slash/arcaea.py b/bots/discord/slash/arcaea.py index 5ef7b7e3bb..0a50364488 100644 --- a/bots/discord/slash/arcaea.py +++ b/bots/discord/slash/arcaea.py @@ -5,6 +5,7 @@ arcaea = client.create_group("arcaea", "Queries about Arcaea.") + @arcaea.command(description="Get the latest version of game apk.") async def download(ctx: discord.ApplicationContext): await slash_parser(ctx, "download") diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index 875fea85a7..0ad2a3cf2d 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -5,8 +5,8 @@ from core.utils.i18n import get_available_locales @client.slash_command(description="Set the bot running languages.") -@discord.option(name="lang", description="Supported language codes.") -async def locale(ctx: discord.ApplicationContext): +@discord.option(name="lang", description="Supported language codes.", choice=get_available_locales()) +async def locale(ctx: discord.ApplicationContext, lang: str): await slash_parser(ctx, lang) @@ -33,30 +33,44 @@ async def whoami(ctx: discord.ApplicationContext): admin = client.create_group("admin", "Commands available to bot administrators.") -@admin.slash_command(description="Set members as bot administrators.") +@admin.command(description="Set members as bot administrators.") @discord.option(name="user_id", description="The user ID.") -async def add(ctx: discord.ApplicationContext): +async def add(ctx: discord.ApplicationContext, user_id: str): await slash_parser(ctx, f'add {user_id}') -@admin.slash_command(description="Remove bot administrator from member.") +@admin.command(description="Remove bot administrator from member.") @discord.option(name="user_id", description="The user ID.") -async def remove(ctx: discord.ApplicationContext): +async def remove(ctx: discord.ApplicationContext, user_id: str): await slash_parser(ctx, f'remove {user_id}') -@admin.slash_command(description="View all bot administrators.") +@admin.command(description="View all bot administrators.") async def show(ctx: discord.ApplicationContext): await slash_parser(ctx, f'list') -@admin.slash_command(description="Limit someone to use bot in the channel.") +@admin.command(description="Limit someone to use bot in the channel.") @discord.option(name="user_id", description="The user ID.") -async def ban(ctx: discord.ApplicationContext): +async def ban(ctx: discord.ApplicationContext, user_id: str): await slash_parser(ctx, f'ban {user_id}') -@admin.slash_command(description="Remove limit someone to use bot in the channel.") +@admin.command(description="Remove limit someone to use bot in the channel.") @discord.option(name="user_id", description="The user ID.") -async def ban(ctx: discord.ApplicationContext): +async def ban(ctx: discord.ApplicationContext, user_id: str): await slash_parser(ctx, f'unban {user_id}') + + +setup = client.create_group("setup", "Set up bot actions.") + + +@setup.command(description="Set up whether to display input prompts.") +async def typing(ctx: discord.ApplicationContext): + await slash_parser(ctx, 'typing') + + +@setup.command(description="Set the time offset.") +@discord.option(name="offset", description="The timezone offset.") +async def offset(ctx: discord.ApplicationContext, offset: str): + await slash_parser(ctx, f'timeoffset {offset}') \ No newline at end of file diff --git a/modules/core/locales/en_us.json b/modules/core/locales/en_us.json index 13f0fbdd8f..bca848584e 100644 --- a/modules/core/locales/en_us.json +++ b/modules/core/locales/en_us.json @@ -30,10 +30,10 @@ "core.help.prefix.list": "View custom command prefixes.", "core.help.prefix.remove": "Remove custom command prefix.", "core.help.prefix.reset": "Reset custom command prefix.", - "core.help.setup.check": "setups whether to display command check prompts.", + "core.help.setup.check": "Set up whether to display command check prompts.", "core.help.setup.desc": "Set up bot actions.", "core.help.setup.timeoffset": "Set the time offset.", - "core.help.setup.typing": "setup whether to display input prompts.", + "core.help.setup.typing": "Set up whether to display input prompts.", "core.help.version": "View bot version.", "core.help.whoami": "Get the ID of the user account that sent the command inside the bot.", "core.message.abuse.ban.success": "Successfully banned ${user}.", From 27eaf639b1a6396c675997ab0a1cc25cb969d63c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 22:06:05 +0800 Subject: [PATCH 111/168] fix --- modules/server/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/server/__init__.py b/modules/server/__init__.py index 96d188ae0f..8d3f8fcd2b 100644 --- a/modules/server/__init__.py +++ b/modules/server/__init__.py @@ -45,7 +45,7 @@ async def main(msg: Bot.MessageSession): sm = ['j', 'b'] for x in sm: gather_list.append(asyncio.ensure_future(s( - msg, f'{msg.parsed_msg[""]}', msg.parsed_msg.get('-r', False), msg.parsed_msg.get('-p', False + msg, f'{msg.parsed_msg[""]}', msg.parsed_msg.get('-r', False), msg.parsed_msg.get('-p', False ), x))) g = await asyncio.gather(*gather_list) if g == ['', '']: From 298e4074e38e02d5cf03d0d4404abe74ee4d2c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 22:11:22 +0800 Subject: [PATCH 112/168] update --- bots/discord/slash/core.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index 0ad2a3cf2d..d91bfbd90d 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -4,8 +4,11 @@ from bots.discord.slash_parser import slash_parser from core.utils.i18n import get_available_locales +admin = client.create_group("admin", "Commands available to bot administrators.") +setup = client.create_group("setup", "Set up bot actions.") + @client.slash_command(description="Set the bot running languages.") -@discord.option(name="lang", description="Supported language codes.", choice=get_available_locales()) +@discord.option(name="lang", description="Supported language codes.", choices=get_available_locales()) async def locale(ctx: discord.ApplicationContext, lang: str): await slash_parser(ctx, lang) @@ -30,9 +33,6 @@ async def whoami(ctx: discord.ApplicationContext): await slash_parser(ctx, '') -admin = client.create_group("admin", "Commands available to bot administrators.") - - @admin.command(description="Set members as bot administrators.") @discord.option(name="user_id", description="The user ID.") async def add(ctx: discord.ApplicationContext, user_id: str): @@ -61,10 +61,6 @@ async def ban(ctx: discord.ApplicationContext, user_id: str): async def ban(ctx: discord.ApplicationContext, user_id: str): await slash_parser(ctx, f'unban {user_id}') - -setup = client.create_group("setup", "Set up bot actions.") - - @setup.command(description="Set up whether to display input prompts.") async def typing(ctx: discord.ApplicationContext): await slash_parser(ctx, 'typing') From 0d1229527a537c049b4e2805fa30ca0d38beb122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 22:30:07 +0800 Subject: [PATCH 113/168] Update --- bots/discord/slash/arcaea.py | 4 ++-- bots/discord/slash/core.py | 34 +++++++++++++++++++--------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/bots/discord/slash/arcaea.py b/bots/discord/slash/arcaea.py index 0a50364488..a5fb3b3f98 100644 --- a/bots/discord/slash/arcaea.py +++ b/bots/discord/slash/arcaea.py @@ -21,9 +21,9 @@ async def random(ctx: discord.ApplicationContext): @rank.command(description="View the current rank of the free packs.") async def free(ctx: discord.ApplicationContext): - await slash_parser(ctx, "rank free") + await slash_parser(ctx, "free") @rank.command(description="View the current rank of the paid packs.") async def paid(ctx: discord.ApplicationContext): - await slash_parser(ctx, "rank paid") + await slash_parser(ctx, "paid") diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index d91bfbd90d..fb12c99f4e 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -4,69 +4,73 @@ from bots.discord.slash_parser import slash_parser from core.utils.i18n import get_available_locales -admin = client.create_group("admin", "Commands available to bot administrators.") -setup = client.create_group("setup", "Set up bot actions.") - @client.slash_command(description="Set the bot running languages.") @discord.option(name="lang", description="Supported language codes.", choices=get_available_locales()) -async def locale(ctx: discord.ApplicationContext, lang: str): +async def locale(ctx: discord.ApplicationContext, lang: str = None): await slash_parser(ctx, lang) @client.slash_command(description="Make the bot stop sending message.") async def mute(ctx: discord.ApplicationContext): - await slash_parser(ctx, '') + await slash_parser(ctx, "") @client.slash_command(description="Get bot status.") async def ping(ctx: discord.ApplicationContext): - await slash_parser(ctx, '') + await slash_parser(ctx, "") @client.slash_command(description="View bot version.") async def version(ctx: discord.ApplicationContext): - await slash_parser(ctx, '') + await slash_parser(ctx, "") @client.slash_command(description="Get the ID of the user account that sent the command inside the bot.") async def whoami(ctx: discord.ApplicationContext): - await slash_parser(ctx, '') + await slash_parser(ctx, "") + + +admin = client.create_group("admin", "Commands available to bot administrators.") @admin.command(description="Set members as bot administrators.") @discord.option(name="user_id", description="The user ID.") async def add(ctx: discord.ApplicationContext, user_id: str): - await slash_parser(ctx, f'add {user_id}') + await slash_parser(ctx, f"add {user_id}") @admin.command(description="Remove bot administrator from member.") @discord.option(name="user_id", description="The user ID.") async def remove(ctx: discord.ApplicationContext, user_id: str): - await slash_parser(ctx, f'remove {user_id}') + await slash_parser(ctx, f"remove {user_id}") @admin.command(description="View all bot administrators.") async def show(ctx: discord.ApplicationContext): - await slash_parser(ctx, f'list') + await slash_parser(ctx, "list") @admin.command(description="Limit someone to use bot in the channel.") @discord.option(name="user_id", description="The user ID.") async def ban(ctx: discord.ApplicationContext, user_id: str): - await slash_parser(ctx, f'ban {user_id}') + await slash_parser(ctx, f"ban {user_id}") @admin.command(description="Remove limit someone to use bot in the channel.") @discord.option(name="user_id", description="The user ID.") async def ban(ctx: discord.ApplicationContext, user_id: str): - await slash_parser(ctx, f'unban {user_id}') + await slash_parser(ctx, f"unban {user_id}") + + +setup = client.create_group("setup", "Set up bot actions.") + @setup.command(description="Set up whether to display input prompts.") async def typing(ctx: discord.ApplicationContext): - await slash_parser(ctx, 'typing') + await slash_parser(ctx, "typing") @setup.command(description="Set the time offset.") @discord.option(name="offset", description="The timezone offset.") async def offset(ctx: discord.ApplicationContext, offset: str): - await slash_parser(ctx, f'timeoffset {offset}') \ No newline at end of file + await slash_parser(ctx, f"timeoffset {offset}") \ No newline at end of file From 54756860e22ab01221f0627dfd920eb311d74fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 22:48:00 +0800 Subject: [PATCH 114/168] update locale --- bots/discord/slash/arcaea.py | 4 +- bots/discord/slash/core.py | 33 ++++++++------- modules/core/locales/en_us.json | 38 ++++++++--------- modules/core/locales/zh_cn.json | 38 ++++++++--------- modules/core/locales/zh_tw.json | 38 ++++++++--------- modules/core/modules.py | 72 ++++++++++++++++----------------- 6 files changed, 111 insertions(+), 112 deletions(-) diff --git a/bots/discord/slash/arcaea.py b/bots/discord/slash/arcaea.py index a5fb3b3f98..0a50364488 100644 --- a/bots/discord/slash/arcaea.py +++ b/bots/discord/slash/arcaea.py @@ -21,9 +21,9 @@ async def random(ctx: discord.ApplicationContext): @rank.command(description="View the current rank of the free packs.") async def free(ctx: discord.ApplicationContext): - await slash_parser(ctx, "free") + await slash_parser(ctx, "rank free") @rank.command(description="View the current rank of the paid packs.") async def paid(ctx: discord.ApplicationContext): - await slash_parser(ctx, "paid") + await slash_parser(ctx, "rank paid") diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index fb12c99f4e..19d46ba407 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -2,11 +2,10 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser -from core.utils.i18n import get_available_locales @client.slash_command(description="Set the bot running languages.") -@discord.option(name="lang", description="Supported language codes.", choices=get_available_locales()) -async def locale(ctx: discord.ApplicationContext, lang: str = None): +@discord.option(name="lang", default="", description="Supported language codes.") +async def locale(ctx: discord.ApplicationContext, lang: str): await slash_parser(ctx, lang) @@ -30,6 +29,20 @@ async def whoami(ctx: discord.ApplicationContext): await slash_parser(ctx, "") +setup = client.create_group("setup", "Set up bot actions.") + + +@setup.command(description="Set up whether to display input prompts.") +async def typing(ctx: discord.ApplicationContext): + await slash_parser(ctx, "typing") + + +@setup.command(description="Set the time offset.") +@discord.option(name="offset", description="The timezone offset.") +async def offset(ctx: discord.ApplicationContext, offset: str): + await slash_parser(ctx, f"timeoffset {offset}") + + admin = client.create_group("admin", "Commands available to bot administrators.") @@ -60,17 +73,3 @@ async def ban(ctx: discord.ApplicationContext, user_id: str): @discord.option(name="user_id", description="The user ID.") async def ban(ctx: discord.ApplicationContext, user_id: str): await slash_parser(ctx, f"unban {user_id}") - - -setup = client.create_group("setup", "Set up bot actions.") - - -@setup.command(description="Set up whether to display input prompts.") -async def typing(ctx: discord.ApplicationContext): - await slash_parser(ctx, "typing") - - -@setup.command(description="Set the time offset.") -@discord.option(name="offset", description="The timezone offset.") -async def offset(ctx: discord.ApplicationContext, offset: str): - await slash_parser(ctx, f"timeoffset {offset}") \ No newline at end of file diff --git a/modules/core/locales/en_us.json b/modules/core/locales/en_us.json index bca848584e..3ff85b9fec 100644 --- a/modules/core/locales/en_us.json +++ b/modules/core/locales/en_us.json @@ -17,9 +17,9 @@ "core.help.module.disable_all": "Disable all modules.", "core.help.module.enable": "Enable single/multiple module(s).", "core.help.module.enable_all": "Enable all modules.", - "core.help.module.help": "View help list.", - "core.help.module.help.detail": "View details of a module.", - "core.help.module.help.legacy": "View help list. (Legacy)", + "core.help.help": "View help list.", + "core.help.help.detail": "View details of a module.", + "core.help.help.legacy": "View help list. (Legacy)", "core.help.module.list": "View all available modules.", "core.help.module.list.legacy": "View all available modules. (Legacy)", "core.help.mute": "Make the bot stop sending message.", @@ -87,22 +87,22 @@ "core.message.module.enable.not_found": "Failed: Module \"${module}\" does not exist.", "core.message.module.enable.qqchannel_global.success": "Success: Enabled module \"${module}\" for all text channels.", "core.message.module.enable.success": "Success: Enabled module \"${module}\".", - "core.message.module.help.author.type1": "Module author: ", - "core.message.module.help.author.type2": "Module Author", - "core.message.module.help.helpdoc.address": "Online module document: ${help_url}", - "core.message.module.help.legacy.availables": "Currently available module(s):", - "core.message.module.help.legacy.base": "Base Command: ", - "core.message.module.help.legacy.external": "Extension Command: ", - "core.message.module.help.legacy.more_information": "Use \"${prefix}help \" to view details.\nUse \"${prefix}module list\" to view all available modules.\nYou can also consult the web documentation for help:\n${help_url}", - "core.message.module.help.more_information": "Here are the help documents shown only show the enabled module(s). If you need to view the help documents of all modules, please use \"${prefix}module list\".\nYou can also consult the web documentation for help:\n${help_url}\nIf you have sufficient funds, welcome to sponsor us: \n${donate_url}", - "core.message.module.help.not_found": "This module may not exist. Please check your input.", - "core.message.module.help.regex.detail": "(${msg})", - "core.message.module.help.regex.no_information": "No description", - "core.message.module.help.support_regex": "This module supports regular expressions, the message will match with the following: ", - "core.message.module.help.table.header.alias": "Command Alias", - "core.message.module.help.table.header.base": "Base Module List", - "core.message.module.help.table.header.external": "Extended Module List", - "core.message.module.help.table.header.help": "Help", + "core.message.help.author.type1": "Module author: ", + "core.message.help.author.type2": "Module Author", + "core.message.help.helpdoc.address": "Online module document: ${help_url}", + "core.message.help.legacy.availables": "Currently available module(s):", + "core.message.help.legacy.base": "Base Command: ", + "core.message.help.legacy.external": "Extension Command: ", + "core.message.help.legacy.more_information": "Use \"${prefix}help \" to view details.\nUse \"${prefix}module list\" to view all available modules.\nYou can also consult the web documentation for help:\n${help_url}", + "core.message.help.more_information": "Here are the help documents shown only show the enabled module(s). If you need to view the help documents of all modules, please use \"${prefix}module list\".\nYou can also consult the web documentation for help:\n${help_url}\nIf you have sufficient funds, welcome to sponsor us: \n${donate_url}", + "core.message.help.not_found": "This module may not exist. Please check your input.", + "core.message.help.regex.detail": "(${msg})", + "core.message.help.regex.no_information": "No description", + "core.message.help.support_regex": "This module supports regular expressions, the message will match with the following: ", + "core.message.help.table.header.alias": "Command Alias", + "core.message.help.table.header.base": "Base Module List", + "core.message.help.table.header.external": "Extended Module List", + "core.message.help.table.header.help": "Help", "core.message.module.load.error": "An error occurred: This module has been loaded or does not exist.", "core.message.module.load.failed": "Failed to load module.", "core.message.module.load.success": "Successfully loaded module(s): ${module}", diff --git a/modules/core/locales/zh_cn.json b/modules/core/locales/zh_cn.json index c4a92dd4ef..bf6d5067d9 100644 --- a/modules/core/locales/zh_cn.json +++ b/modules/core/locales/zh_cn.json @@ -17,9 +17,9 @@ "core.help.module.disable_all": "关闭所有模块。", "core.help.module.enable": "开启一个/多个模块。", "core.help.module.enable_all": "开启所有模块。", - "core.help.module.help": "查看帮助列表。", - "core.help.module.help.detail": "查看一个模块的详细信息。", - "core.help.module.help.legacy": "查看帮助列表。（旧版）", + "core.help.help": "查看帮助列表。", + "core.help.help.detail": "查看一个模块的详细信息。", + "core.help.help.legacy": "查看帮助列表。（旧版）", "core.help.module.list": "查看所有可用模块。", "core.help.module.list.legacy": "查看所有可用模块。（旧版）", "core.help.mute": "使机器人停止发言。", @@ -87,22 +87,22 @@ "core.message.module.enable.not_found": "失败：“${module}”模块不存在。", "core.message.module.enable.qqchannel_global.success": "成功：为所有文字频道开启“${module}”模块。", "core.message.module.enable.success": "成功：开启模块“${module}”。", - "core.message.module.help.author.type1": "模块作者：", - "core.message.module.help.author.type2": "模块作者", - "core.message.module.help.helpdoc.address": "在线模块文档：${help_url}", - "core.message.module.help.legacy.availables": "当前可用的模块有：", - "core.message.module.help.legacy.base": "基础命令：", - "core.message.module.help.legacy.external": "模块扩展命令：", - "core.message.module.help.legacy.more_information": "使用“${prefix}help <对应模块名>”查看详细信息。\n使用“${prefix}module list”查看所有的可用模块。\n您也可以通过查阅在线文档获取帮助：\n${help_url}", - "core.message.module.help.more_information": "此处展示的帮助文档仅展示已开启的模块，若需要查看全部模块的帮助文档，请使用“${prefix}module list”。\n您也可以通过查阅在线文档获取帮助：\n${help_url}\n若您有经济实力，欢迎给孩子们在爱发电上打钱：\n${donate_url}", - "core.message.module.help.not_found": "此模块可能不存在，请检查输入。", - "core.message.module.help.regex.detail": "（${msg}）", - "core.message.module.help.regex.no_information": "无描述", - "core.message.module.help.support_regex": "此模块支持正则表达式，消息发送时将会匹配以下内容：", - "core.message.module.help.table.header.alias": "命令别名", - "core.message.module.help.table.header.base": "基础模块列表", - "core.message.module.help.table.header.external": "扩展模块列表", - "core.message.module.help.table.header.help": "帮助信息", + "core.message.help.author.type1": "模块作者：", + "core.message.help.author.type2": "模块作者", + "core.message.help.helpdoc.address": "在线模块文档：${help_url}", + "core.message.help.legacy.availables": "当前可用的模块有：", + "core.message.help.legacy.base": "基础命令：", + "core.message.help.legacy.external": "模块扩展命令：", + "core.message.help.legacy.more_information": "使用“${prefix}help <对应模块名>”查看详细信息。\n使用“${prefix}module list”查看所有的可用模块。\n您也可以通过查阅在线文档获取帮助：\n${help_url}", + "core.message.help.more_information": "此处展示的帮助文档仅展示已开启的模块，若需要查看全部模块的帮助文档，请使用“${prefix}module list”。\n您也可以通过查阅在线文档获取帮助：\n${help_url}\n若您有经济实力，欢迎给孩子们在爱发电上打钱：\n${donate_url}", + "core.message.help.not_found": "此模块可能不存在，请检查输入。", + "core.message.help.regex.detail": "（${msg}）", + "core.message.help.regex.no_information": "无描述", + "core.message.help.support_regex": "此模块支持正则表达式，消息发送时将会匹配以下内容：", + "core.message.help.table.header.alias": "命令别名", + "core.message.help.table.header.base": "基础模块列表", + "core.message.help.table.header.external": "扩展模块列表", + "core.message.help.table.header.help": "帮助信息", "core.message.module.load.error": "发生错误：该模块已加载或不存在。", "core.message.module.load.failed": "加载模块失败。", "core.message.module.load.success": "成功加载模块：${module}", diff --git a/modules/core/locales/zh_tw.json b/modules/core/locales/zh_tw.json index ae8d7ec307..3c04693dd8 100644 --- a/modules/core/locales/zh_tw.json +++ b/modules/core/locales/zh_tw.json @@ -17,9 +17,9 @@ "core.help.module.disable_all": "停用所有模組。", "core.help.module.enable": "啟用一個/多個模組。", "core.help.module.enable_all": "啟用所有模組。", - "core.help.module.help": "檢視說明列表。", - "core.help.module.help.detail": "檢視一個模組的詳細資訊。", - "core.help.module.help.legacy": "檢視說明列表。（舊版）", + "core.help.help": "檢視說明列表。", + "core.help.help.detail": "檢視一個模組的詳細資訊。", + "core.help.help.legacy": "檢視說明列表。（舊版）", "core.help.module.list": "檢視所有可用模組。", "core.help.module.list.legacy": "檢視所有可用模組。（舊版）", "core.help.mute": "使機器人停止發言。", @@ -87,22 +87,22 @@ "core.message.module.enable.not_found": "失敗：「${module}」模組不存在。", "core.message.module.enable.qqchannel_global.success": "成功：為所有文字頻道啟用「${module}」模組。", "core.message.module.enable.success": "成功：啟用模組「${module}」。", - "core.message.module.help.author.type1": "模組作者：", - "core.message.module.help.author.type2": "模組作者", - "core.message.module.help.helpdoc.address": "線上模組說明文件：${help_url}", - "core.message.module.help.legacy.availables": "目前可用的模組有：", - "core.message.module.help.legacy.base": "基礎指令：", - "core.message.module.help.legacy.external": "模組擴充指令：", - "core.message.module.help.legacy.more_information": "使用「${prefix}help <對應模組名>」檢視詳細資訊。\n使用「${prefix}module list」檢視所有的可用模組。\n您也可以透過查閱線上文件取得說明：\n${help_url}", - "core.message.module.help.more_information": "此處展示的說明文件僅展示已啟用的模組，若需要檢視全部模組的說明文件，請使用「${prefix}module list」。\n您也可以透過查閱線上文件取得說明：\n${help_url}\n若您有經濟實力，歡迎在愛發電提供贊助：\n${donate_url}", - "core.message.module.help.not_found": "此模組可能不存在，請校對輸入。", - "core.message.module.help.regex.detail": "（${msg}）", - "core.message.module.help.regex.no_information": "無描述", - "core.message.module.help.support_regex": "此模組支援正規表示式，訊息傳送時將會尋找相符的以下內容：", - "core.message.module.help.table.header.alias": "指令別名", - "core.message.module.help.table.header.base": "基礎模組列表", - "core.message.module.help.table.header.external": "擴充模組列表", - "core.message.module.help.table.header.help": "說明資訊", + "core.message.help.author.type1": "模組作者：", + "core.message.help.author.type2": "模組作者", + "core.message.help.helpdoc.address": "線上模組說明文件：${help_url}", + "core.message.help.legacy.availables": "目前可用的模組有：", + "core.message.help.legacy.base": "基礎指令：", + "core.message.help.legacy.external": "模組擴充指令：", + "core.message.help.legacy.more_information": "使用「${prefix}help <對應模組名>」檢視詳細資訊。\n使用「${prefix}module list」檢視所有的可用模組。\n您也可以透過查閱線上文件取得說明：\n${help_url}", + "core.message.help.more_information": "此處展示的說明文件僅展示已啟用的模組，若需要檢視全部模組的說明文件，請使用「${prefix}module list」。\n您也可以透過查閱線上文件取得說明：\n${help_url}\n若您有經濟實力，歡迎在愛發電提供贊助：\n${donate_url}", + "core.message.help.not_found": "此模組可能不存在，請校對輸入。", + "core.message.help.regex.detail": "（${msg}）", + "core.message.help.regex.no_information": "無描述", + "core.message.help.support_regex": "此模組支援正規表示式，訊息傳送時將會尋找相符的以下內容：", + "core.message.help.table.header.alias": "指令別名", + "core.message.help.table.header.base": "基礎模組列表", + "core.message.help.table.header.external": "擴充模組列表", + "core.message.help.table.header.help": "說明資訊", "core.message.module.load.error": "發生錯誤：此模組已載入或不存在。", "core.message.module.load.failed": "載入模組失敗。", "core.message.module.load.success": "成功載入模組：${module}", diff --git a/modules/core/modules.py b/modules/core/modules.py index b0d96f0ef0..a0d1f48446 100644 --- a/modules/core/modules.py +++ b/modules/core/modules.py @@ -289,7 +289,7 @@ def module_reload(module, extra_modules, base_mode=False): hlp = module('help', base=True) -@hlp.command(' {{core.help.module.help.detail}}') +@hlp.command(' {{core.help.help.detail}}') async def bot_help(msg: Bot.MessageSession): module_list = ModulesManager.return_modules_list( target_from=msg.target.target_from) @@ -314,7 +314,7 @@ async def bot_help(msg: Bot.MessageSession): doc = '\n'.join(msgs) if module_.regex_list.set: - doc += '\n' + msg.locale.t("core.message.module.help.support_regex") + doc += '\n' + msg.locale.t("core.message.help.support_regex") for regex in module_.regex_list.set: pattern = None if isinstance(regex.pattern, str): @@ -324,10 +324,10 @@ async def bot_help(msg: Bot.MessageSession): if pattern: desc = regex.desc if desc: - doc += f'\n{pattern} ' + msg.locale.t("core.message.module.help.regex.detail", + doc += f'\n{pattern} ' + msg.locale.t("core.message.help.regex.detail", msg=msg.locale.tl_str(desc)) else: - doc += f'\n{pattern} ' + msg.locale.t("core.message.module.help.regex.no_information") + doc += f'\n{pattern} ' + msg.locale.t("core.message.help.regex.no_information") module_alias = module_.alias malias = [] if module_alias: @@ -335,17 +335,17 @@ async def bot_help(msg: Bot.MessageSession): malias.append(f'{a} -> {module_alias[a]}') if module_.developers is not None: devs = msg.locale.t('message.delimiter').join(module_.developers) - devs_msg = '\n' + msg.locale.t("core.message.module.help.author.type1") + devs + devs_msg = '\n' + msg.locale.t("core.message.help.author.type1") + devs else: devs_msg = '' - wiki_msg = '\n' + msg.locale.t("core.message.module.help.helpdoc.address", + wiki_msg = '\n' + msg.locale.t("core.message.help.helpdoc.address", help_url=Config('help_url')) + '/' + help_name if len(doc) > 500 and msg.Feature.image: try: tables = [ImageTable([[doc, '\n'.join(malias), devs]], - [msg.locale.t("core.message.module.help.table.header.help"), - msg.locale.t("core.message.module.help.table.header.alias"), - msg.locale.t("core.message.module.help.author.type2")])] + [msg.locale.t("core.message.help.table.header.help"), + msg.locale.t("core.message.help.table.header.alias"), + msg.locale.t("core.message.help.author.type2")])] render = await image_table_render(tables) if render: await msg.finish([Image(render), @@ -356,11 +356,11 @@ async def bot_help(msg: Bot.MessageSession): doc += f'\n{msg.locale.t("core.help.alias")}\n' + '\n'.join(malias) await msg.finish((doc + devs_msg + wiki_msg).lstrip()) else: - await msg.finish(msg.locale.t("core.message.module.help.not_found")) + await msg.finish(msg.locale.t("core.message.help.not_found")) -@hlp.command(['{{core.help.module.help}}', - 'legacy {{core.help.module.help.legacy}}']) +@hlp.command(['{{core.help.help}}', + 'legacy {{core.help.help.legacy}}']) async def _(msg: Bot.MessageSession): module_list = ModulesManager.return_modules_list( target_from=msg.target.target_from) @@ -384,7 +384,7 @@ async def _(msg: Bot.MessageSession): doc_.append(help_.return_formatted_help_doc()) doc = '\n'.join(doc_) if module_.regex_list.set: - doc += '\n' + msg.locale.t("core.message.module.help.support_regex") + doc += '\n' + msg.locale.t("core.message.help.support_regex") for regex in module_.regex_list.set: pattern = None if isinstance(regex.pattern, str): @@ -394,10 +394,10 @@ async def _(msg: Bot.MessageSession): if pattern: desc = regex.desc if desc: - doc += f'\n{pattern} ' + msg.locale.t("core.message.module.help.regex.detail", + doc += f'\n{pattern} ' + msg.locale.t("core.message.help.regex.detail", msg=msg.locale.tl_str(desc)) else: - doc += f'\n{pattern} ' + msg.locale.t("core.message.module.help.regex.no_information") + doc += f'\n{pattern} ' + msg.locale.t("core.message.help.regex.no_information") appends.append(doc) module_alias = module_.alias malias = [] @@ -413,34 +413,34 @@ async def _(msg: Bot.MessageSession): m.append(appends) if essential: tables.append(ImageTable( - essential, [msg.locale.t("core.message.module.help.table.header.base"), - msg.locale.t("core.message.module.help.table.header.help"), - msg.locale.t("core.message.module.help.table.header.alias"), - msg.locale.t("core.message.module.help.author.type2")])) + essential, [msg.locale.t("core.message.help.table.header.base"), + msg.locale.t("core.message.help.table.header.help"), + msg.locale.t("core.message.help.table.header.alias"), + msg.locale.t("core.message.help.author.type2")])) if m: - tables.append(ImageTable(m, [msg.locale.t("core.message.module.help.table.header.external"), - msg.locale.t("core.message.module.help.table.header.help"), - msg.locale.t("core.message.module.help.table.header.alias"), - msg.locale.t("core.message.module.help.author.type2")])) + tables.append(ImageTable(m, [msg.locale.t("core.message.help.table.header.external"), + msg.locale.t("core.message.help.table.header.help"), + msg.locale.t("core.message.help.table.header.alias"), + msg.locale.t("core.message.help.author.type2")])) if tables: render = await image_table_render(tables) if render: legacy_help = False await msg.finish([Image(render), - Plain(msg.locale.t("core.message.module.help.more_information", + Plain(msg.locale.t("core.message.help.more_information", prefix=msg.prefixes[0], help_url=Config('help_url'), donate_url=Config('donate_url')))]) except Exception: traceback.print_exc() if legacy_help: - help_msg = [msg.locale.t("core.message.module.help.legacy.base")] + help_msg = [msg.locale.t("core.message.help.legacy.base")] essential = [] for x in module_list: if module_list[x].base and not ( module_list[x].required_superuser or module_list[x].required_base_superuser): essential.append(module_list[x].bind_prefix) help_msg.append(' | '.join(essential)) - help_msg.append(msg.locale.t("core.message.module.help.legacy.external")) + help_msg.append(msg.locale.t("core.message.help.legacy.external")) module_ = [] for x in module_list: if x in target_enabled_list and not ( @@ -449,7 +449,7 @@ async def _(msg: Bot.MessageSession): help_msg.append(' | '.join(module_)) help_msg.append( msg.locale.t( - "core.message.module.help.legacy.more_information", + "core.message.help.legacy.more_information", prefix=msg.prefixes[0], help_url=Config('help_url'))) await msg.finish('\n'.join(help_msg)) @@ -479,7 +479,7 @@ async def modules_help(msg: Bot.MessageSession, legacy): doc_.append(help_.return_formatted_help_doc()) doc = '\n'.join(doc_) if module_.regex_list.set: - doc += '\n' + msg.locale.t("core.message.module.help.support_regex") + doc += '\n' + msg.locale.t("core.message.help.support_regex") for regex in module_.regex_list.set: pattern = None if isinstance(regex.pattern, str): @@ -489,10 +489,10 @@ async def modules_help(msg: Bot.MessageSession, legacy): if pattern: desc = regex.desc if desc: - doc += f'\n{pattern} ' + msg.locale.t("core.message.module.help.regex.detail", + doc += f'\n{pattern} ' + msg.locale.t("core.message.help.regex.detail", msg=msg.locale.tl_str(desc)) else: - doc += f'\n{pattern} ' + msg.locale.t("core.message.module.help.regex.no_information") + doc += f'\n{pattern} ' + msg.locale.t("core.message.help.regex.no_information") appends.append(doc) module_alias = module_.alias malias = [] @@ -504,10 +504,10 @@ async def modules_help(msg: Bot.MessageSession, legacy): appends.append(msg.locale.t('message.delimiter').join(module_.developers)) m.append(appends) if m: - tables.append(ImageTable(m, [msg.locale.t("core.message.module.help.table.header.external"), - msg.locale.t("core.message.module.help.table.header.help"), - msg.locale.t("core.message.module.help.table.header.alias"), - msg.locale.t("core.message.module.help.author.type2")])) + tables.append(ImageTable(m, [msg.locale.t("core.message.help.table.header.external"), + msg.locale.t("core.message.help.table.header.help"), + msg.locale.t("core.message.help.table.header.alias"), + msg.locale.t("core.message.help.author.type2")])) if tables: render = await image_table_render(tables) if render: @@ -516,7 +516,7 @@ async def modules_help(msg: Bot.MessageSession, legacy): except Exception: traceback.print_exc() if legacy_help: - help_msg = [msg.locale.t("core.message.module.help.legacy.availables")] + help_msg = [msg.locale.t("core.message.help.legacy.availables")] module_ = [] for x in module_list: if x[0] == '_': @@ -527,7 +527,7 @@ async def modules_help(msg: Bot.MessageSession, legacy): help_msg.append(' | '.join(module_)) help_msg.append( msg.locale.t( - "core.message.module.help.legacy.more_information", + "core.message.help.legacy.more_information", prefix=msg.prefixes[0], help_url=Config('help_url'))) await msg.finish('\n'.join(help_msg)) From 8cb4950d2b55dcd797e622459176d40b16f1bf63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 22:59:42 +0800 Subject: [PATCH 115/168] fix = =; --- modules/core/locales/en_us.json | 36 ++++++++++++++++----------------- modules/core/locales/zh_cn.json | 36 ++++++++++++++++----------------- modules/core/locales/zh_tw.json | 36 ++++++++++++++++----------------- modules/cytoid/profile.py | 2 ++ 4 files changed, 56 insertions(+), 54 deletions(-) diff --git a/modules/core/locales/en_us.json b/modules/core/locales/en_us.json index 3ff85b9fec..7850c60967 100644 --- a/modules/core/locales/en_us.json +++ b/modules/core/locales/en_us.json @@ -10,6 +10,9 @@ "core.help.alias.list.legacy": "View custom command alias. (Legacy)", "core.help.alias.remove": "Remove custom command alias.", "core.help.alias.reset": "Reset custom command alias.", + "core.help.help": "View help list.", + "core.help.help.detail": "View details of a module.", + "core.help.help.legacy": "View help list. (Legacy)", "core.help.leave": "Let the bot leave the group.", "core.help.locale.desc": "Control bot language.", "core.help.locale.set": "Set the bot running languages.", @@ -17,9 +20,6 @@ "core.help.module.disable_all": "Disable all modules.", "core.help.module.enable": "Enable single/multiple module(s).", "core.help.module.enable_all": "Enable all modules.", - "core.help.help": "View help list.", - "core.help.help.detail": "View details of a module.", - "core.help.help.legacy": "View help list. (Legacy)", "core.help.module.list": "View all available modules.", "core.help.module.list.legacy": "View all available modules. (Legacy)", "core.help.mute": "Make the bot stop sending message.", @@ -72,21 +72,6 @@ "core.message.forward_msg.disable": "Forward message disabled.", "core.message.forward_msg.disabled": "Forward message disabled.", "core.message.forward_msg.enable": "Forward message enabled.", - "core.message.leave.success": "Goodbye.", - "core.message.locale": "Current language: ", - "core.message.locale.reload.failed": "Failed to reload the following string: ${detail}.", - "core.message.locale.set.invalid": "Invalid language code. Supported language code(s): ${langlist}", - "core.message.locale.set.prompt": "Use \"${prefix}locale \" to set the language.\nSupported language code(s): ${langlist}\nGo to Crowdin and help with translation:\nhttps://www.crowdin.com/project/akari-bot", - "core.message.module.disable.already": "Failed: Module \"${module}\" is disabled.", - "core.message.module.disable.base": "Failed: \"${module}\" is a base module, thus cannot be disabled.", - "core.message.module.disable.not_found": "Failed: Module \"${module}\" does not exist.", - "core.message.module.disable.qqchannel_global.success": "Success: Disabled module \"${module}\" for all text channels.", - "core.message.module.disable.success": "Success: Disabled module \"${module}\".", - "core.message.module.enable.already": "Failed: Module \"${module}\" is already enabled.", - "core.message.module.enable.base": "Failed: \"${module}\" is a base module, thus cannot be disabled.", - "core.message.module.enable.not_found": "Failed: Module \"${module}\" does not exist.", - "core.message.module.enable.qqchannel_global.success": "Success: Enabled module \"${module}\" for all text channels.", - "core.message.module.enable.success": "Success: Enabled module \"${module}\".", "core.message.help.author.type1": "Module author: ", "core.message.help.author.type2": "Module Author", "core.message.help.helpdoc.address": "Online module document: ${help_url}", @@ -103,6 +88,21 @@ "core.message.help.table.header.base": "Base Module List", "core.message.help.table.header.external": "Extended Module List", "core.message.help.table.header.help": "Help", + "core.message.leave.success": "Goodbye.", + "core.message.locale": "Current language: ", + "core.message.locale.reload.failed": "Failed to reload the following string: ${detail}.", + "core.message.locale.set.invalid": "Invalid language code. Supported language code(s): ${langlist}", + "core.message.locale.set.prompt": "Use \"${prefix}locale \" to set the language.\nSupported language code(s): ${langlist}\nGo to Crowdin and help with translation:\nhttps://www.crowdin.com/project/akari-bot", + "core.message.module.disable.already": "Failed: Module \"${module}\" is disabled.", + "core.message.module.disable.base": "Failed: \"${module}\" is a base module, thus cannot be disabled.", + "core.message.module.disable.not_found": "Failed: Module \"${module}\" does not exist.", + "core.message.module.disable.qqchannel_global.success": "Success: Disabled module \"${module}\" for all text channels.", + "core.message.module.disable.success": "Success: Disabled module \"${module}\".", + "core.message.module.enable.already": "Failed: Module \"${module}\" is already enabled.", + "core.message.module.enable.base": "Failed: \"${module}\" is a base module, thus cannot be disabled.", + "core.message.module.enable.not_found": "Failed: Module \"${module}\" does not exist.", + "core.message.module.enable.qqchannel_global.success": "Success: Enabled module \"${module}\" for all text channels.", + "core.message.module.enable.success": "Success: Enabled module \"${module}\".", "core.message.module.load.error": "An error occurred: This module has been loaded or does not exist.", "core.message.module.load.failed": "Failed to load module.", "core.message.module.load.success": "Successfully loaded module(s): ${module}", diff --git a/modules/core/locales/zh_cn.json b/modules/core/locales/zh_cn.json index bf6d5067d9..37fc4b7ecd 100644 --- a/modules/core/locales/zh_cn.json +++ b/modules/core/locales/zh_cn.json @@ -10,6 +10,9 @@ "core.help.alias.list.legacy": "查看自定义命令别名列表。（旧版）", "core.help.alias.remove": "移除自定义命令别名。", "core.help.alias.reset": "重置自定义命令别名。", + "core.help.help": "查看帮助列表。", + "core.help.help.detail": "查看一个模块的详细信息。", + "core.help.help.legacy": "查看帮助列表。（旧版）", "core.help.leave": "使机器人离开群组。", "core.help.locale.desc": "控制机器人语言。", "core.help.locale.set": "设置机器人运行语言。", @@ -17,9 +20,6 @@ "core.help.module.disable_all": "关闭所有模块。", "core.help.module.enable": "开启一个/多个模块。", "core.help.module.enable_all": "开启所有模块。", - "core.help.help": "查看帮助列表。", - "core.help.help.detail": "查看一个模块的详细信息。", - "core.help.help.legacy": "查看帮助列表。（旧版）", "core.help.module.list": "查看所有可用模块。", "core.help.module.list.legacy": "查看所有可用模块。（旧版）", "core.help.mute": "使机器人停止发言。", @@ -72,21 +72,6 @@ "core.message.forward_msg.disable": "已关闭转发消息。", "core.message.forward_msg.disabled": "转发消息已关闭。", "core.message.forward_msg.enable": "已开启转发消息。", - "core.message.leave.success": "已执行，再见。", - "core.message.locale": "当前使用的语言：", - "core.message.locale.reload.failed": "以下字符串重载失败：${detail}。", - "core.message.locale.set.invalid": "语言代码无效，支持的语言代码：${langlist}", - "core.message.locale.set.prompt": "可使用“${prefix}locale <语言代码>”设置语言。\n支持的语言代码：${langlist}\n欢迎前往 Crowdin 协助翻译：\nhttps://www.crowdin.com/project/akari-bot", - "core.message.module.disable.already": "失败：“${module}”模块已关闭。", - "core.message.module.disable.base": "失败：“${module}”为基础模块，无法关闭。", - "core.message.module.disable.not_found": "失败：“${module}”模块不存在。", - "core.message.module.disable.qqchannel_global.success": "成功：为所有文字频道关闭“${module}”模块。", - "core.message.module.disable.success": "成功：关闭模块“${module}”。", - "core.message.module.enable.already": "失败：“${module}”模块已开启。", - "core.message.module.enable.base": "失败：“${module}”为基础模块，无法关闭。", - "core.message.module.enable.not_found": "失败：“${module}”模块不存在。", - "core.message.module.enable.qqchannel_global.success": "成功：为所有文字频道开启“${module}”模块。", - "core.message.module.enable.success": "成功：开启模块“${module}”。", "core.message.help.author.type1": "模块作者：", "core.message.help.author.type2": "模块作者", "core.message.help.helpdoc.address": "在线模块文档：${help_url}", @@ -103,6 +88,21 @@ "core.message.help.table.header.base": "基础模块列表", "core.message.help.table.header.external": "扩展模块列表", "core.message.help.table.header.help": "帮助信息", + "core.message.leave.success": "已执行，再见。", + "core.message.locale": "当前使用的语言：", + "core.message.locale.reload.failed": "以下字符串重载失败：${detail}。", + "core.message.locale.set.invalid": "语言代码无效，支持的语言代码：${langlist}", + "core.message.locale.set.prompt": "可使用“${prefix}locale <语言代码>”设置语言。\n支持的语言代码：${langlist}\n欢迎前往 Crowdin 协助翻译：\nhttps://www.crowdin.com/project/akari-bot", + "core.message.module.disable.already": "失败：“${module}”模块已关闭。", + "core.message.module.disable.base": "失败：“${module}”为基础模块，无法关闭。", + "core.message.module.disable.not_found": "失败：“${module}”模块不存在。", + "core.message.module.disable.qqchannel_global.success": "成功：为所有文字频道关闭“${module}”模块。", + "core.message.module.disable.success": "成功：关闭模块“${module}”。", + "core.message.module.enable.already": "失败：“${module}”模块已开启。", + "core.message.module.enable.base": "失败：“${module}”为基础模块，无法关闭。", + "core.message.module.enable.not_found": "失败：“${module}”模块不存在。", + "core.message.module.enable.qqchannel_global.success": "成功：为所有文字频道开启“${module}”模块。", + "core.message.module.enable.success": "成功：开启模块“${module}”。", "core.message.module.load.error": "发生错误：该模块已加载或不存在。", "core.message.module.load.failed": "加载模块失败。", "core.message.module.load.success": "成功加载模块：${module}", diff --git a/modules/core/locales/zh_tw.json b/modules/core/locales/zh_tw.json index 3c04693dd8..2b2369e394 100644 --- a/modules/core/locales/zh_tw.json +++ b/modules/core/locales/zh_tw.json @@ -10,6 +10,9 @@ "core.help.alias.list.legacy": "檢視自訂指令別名列表。（舊版）", "core.help.alias.remove": "移除自訂指令別名。", "core.help.alias.reset": "重設自訂指令別名。", + "core.help.help": "檢視說明列表。", + "core.help.help.detail": "檢視一個模組的詳細資訊。", + "core.help.help.legacy": "檢視說明列表。（舊版）", "core.help.leave": "使機器人離開群組。", "core.help.locale.desc": "控制機器人語言。", "core.help.locale.set": "設定機器人使用的語言。", @@ -17,9 +20,6 @@ "core.help.module.disable_all": "停用所有模組。", "core.help.module.enable": "啟用一個/多個模組。", "core.help.module.enable_all": "啟用所有模組。", - "core.help.help": "檢視說明列表。", - "core.help.help.detail": "檢視一個模組的詳細資訊。", - "core.help.help.legacy": "檢視說明列表。（舊版）", "core.help.module.list": "檢視所有可用模組。", "core.help.module.list.legacy": "檢視所有可用模組。（舊版）", "core.help.mute": "使機器人停止發言。", @@ -72,21 +72,6 @@ "core.message.forward_msg.disable": "已停用轉發訊息。", "core.message.forward_msg.disabled": "轉發訊息已停用。", "core.message.forward_msg.enable": "已啟用轉發訊息。", - "core.message.leave.success": "已執行，再見。", - "core.message.locale": "目前使用的語言：", - "core.message.locale.reload.failed": "以下字串重新加載失敗：${detail}。", - "core.message.locale.set.invalid": "無效的語言代碼，已支援的語言代碼：${langlist}", - "core.message.locale.set.prompt": "可使用「${prefix}locale <語言代碼>」設定語言。\n已支援的語言代碼：${langlist}\n歡迎前往 Crowdin 協助翻譯：\nhttps://www.crowdin.com/project/akari-bot", - "core.message.module.disable.already": "失敗：「${module}」模組已停用。", - "core.message.module.disable.base": "失敗：「${module}」為基礎模組，無法停用。", - "core.message.module.disable.not_found": "失敗：「${module}」模組不存在。", - "core.message.module.disable.qqchannel_global.success": "成功：為所有文字頻道停用「${module}」模組。", - "core.message.module.disable.success": "成功：停用模組「${module}」。", - "core.message.module.enable.already": "失敗：「${module}」模組已啟用。", - "core.message.module.enable.base": "失敗：「${module}」為基礎模組，無法停用。", - "core.message.module.enable.not_found": "失敗：「${module}」模組不存在。", - "core.message.module.enable.qqchannel_global.success": "成功：為所有文字頻道啟用「${module}」模組。", - "core.message.module.enable.success": "成功：啟用模組「${module}」。", "core.message.help.author.type1": "模組作者：", "core.message.help.author.type2": "模組作者", "core.message.help.helpdoc.address": "線上模組說明文件：${help_url}", @@ -103,6 +88,21 @@ "core.message.help.table.header.base": "基礎模組列表", "core.message.help.table.header.external": "擴充模組列表", "core.message.help.table.header.help": "說明資訊", + "core.message.leave.success": "已執行，再見。", + "core.message.locale": "目前使用的語言：", + "core.message.locale.reload.failed": "以下字串重新加載失敗：${detail}。", + "core.message.locale.set.invalid": "無效的語言代碼，已支援的語言代碼：${langlist}", + "core.message.locale.set.prompt": "可使用「${prefix}locale <語言代碼>」設定語言。\n已支援的語言代碼：${langlist}\n歡迎前往 Crowdin 協助翻譯：\nhttps://www.crowdin.com/project/akari-bot", + "core.message.module.disable.already": "失敗：「${module}」模組已停用。", + "core.message.module.disable.base": "失敗：「${module}」為基礎模組，無法停用。", + "core.message.module.disable.not_found": "失敗：「${module}」模組不存在。", + "core.message.module.disable.qqchannel_global.success": "成功：為所有文字頻道停用「${module}」模組。", + "core.message.module.disable.success": "成功：停用模組「${module}」。", + "core.message.module.enable.already": "失敗：「${module}」模組已啟用。", + "core.message.module.enable.base": "失敗：「${module}」為基礎模組，無法停用。", + "core.message.module.enable.not_found": "失敗：「${module}」模組不存在。", + "core.message.module.enable.qqchannel_global.success": "成功：為所有文字頻道啟用「${module}」模組。", + "core.message.module.enable.success": "成功：啟用模組「${module}」。", "core.message.module.load.error": "發生錯誤：此模組已載入或不存在。", "core.message.module.load.failed": "載入模組失敗。", "core.message.module.load.success": "成功載入模組：${module}", diff --git a/modules/cytoid/profile.py b/modules/cytoid/profile.py index e0cafe3cc1..2464ca24cb 100644 --- a/modules/cytoid/profile.py +++ b/modules/cytoid/profile.py @@ -1,3 +1,5 @@ +import ujson as json + from core.builtins import Bot, Image, Plain from core.utils.http import get_url from .dbutils import CytoidBindInfoManager From d7a5c6f617b0b633fe712e88c35e822c91240337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 23:05:23 +0800 Subject: [PATCH 116/168] upd tweet --- bots/discord/slash/tweet.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/bots/discord/slash/tweet.py b/bots/discord/slash/tweet.py index e889384154..e2b55c668d 100644 --- a/bots/discord/slash/tweet.py +++ b/bots/discord/slash/tweet.py @@ -3,10 +3,7 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser -tweet = client.create_group("tweet", "Get tweet image from tweet ID or link.") - - -@tweet.command() +@client.slash_command(description="Get tweet image from tweet ID or link.") @discord.option(name="tweet", description="The tweet ID or tweet link.") -async def get(ctx: discord.ApplicationContext, tweet: str): - await slash_parser(ctx, tweet) +async def tweet(ctx: discord.ApplicationContext, tweet: str): + await slash_parser(ctx, tweet) \ No newline at end of file From 6e38ba2935714347cd1e2b306f6cd343c4db2d2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Sun, 17 Dec 2023 23:11:23 +0800 Subject: [PATCH 117/168] :thinking: --- bots/discord/slash/tweet.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/discord/slash/tweet.py b/bots/discord/slash/tweet.py index e2b55c668d..f2ee7cab5a 100644 --- a/bots/discord/slash/tweet.py +++ b/bots/discord/slash/tweet.py @@ -4,6 +4,6 @@ from bots.discord.slash_parser import slash_parser @client.slash_command(description="Get tweet image from tweet ID or link.") -@discord.option(name="tweet", description="The tweet ID or tweet link.") +@discord.option(name="tweetid", description="The tweet ID or tweet link.") async def tweet(ctx: discord.ApplicationContext, tweet: str): - await slash_parser(ctx, tweet) \ No newline at end of file + await slash_parser(ctx, tweetid) \ No newline at end of file From 4e6f65033bb7f8dc1f9e2582cbdbf8929957bef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 01:29:33 +0800 Subject: [PATCH 118/168] Update tweet.py --- bots/discord/slash/tweet.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/discord/slash/tweet.py b/bots/discord/slash/tweet.py index f2ee7cab5a..173c898001 100644 --- a/bots/discord/slash/tweet.py +++ b/bots/discord/slash/tweet.py @@ -5,5 +5,5 @@ @client.slash_command(description="Get tweet image from tweet ID or link.") @discord.option(name="tweetid", description="The tweet ID or tweet link.") -async def tweet(ctx: discord.ApplicationContext, tweet: str): - await slash_parser(ctx, tweetid) \ No newline at end of file +async def tweet(ctx: discord.ApplicationContext, tweetid: str): + await slash_parser(ctx, tweetid) From 819b9f79534e0ea86f081b1d5bf13dde792dca2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 01:51:14 +0800 Subject: [PATCH 119/168] Create ask.py --- bots/discord/slash/ask.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 bots/discord/slash/ask.py diff --git a/bots/discord/slash/ask.py b/bots/discord/slash/ask.py new file mode 100644 index 0000000000..81a084e2da --- /dev/null +++ b/bots/discord/slash/ask.py @@ -0,0 +1,20 @@ +import discord + +from bots.discord.client import client +from bots.discord.slash_parser import slash_parser + + +async def example_question(ctx: discord.AutocompleteContext): + if ctx.options["question"] == "": + question = ["Who are you?", + "What does AI work?", + "How to maintain a healthy lifestyle?", + "Teach me how to bake a cake.", + "What is the answer to the ultimate question of life, The universe, and everything?"] + return question + + +@client.slash_command(description="Answer your question via ChatGPT.") +@discord.option(name="question", description="Ask ChatGPT...", autocomplete=example_question) +async def ask(ctx: discord.ApplicationContext, question: str): + await slash_parser(ctx, question) From 00db41afbba579fdf966576670785c70fdd6d584 Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Mon, 18 Dec 2023 12:00:58 +0800 Subject: [PATCH 120/168] update --- core/builtins/message/chain.py | 20 +++++++------ core/builtins/message/internal.py | 6 ++-- modules/weekly_rss/__init__.py | 6 ++-- schedulers/mcv_rss.py | 47 +++++++++++++++++-------------- schedulers/minecraft_news.py | 12 ++++---- 5 files changed, 49 insertions(+), 42 deletions(-) diff --git a/core/builtins/message/chain.py b/core/builtins/message/chain.py index 2350ecdddf..7f4e14cd3e 100644 --- a/core/builtins/message/chain.py +++ b/core/builtins/message/chain.py @@ -5,22 +5,22 @@ import ujson as json -from core.builtins.message.internal import Plain, Image, Voice, Embed, Url, ErrorMessage, FormattedTime, I18NText +from core.builtins.message.internal import Plain, Image, Voice, Embed, Url, ErrorMessage, FormattedTime, I18NContext from core.builtins.utils import Secret from core.logger import Logger from core.types.message import MessageChain as MessageChainT, MessageSession class MessageChain(MessageChainT): - def __init__(self, elements: Union[str, List[Union[Plain, Image, Voice, Embed, Url, FormattedTime]], - Tuple[Union[Plain, Image, Voice, Embed, Url, FormattedTime]], - Plain, Image, Voice, Embed, Url, FormattedTime] = None): + def __init__(self, elements: Union[str, List[Union[Plain, Image, Voice, Embed, Url, FormattedTime, I18NContext]], + Tuple[Union[Plain, Image, Voice, Embed, Url, FormattedTime, I18NContext]], + Plain, Image, Voice, Embed, Url, FormattedTime, I18NContext] = None): self.value = [] if isinstance(elements, ErrorMessage): elements = str(elements) if isinstance(elements, str): elements = Plain(elements) - if isinstance(elements, (Plain, Image, Voice, Embed, Url, FormattedTime)): + if isinstance(elements, (Plain, Image, Voice, Embed, Url, FormattedTime, I18NContext)): if isinstance(elements, Plain): if elements.text != '': elements = match_kecode(elements.text) @@ -57,7 +57,7 @@ def __init__(self, elements: Union[str, List[Union[Plain, Image, Voice, Embed, U self.value.append(FormattedTime(e['data']['time'], e['data']['date'], e['data']['seconds'], e['data']['timezone'])) elif e['type'] == 'i18n': - self.value.append(I18NText(e['data']['key'], **e['data']['kwargs'])) + self.value.append(I18NContext(e['data']['key'], **e['data']['kwargs'])) elif isinstance(e, str): if e != '': self.value += match_kecode(e) @@ -131,8 +131,12 @@ def as_sendable(self, msg: MessageSession = None, embed=True): value.append(Plain(ErrorMessage('{error.message.chain.plain.empty}', locale=locale))) elif isinstance(x, FormattedTime): value.append(Plain(x.to_str(msg=msg))) - elif isinstance(x, I18NText): - value.append(Plain(msg.locale.t(x.key, **x.kwargs))) + elif isinstance(x, I18NContext): + t_value = msg.locale.t(x.key, **x.kwargs) + if isinstance(t_value, str): + value.append(t_value) + elif isinstance(t_value, list): + value += MessageChain(t_value).as_sendable(msg) else: value.append(x) if not value: diff --git a/core/builtins/message/internal.py b/core/builtins/message/internal.py index 1f102cd007..02268add1e 100644 --- a/core/builtins/message/internal.py +++ b/core/builtins/message/internal.py @@ -97,7 +97,7 @@ def to_dict(self): 'timezone': self.timezone}} -class I18NText: +class I18NContext: def __init__(self, key, **kwargs): self.key = key self.kwargs = kwargs @@ -106,7 +106,7 @@ def __str__(self): return self.key def __repr__(self): - return f'I18NText(key="{self.key}", kwargs={self.kwargs})' + return f'I18NContext(key="{self.key}", kwargs={self.kwargs})' def to_dict(self): return {'type': 'i18n', 'data': {'key': self.key, 'kwargs': self.kwargs}} @@ -285,4 +285,4 @@ def to_dict(self): 'fields': self.fields}} -__all__ = ["Plain", "Image", "Voice", "Embed", "EmbedField", "Url", "ErrorMessage", "FormattedTime", "I18NText"] +__all__ = ["Plain", "Image", "Voice", "Embed", "EmbedField", "Url", "ErrorMessage", "FormattedTime", "I18NContext"] diff --git a/modules/weekly_rss/__init__.py b/modules/weekly_rss/__init__.py index f362647bc6..c61700480d 100644 --- a/modules/weekly_rss/__init__.py +++ b/modules/weekly_rss/__init__.py @@ -1,4 +1,4 @@ -from core.builtins import Bot, Image, Plain, command_prefix +from core.builtins import Bot, Image, Plain, command_prefix, I18NContext from core.component import module from core.logger import Logger from core.utils.i18n import Locale @@ -19,7 +19,7 @@ async def weekly_rss(fetch: Bot.FetchTarget, ctx: Bot.ModuleHookContext): weekly_cn = Image(await msgchain2image(weekly_cn)) weekly_tw = Image(await msgchain2image(weekly_tw)) post_msg = {'zh_cn': weekly_cn, 'zh_tw': weekly_tw, 'fallback': weekly_cn} - await fetch.post_message('weekly_rss', post_msg, i18n=True) + await fetch.post_message('weekly_rss', I18NContext(post_msg), i18n=True) Logger.info('Weekly checked.') @@ -50,7 +50,7 @@ async def weekly_rss(fetch: Bot.FetchTarget, ctx: Bot.ModuleHookContext): weekly_cn = Image(await msgchain2image(weekly_cn)) weekly_tw = Image(await msgchain2image(weekly_tw)) post_msg = {'zh_cn': weekly_cn, 'zh_tw': weekly_tw, 'fallback': weekly_cn} - await fetch.post_message('teahouse_weekly_rss', post_msg, i18n=True) + await fetch.post_message('teahouse_weekly_rss', I18NContext(post_msg), i18n=True) else: await fetch.post_message('teahouse_weekly_rss', weekly) Logger.info('Teahouse Weekly checked.') diff --git a/schedulers/mcv_rss.py b/schedulers/mcv_rss.py index 9237b06f4e..1784d1569c 100644 --- a/schedulers/mcv_rss.py +++ b/schedulers/mcv_rss.py @@ -8,7 +8,7 @@ from google_play_scraper import app as google_play_scraper from config import CFG, Config -from core.builtins import I18NText, FormattedTime +from core.builtins import I18NContext, FormattedTime from core.logger import Logger from core.queue import JobQueue from core.scheduler import Scheduler, IntervalTrigger @@ -88,8 +88,8 @@ async def mcv_rss(): Logger.info(f'huh, we find {release}.') await JobQueue.trigger_hook_all('mcv_rss', - message=[I18NText('mcv_rss.message.mcv_rss.release', - version=release).to_dict(), + message=[I18NContext('mcv_rss.message.mcv_rss.release', + version=release).to_dict(), FormattedTime(time_release).to_dict() ]) verlist.append(release) @@ -99,15 +99,17 @@ async def mcv_rss(): get_stored_news_title = get_stored_list('scheduler', 'mcnews') if article[1] not in get_stored_news_title: await JobQueue.trigger_hook_all('minecraft_news', - message=[I18NText('minecraft_news.message.update_log', - version=release, article=article[0]).to_dict()]) + message=[I18NContext('minecraft_news.message.update_log', + version=release, + article=article[0]).to_dict()]) get_stored_news_title.append(article[1]) update_stored_list('scheduler', 'mcnews', get_stored_news_title) if snapshot not in verlist: Logger.info(f'huh, we find {snapshot}.') - await JobQueue.trigger_hook_all('mcv_rss', message=[I18NText('mcv_rss.message.mcv_rss.snapshot', - version=file['latest']['snapshot']).to_dict(), - FormattedTime(time_snapshot).to_dict()]) + await JobQueue.trigger_hook_all('mcv_rss', message=[I18NContext('mcv_rss.message.mcv_rss.snapshot', + version=file['latest'][ + 'snapshot']).to_dict(), + FormattedTime(time_snapshot).to_dict()]) verlist.append(snapshot) update_stored_list('scheduler', 'mcv_rss', verlist) article = await get_article(snapshot) @@ -115,8 +117,9 @@ async def mcv_rss(): get_stored_news_title = get_stored_list('scheduler', 'mcnews') if article[1] not in get_stored_news_title: await JobQueue.trigger_hook_all('minecraft_news', - message=[I18NText('minecraft_news.message.update_log', - version=snapshot, article=article[0]).to_dict()]) + message=[I18NContext('minecraft_news.message.update_log', + version=snapshot, + article=article[0]).to_dict()]) get_stored_news_title.append(article[1]) update_stored_list('scheduler', 'mcnews', get_stored_news_title) except Exception: @@ -132,7 +135,8 @@ async def mcbv_rss(): version = google_play_scraper('com.mojang.minecraftpe')['version'] if version not in verlist: Logger.info(f'huh, we find bedrock {version}.') - await JobQueue.trigger_hook_all('mcbv_rss', message='mcv_rss.message.mcbv_rss', i18n=True, version=version) + await JobQueue.trigger_hook_all('mcbv_rss', message=[I18NContext('mcv_rss.message.mcbv_rss', + version=version).to_dict()]) verlist.append(version) update_stored_list('scheduler', 'mcbv_rss', verlist) except Exception: @@ -155,11 +159,12 @@ async def mcv_jira_rss(): if release not in verlist: Logger.info(f'huh, we find {release}.') if release.lower().find('future version') != -1: - await JobQueue.trigger_hook_all('mcv_jira_rss', message='mcv_rss.message.mcv_jira_rss.future', - i18n=True, version=release) + await JobQueue.trigger_hook_all('mcv_jira_rss', + message=[I18NContext('mcv_rss.message.mcv_jira_rss.future', + version=release).to_dict()]) else: - await JobQueue.trigger_hook_all('mcv_jira_rss', message='mcv_rss.message.mcv_jira_rss', i18n=True, - version=release) + await JobQueue.trigger_hook_all('mcv_jira_rss', message=[I18NContext('mcv_rss.message.mcv_jira_rss', + version=release).to_dict()]) verlist.append(release) update_stored_list('scheduler', 'mcv_jira_rss', verlist) @@ -183,8 +188,8 @@ async def mcbv_jira_rss(): if release not in verlist: Logger.info(f'huh, we find {release}.') - await JobQueue.trigger_hook_all('mcbv_jira_rss', message='mcv_rss.message.mcbv_jira_rss', - i18n=True, version=release) + await JobQueue.trigger_hook_all('mcbv_jira_rss', message=[I18NContext('mcv_rss.message.mcbv_jira_rss', + version=release).to_dict()]) verlist.append(release) update_stored_list('scheduler', 'mcbv_jira_rss', verlist) except Exception: @@ -207,8 +212,8 @@ async def mcdv_jira_rss(): if release not in verlist: Logger.info(f'huh, we find {release}.') - await JobQueue.trigger_hook_all('mcdv_jira_rss', message='mcv_rss.message.mcdv_jira_rss', - i18n=True, version=release) + await JobQueue.trigger_hook_all('mcdv_jira_rss', message=[I18NContext('mcv_rss.message.mcdv_jira_rss', + version=release).to_dict()]) verlist.append(release) update_stored_list('scheduler', 'mcdv_jira_rss', verlist) except Exception: @@ -231,8 +236,8 @@ async def mclgv_jira_rss(): if release not in verlist: Logger.info(f'huh, we find {release}.') - await JobQueue.trigger_hook_all('mclgv_jira_rss', message='mcv_rss.message.mclgv_jira_rss', - i18n=True, version=release) + await JobQueue.trigger_hook_all('mclgv_jira_rss', message=[I18NContext('mcv_rss.message.mclgv_jira_rss', + version=release).to_dict()]) verlist.append(release) update_stored_list('scheduler', 'mclgv_jira_rss', verlist) except Exception: diff --git a/schedulers/minecraft_news.py b/schedulers/minecraft_news.py index fb47a7efbf..ac1e7c4de9 100644 --- a/schedulers/minecraft_news.py +++ b/schedulers/minecraft_news.py @@ -6,7 +6,7 @@ import ujson as json from config import Config, CFG -from core.builtins import Url +from core.builtins import Url, I18NContext from core.logger import Logger from core.queue import JobQueue from core.scheduler import Scheduler, IntervalTrigger @@ -70,9 +70,8 @@ async def start_check_news(use_local=True): publish_date = datetime.strptime(o_article['publish_date'], '%d %B %Y %H:%M:%S %Z') now = datetime.now() if now - publish_date < timedelta(days=2): - await JobQueue.trigger_hook_all('minecraft_news', - message='minecraft_news.message.minecraft_news', i18n=True, - title=title, desc=desc, link=str(Url(link))) + await JobQueue.trigger_hook_all('minecraft_news', message=[I18NContext('minecraft_news.message.minecraft_news', + title=title, desc=desc, link=link).to_dict()]) alist.append(title) update_stored_list('scheduler', 'mcnews', alist) except Exception: @@ -100,9 +99,8 @@ async def feedback_news(): link = article['html_url'] Logger.info(f'huh, we find {name}.') await JobQueue.trigger_hook_all('feedback_news', - message='minecraft_news.message.feedback_news', - i18n=True, - name=name, link=str(Url(link))) + message=[I18NContext('minecraft_news.message.feedback_news', + name=name, link=str(Url(link))).to_dict()]) alist.append(name) update_stored_list('scheduler', 'mcfeedbacknews', alist) except Exception: From 19654b5b007d78b54167d8136d6df43d761e3d4d Mon Sep 17 00:00:00 2001 From: xtex Date: Mon, 18 Dec 2023 12:25:11 +0800 Subject: [PATCH 121/168] fix pip install (#1061) --- modules/core/su_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/su_utils.py b/modules/core/su_utils.py index 3a7f71a114..bb16d6e9cf 100644 --- a/modules/core/su_utils.py +++ b/modules/core/su_utils.py @@ -299,7 +299,7 @@ def update_dependencies(): pip_install = os.popen('pip install -r requirements.txt').read()[:-1] if len(pip_install) > 500: return '...' + pip_install[-500:] - return + return pip_install @upd.command() From 6f8d671ecbd2c61482d8907e7b814f7f4b039734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 15:28:50 +0800 Subject: [PATCH 122/168] Update --- bots/discord/slash/ask.py | 20 --------------- bots/discord/slash/core.py | 34 +------------------------ bots/discord/slash/wolframalpha.py | 17 +++++++++++++ modules/wolframalpha/locales/en_us.json | 4 +-- modules/wolframalpha/locales/zh_cn.json | 2 +- modules/wolframalpha/locales/zh_tw.json | 4 +-- 6 files changed, 23 insertions(+), 58 deletions(-) delete mode 100644 bots/discord/slash/ask.py create mode 100644 bots/discord/slash/wolframalpha.py diff --git a/bots/discord/slash/ask.py b/bots/discord/slash/ask.py deleted file mode 100644 index 81a084e2da..0000000000 --- a/bots/discord/slash/ask.py +++ /dev/null @@ -1,20 +0,0 @@ -import discord - -from bots.discord.client import client -from bots.discord.slash_parser import slash_parser - - -async def example_question(ctx: discord.AutocompleteContext): - if ctx.options["question"] == "": - question = ["Who are you?", - "What does AI work?", - "How to maintain a healthy lifestyle?", - "Teach me how to bake a cake.", - "What is the answer to the ultimate question of life, The universe, and everything?"] - return question - - -@client.slash_command(description="Answer your question via ChatGPT.") -@discord.option(name="question", description="Ask ChatGPT...", autocomplete=example_question) -async def ask(ctx: discord.ApplicationContext, question: str): - await slash_parser(ctx, question) diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index 19d46ba407..6b68d23d3d 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -40,36 +40,4 @@ async def typing(ctx: discord.ApplicationContext): @setup.command(description="Set the time offset.") @discord.option(name="offset", description="The timezone offset.") async def offset(ctx: discord.ApplicationContext, offset: str): - await slash_parser(ctx, f"timeoffset {offset}") - - -admin = client.create_group("admin", "Commands available to bot administrators.") - - -@admin.command(description="Set members as bot administrators.") -@discord.option(name="user_id", description="The user ID.") -async def add(ctx: discord.ApplicationContext, user_id: str): - await slash_parser(ctx, f"add {user_id}") - - -@admin.command(description="Remove bot administrator from member.") -@discord.option(name="user_id", description="The user ID.") -async def remove(ctx: discord.ApplicationContext, user_id: str): - await slash_parser(ctx, f"remove {user_id}") - - -@admin.command(description="View all bot administrators.") -async def show(ctx: discord.ApplicationContext): - await slash_parser(ctx, "list") - - -@admin.command(description="Limit someone to use bot in the channel.") -@discord.option(name="user_id", description="The user ID.") -async def ban(ctx: discord.ApplicationContext, user_id: str): - await slash_parser(ctx, f"ban {user_id}") - - -@admin.command(description="Remove limit someone to use bot in the channel.") -@discord.option(name="user_id", description="The user ID.") -async def ban(ctx: discord.ApplicationContext, user_id: str): - await slash_parser(ctx, f"unban {user_id}") + await slash_parser(ctx, f"timeoffset {offset}") \ No newline at end of file diff --git a/bots/discord/slash/wolframalpha.py b/bots/discord/slash/wolframalpha.py new file mode 100644 index 0000000000..537857e173 --- /dev/null +++ b/bots/discord/slash/wolframalpha.py @@ -0,0 +1,17 @@ +import discord + +from bots.discord.client import client +from bots.discord.slash_parser import slash_parser + +wolframalpha = client.create_group("wolframalpha", "Use WolframAlpha.") + +@wolframalpha.command(description="Input a question or formula to search for WolframAlpha.") +@discord.option(name="query", description="Enter what you want to calculate.") +async def query(ctx: discord.ApplicationContext, query: str): + await slash_parser(ctx, query) + + +@wolframalpha.command(description="Answer the question via WolframAlpha.") +@discord.option(name="question", description="Ask WolframAlpha.") +async def ask(ctx: discord.ApplicationContext, question: str): + await slash_parser(ctx, f"ask {question}") \ No newline at end of file diff --git a/modules/wolframalpha/locales/en_us.json b/modules/wolframalpha/locales/en_us.json index f8d15b4393..795030033d 100644 --- a/modules/wolframalpha/locales/en_us.json +++ b/modules/wolframalpha/locales/en_us.json @@ -1,6 +1,6 @@ { "wolframalpha.help": "Input a question or formula to search for WolframAlpha.", "wolframalpha.help.ask": "Answer the question via WolframAlpha.", - "wolframalpha.help.desc": "搜索 WolframAlpha。", + "wolframalpha.help.desc": "Use WolframAlpha.", "wolframalpha.message.incomprehensible": "WolframAlpha can't understand your question." -} +} diff --git a/modules/wolframalpha/locales/zh_cn.json b/modules/wolframalpha/locales/zh_cn.json index be47546eab..8bc8b4a7ed 100644 --- a/modules/wolframalpha/locales/zh_cn.json +++ b/modules/wolframalpha/locales/zh_cn.json @@ -1,6 +1,6 @@ { "wolframalpha.help": "输入问题或公式以搜索 WolframAlpha。", "wolframalpha.help.ask": "通过 WolframAlpha 回答问题。", - "wolframalpha.help.desc": "WolframAlpha 相关工具。", + "wolframalpha.help.desc": "使用 WolframAlpha。", "wolframalpha.message.incomprehensible": "WolframAlpha 无法理解你的问题，请尝试使用英语提问。" } diff --git a/modules/wolframalpha/locales/zh_tw.json b/modules/wolframalpha/locales/zh_tw.json index 76f8fb537d..6d3dc1b858 100644 --- a/modules/wolframalpha/locales/zh_tw.json +++ b/modules/wolframalpha/locales/zh_tw.json @@ -1,6 +1,6 @@ { "wolframalpha.help": "輸入問題或公式以搜尋 WolframAlpha。", "wolframalpha.help.ask": "透過 WolframAlpha 回答問題。", - "wolframalpha.help.desc": "WolframAlpha 相關工具。", + "wolframalpha.help.desc": "使用 WolframAlpha。", "wolframalpha.message.incomprehensible": "WolframAlpha 無法理解你的問題，請嘗試使用英語提問。" -} +} From 3c0d872a84945861fb6ca5977de4c8c97045888a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 17:57:05 +0800 Subject: [PATCH 123/168] upd slash --- bots/discord/slash/arcaea.py | 4 ++-- bots/discord/slash/core.py | 32 ++++++++++++++++++++++++++++++ bots/discord/slash/tweet.py | 4 ++-- bots/discord/slash/wolframalpha.py | 2 +- 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/bots/discord/slash/arcaea.py b/bots/discord/slash/arcaea.py index 0a50364488..a5fb3b3f98 100644 --- a/bots/discord/slash/arcaea.py +++ b/bots/discord/slash/arcaea.py @@ -21,9 +21,9 @@ async def random(ctx: discord.ApplicationContext): @rank.command(description="View the current rank of the free packs.") async def free(ctx: discord.ApplicationContext): - await slash_parser(ctx, "rank free") + await slash_parser(ctx, "free") @rank.command(description="View the current rank of the paid packs.") async def paid(ctx: discord.ApplicationContext): - await slash_parser(ctx, "rank paid") + await slash_parser(ctx, "paid") diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index 6b68d23d3d..5b1cfd61c4 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -29,6 +29,38 @@ async def whoami(ctx: discord.ApplicationContext): await slash_parser(ctx, "") +admin = client.create_group("admin", "Commands available to bot administrators.") + + +@admin.command(description="Set members as bot administrators.") +@discord.option(name="user_id", description="The user ID.") +async def add(ctx: discord.ApplicationContext, user_id: str): + await slash_parser(ctx, f"add {user_id}") + + +@admin.command(description="Remove bot administrator from member.") +@discord.option(name="user_id", description="The user ID.") +async def remove(ctx: discord.ApplicationContext, user_id: str): + await slash_parser(ctx, f"remove {user_id}") + + +@admin.command(description="View all bot administrators.") +async def list(ctx: discord.ApplicationContext): + await slash_parser(ctx, "list") + + +@admin.command(description="Limit someone to use bot in the channel.") +@discord.option(name="user_id", description="The user ID.") +async def ban(ctx: discord.ApplicationContext, user_id: str): + await slash_parser(ctx, f"ban {user_id}") + + +@admin.command(description="Remove limit someone to use bot in the channel.") +@discord.option(name="user_id", description="The user ID.") +async def unban(ctx: discord.ApplicationContext, user_id: str): + await slash_parser(ctx, f"unban {user_id}") + + setup = client.create_group("setup", "Set up bot actions.") diff --git a/bots/discord/slash/tweet.py b/bots/discord/slash/tweet.py index 173c898001..fb1ccdf7f2 100644 --- a/bots/discord/slash/tweet.py +++ b/bots/discord/slash/tweet.py @@ -4,6 +4,6 @@ from bots.discord.slash_parser import slash_parser @client.slash_command(description="Get tweet image from tweet ID or link.") -@discord.option(name="tweetid", description="The tweet ID or tweet link.") +@discord.option(name="tweet", description="The tweet ID or tweet link.") async def tweet(ctx: discord.ApplicationContext, tweetid: str): - await slash_parser(ctx, tweetid) + await slash_parser(ctx, tweet) diff --git a/bots/discord/slash/wolframalpha.py b/bots/discord/slash/wolframalpha.py index 537857e173..e69727eb81 100644 --- a/bots/discord/slash/wolframalpha.py +++ b/bots/discord/slash/wolframalpha.py @@ -7,7 +7,7 @@ @wolframalpha.command(description="Input a question or formula to search for WolframAlpha.") @discord.option(name="query", description="Enter what you want to calculate.") -async def query(ctx: discord.ApplicationContext, query: str): +async def _(ctx: discord.ApplicationContext, query: str): await slash_parser(ctx, query) From db99b467306d67200ebdabdb7b938e37cffd0f39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 19:04:53 +0800 Subject: [PATCH 124/168] Update slash --- bots/discord/slash/arcaea.py | 4 +- bots/discord/slash/core.py | 90 ++++++++++++++++++++++++----- bots/discord/slash/dictionary.py | 10 ---- bots/discord/slash/exchange_rate.py | 11 ++++ bots/discord/slash/ip.py | 10 ++++ bots/discord/slash/whois.py | 10 ++++ bots/discord/slash/wolframalpha.py | 9 +-- modules/core/locales/en_us.json | 2 +- modules/core/locales/zh_cn.json | 2 +- modules/core/locales/zh_tw.json | 2 +- 10 files changed, 118 insertions(+), 32 deletions(-) delete mode 100644 bots/discord/slash/dictionary.py create mode 100644 bots/discord/slash/exchange_rate.py create mode 100644 bots/discord/slash/ip.py create mode 100644 bots/discord/slash/whois.py diff --git a/bots/discord/slash/arcaea.py b/bots/discord/slash/arcaea.py index a5fb3b3f98..0a50364488 100644 --- a/bots/discord/slash/arcaea.py +++ b/bots/discord/slash/arcaea.py @@ -21,9 +21,9 @@ async def random(ctx: discord.ApplicationContext): @rank.command(description="View the current rank of the free packs.") async def free(ctx: discord.ApplicationContext): - await slash_parser(ctx, "free") + await slash_parser(ctx, "rank free") @rank.command(description="View the current rank of the paid packs.") async def paid(ctx: discord.ApplicationContext): - await slash_parser(ctx, "paid") + await slash_parser(ctx, "rank paid") diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index 5b1cfd61c4..7af3d49085 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -2,9 +2,17 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser +from core.utils.i18n import get_available_locales + + +@client.slash_command(description="View details of a module.") +@discord.option(name="module", default="", description="The module you want to know about.") +async def help(ctx: discord.ApplicationContext, module: str): + await slash_parser(ctx, module) + @client.slash_command(description="Set the bot running languages.") -@discord.option(name="lang", default="", description="Supported language codes.") +@discord.option(name="lang", choices=get_available_locales(), default="", description="Supported language codes.") async def locale(ctx: discord.ApplicationContext, lang: str): await slash_parser(ctx, lang) @@ -14,6 +22,11 @@ async def mute(ctx: discord.ApplicationContext): await slash_parser(ctx, "") +@client.slash_command(description="Get the number of petals in the current channel.") +async def petal(ctx: discord.ApplicationContext): + await slash_parser(ctx, "") + + @client.slash_command(description="Get bot status.") async def ping(ctx: discord.ApplicationContext): await slash_parser(ctx, "") @@ -33,15 +46,15 @@ async def whoami(ctx: discord.ApplicationContext): @admin.command(description="Set members as bot administrators.") -@discord.option(name="user_id", description="The user ID.") -async def add(ctx: discord.ApplicationContext, user_id: str): - await slash_parser(ctx, f"add {user_id}") +@discord.option(name="userid", description="The user ID.") +async def add(ctx: discord.ApplicationContext, userid: str): + await slash_parser(ctx, f"add {userid}") @admin.command(description="Remove bot administrator from member.") -@discord.option(name="user_id", description="The user ID.") -async def remove(ctx: discord.ApplicationContext, user_id: str): - await slash_parser(ctx, f"remove {user_id}") +@discord.option(name="userid", description="The user ID.") +async def remove(ctx: discord.ApplicationContext, userid: str): + await slash_parser(ctx, f"remove {userid}") @admin.command(description="View all bot administrators.") @@ -50,16 +63,67 @@ async def list(ctx: discord.ApplicationContext): @admin.command(description="Limit someone to use bot in the channel.") -@discord.option(name="user_id", description="The user ID.") -async def ban(ctx: discord.ApplicationContext, user_id: str): - await slash_parser(ctx, f"ban {user_id}") +@discord.option(name="userid", description="The user ID.") +async def ban(ctx: discord.ApplicationContext, userid: str): + await slash_parser(ctx, f"ban {userid}") @admin.command(description="Remove limit someone to use bot in the channel.") -@discord.option(name="user_id", description="The user ID.") -async def unban(ctx: discord.ApplicationContext, user_id: str): - await slash_parser(ctx, f"unban {user_id}") +@discord.option(name="userid", description="The user ID.") +async def unban(ctx: discord.ApplicationContext, userid: str): + await slash_parser(ctx, f"unban {userid}") + + +alias = client.create_group("alias", "Set custom command alias.") + + +@alias.command(description="Add custom command alias.") +@discord.option(name="alias", description="The custom alias.") +@discord.option(name="command", description="The command you want to refer to.") +async def add(ctx: discord.ApplicationContext, alias: str, command: str): + await slash_parser(ctx, f"add {alias} {command}") + + +@alias.command(description="Remove custom command alias.") +@discord.option(name="alias", description="The custom alias.") +async def remove(ctx: discord.ApplicationContext, alias: str): + await slash_parser(ctx, f"remove {alias}") + + +@alias.command(description="View custom command alias.") +async def list(ctx: discord.ApplicationContext): + await slash_parser(ctx, "list") + + +@alias.command(description="Reset custom command alias.") +async def reset(ctx: discord.ApplicationContext): + await slash_parser(ctx, "reset") + + +prefix = client.create_group("prefix", "Set custom command prefix.") + + +@prefix.command(description="Add custom command prefix.") +@discord.option(name="prefix", description="The custom prefix.") +async def add(ctx: discord.ApplicationContext, prefix: str): + await slash_parser(ctx, f"add {prefix}") + + +@prefix.command(description="Remove custom command prefix.") +@discord.option(name="prefix", description="The custom prefix.") +async def remove(ctx: discord.ApplicationContext, prefix: str): + await slash_parser(ctx, f"remove {prefix}") + + +@prefix.command(description="View custom command prefix.") +async def list(ctx: discord.ApplicationContext): + await slash_parser(ctx, "list") + +@prefix.command(description="Reset custom command prefix.") +async def reset(ctx: discord.ApplicationContext): + await slash_parser(ctx, "reset") + setup = client.create_group("setup", "Set up bot actions.") diff --git a/bots/discord/slash/dictionary.py b/bots/discord/slash/dictionary.py deleted file mode 100644 index b9e10f7b97..0000000000 --- a/bots/discord/slash/dictionary.py +++ /dev/null @@ -1,10 +0,0 @@ -import discord - -from bots.discord.client import client -from bots.discord.slash_parser import slash_parser - - -@client.slash_command(description="查询柯林斯词典", name='dict') -@discord.option(name="word", description="词汇") -async def _(ctx: discord.ApplicationContext, word: str): - await slash_parser(ctx, word) diff --git a/bots/discord/slash/exchange_rate.py b/bots/discord/slash/exchange_rate.py new file mode 100644 index 0000000000..6f32a0cd3e --- /dev/null +++ b/bots/discord/slash/exchange_rate.py @@ -0,0 +1,11 @@ +import discord + +from bots.discord.client import client +from bots.discord.slash_parser import slash_parser + +@client.slash_command(description="Convert currency prices according to the exchange rate of the day.") +@discord.option(name="amount", default=1, description="The amount of base currency.") +@discord.option(name="base", description="The base currency unit.") +@discord.option(name="target", description="The target currency unit.") +async def exchange_rate(ctx: discord.ApplicationContext, amount: float, base: str, target: str): + await slash_parser(ctx, f"{amount}{base} {target}") diff --git a/bots/discord/slash/ip.py b/bots/discord/slash/ip.py new file mode 100644 index 0000000000..2c6932ddb3 --- /dev/null +++ b/bots/discord/slash/ip.py @@ -0,0 +1,10 @@ +import discord + +from bots.discord.client import client +from bots.discord.slash_parser import slash_parser + + +@client.slash_command(description="Query the information of IP.") +@discord.option(name="ip_address", description="The IP address.") +async def ip(ctx: discord.ApplicationContext, ip_address: str): + await slash_parser(ctx, ip_address) diff --git a/bots/discord/slash/whois.py b/bots/discord/slash/whois.py new file mode 100644 index 0000000000..24385d99ed --- /dev/null +++ b/bots/discord/slash/whois.py @@ -0,0 +1,10 @@ +import discord + +from bots.discord.client import client +from bots.discord.slash_parser import slash_parser + + +@client.slash_command(description="Query the information of WHOIS.") +@discord.option(name="domain", description="The domain.") +async def whois(ctx: discord.ApplicationContext, domain: str): + await slash_parser(ctx, domain) diff --git a/bots/discord/slash/wolframalpha.py b/bots/discord/slash/wolframalpha.py index e69727eb81..0263c9f1f5 100644 --- a/bots/discord/slash/wolframalpha.py +++ b/bots/discord/slash/wolframalpha.py @@ -3,14 +3,15 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser -wolframalpha = client.create_group("wolframalpha", "Use WolframAlpha.") - -@wolframalpha.command(description="Input a question or formula to search for WolframAlpha.") +@client.slash_command(description="Input a question or formula to search for WolframAlpha.") @discord.option(name="query", description="Enter what you want to calculate.") -async def _(ctx: discord.ApplicationContext, query: str): +async def wolframalpha(ctx: discord.ApplicationContext, query: str): await slash_parser(ctx, query) +wolframalpha = client.create_group("wolframalpha", "Use WolframAlpha.") + + @wolframalpha.command(description="Answer the question via WolframAlpha.") @discord.option(name="question", description="Ask WolframAlpha.") async def ask(ctx: discord.ApplicationContext, question: str): diff --git a/modules/core/locales/en_us.json b/modules/core/locales/en_us.json index 7850c60967..d0848c14d8 100644 --- a/modules/core/locales/en_us.json +++ b/modules/core/locales/en_us.json @@ -26,7 +26,7 @@ "core.help.option.module.g": "Perform global operations of the channels.", "core.help.petal": "Get the number of petals in the current group.", "core.help.ping": "Get bot status.", - "core.help.prefix.add": "Set custom command prefix.", + "core.help.prefix.add": "Add custom command prefix.", "core.help.prefix.list": "View custom command prefixes.", "core.help.prefix.remove": "Remove custom command prefix.", "core.help.prefix.reset": "Reset custom command prefix.", diff --git a/modules/core/locales/zh_cn.json b/modules/core/locales/zh_cn.json index 37fc4b7ecd..13b4b70aff 100644 --- a/modules/core/locales/zh_cn.json +++ b/modules/core/locales/zh_cn.json @@ -26,7 +26,7 @@ "core.help.option.module.g": "对频道进行全局操作。", "core.help.petal": "获取当前群组的花瓣数。", "core.help.ping": "获取机器人状态。", - "core.help.prefix.add": "设置自定义命令前缀。", + "core.help.prefix.add": "添加自定义命令前缀。", "core.help.prefix.list": "查看自定义命令前缀列表。", "core.help.prefix.remove": "移除自定义命令前缀。", "core.help.prefix.reset": "重置自定义命令前缀。", diff --git a/modules/core/locales/zh_tw.json b/modules/core/locales/zh_tw.json index 2b2369e394..9fe17d2472 100644 --- a/modules/core/locales/zh_tw.json +++ b/modules/core/locales/zh_tw.json @@ -26,7 +26,7 @@ "core.help.option.module.g": "對頻道進行全域操作。", "core.help.petal": "取得目前群組的花瓣數。", "core.help.ping": "取得機器人狀態。", - "core.help.prefix.add": "設定自訂指令前綴。", + "core.help.prefix.add": "新增自訂指令前綴。", "core.help.prefix.list": "檢視自訂指令前綴列表。", "core.help.prefix.remove": "移除自訂指令前綴。", "core.help.prefix.reset": "重設自訂指令前綴。", From 8ac6d68b85f2c86ae3e5c419a9a979a23c315ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 19:11:27 +0800 Subject: [PATCH 125/168] . --- bots/discord/slash/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index 7af3d49085..8e18715d3d 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -12,7 +12,7 @@ async def help(ctx: discord.ApplicationContext, module: str): @client.slash_command(description="Set the bot running languages.") -@discord.option(name="lang", choices=get_available_locales(), default="", description="Supported language codes.") +@discord.option(name="lang", default="", description="Supported language codes.") async def locale(ctx: discord.ApplicationContext, lang: str): await slash_parser(ctx, lang) From ae3d489732565ac7f66d163027779c11ec1cd99c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 19:14:14 +0800 Subject: [PATCH 126/168] think --- bots/discord/slash/core.py | 2 +- bots/discord/slash/exchange_rate.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index 8e18715d3d..7af3d49085 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -12,7 +12,7 @@ async def help(ctx: discord.ApplicationContext, module: str): @client.slash_command(description="Set the bot running languages.") -@discord.option(name="lang", default="", description="Supported language codes.") +@discord.option(name="lang", choices=get_available_locales(), default="", description="Supported language codes.") async def locale(ctx: discord.ApplicationContext, lang: str): await slash_parser(ctx, lang) diff --git a/bots/discord/slash/exchange_rate.py b/bots/discord/slash/exchange_rate.py index 6f32a0cd3e..702aa0d24a 100644 --- a/bots/discord/slash/exchange_rate.py +++ b/bots/discord/slash/exchange_rate.py @@ -4,7 +4,7 @@ from bots.discord.slash_parser import slash_parser @client.slash_command(description="Convert currency prices according to the exchange rate of the day.") -@discord.option(name="amount", default=1, description="The amount of base currency.") +@discord.option(name="amount", default="1", description="The amount of base currency.") @discord.option(name="base", description="The base currency unit.") @discord.option(name="target", description="The target currency unit.") async def exchange_rate(ctx: discord.ApplicationContext, amount: float, base: str, target: str): From 5950698a0334a913004cca7a77c0813812e68793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 19:16:44 +0800 Subject: [PATCH 127/168] rm --- bots/discord/slash/exchange_rate.py | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 bots/discord/slash/exchange_rate.py diff --git a/bots/discord/slash/exchange_rate.py b/bots/discord/slash/exchange_rate.py deleted file mode 100644 index 702aa0d24a..0000000000 --- a/bots/discord/slash/exchange_rate.py +++ /dev/null @@ -1,11 +0,0 @@ -import discord - -from bots.discord.client import client -from bots.discord.slash_parser import slash_parser - -@client.slash_command(description="Convert currency prices according to the exchange rate of the day.") -@discord.option(name="amount", default="1", description="The amount of base currency.") -@discord.option(name="base", description="The base currency unit.") -@discord.option(name="target", description="The target currency unit.") -async def exchange_rate(ctx: discord.ApplicationContext, amount: float, base: str, target: str): - await slash_parser(ctx, f"{amount}{base} {target}") From 0f2544ad693ee1ec53c6ce6f36cad2824365ea73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 19:21:09 +0800 Subject: [PATCH 128/168] thonc --- bots/discord/slash/core.py | 50 ----------------------------- bots/discord/slash/exchange_rate.py | 11 +++++++ bots/discord/slash/ip.py | 1 - 3 files changed, 11 insertions(+), 51 deletions(-) create mode 100644 bots/discord/slash/exchange_rate.py diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index 7af3d49085..f8c92dd6b8 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -74,56 +74,6 @@ async def unban(ctx: discord.ApplicationContext, userid: str): await slash_parser(ctx, f"unban {userid}") -alias = client.create_group("alias", "Set custom command alias.") - - -@alias.command(description="Add custom command alias.") -@discord.option(name="alias", description="The custom alias.") -@discord.option(name="command", description="The command you want to refer to.") -async def add(ctx: discord.ApplicationContext, alias: str, command: str): - await slash_parser(ctx, f"add {alias} {command}") - - -@alias.command(description="Remove custom command alias.") -@discord.option(name="alias", description="The custom alias.") -async def remove(ctx: discord.ApplicationContext, alias: str): - await slash_parser(ctx, f"remove {alias}") - - -@alias.command(description="View custom command alias.") -async def list(ctx: discord.ApplicationContext): - await slash_parser(ctx, "list") - - -@alias.command(description="Reset custom command alias.") -async def reset(ctx: discord.ApplicationContext): - await slash_parser(ctx, "reset") - - -prefix = client.create_group("prefix", "Set custom command prefix.") - - -@prefix.command(description="Add custom command prefix.") -@discord.option(name="prefix", description="The custom prefix.") -async def add(ctx: discord.ApplicationContext, prefix: str): - await slash_parser(ctx, f"add {prefix}") - - -@prefix.command(description="Remove custom command prefix.") -@discord.option(name="prefix", description="The custom prefix.") -async def remove(ctx: discord.ApplicationContext, prefix: str): - await slash_parser(ctx, f"remove {prefix}") - - -@prefix.command(description="View custom command prefix.") -async def list(ctx: discord.ApplicationContext): - await slash_parser(ctx, "list") - - -@prefix.command(description="Reset custom command prefix.") -async def reset(ctx: discord.ApplicationContext): - await slash_parser(ctx, "reset") - setup = client.create_group("setup", "Set up bot actions.") diff --git a/bots/discord/slash/exchange_rate.py b/bots/discord/slash/exchange_rate.py new file mode 100644 index 0000000000..702aa0d24a --- /dev/null +++ b/bots/discord/slash/exchange_rate.py @@ -0,0 +1,11 @@ +import discord + +from bots.discord.client import client +from bots.discord.slash_parser import slash_parser + +@client.slash_command(description="Convert currency prices according to the exchange rate of the day.") +@discord.option(name="amount", default="1", description="The amount of base currency.") +@discord.option(name="base", description="The base currency unit.") +@discord.option(name="target", description="The target currency unit.") +async def exchange_rate(ctx: discord.ApplicationContext, amount: float, base: str, target: str): + await slash_parser(ctx, f"{amount}{base} {target}") diff --git a/bots/discord/slash/ip.py b/bots/discord/slash/ip.py index 2c6932ddb3..76888dc23f 100644 --- a/bots/discord/slash/ip.py +++ b/bots/discord/slash/ip.py @@ -3,7 +3,6 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser - @client.slash_command(description="Query the information of IP.") @discord.option(name="ip_address", description="The IP address.") async def ip(ctx: discord.ApplicationContext, ip_address: str): From 86086deb42fb88c4aa324e8fe214cadb08f93522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 19:36:28 +0800 Subject: [PATCH 129/168] orz --- bots/discord/slash/core.py | 49 +++++++++++++++++++++++++++++ bots/discord/slash/exchange_rate.py | 2 +- bots/discord/slash/wolframalpha.py | 11 ++++--- 3 files changed, 56 insertions(+), 6 deletions(-) diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index f8c92dd6b8..dcd868ebe7 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -73,6 +73,55 @@ async def ban(ctx: discord.ApplicationContext, userid: str): async def unban(ctx: discord.ApplicationContext, userid: str): await slash_parser(ctx, f"unban {userid}") +ali = client.create_group("alias", "Set custom command alias.") + + +@ali.command(description="Add custom command alias.") +@discord.option(name="custom_alias", description="The custom alias.") +@discord.option(name="command", description="The command you want to refer to.") +async def add(ctx: discord.ApplicationContext, custom_alias: str, command: str): + await slash_parser(ctx, f"add {custom_alias} {command}") + + +@ali.command(description="Remove custom command alias.") +@discord.option(name="custom_alias", description="The custom alias.") +async def remove(ctx: discord.ApplicationContext, custom_alias: str): + await slash_parser(ctx, f"remove {custom_alias}") + + +@ali.command(description="View custom command alias.") +async def list(ctx: discord.ApplicationContext): + await slash_parser(ctx, "list") + + +@ali.command(description="Reset custom command alias.") +async def reset(ctx: discord.ApplicationContext): + await slash_parser(ctx, "reset") + + +p = client.create_group("prefix", "Set custom command prefix.") + + +@p.command(description="Add custom command prefix.") +@discord.option(name="custom_prefix", description="The custom prefix.") +async def add(ctx: discord.ApplicationContext, custom_prefix: str): + await slash_parser(ctx, f"add {custom_prefix}") + + +@p.command(description="Remove custom command prefix.") +@discord.option(name="custom_prefix", description="The custom prefix.") +async def remove(ctx: discord.ApplicationContext, custom_prefix: str): + await slash_parser(ctx, f"remove {custom_prefix}") + + +@p.command(description="View custom command prefix.") +async def list(ctx: discord.ApplicationContext): + await slash_parser(ctx, "list") + + +@p.command(description="Reset custom command prefix.") +async def reset(ctx: discord.ApplicationContext): + await slash_parser(ctx, "reset") setup = client.create_group("setup", "Set up bot actions.") diff --git a/bots/discord/slash/exchange_rate.py b/bots/discord/slash/exchange_rate.py index 702aa0d24a..a832e27aad 100644 --- a/bots/discord/slash/exchange_rate.py +++ b/bots/discord/slash/exchange_rate.py @@ -4,7 +4,7 @@ from bots.discord.slash_parser import slash_parser @client.slash_command(description="Convert currency prices according to the exchange rate of the day.") -@discord.option(name="amount", default="1", description="The amount of base currency.") +@discord.option(name="amount", default=1.0, description="The amount of base currency.") @discord.option(name="base", description="The base currency unit.") @discord.option(name="target", description="The target currency unit.") async def exchange_rate(ctx: discord.ApplicationContext, amount: float, base: str, target: str): diff --git a/bots/discord/slash/wolframalpha.py b/bots/discord/slash/wolframalpha.py index 0263c9f1f5..f6fcb5c72f 100644 --- a/bots/discord/slash/wolframalpha.py +++ b/bots/discord/slash/wolframalpha.py @@ -3,15 +3,16 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser -@client.slash_command(description="Input a question or formula to search for WolframAlpha.") -@discord.option(name="query", description="Enter what you want to calculate.") -async def wolframalpha(ctx: discord.ApplicationContext, query: str): - await slash_parser(ctx, query) - wolframalpha = client.create_group("wolframalpha", "Use WolframAlpha.") +@olframalpha_command(description="Input a question or formula to search for WolframAlpha.") +@discord.option(name="query", description="Enter what you want to calculate.") +async def query(ctx: discord.ApplicationContext, query: str): + await slash_parser(ctx, query) + + @wolframalpha.command(description="Answer the question via WolframAlpha.") @discord.option(name="question", description="Ask WolframAlpha.") async def ask(ctx: discord.ApplicationContext, question: str): From c4b29a8893520848bb878473a22748cb0f654388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 19:39:29 +0800 Subject: [PATCH 130/168] . --- bots/discord/slash/core.py | 138 ----------------------------- bots/discord/slash/wolframalpha.py | 11 ++- 2 files changed, 5 insertions(+), 144 deletions(-) delete mode 100644 bots/discord/slash/core.py diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py deleted file mode 100644 index dcd868ebe7..0000000000 --- a/bots/discord/slash/core.py +++ /dev/null @@ -1,138 +0,0 @@ -import discord - -from bots.discord.client import client -from bots.discord.slash_parser import slash_parser -from core.utils.i18n import get_available_locales - - -@client.slash_command(description="View details of a module.") -@discord.option(name="module", default="", description="The module you want to know about.") -async def help(ctx: discord.ApplicationContext, module: str): - await slash_parser(ctx, module) - - -@client.slash_command(description="Set the bot running languages.") -@discord.option(name="lang", choices=get_available_locales(), default="", description="Supported language codes.") -async def locale(ctx: discord.ApplicationContext, lang: str): - await slash_parser(ctx, lang) - - -@client.slash_command(description="Make the bot stop sending message.") -async def mute(ctx: discord.ApplicationContext): - await slash_parser(ctx, "") - - -@client.slash_command(description="Get the number of petals in the current channel.") -async def petal(ctx: discord.ApplicationContext): - await slash_parser(ctx, "") - - -@client.slash_command(description="Get bot status.") -async def ping(ctx: discord.ApplicationContext): - await slash_parser(ctx, "") - - -@client.slash_command(description="View bot version.") -async def version(ctx: discord.ApplicationContext): - await slash_parser(ctx, "") - - -@client.slash_command(description="Get the ID of the user account that sent the command inside the bot.") -async def whoami(ctx: discord.ApplicationContext): - await slash_parser(ctx, "") - - -admin = client.create_group("admin", "Commands available to bot administrators.") - - -@admin.command(description="Set members as bot administrators.") -@discord.option(name="userid", description="The user ID.") -async def add(ctx: discord.ApplicationContext, userid: str): - await slash_parser(ctx, f"add {userid}") - - -@admin.command(description="Remove bot administrator from member.") -@discord.option(name="userid", description="The user ID.") -async def remove(ctx: discord.ApplicationContext, userid: str): - await slash_parser(ctx, f"remove {userid}") - - -@admin.command(description="View all bot administrators.") -async def list(ctx: discord.ApplicationContext): - await slash_parser(ctx, "list") - - -@admin.command(description="Limit someone to use bot in the channel.") -@discord.option(name="userid", description="The user ID.") -async def ban(ctx: discord.ApplicationContext, userid: str): - await slash_parser(ctx, f"ban {userid}") - - -@admin.command(description="Remove limit someone to use bot in the channel.") -@discord.option(name="userid", description="The user ID.") -async def unban(ctx: discord.ApplicationContext, userid: str): - await slash_parser(ctx, f"unban {userid}") - -ali = client.create_group("alias", "Set custom command alias.") - - -@ali.command(description="Add custom command alias.") -@discord.option(name="custom_alias", description="The custom alias.") -@discord.option(name="command", description="The command you want to refer to.") -async def add(ctx: discord.ApplicationContext, custom_alias: str, command: str): - await slash_parser(ctx, f"add {custom_alias} {command}") - - -@ali.command(description="Remove custom command alias.") -@discord.option(name="custom_alias", description="The custom alias.") -async def remove(ctx: discord.ApplicationContext, custom_alias: str): - await slash_parser(ctx, f"remove {custom_alias}") - - -@ali.command(description="View custom command alias.") -async def list(ctx: discord.ApplicationContext): - await slash_parser(ctx, "list") - - -@ali.command(description="Reset custom command alias.") -async def reset(ctx: discord.ApplicationContext): - await slash_parser(ctx, "reset") - - -p = client.create_group("prefix", "Set custom command prefix.") - - -@p.command(description="Add custom command prefix.") -@discord.option(name="custom_prefix", description="The custom prefix.") -async def add(ctx: discord.ApplicationContext, custom_prefix: str): - await slash_parser(ctx, f"add {custom_prefix}") - - -@p.command(description="Remove custom command prefix.") -@discord.option(name="custom_prefix", description="The custom prefix.") -async def remove(ctx: discord.ApplicationContext, custom_prefix: str): - await slash_parser(ctx, f"remove {custom_prefix}") - - -@p.command(description="View custom command prefix.") -async def list(ctx: discord.ApplicationContext): - await slash_parser(ctx, "list") - - -@p.command(description="Reset custom command prefix.") -async def reset(ctx: discord.ApplicationContext): - await slash_parser(ctx, "reset") - - -setup = client.create_group("setup", "Set up bot actions.") - - -@setup.command(description="Set up whether to display input prompts.") -async def typing(ctx: discord.ApplicationContext): - await slash_parser(ctx, "typing") - - -@setup.command(description="Set the time offset.") -@discord.option(name="offset", description="The timezone offset.") -async def offset(ctx: discord.ApplicationContext, offset: str): - await slash_parser(ctx, f"timeoffset {offset}") \ No newline at end of file diff --git a/bots/discord/slash/wolframalpha.py b/bots/discord/slash/wolframalpha.py index f6fcb5c72f..0263c9f1f5 100644 --- a/bots/discord/slash/wolframalpha.py +++ b/bots/discord/slash/wolframalpha.py @@ -3,16 +3,15 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser - -wolframalpha = client.create_group("wolframalpha", "Use WolframAlpha.") - - -@olframalpha_command(description="Input a question or formula to search for WolframAlpha.") +@client.slash_command(description="Input a question or formula to search for WolframAlpha.") @discord.option(name="query", description="Enter what you want to calculate.") -async def query(ctx: discord.ApplicationContext, query: str): +async def wolframalpha(ctx: discord.ApplicationContext, query: str): await slash_parser(ctx, query) +wolframalpha = client.create_group("wolframalpha", "Use WolframAlpha.") + + @wolframalpha.command(description="Answer the question via WolframAlpha.") @discord.option(name="question", description="Ask WolframAlpha.") async def ask(ctx: discord.ApplicationContext, question: str): From dda6dd5cf6e6131f179c5dbec596e9fdc00ef3e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 19:42:21 +0800 Subject: [PATCH 131/168] ... --- bots/discord/slash/core.py | 138 ++++++++++++++++++++++++++++ bots/discord/slash/exchange_rate.py | 11 --- bots/discord/slash/ip.py | 1 + 3 files changed, 139 insertions(+), 11 deletions(-) create mode 100644 bots/discord/slash/core.py delete mode 100644 bots/discord/slash/exchange_rate.py diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py new file mode 100644 index 0000000000..2afb1cbd97 --- /dev/null +++ b/bots/discord/slash/core.py @@ -0,0 +1,138 @@ +import discord + +from bots.discord.client import client +from bots.discord.slash_parser import slash_parser +from core.utils.i18n import get_available_locales + + +@client.slash_command(description="View details of a module.") +@discord.option(name="module", default="", description="The module you want to know about.") +async def help(ctx: discord.ApplicationContext, module: str): + await slash_parser(ctx, module) + + +@client.slash_command(description="Set the bot running languages.") +@discord.option(name="lang", choices=get_available_locales(), default="", description="Supported language codes.") +async def locale(ctx: discord.ApplicationContext, lang: str): + await slash_parser(ctx, lang) + + +@client.slash_command(description="Make the bot stop sending message.") +async def mute(ctx: discord.ApplicationContext): + await slash_parser(ctx, "") + + +@client.slash_command(description="Get the number of petals in the current channel.") +async def petal(ctx: discord.ApplicationContext): + await slash_parser(ctx, "") + + +@client.slash_command(description="Get bot status.") +async def ping(ctx: discord.ApplicationContext): + await slash_parser(ctx, "") + + +@client.slash_command(description="View bot version.") +async def version(ctx: discord.ApplicationContext): + await slash_parser(ctx, "") + + +@client.slash_command(description="Get the ID of the user account that sent the command inside the bot.") +async def whoami(ctx: discord.ApplicationContext): + await slash_parser(ctx, "") + + +admin = client.create_group("admin", "Commands available to bot administrators.") + + +@admin.command(description="Set members as bot administrators.") +@discord.option(name="userid", description="The user ID.") +async def add(ctx: discord.ApplicationContext, userid: str): + await slash_parser(ctx, f"add {userid}") + + +@admin.command(description="Remove bot administrator from member.") +@discord.option(name="userid", description="The user ID.") +async def remove(ctx: discord.ApplicationContext, userid: str): + await slash_parser(ctx, f"remove {userid}") + + +@admin.command(description="View all bot administrators.") +async def list(ctx: discord.ApplicationContext): + await slash_parser(ctx, "list") + + +@admin.command(description="Limit someone to use bot in the channel.") +@discord.option(name="userid", description="The user ID.") +async def ban(ctx: discord.ApplicationContext, userid: str): + await slash_parser(ctx, f"ban {userid}") + + +@admin.command(description="Remove limit someone to use bot in the channel.") +@discord.option(name="userid", description="The user ID.") +async def unban(ctx: discord.ApplicationContext, userid: str): + await slash_parser(ctx, f"unban {userid}") + +ali = client.create_group("alias", "Set custom command alias.") + + +@ali.command(description="Add custom command alias.") +@discord.option(name="alias", description="The custom alias.") +@discord.option(name="command", description="The command you want to refer to.") +async def add(ctx: discord.ApplicationContext, alias: str, command: str): + await slash_parser(ctx, f"add {alias} {command}") + + +@ali.command(description="Remove custom command alias.") +@discord.option(name="alias", description="The custom alias.") +async def remove(ctx: discord.ApplicationContext, alias: str): + await slash_parser(ctx, f"remove {alias}") + + +@ali.command(description="View custom command alias.") +async def list(ctx: discord.ApplicationContext): + await slash_parser(ctx, "list") + + +@ali.command(description="Reset custom command alias.") +async def reset(ctx: discord.ApplicationContext): + await slash_parser(ctx, "reset") + + +p = client.create_group("prefix", "Set custom command prefix.") + + +@p.command(description="Add custom command prefix.") +@discord.option(name="prefix", description="The custom prefix.") +async def add(ctx: discord.ApplicationContext, prefix: str): + await slash_parser(ctx, f"add {prefix}") + + +@p.command(description="Remove custom command prefix.") +@discord.option(name="prefix", description="The custom prefix.") +async def remove(ctx: discord.ApplicationContext, prefix: str): + await slash_parser(ctx, f"remove {prefix}") + + +@p.command(description="View custom command prefix.") +async def list(ctx: discord.ApplicationContext): + await slash_parser(ctx, "list") + + +@p.command(description="Reset custom command prefix.") +async def reset(ctx: discord.ApplicationContext): + await slash_parser(ctx, "reset") + + +setup = client.create_group("setup", "Set up bot actions.") + + +@setup.command(description="Set up whether to display input prompts.") +async def typing(ctx: discord.ApplicationContext): + await slash_parser(ctx, "typing") + + +@setup.command(description="Set the time offset.") +@discord.option(name="offset", description="The timezone offset.") +async def offset(ctx: discord.ApplicationContext, offset: str): + await slash_parser(ctx, f"timeoffset {offset}") \ No newline at end of file diff --git a/bots/discord/slash/exchange_rate.py b/bots/discord/slash/exchange_rate.py deleted file mode 100644 index a832e27aad..0000000000 --- a/bots/discord/slash/exchange_rate.py +++ /dev/null @@ -1,11 +0,0 @@ -import discord - -from bots.discord.client import client -from bots.discord.slash_parser import slash_parser - -@client.slash_command(description="Convert currency prices according to the exchange rate of the day.") -@discord.option(name="amount", default=1.0, description="The amount of base currency.") -@discord.option(name="base", description="The base currency unit.") -@discord.option(name="target", description="The target currency unit.") -async def exchange_rate(ctx: discord.ApplicationContext, amount: float, base: str, target: str): - await slash_parser(ctx, f"{amount}{base} {target}") diff --git a/bots/discord/slash/ip.py b/bots/discord/slash/ip.py index 76888dc23f..2c6932ddb3 100644 --- a/bots/discord/slash/ip.py +++ b/bots/discord/slash/ip.py @@ -3,6 +3,7 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser + @client.slash_command(description="Query the information of IP.") @discord.option(name="ip_address", description="The IP address.") async def ip(ctx: discord.ApplicationContext, ip_address: str): From 2bf43a69b307eef2d402be2f44f9e6296135b43b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 19:49:12 +0800 Subject: [PATCH 132/168] revert core --- bots/discord/slash/core.py | 65 +----------------------------- bots/discord/slash/wolframalpha.py | 9 ++--- 2 files changed, 6 insertions(+), 68 deletions(-) diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index 2afb1cbd97..f2809ee73d 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -5,14 +5,8 @@ from core.utils.i18n import get_available_locales -@client.slash_command(description="View details of a module.") -@discord.option(name="module", default="", description="The module you want to know about.") -async def help(ctx: discord.ApplicationContext, module: str): - await slash_parser(ctx, module) - - @client.slash_command(description="Set the bot running languages.") -@discord.option(name="lang", choices=get_available_locales(), default="", description="Supported language codes.") +@discord.option(name="lang", default="", description="Supported language codes.") async def locale(ctx: discord.ApplicationContext, lang: str): await slash_parser(ctx, lang) @@ -22,11 +16,6 @@ async def mute(ctx: discord.ApplicationContext): await slash_parser(ctx, "") -@client.slash_command(description="Get the number of petals in the current channel.") -async def petal(ctx: discord.ApplicationContext): - await slash_parser(ctx, "") - - @client.slash_command(description="Get bot status.") async def ping(ctx: discord.ApplicationContext): await slash_parser(ctx, "") @@ -72,57 +61,7 @@ async def ban(ctx: discord.ApplicationContext, userid: str): @discord.option(name="userid", description="The user ID.") async def unban(ctx: discord.ApplicationContext, userid: str): await slash_parser(ctx, f"unban {userid}") - -ali = client.create_group("alias", "Set custom command alias.") - - -@ali.command(description="Add custom command alias.") -@discord.option(name="alias", description="The custom alias.") -@discord.option(name="command", description="The command you want to refer to.") -async def add(ctx: discord.ApplicationContext, alias: str, command: str): - await slash_parser(ctx, f"add {alias} {command}") - - -@ali.command(description="Remove custom command alias.") -@discord.option(name="alias", description="The custom alias.") -async def remove(ctx: discord.ApplicationContext, alias: str): - await slash_parser(ctx, f"remove {alias}") - - -@ali.command(description="View custom command alias.") -async def list(ctx: discord.ApplicationContext): - await slash_parser(ctx, "list") - - -@ali.command(description="Reset custom command alias.") -async def reset(ctx: discord.ApplicationContext): - await slash_parser(ctx, "reset") - - -p = client.create_group("prefix", "Set custom command prefix.") - - -@p.command(description="Add custom command prefix.") -@discord.option(name="prefix", description="The custom prefix.") -async def add(ctx: discord.ApplicationContext, prefix: str): - await slash_parser(ctx, f"add {prefix}") - - -@p.command(description="Remove custom command prefix.") -@discord.option(name="prefix", description="The custom prefix.") -async def remove(ctx: discord.ApplicationContext, prefix: str): - await slash_parser(ctx, f"remove {prefix}") - - -@p.command(description="View custom command prefix.") -async def list(ctx: discord.ApplicationContext): - await slash_parser(ctx, "list") - - -@p.command(description="Reset custom command prefix.") -async def reset(ctx: discord.ApplicationContext): - await slash_parser(ctx, "reset") - + setup = client.create_group("setup", "Set up bot actions.") diff --git a/bots/discord/slash/wolframalpha.py b/bots/discord/slash/wolframalpha.py index 0263c9f1f5..e69727eb81 100644 --- a/bots/discord/slash/wolframalpha.py +++ b/bots/discord/slash/wolframalpha.py @@ -3,15 +3,14 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser -@client.slash_command(description="Input a question or formula to search for WolframAlpha.") +wolframalpha = client.create_group("wolframalpha", "Use WolframAlpha.") + +@wolframalpha.command(description="Input a question or formula to search for WolframAlpha.") @discord.option(name="query", description="Enter what you want to calculate.") -async def wolframalpha(ctx: discord.ApplicationContext, query: str): +async def _(ctx: discord.ApplicationContext, query: str): await slash_parser(ctx, query) -wolframalpha = client.create_group("wolframalpha", "Use WolframAlpha.") - - @wolframalpha.command(description="Answer the question via WolframAlpha.") @discord.option(name="question", description="Ask WolframAlpha.") async def ask(ctx: discord.ApplicationContext, question: str): From f1031437c5409c2b6963868a2bcc9086a2a2c0a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 19:50:44 +0800 Subject: [PATCH 133/168] --- bots/discord/slash/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index f2809ee73d..6b295e71b1 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -6,7 +6,7 @@ @client.slash_command(description="Set the bot running languages.") -@discord.option(name="lang", default="", description="Supported language codes.") +@discord.option(name="lang", choices=get_available_locales(), default="", description="Supported language codes.") async def locale(ctx: discord.ApplicationContext, lang: str): await slash_parser(ctx, lang) From a96ea5993df8655d1d18703af93f7bdab9cc6e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 19:53:33 +0800 Subject: [PATCH 134/168] Add exchange_rate.py --- bots/discord/slash/exchange_rate.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 bots/discord/slash/exchange_rate.py diff --git a/bots/discord/slash/exchange_rate.py b/bots/discord/slash/exchange_rate.py new file mode 100644 index 0000000000..02312ff523 --- /dev/null +++ b/bots/discord/slash/exchange_rate.py @@ -0,0 +1,11 @@ +import discord + +from bots.discord.client import client +from bots.discord.slash_parser import slash_parser + +@client.slash_command(description="Convert currency prices according to the exchange rate of the day.") +@discord.option(name="amount", default=1.0, description="The amount of base currency.") +@discord.option(name="base", description="The base currency unit.") +@discord.option(name="target", description="The target currency unit.") +async def exchange_rate(ctx: discord.ApplicationContext, amount: float, base: str, target: str): + await slash_parser(ctx, f"{amount}{base} {target}") \ No newline at end of file From 2d36d67619a537f45ad03013e9e04e149a61fecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 19:58:18 +0800 Subject: [PATCH 135/168] upd --- bots/discord/slash/core.py | 10 ++++++++++ bots/discord/slash/exchange_rate.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index 6b295e71b1..0c57338351 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -4,6 +4,11 @@ from bots.discord.slash_parser import slash_parser from core.utils.i18n import get_available_locales +@client.slash_command(description="View details of a module.") +@discord.option(name="module", default="", description="The module you want to know about.") +async def help(ctx: discord.ApplicationContext, module: str): + await slash_parser(ctx, module) + @client.slash_command(description="Set the bot running languages.") @discord.option(name="lang", choices=get_available_locales(), default="", description="Supported language codes.") @@ -21,6 +26,11 @@ async def ping(ctx: discord.ApplicationContext): await slash_parser(ctx, "") +@client.slash_command(description="Get the number of petals in the current channel.") +async def petal(ctx: discord.ApplicationContext): + await slash_parser(ctx, "") + + @client.slash_command(description="View bot version.") async def version(ctx: discord.ApplicationContext): await slash_parser(ctx, "") diff --git a/bots/discord/slash/exchange_rate.py b/bots/discord/slash/exchange_rate.py index 02312ff523..564986f275 100644 --- a/bots/discord/slash/exchange_rate.py +++ b/bots/discord/slash/exchange_rate.py @@ -4,7 +4,7 @@ from bots.discord.slash_parser import slash_parser @client.slash_command(description="Convert currency prices according to the exchange rate of the day.") -@discord.option(name="amount", default=1.0, description="The amount of base currency.") +@discord.option(name="amount", description="The amount of base currency.") @discord.option(name="base", description="The base currency unit.") @discord.option(name="target", description="The target currency unit.") async def exchange_rate(ctx: discord.ApplicationContext, amount: float, base: str, target: str): From 1d79c2360a2706009b386458800e127cae14b1e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 20:02:39 +0800 Subject: [PATCH 136/168] upd --- bots/discord/slash/exchange_rate.py | 2 +- bots/discord/slash/wolframalpha.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bots/discord/slash/exchange_rate.py b/bots/discord/slash/exchange_rate.py index 564986f275..b81aac061c 100644 --- a/bots/discord/slash/exchange_rate.py +++ b/bots/discord/slash/exchange_rate.py @@ -4,7 +4,7 @@ from bots.discord.slash_parser import slash_parser @client.slash_command(description="Convert currency prices according to the exchange rate of the day.") -@discord.option(name="amount", description="The amount of base currency.") +@discord.option(name="amount", default="1", description="The amount of base currency.") @discord.option(name="base", description="The base currency unit.") @discord.option(name="target", description="The target currency unit.") async def exchange_rate(ctx: discord.ApplicationContext, amount: float, base: str, target: str): diff --git a/bots/discord/slash/wolframalpha.py b/bots/discord/slash/wolframalpha.py index e69727eb81..34858f2a76 100644 --- a/bots/discord/slash/wolframalpha.py +++ b/bots/discord/slash/wolframalpha.py @@ -3,13 +3,13 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser -wolframalpha = client.create_group("wolframalpha", "Use WolframAlpha.") - -@wolframalpha.command(description="Input a question or formula to search for WolframAlpha.") +@client.slash_command(name="wolframalpha", description="Input a question or formula to search for WolframAlpha.") @discord.option(name="query", description="Enter what you want to calculate.") -async def _(ctx: discord.ApplicationContext, query: str): +async def query(ctx: discord.ApplicationContext, query: str): await slash_parser(ctx, query) +wolframalpha = client.create_group("wolframalpha", "Use WolframAlpha.") + @wolframalpha.command(description="Answer the question via WolframAlpha.") @discord.option(name="question", description="Ask WolframAlpha.") From 97662090786acfc874333a90c5711e9d3fa28d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 20:15:53 +0800 Subject: [PATCH 137/168] Add color --- bots/discord/slash/color.py | 14 ++++++++++++++ bots/discord/slash/exchange_rate.py | 5 ++--- bots/discord/slash/github.py | 29 +++++++++++++++++++++-------- modules/github/__init__.py | 8 ++++---- 4 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 bots/discord/slash/color.py diff --git a/bots/discord/slash/color.py b/bots/discord/slash/color.py new file mode 100644 index 0000000000..ea01c70051 --- /dev/null +++ b/bots/discord/slash/color.py @@ -0,0 +1,14 @@ +import discord + +from bots.discord.client import client +from bots.discord.slash_parser import slash_parser + + +async def auto_complete(ctx: discord.AutocompleteContext): + if ctx.options["color"] == '': + return ['#123456', 'rgb(12,34,56)', 'hsl(123,45%,67%)'] + +@client.slash_command(description="Get color information.") +@discord.option(name="color", default="", autocomplete=auto_complete, description="Color information. Support for Hex, RGB, HSL color code, or name in CSS and Material Design.") +async def color(ctx: discord.ApplicationContext, color: str): + await slash_parser(ctx, color) diff --git a/bots/discord/slash/exchange_rate.py b/bots/discord/slash/exchange_rate.py index b81aac061c..1fd92cc98d 100644 --- a/bots/discord/slash/exchange_rate.py +++ b/bots/discord/slash/exchange_rate.py @@ -4,8 +4,7 @@ from bots.discord.slash_parser import slash_parser @client.slash_command(description="Convert currency prices according to the exchange rate of the day.") -@discord.option(name="amount", default="1", description="The amount of base currency.") -@discord.option(name="base", description="The base currency unit.") +@discord.option(name="base", description="The base currency.") @discord.option(name="target", description="The target currency unit.") async def exchange_rate(ctx: discord.ApplicationContext, amount: float, base: str, target: str): - await slash_parser(ctx, f"{amount}{base} {target}") \ No newline at end of file + await slash_parser(ctx, f"{base} {target}") \ No newline at end of file diff --git a/bots/discord/slash/github.py b/bots/discord/slash/github.py index 86c8b441e2..e3d11e191d 100644 --- a/bots/discord/slash/github.py +++ b/bots/discord/slash/github.py @@ -3,16 +3,29 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser -github = client.create_group("github", "查询Github的相关信息") +github = client.create_group("github", "Github query tool.") -@github.command() -@discord.option(name="username_or_repo", description="用户名或仓库名") -async def get(ctx: discord.ApplicationContext, username_or_repo: str): - await slash_parser(ctx, username_or_repo) +@github.command(description="Trying to automatically identifying and distinguishing repo/user.") +@discord.option(name="name", description="GitHub user or repository name.") +async def get(ctx: discord.ApplicationContext, name: str): + await slash_parser(ctx, name) -@github.command() -@discord.option(name="keyword", description="搜索关键词") -async def search(ctx: discord.ApplicationContext, keyword: str): + +@github.command(description="Get GitHub repository information.") +@discord.option(name="name", description="GitHub repository name.") +async def repo(ctx: discord.ApplicationContext, name: str): + await slash_parser(ctx, f'repo {name}') + + +@github.command(description="Get GitHub user or organization information.") +@discord.option(name="name", description="GitHub user name.") +async def user(ctx: discord.ApplicationContext, name: str): + await slash_parser(ctx, f'user {name}') + + +@github.command(description="Search repositories on GitHub.") +@discord.option(name="query", description="Search keywords.") +async def search(ctx: discord.ApplicationContext, query: str): await slash_parser(ctx, f'search {keyword}') diff --git a/modules/github/__init__.py b/modules/github/__init__.py index e68b54bc31..05e1c3a4dd 100644 --- a/modules/github/__init__.py +++ b/modules/github/__init__.py @@ -5,7 +5,7 @@ github = module('github', alias='gh', developers=['Dianliang233'], desc='{github.help.desc}') -@github.handle(' {{github.help}}') +@github.command(' {{github.help}}') async def _(msg: Bot.MessageSession, name: str): if '/' in name: await repo.repo(msg) @@ -13,16 +13,16 @@ async def _(msg: Bot.MessageSession, name: str): await user.user(msg) -@github.handle('repo {{github.help.repo}}') +@github.command('repo {{github.help.repo}}') async def _(msg: Bot.MessageSession): await repo.repo(msg) -@github.handle('user {{github.help.user}}') +@github.command('user {{github.help.user}}') async def _(msg: Bot.MessageSession): await user.user(msg) -@github.handle('search {{github.help.search}}') +@github.command('search {{github.help.search}}') async def _(msg: Bot.MessageSession): await search.search(msg) From c48452ed0cb74b0514c71d672050aaab6035b710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 20:17:50 +0800 Subject: [PATCH 138/168] fix --- bots/discord/slash/wolframalpha.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bots/discord/slash/wolframalpha.py b/bots/discord/slash/wolframalpha.py index 34858f2a76..6a0c6edd85 100644 --- a/bots/discord/slash/wolframalpha.py +++ b/bots/discord/slash/wolframalpha.py @@ -3,13 +3,14 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser -@client.slash_command(name="wolframalpha", description="Input a question or formula to search for WolframAlpha.") -@discord.option(name="query", description="Enter what you want to calculate.") -async def query(ctx: discord.ApplicationContext, query: str): - await slash_parser(ctx, query) wolframalpha = client.create_group("wolframalpha", "Use WolframAlpha.") +@wolframalpha.command(description="Input a question or formula to search for WolframAlpha.") +@discord.option(name="query", description="Enter what you want to calculate.") +async def _(ctx: discord.ApplicationContext, query: str): + await slash_parser(ctx, query) + @wolframalpha.command(description="Answer the question via WolframAlpha.") @discord.option(name="question", description="Ask WolframAlpha.") From 0de53ba14996760c14d8b51101385a507b977c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 20:52:26 +0800 Subject: [PATCH 139/168] Add dice --- bots/discord/slash/core.py | 3 +-- bots/discord/slash/dice.py | 24 ++++++++++++++++++++++++ modules/github/repo.py | 1 + 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 bots/discord/slash/dice.py diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index 0c57338351..8e3207557c 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -2,7 +2,6 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser -from core.utils.i18n import get_available_locales @client.slash_command(description="View details of a module.") @discord.option(name="module", default="", description="The module you want to know about.") @@ -11,7 +10,7 @@ async def help(ctx: discord.ApplicationContext, module: str): @client.slash_command(description="Set the bot running languages.") -@discord.option(name="lang", choices=get_available_locales(), default="", description="Supported language codes.") +@discord.option(name="lang", default="", description="Supported language codes.") async def locale(ctx: discord.ApplicationContext, lang: str): await slash_parser(ctx, lang) diff --git a/bots/discord/slash/dice.py b/bots/discord/slash/dice.py new file mode 100644 index 0000000000..bc39a486eb --- /dev/null +++ b/bots/discord/slash/dice.py @@ -0,0 +1,24 @@ +import discord + +from bots.discord.client import client +from bots.discord.slash_parser import slash_parser + + +async def auto_complete(ctx: discord.AutocompleteContext): + if ctx.options["dices"] == '': + return ['d4', 'd6', 'd8', 'd12', 'd20'] + + +dice = client.create_group("dice", "Random dice.") + + +@dice.command(description="Roll the specified dice.") +@discord.option(name="dices", autocomplete=auto_complete, description="Dice expression.") +@discord.option(name="dc", default="", description="Difficulty class.") +async def roll(ctx: discord.ApplicationContext, dices: str, dc: str): + await slash_parser(ctx, f'{dices} {dc}') + + +@dice.command(description="Modify the checking rule of dc.") +async def rule(ctx: discord.ApplicationContext): + await slash_parser(ctx, 'rule') diff --git a/modules/github/repo.py b/modules/github/repo.py index bed4fea703..773800fc0f 100644 --- a/modules/github/repo.py +++ b/modules/github/repo.py @@ -1,3 +1,4 @@ +import asyncio import traceback from core.builtins import Bot, Image, Plain, Url From 747683e0581de00059853bc7d7fd73a0ee17def8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 21:01:21 +0800 Subject: [PATCH 140/168] Add ask --- bots/discord/slash/ask.py | 10 ++++++++++ bots/discord/slash/wolframalpha.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 bots/discord/slash/ask.py diff --git a/bots/discord/slash/ask.py b/bots/discord/slash/ask.py new file mode 100644 index 0000000000..4cd3fefec9 --- /dev/null +++ b/bots/discord/slash/ask.py @@ -0,0 +1,10 @@ +import discord + +from bots.discord.client import client +from bots.discord.slash_parser import slash_parser + + +@client.slash_command(description="Answer your question via ChatGPT.") +@discord.option(name="question", description="Ask ChatGPT.") +async def ask(ctx: discord.ApplicationContext, question: str): + await slash_parser(ctx, question) \ No newline at end of file diff --git a/bots/discord/slash/wolframalpha.py b/bots/discord/slash/wolframalpha.py index 6a0c6edd85..33651d9bac 100644 --- a/bots/discord/slash/wolframalpha.py +++ b/bots/discord/slash/wolframalpha.py @@ -8,7 +8,7 @@ @wolframalpha.command(description="Input a question or formula to search for WolframAlpha.") @discord.option(name="query", description="Enter what you want to calculate.") -async def _(ctx: discord.ApplicationContext, query: str): +async def query(ctx: discord.ApplicationContext, query: str): await slash_parser(ctx, query) From f4a9124fc3fb8d9773cefb0b7b1535ce4a7b2381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 21:25:11 +0800 Subject: [PATCH 141/168] Update whois --- modules/whois/__init__.py | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/modules/whois/__init__.py b/modules/whois/__init__.py index 576ec91026..87e781f571 100644 --- a/modules/whois/__init__.py +++ b/modules/whois/__init__.py @@ -1,3 +1,5 @@ +from datetime import datetime + from whois import whois from core.builtins import Bot, Plain, Image @@ -5,11 +7,11 @@ from core.utils.image import msgchain2image -def process(input): - if isinstance(input, list) and len(input) > 0: - return input[0] +def process(input_): + if isinstance(input_, list) and len(input_) > 0: + return input_[0] else: - return input + return input_ def get_value(dict, key): @@ -59,6 +61,15 @@ async def get_whois(msg, domain): if whois_server: whois_server = whois_server.lower() + if updated_date: + updated_date = process(updated_date).timestamp() + + if creation_date: + creation_date = process(creation_date).timestamp() + + if expiration_date: + expiration_date = process(expiration_date).timestamp() + if name_servers: name_servers_list = list(set([i.lower() for i in name_servers])) else: @@ -68,9 +79,9 @@ async def get_whois(msg, domain): {msg.locale.t('whois.message.domain_name')}{process(domain_name).lower()}{f""" {msg.locale.t('whois.message.registrar')}{registrar}""" if registrar else ''}{f""" {msg.locale.t('whois.message.whois_server')}{whois_server}""" if whois_server else ''}{f""" -{msg.locale.t('whois.message.updated_date')}{str(process(updated_date))}""" if updated_date else ''}{f""" -{msg.locale.t('whois.message.creation_date')}{str(process(creation_date))}""" if creation_date else ''}{f""" -{msg.locale.t('whois.message.expiration_date')}{str(process(expiration_date))}""" if expiration_date else ''}{f""" +{msg.locale.t('whois.message.updated_date')}{msg.ts2strftime(updated_date)}""" if updated_date else ''}{f""" +{msg.locale.t('whois.message.creation_date')}{msg.ts2strftime(creation_date)}""" if creation_date else ''}{f""" +{msg.locale.t('whois.message.expiration_date')}{msg.ts2strftime(expiration_date)}""" if expiration_date else ''}{f""" {msg.locale.t('whois.message.name_servers')}{', '.join(name_servers_list)}""" if name_servers else ''}{f""" {msg.locale.t('whois.message.dnssec')}{process(dnssec)}""" if dnssec else ''}{f""" {msg.locale.t('whois.message.name')}{process(name)}""" if name else ''}{f""" From 43587814002dce82649db806ae6029bae604b371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Mon, 18 Dec 2023 21:49:56 +0800 Subject: [PATCH 142/168] fix sth --- core/builtins/message/__init__.py | 2 +- core/petal.py | 2 +- core/types/message/__init__.py | 4 +++- modules/cytoid/rating.py | 5 +++-- modules/whois/__init__.py | 15 +++++++++------ 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/core/builtins/message/__init__.py b/core/builtins/message/__init__.py index bc67a081ab..e629e91418 100644 --- a/core/builtins/message/__init__.py +++ b/core/builtins/message/__init__.py @@ -1,6 +1,6 @@ import asyncio from config import Config -from datetime import datetime, timedelta +from datetime import datetime from typing import List from core.builtins.message.chain import * diff --git a/core/petal.py b/core/petal.py index e351262f1d..abacfe44bd 100644 --- a/core/petal.py +++ b/core/petal.py @@ -1,6 +1,6 @@ import os import json -from datetime import datetime, timedelta +from datetime import datetime from decimal import Decimal from config import Config diff --git a/core/types/message/__init__.py b/core/types/message/__init__.py index 703c9e0b53..edb1846fe5 100644 --- a/core/types/message/__init__.py +++ b/core/types/message/__init__.py @@ -227,11 +227,13 @@ async def get_text_channel_list(self): """ raise NotImplementedError - def ts2strftime(self, timestamp: float, date=True, seconds=True, timezone=True): + def ts2strftime(self, timestamp: float, date=True, iso=False, time=True, seconds=True, timezone=True): """ 用于将时间戳转换为可读的时间格式。 :param timestamp: 时间戳 :param date: 是否显示日期 + :param iso: 是否以ISO格式显示 + :param time: 是否显示时间 :param seconds: 是否显示秒 :param timezone: 是否显示时区 """ diff --git a/modules/cytoid/rating.py b/modules/cytoid/rating.py index 7b1a5d62d0..30924b76c2 100644 --- a/modules/cytoid/rating.py +++ b/modules/cytoid/rating.py @@ -3,7 +3,7 @@ import time import traceback import uuid -from datetime import datetime, timedelta +from datetime import datetime from os.path import abspath import aiohttp @@ -18,6 +18,7 @@ from core.logger import Logger from core.utils.http import get_url from core.utils.html2text import html2text +from core.utils.text import parse_time_string async def get_rating(msg: Bot.MessageSession, uid, query_type): @@ -98,7 +99,7 @@ async def mkresources(msg: Bot.MessageSession, x, rank): rt = x['rating'] details = x['details'] _date = datetime.strptime(x['date'], "%Y-%m-%dT%H:%M:%S.%fZ") - local_time = _date + timedelta(hours=int(msg.options.get('timezone_offset', Config('timezone_offset', '+8')))) + local_time = _date + parse_time_string(msg.options.get('timezone_offset', Config('timezone_offset', '+8'))) playtime = local_time.timestamp() nowtime = time.time() playtime = playtime - nowtime diff --git a/modules/whois/__init__.py b/modules/whois/__init__.py index 87e781f571..140dd3d01f 100644 --- a/modules/whois/__init__.py +++ b/modules/whois/__init__.py @@ -2,9 +2,11 @@ from whois import whois +from config import Config from core.builtins import Bot, Plain, Image from core.component import module from core.utils.image import msgchain2image +from core.utils.text import parse_time_string def process(input_): @@ -61,14 +63,15 @@ async def get_whois(msg, domain): if whois_server: whois_server = whois_server.lower() - if updated_date: - updated_date = process(updated_date).timestamp() + if updated_date: # 此时间为UTC时间 + updated_date = (process(updated_date) + parse_time_string(Config('timezone_offset', '+8'))).timestamp() - if creation_date: - creation_date = process(creation_date).timestamp() + if creation_date: # 此时间为UTC时间 + creation_date = (process(creation_date) + parse_time_string(Config('timezone_offset', '+8'))).timestamp() + + if expiration_date: # 此时间为UTC时间 + expiration_date = (process(expiration_date) + parse_time_string(Config('timezone_offset', '+8'))).timestamp() - if expiration_date: - expiration_date = process(expiration_date).timestamp() if name_servers: name_servers_list = list(set([i.lower() for i in name_servers])) From 5a1a7e2ef736a6aeb3823f1b473450c25bc99420 Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Mon, 18 Dec 2023 22:37:36 +0800 Subject: [PATCH 143/168] Update chain.py --- core/builtins/message/chain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/builtins/message/chain.py b/core/builtins/message/chain.py index 7f4e14cd3e..1e88097b41 100644 --- a/core/builtins/message/chain.py +++ b/core/builtins/message/chain.py @@ -134,7 +134,7 @@ def as_sendable(self, msg: MessageSession = None, embed=True): elif isinstance(x, I18NContext): t_value = msg.locale.t(x.key, **x.kwargs) if isinstance(t_value, str): - value.append(t_value) + value.append(Plain(t_value)) elif isinstance(t_value, list): value += MessageChain(t_value).as_sendable(msg) else: From 51841a2e7837f286e1c149f1050ccbf3670643f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Tue, 19 Dec 2023 11:55:09 +0800 Subject: [PATCH 144/168] Update exchange_rate.py --- bots/discord/slash/exchange_rate.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bots/discord/slash/exchange_rate.py b/bots/discord/slash/exchange_rate.py index 1fd92cc98d..04dd9f432d 100644 --- a/bots/discord/slash/exchange_rate.py +++ b/bots/discord/slash/exchange_rate.py @@ -4,7 +4,8 @@ from bots.discord.slash_parser import slash_parser @client.slash_command(description="Convert currency prices according to the exchange rate of the day.") -@discord.option(name="base", description="The base currency.") +@discord.option(name="amount", description="The amount of base currency.") +@discord.option(name="base", description="The base currency unit.") @discord.option(name="target", description="The target currency unit.") async def exchange_rate(ctx: discord.ApplicationContext, amount: float, base: str, target: str): - await slash_parser(ctx, f"{base} {target}") \ No newline at end of file + await slash_parser(ctx, f"{amount}{base} {target}") From f5498fc46cb0f1f3108cb075c006326273192e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Tue, 19 Dec 2023 12:03:16 +0800 Subject: [PATCH 145/168] add alias & prefix --- bots/discord/slash/core.py | 53 +++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index 8e3207557c..aca679a95b 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -72,6 +72,57 @@ async def unban(ctx: discord.ApplicationContext, userid: str): await slash_parser(ctx, f"unban {userid}") +ali = client.create_group("alias", "Set custom command alias.") + + +@ali.command(description="Add custom command alias.") +@discord.option(name="alias", description="The custom alias.") +@discord.option(name="command", description="The command you want to refer to.") +async def add(ctx: discord.ApplicationContext, alias: str, command: str): + await slash_parser(ctx, f"add {alias} {command}") + + +@ali.command(description="Remove custom command alias.") +@discord.option(name="alias", description="The custom alias.") +async def remove(ctx: discord.ApplicationContext, alias: str): + await slash_parser(ctx, f"remove {alias}") + + +@ali.command(description="View custom command alias.") +async def list(ctx: discord.ApplicationContext): + await slash_parser(ctx, "list") + + +@ali.command(description="Reset custom command alias.") +async def reset(ctx: discord.ApplicationContext): + await slash_parser(ctx, "reset") + + +p = client.create_group("prefix", "Set custom command prefix.") + + +@p.command(description="Add custom command prefix.") +@discord.option(name="prefix", description="The custom prefix.") +async def add(ctx: discord.ApplicationContext, prefix: str): + await slash_parser(ctx, f"add {prefix}") + + +@p.command(description="Remove custom command prefix.") +@discord.option(name="prefix", description="The custom prefix.") +async def remove(ctx: discord.ApplicationContext, prefix: str): + await slash_parser(ctx, f"remove {prefix}") + + +@p.command(description="View custom command prefix.") +async def list(ctx: discord.ApplicationContext): + await slash_parser(ctx, "list") + + +@p.command(description="Reset custom command prefix.") +async def reset(ctx: discord.ApplicationContext): + await slash_parser(ctx, "reset") + + setup = client.create_group("setup", "Set up bot actions.") @@ -83,4 +134,4 @@ async def typing(ctx: discord.ApplicationContext): @setup.command(description="Set the time offset.") @discord.option(name="offset", description="The timezone offset.") async def offset(ctx: discord.ApplicationContext, offset: str): - await slash_parser(ctx, f"timeoffset {offset}") \ No newline at end of file + await slash_parser(ctx, f"timeoffset {offset}") From a6a312ae0b4b31f85c6c44273a3b080c073ddf9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Tue, 19 Dec 2023 12:52:54 +0800 Subject: [PATCH 146/168] Update wiki.py --- bots/discord/slash/wiki.py | 139 +++++++++++++++++++++++-------------- 1 file changed, 87 insertions(+), 52 deletions(-) diff --git a/bots/discord/slash/wiki.py b/bots/discord/slash/wiki.py index 780f73b1bf..779b03862c 100644 --- a/bots/discord/slash/wiki.py +++ b/bots/discord/slash/wiki.py @@ -6,7 +6,22 @@ from bots.discord.slash_parser import slash_parser, ctx_to_session from modules.wiki import WikiLib, WikiTargetInfo -wiki = client.create_group("wiki", "查询Mediawiki的相关信息") +@client.slash_command(description="Get recent abuse logs for the default wiki.") +async def ab(ctx: discord.ApplicationContext): + await slash_parser(ctx, "legacy") + + +@client.slash_command(description="Get recent newbie logs for the default wiki.") +async def newbie(ctx: discord.ApplicationContext): + await slash_parser(ctx, "") + + +@client.slash_command(description="Get recent changes for the default wiki.") +async def rc(ctx: discord.ApplicationContext): + await slash_parser(ctx, "legacy") + + +wiki = client.create_group("wiki", "Query information from Mediawiki-based websites.") async def auto_search(ctx: discord.AutocompleteContext): @@ -40,86 +55,106 @@ async def auto_get_custom_iw_list(ctx: discord.AutocompleteContext): async def default_wiki(ctx: discord.AutocompleteContext): if ctx.options["link"] == '': - return ['https://minecraft.fandom.com/zh/'] + return ['https://zh.minecraft.wiki/'] -@wiki.command(description="根据页面名称查询一个wiki页面") -@discord.option(name="title", description="页面名称", autocomplete=auto_search) -async def query(ctx: discord.ApplicationContext, title: str): - await slash_parser(ctx, title) +@wiki.command(description="Query a wiki page.") +@discord.option(name="pagename", description="The title of wiki page.", autocomplete=auto_search) +async def query(ctx: discord.ApplicationContext, pagename: str): + await slash_parser(ctx, pagename) -@wiki.command(description="根据页面名称搜索一个wiki页面") -@discord.option(name="title", description="页面名称") -async def search(ctx: discord.ApplicationContext, title: str): - await slash_parser(ctx, f'search {title}') +@wiki.command(name="id", description="Query a Wiki page based on page ID.") +@discord.option(name="pageid", description="The wiki page ID.") +async def byid(ctx: discord.ApplicationContext, pageid: str): + await slash_parser(ctx, f'id {pageid}') -@wiki.command(name="id", description="根据页面ID查询一个wiki页面") -@discord.option(name="pid", description="页面ID") -async def page_id(ctx: discord.ApplicationContext, pid: str): - await slash_parser(ctx, f'-p {pid}') +@wiki.command(description="Search a wiki page.") +@discord.option(name="pagename", description="The title of wiki page.", autocomplete=auto_search) +async def search(ctx: discord.ApplicationContext, pagename: str): + await slash_parser(ctx, f'search {pagename}') -@wiki.command(name="set", description="设置起始查询wiki") -@discord.option(name="link", description="页面链接", autocomplete=default_wiki) -async def set_base(ctx: discord.ApplicationContext, link: str): - await slash_parser(ctx, f'set {link}') +@wiki.command(name="set", description="Set up start wiki.") +@discord.option(name="wikiurl", description="The URL of wiki.", autocomplete=default_wiki) +async def set_base(ctx: discord.ApplicationContext, wikiurl: str): + await slash_parser(ctx, f'set {wikiurl}') -iw = wiki.create_subgroup("iw", "设置有关自定义Interwiki的命令") +iw = wiki.create_subgroup("iw", "Set up commands for custom Interwiki.") -@iw.command(description="添加自定义Interwiki") -@discord.option(name="interwiki", description="自定义iw名") -@discord.option(name="link", description="页面链接") -async def add(ctx: discord.ApplicationContext, iw: str, link: str): - await slash_parser(ctx, f'iw add {iw} {link}') +@iw.command(description="Add custom Interwiki.") +@discord.option(name="interwiki", description="The custom Interwiki.") +@discord.option(name="wikiurl", description="The URL of wiki.") +async def add(ctx: discord.ApplicationContext, interwiki: str, wikiurl: str): + await slash_parser(ctx, f'iw add {interwiki} {wikiurl}') -@iw.command(name='remove', description="删除自定义Interwiki") -@discord.option(name="iw", description="自定义iw名", autocomplete=auto_get_custom_iw_list) -async def iw_remove(ctx: discord.ApplicationContext, iw: str): - await slash_parser(ctx, f'iw rm {iw}') +@iw.command(description="Remove custom Interwiki.") +@discord.option(name="interwiki", description="The custom Interwiki.", autocomplete=auto_get_custom_iw_list) +async def iw_remove(ctx: discord.ApplicationContext, interwiki: str): + await slash_parser(ctx, f'iw remove {interwiki}') -@iw.command(name="list", description="查看所有已自定义的Interwiki") -async def iw_list(ctx: discord.ApplicationContext): - await slash_parser(ctx, 'iw list') +@iw.command(name="list", description="Lists the currently configured Interwiki.") +@discord.option(name="legacy", choices=['True', 'False'], description="Whether to use legacy mode") +async def iw_list(ctx: discord.ApplicationContext, legacy: str): + legacy = "legacy" if legacy == "True" else "" + await slash_parser(ctx, f'iw list {legacy}') -@iw.command(description="获取自定义Interwiki的链接") -@discord.option(name="iw", description="自定义interwiki名", autocomplete=auto_get_custom_iw_list) -async def get(ctx: discord.ApplicationContext, iw: str): - await slash_parser(ctx, f'iw get {iw}') +@iw.command(description="Get the API address corresponding to the set Interwiki.") +@discord.option(name="interwiki", description="The custom Interwiki.", autocomplete=auto_get_custom_iw_list) +async def get(ctx: discord.ApplicationContext, interwiki: str): + await slash_parser(ctx, f'iw get {interwiki}') -headers = wiki.create_subgroup("headers", "设置有关自定义header的命令") +headers = wiki.create_subgroup("headers", "Set up commands for custom response headers.") -@headers.command(name="set", description="添加自定义headers") -@discord.option(name="headers_json", description="自定义headers") -async def set_headers(ctx: discord.ApplicationContext, headers_json: str): - await slash_parser(ctx, f'headers set {headers_json}') +@headers.command(name="add", description="Add custom request headers.") +@discord.option(name="headers", description="The json of custom request headers.") +async def add_headers(ctx: discord.ApplicationContext, headers: str): + await slash_parser(ctx, f'headers set {headers}') -@headers.command(description="删除一个自定义header") -@discord.option(name="header_key") -async def delete(ctx: discord.ApplicationContext, header_key: str): - await slash_parser(ctx, f'headers del {header_key}') +@headers.command(name="remove", description="Remove custom request headers.") +@discord.option(name="headerkey", description="The key of custom request headers json.") +async def set_headers(ctx: discord.ApplicationContext, headerkey: str): + await slash_parser(ctx, f'headers remove {headerkey}') -@headers.command(name='show', description="查看所有自定义的headers") -async def headers_show(ctx: discord.ApplicationContext): +@headers.command(name='show', description="View the currently set request headers.") +async def show_headers(ctx: discord.ApplicationContext): await slash_parser(ctx, 'headers show') -@headers.command(name='reset', description="重置所有自定义的headers") -async def headers_reset(ctx: discord.ApplicationContext): +@headers.command(name='reset', description="Reset custom request headers.") +async def reset_headers(ctx: discord.ApplicationContext): await slash_parser(ctx, 'headers reset') -@wiki.command(description="是否启用Fandom全局Interwiki查询") -@discord.option(name="_", choices=['enable', 'disable']) -async def fandom(ctx: discord.ApplicationContext, _: str): - await slash_parser(ctx, f'fandom {_}') +p = wiki.create_subgroup("prefix", "Set up commands for custom wiki prefix.") + + +@p.command(name="set", description="Set custom wiki prefix.") +@discord.option(name="prefix", description="The custom wiki prefix.") +async def set_prefix(ctx: discord.ApplicationContext, prefix: str): + await slash_parser(ctx, f'prefix set {prefix}') + + +@p.command(name="reset", description="Reset custom wiki prefix.") +async def reset_prefix(ctx: discord.ApplicationContext): + await slash_parser(ctx, 'prefix reset') + + +@wiki.command(description="Toggle whether to use Fandom global Interwiki queries.") +async def fandom(ctx: discord.ApplicationContext): + await slash_parser(ctx, 'fandom') + + +@wiki.command(description="Toggle whether to return the edit link when the page does not exist.") +async def fandom(ctx: discord.ApplicationContext): + await slash_parser(ctx, 'redlink') From 9449b601a3bd782566edcc636a8da873ba5fc0d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Tue, 19 Dec 2023 12:57:10 +0800 Subject: [PATCH 147/168] fix --- bots/discord/slash/wiki.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/discord/slash/wiki.py b/bots/discord/slash/wiki.py index 779b03862c..94c3eb65bb 100644 --- a/bots/discord/slash/wiki.py +++ b/bots/discord/slash/wiki.py @@ -156,5 +156,5 @@ async def fandom(ctx: discord.ApplicationContext): @wiki.command(description="Toggle whether to return the edit link when the page does not exist.") -async def fandom(ctx: discord.ApplicationContext): +async def redlink(ctx: discord.ApplicationContext): await slash_parser(ctx, 'redlink') From 861d50b163c0b8cc7aeedbb03d1afaf56f785b7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Tue, 19 Dec 2023 13:11:03 +0800 Subject: [PATCH 148/168] Update wiki.py --- bots/discord/slash/wiki.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bots/discord/slash/wiki.py b/bots/discord/slash/wiki.py index 94c3eb65bb..f42287b6e7 100644 --- a/bots/discord/slash/wiki.py +++ b/bots/discord/slash/wiki.py @@ -85,27 +85,27 @@ async def set_base(ctx: discord.ApplicationContext, wikiurl: str): iw = wiki.create_subgroup("iw", "Set up commands for custom Interwiki.") -@iw.command(description="Add custom Interwiki.") +@iw.command(name="add", description="Add custom Interwiki.") @discord.option(name="interwiki", description="The custom Interwiki.") @discord.option(name="wikiurl", description="The URL of wiki.") async def add(ctx: discord.ApplicationContext, interwiki: str, wikiurl: str): await slash_parser(ctx, f'iw add {interwiki} {wikiurl}') -@iw.command(description="Remove custom Interwiki.") +@iw.command(name="remove", description="Remove custom Interwiki.") @discord.option(name="interwiki", description="The custom Interwiki.", autocomplete=auto_get_custom_iw_list) -async def iw_remove(ctx: discord.ApplicationContext, interwiki: str): +async def iwremove(ctx: discord.ApplicationContext, interwiki: str): await slash_parser(ctx, f'iw remove {interwiki}') @iw.command(name="list", description="Lists the currently configured Interwiki.") -@discord.option(name="legacy", choices=['True', 'False'], description="Whether to use legacy mode") +@discord.option(name="legacy", description="Whether to use legacy mode") async def iw_list(ctx: discord.ApplicationContext, legacy: str): legacy = "legacy" if legacy == "True" else "" await slash_parser(ctx, f'iw list {legacy}') -@iw.command(description="Get the API address corresponding to the set Interwiki.") +@iw.command(name="show", description="Get the API address corresponding to the set Interwiki.") @discord.option(name="interwiki", description="The custom Interwiki.", autocomplete=auto_get_custom_iw_list) async def get(ctx: discord.ApplicationContext, interwiki: str): await slash_parser(ctx, f'iw get {interwiki}') From f65430a880249338d6a1170b5757ffe0f2e2969b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Tue, 19 Dec 2023 13:15:53 +0800 Subject: [PATCH 149/168] Update wiki.py --- bots/discord/slash/wiki.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bots/discord/slash/wiki.py b/bots/discord/slash/wiki.py index f42287b6e7..2fd4af3fd8 100644 --- a/bots/discord/slash/wiki.py +++ b/bots/discord/slash/wiki.py @@ -99,9 +99,8 @@ async def iwremove(ctx: discord.ApplicationContext, interwiki: str): @iw.command(name="list", description="Lists the currently configured Interwiki.") -@discord.option(name="legacy", description="Whether to use legacy mode") +@discord.option(name="legacy", choices=[('true', 'legacy'), ('false', '')], description="Whether to use legacy mode." ) async def iw_list(ctx: discord.ApplicationContext, legacy: str): - legacy = "legacy" if legacy == "True" else "" await slash_parser(ctx, f'iw list {legacy}') From d3987c54a17735ca874c80ae3e0549de110c2ace Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Tue, 19 Dec 2023 13:17:45 +0800 Subject: [PATCH 150/168] Update wiki.py --- modules/wiki/wiki.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/wiki/wiki.py b/modules/wiki/wiki.py index 15c956dbef..a0f715d194 100644 --- a/modules/wiki/wiki.py +++ b/modules/wiki/wiki.py @@ -127,7 +127,7 @@ async def query_pages(session: Union[Bot.MessageSession, QueryInfo], title: Unio if not matched: query_task[start_wiki]['query'].append(t) elif pageid is not None: - if iw == '': + if iw: query_task = {start_wiki: {'queryid': [pageid], 'iw_prefix': ''}} else: if iw in interwiki_list: From 01b171f5cff5bf9985cb0c18786c9abfe624f0be Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Tue, 19 Dec 2023 13:21:24 +0800 Subject: [PATCH 151/168] Update wiki.py --- modules/wiki/wiki.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/wiki/wiki.py b/modules/wiki/wiki.py index a0f715d194..8bda237b42 100644 --- a/modules/wiki/wiki.py +++ b/modules/wiki/wiki.py @@ -127,7 +127,7 @@ async def query_pages(session: Union[Bot.MessageSession, QueryInfo], title: Unio if not matched: query_task[start_wiki]['query'].append(t) elif pageid is not None: - if iw: + if not iw: query_task = {start_wiki: {'queryid': [pageid], 'iw_prefix': ''}} else: if iw in interwiki_list: From af833b82d0ee4a7627033991ddf9dadf9721d769 Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Tue, 19 Dec 2023 13:55:37 +0800 Subject: [PATCH 152/168] update --- bots/discord/slash/bugtracker.py | 3 ++- bots/discord/slash/color.py | 6 ++++-- bots/discord/slash/dice.py | 2 +- bots/discord/slash/wiki.py | 13 +++++++------ bots/lagrange/message.py | 2 +- core/builtins/message/chain.py | 4 ++-- core/parser/args.py | 2 +- core/utils/message.py | 6 +++--- modules/ask/tools/utils.py | 2 +- modules/chemical_code/__init__.py | 19 ++++++++++--------- modules/core/modules.py | 14 +++++++------- modules/phigros/genb19.py | 2 +- modules/secret/__init__.py | 2 +- modules/wiki/utils/ab_qq.py | 2 +- modules/wiki/utils/rc_qq.py | 4 ++-- modules/wiki/utils/wikilib.py | 22 ++++++++++------------ 16 files changed, 54 insertions(+), 51 deletions(-) diff --git a/bots/discord/slash/bugtracker.py b/bots/discord/slash/bugtracker.py index 1050bfd5ae..c874fac882 100644 --- a/bots/discord/slash/bugtracker.py +++ b/bots/discord/slash/bugtracker.py @@ -5,9 +5,10 @@ async def auto_search(ctx: discord.AutocompleteContext): - if ctx.options["mojiraid"] == '': + if not ctx.options["mojiraid"]: return ['BDS-', 'MCPE-', 'MCD-', 'MCL-', 'MCLG-', 'REALMS-', 'MC-', 'WEB-'] + @client.command(description="Query the corresponding ticket on Mojira.") @discord.option(name="mojiraid", autocomplete=auto_search) async def bugtracker(ctx: discord.ApplicationContext, mojiraid: str): diff --git a/bots/discord/slash/color.py b/bots/discord/slash/color.py index ea01c70051..f9905bc61b 100644 --- a/bots/discord/slash/color.py +++ b/bots/discord/slash/color.py @@ -5,10 +5,12 @@ async def auto_complete(ctx: discord.AutocompleteContext): - if ctx.options["color"] == '': + if not ctx.options["color"]: return ['#123456', 'rgb(12,34,56)', 'hsl(123,45%,67%)'] + @client.slash_command(description="Get color information.") -@discord.option(name="color", default="", autocomplete=auto_complete, description="Color information. Support for Hex, RGB, HSL color code, or name in CSS and Material Design.") +@discord.option(name="color", default="", autocomplete=auto_complete, + description="Color information. Support for Hex, RGB, HSL color code, or name in CSS and Material Design.") async def color(ctx: discord.ApplicationContext, color: str): await slash_parser(ctx, color) diff --git a/bots/discord/slash/dice.py b/bots/discord/slash/dice.py index bc39a486eb..e61abdb35e 100644 --- a/bots/discord/slash/dice.py +++ b/bots/discord/slash/dice.py @@ -5,7 +5,7 @@ async def auto_complete(ctx: discord.AutocompleteContext): - if ctx.options["dices"] == '': + if not ctx.options["dices"]: return ['d4', 'd6', 'd8', 'd12', 'd20'] diff --git a/bots/discord/slash/wiki.py b/bots/discord/slash/wiki.py index 2fd4af3fd8..557eb9b9ab 100644 --- a/bots/discord/slash/wiki.py +++ b/bots/discord/slash/wiki.py @@ -6,6 +6,7 @@ from bots.discord.slash_parser import slash_parser, ctx_to_session from modules.wiki import WikiLib, WikiTargetInfo + @client.slash_command(description="Get recent abuse logs for the default wiki.") async def ab(ctx: discord.ApplicationContext): await slash_parser(ctx, "legacy") @@ -14,12 +15,12 @@ async def ab(ctx: discord.ApplicationContext): @client.slash_command(description="Get recent newbie logs for the default wiki.") async def newbie(ctx: discord.ApplicationContext): await slash_parser(ctx, "") - + @client.slash_command(description="Get recent changes for the default wiki.") async def rc(ctx: discord.ApplicationContext): await slash_parser(ctx, "legacy") - + wiki = client.create_group("wiki", "Query information from Mediawiki-based websites.") @@ -54,7 +55,7 @@ async def auto_get_custom_iw_list(ctx: discord.AutocompleteContext): async def default_wiki(ctx: discord.AutocompleteContext): - if ctx.options["link"] == '': + if not ctx.options["link"]: return ['https://zh.minecraft.wiki/'] @@ -99,7 +100,7 @@ async def iwremove(ctx: discord.ApplicationContext, interwiki: str): @iw.command(name="list", description="Lists the currently configured Interwiki.") -@discord.option(name="legacy", choices=[('true', 'legacy'), ('false', '')], description="Whether to use legacy mode." ) +@discord.option(name="legacy", choices=[('true', 'legacy'), ('false', '')], description="Whether to use legacy mode.") async def iw_list(ctx: discord.ApplicationContext, legacy: str): await slash_parser(ctx, f'iw list {legacy}') @@ -126,7 +127,7 @@ async def set_headers(ctx: discord.ApplicationContext, headerkey: str): @headers.command(name='show', description="View the currently set request headers.") -async def show_headers(ctx: discord.ApplicationContext): +async def show_headers(ctx: discord.ApplicationContext): await slash_parser(ctx, 'headers show') @@ -147,7 +148,7 @@ async def set_prefix(ctx: discord.ApplicationContext, prefix: str): @p.command(name="reset", description="Reset custom wiki prefix.") async def reset_prefix(ctx: discord.ApplicationContext): await slash_parser(ctx, 'prefix reset') - + @wiki.command(description="Toggle whether to use Fandom global Interwiki queries.") async def fandom(ctx: discord.ApplicationContext): diff --git a/bots/lagrange/message.py b/bots/lagrange/message.py index bfc6185c03..c2b768128c 100644 --- a/bots/lagrange/message.py +++ b/bots/lagrange/message.py @@ -218,7 +218,7 @@ async def to_message_chain(self): spl = re.split(r'(\[CQ:.*?])', m) lst = [] for s in spl: - if s == '': + if not s: continue if s.startswith('[CQ:'): if s.startswith('[CQ:image'): diff --git a/core/builtins/message/chain.py b/core/builtins/message/chain.py index 1e88097b41..7c978f6190 100644 --- a/core/builtins/message/chain.py +++ b/core/builtins/message/chain.py @@ -184,7 +184,7 @@ def __repr__(self): def match_kecode(text: str) -> List[Union[Plain, Image, Voice, Embed]]: split_all = re.split(r'(\[Ke:.*?])', text) for x in split_all: - if x == '': + if not x: split_all.remove('') elements = [] for e in split_all: @@ -196,7 +196,7 @@ def match_kecode(text: str) -> List[Union[Plain, Image, Voice, Embed]]: element_type = match.group(1).lower() args = re.split(r',|,.\s', match.group(2)) for x in args: - if x == '': + if not x: args.remove('') if element_type == 'plain': for a in args: diff --git a/core/parser/args.py b/core/parser/args.py index 671721488a..9ed28bbe3d 100644 --- a/core/parser/args.py +++ b/core/parser/args.py @@ -130,7 +130,7 @@ def parse_template(argv: List[str]) -> List[Template]: patterns = filter(None, re.split(r'(\[.*?])|(<.*?>)|(\{.*})| ', a)) for p in patterns: strip_pattern = p.strip() - if strip_pattern == '': + if not strip_pattern: continue if strip_pattern.startswith('['): if not strip_pattern.endswith(']'): diff --git a/core/utils/message.py b/core/utils/message.py index 6ba1fa24d1..56f4bf8b15 100644 --- a/core/utils/message.py +++ b/core/utils/message.py @@ -18,15 +18,15 @@ def remove_ineffective_text(prefix: str, lst: list) -> list: for y in lst: split_list = y.split(x) for _ in split_list: - if split_list[0] == '': + if not split_list[0]: del split_list[0] if len(split_list) > 0: - if split_list[-1] == '': + if not split_list[-1]: del split_list[-1] for _ in split_list: if len(split_list) > 0: spl0 = split_list[0] - if spl0.startswith(prefix) and spl0 != '': + if spl0.startswith(prefix) and spl0: split_list[0] = re.sub(r'^' + prefix, '', split_list[0]) list_cache.append(x.join(split_list)) lst = list_cache diff --git a/modules/ask/tools/utils.py b/modules/ask/tools/utils.py index f210c63cb8..a9df64db14 100644 --- a/modules/ask/tools/utils.py +++ b/modules/ask/tools/utils.py @@ -24,7 +24,7 @@ async def wrapper(*args, **kwargs): def with_args(func: Callable, *args, **kwargs): async def wrapper(*a, **k): # if a is tuple with empty string - if len(a) == 1 and a[0] == '': + if len(a) == 1 and not a[0]: return await func(*args, **kwargs, **k) return await func(*args, *a, **kwargs, **k) diff --git a/modules/chemical_code/__init__.py b/modules/chemical_code/__init__.py index e14e8da533..daf4117fe4 100644 --- a/modules/chemical_code/__init__.py +++ b/modules/chemical_code/__init__.py @@ -21,8 +21,9 @@ csr_link = 'https://www.chemspider.com' -special_id_path = os.path.abspath(f'./assets/chemical_code/special_id') # 去掉文件扩展名并存储在 special_id 列表中 -special_id = [os.path.splitext(filename)[0] for filename in os.listdir(special_id_path)] # 可能会导致识别问题的物质（如部分单质）ID，这些 ID 的图片将会在本地调用 +special_id_path = os.path.abspath(f'./assets/chemical_code/special_id') # 去掉文件扩展名并存储在 special_id 列表中 +special_id = [os.path.splitext(filename)[0] for filename in os.listdir( + special_id_path)] # 可能会导致识别问题的物质（如部分单质）ID，这些 ID 的图片将会在本地调用 element_lists = ['He', 'Li', 'Be', 'Ne', 'Na', 'Mg', 'Al', 'Si', 'Cl', 'Ar', 'Ca', 'Sc', 'Ti', 'Cr', 'Mn', 'Fe', 'Co', 'Ni', @@ -42,7 +43,7 @@ def parse_elements(formula: str) -> dict: elements = {} while True: - if formula == '': + if not formula: break for element in element_lists: if formula.startswith(element): @@ -60,7 +61,7 @@ def parse_elements(formula: str) -> dict: @retry(stop=stop_after_attempt(3), reraise=True) async def search_csr(id=None): - if id is not None: + if id is not None: answer_id = id else: answer_id = random.randint(1, CSID_RANGE_MAX) @@ -97,7 +98,7 @@ async def search_csr(id=None): play_state = {} # 创建一个空字典用于存放游戏状态 -@ccode.command('{{chemical_code.help}}') +@ccode.command('{{chemical_code.help}}') async def chemical_code_by_random(msg: Bot.MessageSession): await chemical_code(msg) @@ -126,7 +127,7 @@ async def s(msg: Bot.MessageSession): async def chemical_code_by_id(msg: Bot.MessageSession): id = msg.parsed_msg[''] if id.isdigit(): - if int(id) == 0: # 若 id 为 0，则随机 + if int(id) == 0: # 若 id 为 0，则随机 await chemical_code(msg) else: await chemical_code(msg, id, random_mode=False) @@ -145,7 +146,7 @@ async def chemical_code(msg: Bot.MessageSession, id=None, random_mode=True, capt play_state[msg.target.target_id]['active'] = False return await msg.finish(msg.locale.t('chemical_code.message.error')) # print(csr) - play_state[msg.target.target_id]['answer'] = csr['name'] + play_state[msg.target.target_id]['answer'] = csr['name'] Logger.info(f'Answer: {csr["name"]}') download = False if csr["id"] in special_id: # 如果正确答案在 special_id 中 @@ -226,7 +227,7 @@ async def ans(msg: Bot.MessageSession, answer, random_mode): play_state[msg.target.target_id]['active'] = False async def timer(start): - if play_state[msg.target.target_id]['active']: + if play_state[msg.target.target_id]['active']: if datetime.now().timestamp() - start > 60 * set_timeout: await msg.send_message( msg.locale.t('chemical_code.message.timeup', answer=play_state[msg.target.target_id]["answer"])) @@ -245,7 +246,7 @@ async def timer(start): result = await msg.wait_next_message([Plain(msg.locale.t('chemical_code.message.showid', id=csr["id"])), Image(newpath), Plain(msg.locale.t('chemical_code.message.captcha', times=set_timeout))], timeout=3600, append_instruction=False) - if play_state[msg.target.target_id]['active']: + if play_state[msg.target.target_id]['active']: if result.as_display(text_only=True) == csr['name']: send_ = msg.locale.t('chemical_code.message.correct') if (g_msg := await gained_petal(wait, 1)): diff --git a/modules/core/modules.py b/modules/core/modules.py index a0d1f48446..23236dfe93 100644 --- a/modules/core/modules.py +++ b/modules/core/modules.py @@ -132,7 +132,7 @@ async def config_modules(msg: Bot.MessageSession): recommend_modules_help_doc_list.append(msg.locale.tl_str(modules_[m].desc)) hdoc = CommandParser(modules_[m], msg=msg, bind_prefix=modules_[m].bind_prefix, command_prefixes=msg.prefixes).return_formatted_help_doc() - if hdoc == '': + if not hdoc: hdoc = msg.locale.t('core.help.none') recommend_modules_help_doc_list.append(hdoc) except InvalidHelpDocTypeError: @@ -177,14 +177,14 @@ def module_reload(module, extra_modules, base_mode=False): reload_count = ModulesManager.reload_module(module) if reload_count > 1: return msg.locale.t('core.message.module.reload.success', module=module) + \ - ('\n' if len(extra_modules) != 0 else '') + \ - '\n'.join(extra_modules) + \ - '\n' + msg.locale.t('core.message.module.reload.with', reloadCnt=reload_count - 1) + ('\n' if len(extra_modules) != 0 else '') + \ + '\n'.join(extra_modules) + \ + '\n' + msg.locale.t('core.message.module.reload.with', reloadCnt=reload_count - 1) elif reload_count == 1: return msg.locale.t('core.message.module.reload.success', module=module) + \ - ('\n' if len(extra_modules) != 0 else '') + \ - '\n'.join(extra_modules) + \ - '\n' + msg.locale.t('core.message.module.reload.no_more') + ('\n' if len(extra_modules) != 0 else '') + \ + '\n'.join(extra_modules) + \ + '\n' + msg.locale.t('core.message.module.reload.no_more') else: return msg.locale.t("core.message.module.reload.failed") diff --git a/modules/phigros/genb19.py b/modules/phigros/genb19.py index d558c91af3..1ce7a178d2 100644 --- a/modules/phigros/genb19.py +++ b/modules/phigros/genb19.py @@ -39,7 +39,7 @@ def drawb19(username, rks_acc, b19data): song_acc = song_[1]['accuracy'] song_base_rks = song_[1]['base_rks'] - if song_id == '': + if not song_id: cardimg = Image.new('RGBA', (384, 240), 'black') else: imgpath = os.path.abspath(f'{assets_path}/illustration/{song_id.split(".")[0].lower()}') diff --git a/modules/secret/__init__.py b/modules/secret/__init__.py index 06fba72c83..1bf6456d1d 100644 --- a/modules/secret/__init__.py +++ b/modules/secret/__init__.py @@ -40,7 +40,7 @@ async def check_abuse(): f'过滤器名：{y["filter"]}\n' \ f'操作：{y["action"]}\n' result = y['result'] - if result == '': + if not result: result = 'pass' s += '处理结果：' + result diff --git a/modules/wiki/utils/ab_qq.py b/modules/wiki/utils/ab_qq.py index bcf51bbdcf..c3bd4ff47a 100644 --- a/modules/wiki/utils/ab_qq.py +++ b/modules/wiki/utils/ab_qq.py @@ -44,7 +44,7 @@ async def ab_qq(msg: MessageSession, wiki_url): t.append(f"过滤器名：{x['filter']}") t.append(f"操作：{x['action']}") result = x['result'] - if result == '': + if not result: result = 'pass' t.append(f"处理结果：{result}") t.append(msg.ts2strftime(strptime2ts(x['timestamp']))) diff --git a/modules/wiki/utils/rc_qq.py b/modules/wiki/utils/rc_qq.py index 430bd2bf4a..cdaafce472 100644 --- a/modules/wiki/utils/rc_qq.py +++ b/modules/wiki/utils/rc_qq.py @@ -57,7 +57,7 @@ async def rc_qq(msg: MessageSession, wiki_url): count = str(count) t.append(f"{title_checked_map[x['title']]}（{count}）") comment = x['comment'] - if comment == '': + if not comment: comment = '（无摘要内容）' t.append(comment) t.append( @@ -70,7 +70,7 @@ async def rc_qq(msg: MessageSession, wiki_url): r = '（新重定向）' t.append(f"{title_checked_map[x['title']]}{r}") comment = x['comment'] - if comment == '': + if not comment: comment = '（无摘要内容）' t.append(comment) if x['type'] == 'log': diff --git a/modules/wiki/utils/wikilib.py b/modules/wiki/utils/wikilib.py index 0172283f41..136c5b4569 100644 --- a/modules/wiki/utils/wikilib.py +++ b/modules/wiki/utils/wikilib.py @@ -296,7 +296,7 @@ async def check_wiki_info_from_database_cache(self): return WikiStatus(available=False, value=False, message='') async def fixup_wiki_info(self): - if self.wiki_info.api == '': + if not self.wiki_info.api: wiki_info = await self.check_wiki_available() if wiki_info.available: self.wiki_info = wiki_info.value @@ -333,7 +333,7 @@ def parse_text(text): ell = True split_desc = desc.split('\n') for d in split_desc: - if d == '': + if not d: split_desc.remove('') if len(split_desc) > 5: split_desc = split_desc[0:5] @@ -441,10 +441,7 @@ async def parse_page_info(self, title: str = None, pageid: int = None, inline=Fa if Config('enable_tos'): raise WhatAreUDoingError selected_section = None - if title is not None: - if title == '': - return PageInfo(title='', link=self.wiki_info.articlepath.replace("$1", ""), info=self.wiki_info, - interwiki_prefix=_prefix, templates=[]) + if title: if inline: split_name = re.split(r'(#)', title) else: @@ -484,12 +481,13 @@ async def parse_page_info(self, title: str = None, pageid: int = None, inline=Fa query_string = {'action': 'query', 'prop': 'info|imageinfo|langlinks|templates', 'llprop': 'url', 'inprop': 'url', 'iiprop': 'url', 'redirects': 'True', 'titles': title} - elif pageid is not None: + elif pageid: page_info = PageInfo(info=self.wiki_info, title=title, args='', interwiki_prefix=_prefix) query_string = {'action': 'query', 'prop': 'info|imageinfo|langlinks|templates', 'llprop': 'url', 'inprop': 'url', 'iiprop': 'url', 'redirects': 'True', 'pageids': pageid} else: - raise ValueError('title and pageid cannot be both None') + return PageInfo(title='', link=self.wiki_info.articlepath.replace("$1", ""), info=self.wiki_info, + interwiki_prefix=_prefix, templates=[]) use_textextracts = True if 'TextExtracts' in self.wiki_info.extensions else False if use_textextracts and selected_section is None: query_string.update({'prop': 'info|imageinfo|langlinks|templates|extracts|pageprops', @@ -497,7 +495,7 @@ async def parse_page_info(self, title: str = None, pageid: int = None, inline=Fa 'exsectionformat': 'plain', 'exchars': '200'}) get_page = await self.get_json(**query_string) query = get_page.get('query') - if query is None: + if not query: return PageInfo(title=title, link=None, desc=self.locale.t("wiki.message.utils.wikilib.error.empty"), info=self.wiki_info) @@ -708,7 +706,7 @@ async def search_something(srwhat): page_info.link = full_url page_info.file = file page_info.desc = page_desc - if not _iw and page_info.args == '': + if not _iw and not page_info.args: page_info.link = self.wiki_info.script + f'?curid={page_info.id}' else: page_info.title = query_langlinks.title @@ -732,12 +730,12 @@ async def search_something(srwhat): _iw=_iw) before_page_info = page_info page_info = iw_query - if iw_query.title == '': + if not iw_query.title: page_info.title = '' else: page_info.before_title = before_page_info.title t = page_info.title - if t != '' and t is not None: + if t: if before_page_info.args is not None: page_info.before_title += urllib.parse.unquote(before_page_info.args) t += urllib.parse.unquote(before_page_info.args) From 3631633da836658b01ba1cdefaf1880b8c046ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Tue, 19 Dec 2023 14:20:20 +0800 Subject: [PATCH 153/168] Update wiki.py --- modules/wiki/wiki.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/wiki/wiki.py b/modules/wiki/wiki.py index 8bda237b42..931bb51baf 100644 --- a/modules/wiki/wiki.py +++ b/modules/wiki/wiki.py @@ -27,26 +27,24 @@ @wiki.command(' [-l ] {{wiki.help}}', options_desc={'-l': '{wiki.help.option.l}'}) -async def _(msg: Bot.MessageSession): +async def _(msg: Bot.MessageSession, PageName: str): get_lang = msg.parsed_msg.get('-l', False) if get_lang: lang = get_lang[''] else: lang = None - await query_pages(msg, msg.parsed_msg[''], lang=lang) + await query_pages(msg, PageName, lang=lang) @wiki.command('id {{wiki.help.id}}') -async def _(msg: Bot.MessageSession): - page_id: str = msg.parsed_msg[''] +async def _(msg: Bot.MessageSession, PageID: str): iw = None - if match_iw := re.match(r'(.*?):(.*)', page_id): + if match_iw := re.match(r'(.*?):(.*)', PageID): iw = match_iw.group(1) - page_id = match_iw.group(2) - if not page_id.isdigit(): + PageID = match_iw.group(2) + if not PageID.isdigit(): await msg.finish(msg.locale.t('wiki.message.id.error')) - Logger.debug(msg.parsed_msg) - await query_pages(msg, pageid=page_id, iw=iw) + await query_pages(msg, pageid=PageID, iw=iw) async def query_pages(session: Union[Bot.MessageSession, QueryInfo], title: Union[str, list, tuple] = None, From 54d4b9c5481dc59d82ef2a119aa111abd490b448 Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Tue, 19 Dec 2023 14:35:50 +0800 Subject: [PATCH 154/168] update --- bot.py | 2 +- bots/aiocqhttp/bot.py | 2 +- bots/api/bot.py | 2 +- bots/discord/slash/wiki.py | 2 +- bots/matrix/message.py | 4 +-- console.py | 4 +-- core/builtins/__init__.py | 4 +-- core/builtins/message/chain.py | 2 +- core/builtins/message/internal.py | 2 +- core/component.py | 2 +- core/parser/args.py | 2 +- core/parser/command.py | 4 +-- core/parser/message.py | 4 +-- core/types/message/__init__.py | 4 +-- core/utils/http.py | 2 +- core/utils/i18n.py | 2 +- core/utils/storedata.py | 2 +- database/__init__.py | 38 +++++++++++----------- database/local.py | 2 +- modules/color/__init__.py | 2 +- modules/core/alias.py | 8 ++--- modules/core/prefix.py | 2 +- modules/core/su_utils.py | 8 ++--- modules/cytoid/__init__.py | 7 ++-- modules/cytoid/dbutils.py | 2 +- modules/cytoid/profile.py | 4 +-- modules/cytoid/rating.py | 2 +- modules/cytoid/utils.py | 4 +-- modules/github/repo.py | 2 +- modules/github/user.py | 2 +- modules/maimai/__init__.py | 9 ++--- modules/maimai/libraries/maimaidx_music.py | 2 +- modules/maimai/regex.py | 23 ++++++------- modules/mcbbs_news/__init__.py | 2 +- modules/mkey/__init__.py | 2 +- modules/mkey/generator.py | 4 +-- modules/mod_dl/__init__.py | 12 +++---- modules/nintendo_err/ctr_results.py | 4 +-- modules/nintendo_err/ctr_support.py | 8 ++--- modules/nintendo_err/switch.py | 2 +- modules/nintendo_err/wiiu_results.py | 4 +-- modules/phigros/__init__.py | 4 +-- modules/phigros/dbutils.py | 2 +- modules/user/tpg.py | 2 +- modules/wiki/audit.py | 2 +- modules/wiki/search.py | 2 +- modules/wiki/utils/__init__.py | 6 ++-- modules/wiki/utils/dbutils.py | 8 ++--- modules/wiki/utils/screenshot_image.py | 10 +++--- modules/wiki/utils/wikilib.py | 10 +++--- modules/wiki/wiki.py | 6 ++-- schedulers/mcv_rss.py | 2 +- 52 files changed, 127 insertions(+), 128 deletions(-) diff --git a/bot.py b/bot.py index 8a07abc6eb..478d0b8106 100644 --- a/bot.py +++ b/bot.py @@ -154,7 +154,7 @@ def run_bot(): logger.remove() logger.add(sys.stderr, format='{message}', level="INFO") query_dbver = session.query(DBVersion).first() - if query_dbver is None: + if not query_dbver: session.add_all([DBVersion(value=str(BotDBUtil.database_version))]) session.commit() query_dbver = session.query(DBVersion).first() diff --git a/bots/aiocqhttp/bot.py b/bots/aiocqhttp/bot.py index edc85b5ec4..f05b6f58f6 100644 --- a/bots/aiocqhttp/bot.py +++ b/bots/aiocqhttp/bot.py @@ -107,7 +107,7 @@ class GuildAccountInfo: @bot.on_message('guild') async def _(event): - if GuildAccountInfo.tiny_id is None: + if not GuildAccountInfo.tiny_id: profile = await bot.call_action('get_guild_service_profile') GuildAccountInfo.tiny_id = profile['tiny_id'] tiny_id = event.user_id diff --git a/bots/api/bot.py b/bots/api/bot.py index c507fc63ec..1b9d73b35a 100644 --- a/bots/api/bot.py +++ b/bots/api/bot.py @@ -54,7 +54,7 @@ async def auth(token: str): @app.get('/target/{target_id}') async def get_target(target_id: str): target = BotDBUtil.TargetInfo(target_id) - if target.query is None: + if not target.query: return JSONResponse(status_code=404, content={ 'target_id': target_id, 'notFound': True, diff --git a/bots/discord/slash/wiki.py b/bots/discord/slash/wiki.py index 557eb9b9ab..a09c1557fd 100644 --- a/bots/discord/slash/wiki.py +++ b/bots/discord/slash/wiki.py @@ -36,7 +36,7 @@ async def auto_search(ctx: discord.AutocompleteContext): query_wiki = iws[match_iw.group(1)] iw = match_iw.group(1) + ':' title = match_iw.group(2) - if query_wiki is None: + if not query_wiki: return [] wiki = WikiLib(query_wiki) if title != "": diff --git a/bots/matrix/message.py b/bots/matrix/message.py index f8aa6c72ee..00d9413685 100644 --- a/bots/matrix/message.py +++ b/bots/matrix/message.py @@ -83,7 +83,7 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal filename = os.path.basename(path) filesize = os.path.getsize(path) (content_type, content_encoding) = mimetypes.guess_type(path) - if content_type is None or content_encoding is None: + if not content_type or not content_encoding: content_type = 'image' content_encoding = 'png' mimetype = f"{content_type}/{content_encoding}" @@ -112,7 +112,7 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal filename = os.path.basename(path) filesize = os.path.getsize(path) (content_type, content_encoding) = mimetypes.guess_type(path) - if content_type is None or content_encoding is None: + if not content_type or not content_encoding: content_type = 'audio' content_encoding = 'ogg' mimetype = f"{content_type}/{content_encoding}" diff --git a/console.py b/console.py index 8deb5096e5..7f8cf6776b 100644 --- a/console.py +++ b/console.py @@ -3,7 +3,7 @@ from config import Config -if Config('db_path') is None: +if not Config('db_path'): raise AttributeError('Wait! You need to fill a valid database address into the config.cfg "db_path" field\n' 'Example: \ndb_path = sqlite:///database/save.db\n' '(Also you can fill in the above example directly,' @@ -26,7 +26,7 @@ from core.logger import Logger query_dbver = session.query(DBVersion).first() -if query_dbver is None: +if not query_dbver: session.add_all([DBVersion(value=str(BotDBUtil.database_version))]) session.commit() query_dbver = session.query(DBVersion).first() diff --git a/core/builtins/__init__.py b/core/builtins/__init__.py index feab461b74..ffa273858d 100644 --- a/core/builtins/__init__.py +++ b/core/builtins/__init__.py @@ -76,9 +76,9 @@ async def trigger(module_or_hook_name: str, args): class FetchedSession(FetchedSessionT): def __init__(self, target_from, target_id, sender_from=None, sender_id=None): - if sender_from is None: + if not sender_from: sender_from = target_from - if sender_id is None: + if not sender_id: sender_id = target_id self.target = MsgInfo(target_id=f'{target_from}|{target_id}', sender_id=f'{sender_from}|{sender_id}', diff --git a/core/builtins/message/chain.py b/core/builtins/message/chain.py index 7c978f6190..e02f0947db 100644 --- a/core/builtins/message/chain.py +++ b/core/builtins/message/chain.py @@ -65,7 +65,7 @@ def __init__(self, elements: Union[str, List[Union[Plain, Image, Voice, Embed, U Logger.error(f'Unexpected message type: {elements}') elif isinstance(elements, MessageChain): self.value = elements.value - elif elements is None: + elif not elements: pass else: Logger.error(f'Unexpected message type: {elements}') diff --git a/core/builtins/message/internal.py b/core/builtins/message/internal.py index 02268add1e..1ab3ea43a0 100644 --- a/core/builtins/message/internal.py +++ b/core/builtins/message/internal.py @@ -103,7 +103,7 @@ def __init__(self, key, **kwargs): self.kwargs = kwargs def __str__(self): - return self.key + return str(self.to_dict()) def __repr__(self): return f'I18NContext(key="{self.key}", kwargs={self.kwargs})' diff --git a/core/component.py b/core/component.py index f33c302be4..1a36959a21 100644 --- a/core/component.py +++ b/core/component.py @@ -34,7 +34,7 @@ def decorator(function): help_doc = [help_doc] if help_docs: help_doc += help_docs - if help_doc is None: + if not help_doc: help_doc = [] ModulesManager.bind_to_module( diff --git a/core/parser/args.py b/core/parser/args.py index 9ed28bbe3d..bcd524db61 100644 --- a/core/parser/args.py +++ b/core/parser/args.py @@ -210,7 +210,7 @@ def parse_argv(argv: List[str], templates: List[Template]) -> MatchedResult: continue for a in args: # optional first if isinstance(a, OptionalPattern): - if a.flag is None: + if not a.flag: afters.append(a.args[0]) continue parsed_argv[a.flag] = Optional({}, flagged=False) diff --git a/core/parser/command.py b/core/parser/command.py index 0458b7a513..210e37ac96 100644 --- a/core/parser/command.py +++ b/core/parser/command.py @@ -24,7 +24,7 @@ def __init__(self, args: Module, command_prefixes: list, self.lang = self.msg.locale if self.msg is not None else Locale(default_locale) help_docs = {} for match in ( - args.command_list.set if self.msg is None else args.command_list.get( + args.command_list.set if not self.msg else args.command_list.get( self.msg.target.target_from)): if match.help_doc: for m in match.help_doc: @@ -64,7 +64,7 @@ def return_formatted_help_doc(self) -> str: return args def parse(self, command): - if self.args is None: + if not self.args: return None command = re.sub(r'[“”]', '"', command) try: diff --git a/core/parser/message.py b/core/parser/message.py index 59f8621317..5acf2c02ff 100644 --- a/core/parser/message.py +++ b/core/parser/message.py @@ -37,7 +37,7 @@ async def remove_temp_ban(msg: Bot.MessageSession): async def tos_msg_counter(msg: Bot.MessageSession, command: str): same = counter_same.get(msg.target.sender_id) - if same is None or datetime.now().timestamp() - same['ts'] > 300 or same['command'] != command: + if not same or datetime.now().timestamp() - same['ts'] > 300 or same['command'] != command: # 检查是否滥用（5分钟内重复使用同一命令10条） counter_same[msg.target.sender_id] = {'command': command, 'count': 1, 'ts': datetime.now().timestamp()} @@ -46,7 +46,7 @@ async def tos_msg_counter(msg: Bot.MessageSession, command: str): if same['count'] > 10: raise AbuseWarning(msg.locale.t("tos.reason.cooldown")) all_ = counter_all.get(msg.target.sender_id) - if all_ is None or datetime.now().timestamp() - all_['ts'] > 300: # 检查是否滥用（5分钟内使用20条命令） + if not all_ or datetime.now().timestamp() - all_['ts'] > 300: # 检查是否滥用（5分钟内使用20条命令） counter_all[msg.target.sender_id] = {'count': 1, 'ts': datetime.now().timestamp()} else: diff --git a/core/types/message/__init__.py b/core/types/message/__init__.py index edb1846fe5..7977762184 100644 --- a/core/types/message/__init__.py +++ b/core/types/message/__init__.py @@ -294,9 +294,9 @@ def __str__(self): class FetchedSession: def __init__(self, target_from, target_id, sender_from=None, sender_id=None): - if sender_from is None: + if not sender_from: sender_from = target_from - if sender_id is None: + if not sender_id: sender_id = target_id self.target = MsgInfo(target_id=f'{target_from}|{target_id}', sender_id=f'{target_from}|{sender_id}', diff --git a/core/utils/http.py b/core/utils/http.py index cba813e081..f5da8de14f 100644 --- a/core/utils/http.py +++ b/core/utils/http.py @@ -178,7 +178,7 @@ async def download_(): logging_err_resp=logging_err_resp) if data is not None: - if filename is None: + if not filename: ftt = ft.match(data).extension path = f'{random_cache_path()}.{ftt}' else: diff --git a/core/utils/i18n.py b/core/utils/i18n.py index e64ba4cd8c..c9c2a22fbf 100644 --- a/core/utils/i18n.py +++ b/core/utils/i18n.py @@ -107,7 +107,7 @@ def load_locale_file(): class Locale: def __init__(self, locale: str, fallback_lng=None): """创建一个本地化对象""" - if fallback_lng is None: + if not fallback_lng: fallback_lng = ['zh_cn', 'zh_tw', 'en_us'] self.locale = locale self.data: LocaleNode = locale_root.query_node(locale) diff --git a/core/utils/storedata.py b/core/utils/storedata.py index 6fd0a4b506..7f9ed5c8b1 100644 --- a/core/utils/storedata.py +++ b/core/utils/storedata.py @@ -8,7 +8,7 @@ def get_stored_list(bot: Union[FetchTarget, str], name: str) -> list: get = BotDBUtil.Data(bot).get(name=name) - if get is None: + if not get: return [] else: return json.loads(get.value) diff --git a/database/__init__.py b/database/__init__.py index 6e5df437f4..94a19d321d 100644 --- a/database/__init__.py +++ b/database/__init__.py @@ -41,7 +41,7 @@ def query_data(self): @retry(stop=stop_after_attempt(3)) @auto_rollback_error def init(self): - if self.query is None: + if not self.query: session.add_all([TargetInfo(targetId=self.target_id)]) session.commit() return self.query_data @@ -50,7 +50,7 @@ def init(self): @property def enabled_modules(self) -> list: - if self.query is None: + if not self.query: return [] return json.loads(self.query.enabledModules) @@ -60,7 +60,7 @@ def check_target_enabled_module(self, module_name) -> bool: @retry(stop=stop_after_attempt(3)) @auto_rollback_error def enable(self, module_name) -> bool: - if self.query is None: + if not self.query: self.query = self.init() enabled_modules = self.enabled_modules.copy() if isinstance(module_name, str): @@ -94,14 +94,14 @@ def disable(self, module_name) -> bool: @property def is_muted(self): - if self.query is None: + if not self.query: return False return self.query.muted @retry(stop=stop_after_attempt(3)) @auto_rollback_error def switch_mute(self) -> bool: - if self.query is None: + if not self.query: self.query = self.init() self.query.muted = not self.query.muted session.commit() @@ -109,16 +109,16 @@ def switch_mute(self) -> bool: @property def options(self): - if self.query is None: + if not self.query: return {} return json.loads(self.query.options) def get_option(self, k=None): - if self.query is None and k is None: + if not self.query and k is None: return {} - elif self.query is None and k is not None: + elif not self.query and k is not None: return None - if k is None: + if not k: return self.options else: return self.options.get(k) @@ -126,7 +126,7 @@ def get_option(self, k=None): @retry(stop=stop_after_attempt(3)) @auto_rollback_error def edit_option(self, k, v) -> bool: - if self.query is None: + if not self.query: self.query = self.init() self.query.options = json.dumps({**json.loads(self.query.options), k: v}) session.commit() @@ -146,7 +146,7 @@ def remove_option(self, k) -> bool: @retry(stop=stop_after_attempt(3)) @auto_rollback_error def edit(self, column: str, value): - if self.query is None: + if not self.query: self.query = self.init() query = self.query setattr(query, column, value) @@ -156,7 +156,7 @@ def edit(self, column: str, value): @property def custom_admins(self): - if self.query is None: + if not self.query: return [] return json.loads(self.query.custom_admins) @@ -166,7 +166,7 @@ def check_custom_target_admin(self, sender_id) -> bool: @retry(stop=stop_after_attempt(3)) @auto_rollback_error def add_custom_admin(self, sender_id) -> bool: - if self.query is None: + if not self.query: self.query = self.init() custom_admins = self.custom_admins.copy() if sender_id not in custom_admins: @@ -187,7 +187,7 @@ def remove_custom_admin(self, sender_id) -> bool: @property def locale(self): - if self.query is None: + if not self.query: self.query = self.init() return self.query.locale @@ -200,14 +200,14 @@ def get_enabled_this(module_name, id_prefix=None) -> List[TargetInfo]: @property def petal(self): - if self.query is None: + if not self.query: return 0 return self.query.petal @retry(stop=stop_after_attempt(3)) @auto_rollback_error def modify_petal(self, amount: int) -> bool: - if self.query is None: + if not self.query: self.query = self.init() petal = self.petal new_petal = petal + amount @@ -221,7 +221,7 @@ class SenderInfo: def __init__(self, sender_id): self.sender_id = sender_id self.query = self.query_SenderInfo - if self.query is None: + if not self.query: session.add_all([SenderInfo(id=sender_id)]) session.commit() self.query = session.query(SenderInfo).filter_by(id=sender_id).first() @@ -249,7 +249,7 @@ def __init__(self, msg: MessageSession, name): self.name = name self.query = session.query(CommandTriggerTime).filter_by(targetId=str(msg.target.sender_id), commandName=name).first() - self.need_insert = True if self.query is None else False + self.need_insert = True if not self.query else False def check(self, delay): if not self.need_insert: @@ -303,7 +303,7 @@ def get(self, name): @auto_rollback_error def update(self, name, value: str): exists = self.get(name) - if exists is None: + if not exists: self.add(name=name, value=value) else: exists.value = value diff --git a/database/local.py b/database/local.py index 32efdeae47..6cf525624c 100644 --- a/database/local.py +++ b/database/local.py @@ -51,7 +51,7 @@ def __init__(self, query_word): self.query_word = query_word self.query = session.query(DirtyFilterTable).filter_by(desc=self.query_word).first() self.need_insert = False - if self.query is None: + if not self.query: self.need_insert = True if self.query is not None and datetime.datetime.now().timestamp() - self.query.timestamp.timestamp() > 86400: session.delete(self.query) diff --git a/modules/color/__init__.py b/modules/color/__init__.py index d45066af81..3605dfe968 100644 --- a/modules/color/__init__.py +++ b/modules/color/__init__.py @@ -27,7 +27,7 @@ @c.command('[] {{color.help}}') @c.command() async def _(msg: Bot.MessageSession, color: str = None): - if color is None: + if not color: color = webcolors.HTML5SimpleColor(*(np.random.randint(0, 256, 3))) elif css_names_to_hex.get(color) is not None: color = webcolors.html5_parse_simple_color(css_names_to_hex[color]) diff --git a/modules/core/alias.py b/modules/core/alias.py index ea5d87d783..c007cd1941 100644 --- a/modules/core/alias.py +++ b/modules/core/alias.py @@ -14,7 +14,7 @@ async def set_alias(msg: Bot.MessageSession): aliases = msg.options.get('command_alias') alias = msg.parsed_msg.get('', False) command = msg.parsed_msg.get('', False) - if aliases is None: + if not aliases: aliases = {} if 'add' in msg.parsed_msg: if alias not in aliases: @@ -55,7 +55,7 @@ async def set_alias(msg: Bot.MessageSession): await msg.finish([msg.locale.t("core.message.alias.list"), Image(img)]) else: pass - + if legacy: - await msg.finish(f'{msg.locale.t("core.message.alias.list")}\n' - + '\n'.join([f'{k} -> {aliases[k]}' for k in aliases])) + await msg.finish(f'{msg.locale.t("core.message.alias.list")}\n' + + '\n'.join([f'{k} -> {aliases[k]}' for k in aliases])) diff --git a/modules/core/prefix.py b/modules/core/prefix.py index 10b69ecd67..f857d5b75c 100644 --- a/modules/core/prefix.py +++ b/modules/core/prefix.py @@ -11,7 +11,7 @@ async def set_prefix(msg: Bot.MessageSession): prefixes = msg.options.get('command_prefix') prefix = msg.parsed_msg.get('', False) - if prefixes is None: + if not prefixes: prefixes = [] if 'add' in msg.parsed_msg: if prefix: diff --git a/modules/core/su_utils.py b/modules/core/su_utils.py index bb16d6e9cf..bc310a6db3 100644 --- a/modules/core/su_utils.py +++ b/modules/core/su_utils.py @@ -78,7 +78,7 @@ async def _(msg: Bot.MessageSession): module_ = None if '' in msg.parsed_msg: module_ = msg.parsed_msg[''] - if module_ is None: + if not module_: result = msg.locale.t("core.message.analytics.days.total", first_record=first_record.timestamp) else: result = msg.locale.t("core.message.analytics.days", module=module_, @@ -116,7 +116,7 @@ async def _(msg: Bot.MessageSession): module_ = None if '' in msg.parsed_msg: module_ = msg.parsed_msg[''] - if module_ is None: + if not module_: result = msg.locale.t("core.message.analytics.year.total", first_record=first_record.timestamp) else: result = msg.locale.t("core.message.analytics.year", module=module_, @@ -185,7 +185,7 @@ async def _(msg: Bot.MessageSession): if not target.startswith(f'{msg.target.target_from}|'): await msg.finish(msg.locale.t("core.message.set.invalid")) target_data = BotDBUtil.TargetInfo(target) - if target_data.query is None: + if not target_data.query: confirm = await msg.wait_confirm(msg.locale.t("core.message.set.confirm.init"), append_instruction=False) if not confirm: return @@ -203,7 +203,7 @@ async def _(msg: Bot.MessageSession): if not target.startswith(f'{msg.target.target_from}|'): await msg.finish(msg.locale.t("core.message.set.invalid")) target_data = BotDBUtil.TargetInfo(target) - if target_data.query is None: + if not target_data.query: confirm = await msg.wait_confirm(msg.locale.t("core.message.set.confirm.init"), append_instruction=False) if not confirm: return diff --git a/modules/cytoid/__init__.py b/modules/cytoid/__init__.py index 94b03bbf12..aeb02a381b 100644 --- a/modules/cytoid/__init__.py +++ b/modules/cytoid/__init__.py @@ -7,7 +7,7 @@ from .utils import get_profile_name ctd = module('cytoid', desc='{cytoid.help.desc}', - developers=['OasisAkari'], alias='ctd') + developers=['OasisAkari'], alias='ctd') @ctd.handle('profile [] {{cytoid.help.profile}}') @@ -30,7 +30,7 @@ async def _(msg: Bot.MessageSession): query_id = pat else: query_id = CytoidBindInfoManager(msg).get_bind_username() - if query_id is None: + if not query_id: await msg.finish(msg.locale.t('cytoid.message.user_unbound', prefix=msg.prefixes[0])) if query: if msg.target.target_from == 'TEST|Console': @@ -48,7 +48,8 @@ async def _(msg: Bot.MessageSession): if img['status']: qc.reset() else: - res = msg.locale.t('message.cooldown', time=int(c), cd_time='150') + msg.locale.t('cytoid.message.b30.cooldown') + res = msg.locale.t('message.cooldown', time=int(c), cd_time='150') + \ + msg.locale.t('cytoid.message.b30.cooldown') await msg.finish(res) diff --git a/modules/cytoid/dbutils.py b/modules/cytoid/dbutils.py index dd69d2c58d..bd7d8ecaa6 100644 --- a/modules/cytoid/dbutils.py +++ b/modules/cytoid/dbutils.py @@ -13,7 +13,7 @@ class CytoidBindInfoManager: def __init__(self, msg: Bot.MessageSession): self.target_id = msg.target.sender_id self.query = session.query(CytoidBindInfo).filter_by(targetId=self.target_id).first() - if self.query is None: + if not self.query: session.add_all([CytoidBindInfo(targetId=self.target_id, username='')]) session.commit() self.query = session.query(CytoidBindInfo).filter_by(targetId=self.target_id).first() diff --git a/modules/cytoid/profile.py b/modules/cytoid/profile.py index 2464ca24cb..9fa0230472 100644 --- a/modules/cytoid/profile.py +++ b/modules/cytoid/profile.py @@ -11,7 +11,7 @@ async def cytoid_profile(msg: Bot.MessageSession): query_id = pat.lower() else: query_id = CytoidBindInfoManager(msg).get_bind_username() - if query_id is None: + if not query_id: await msg.finish(msg.locale.t('cytoid.message.user_unbound', prefix=msg.prefixes[0])) profile_url = 'http://services.cytoid.io/profile/' + query_id try: @@ -22,8 +22,6 @@ async def cytoid_profile(msg: Bot.MessageSession): raise e uid = profile['user']['uid'] nick = profile['user']['name'] - if nick is None: - nick = False avatar = profile['user']['avatar']['large'] basic_exp = profile['exp']['basicExp'] level_exp = profile['exp']['levelExp'] diff --git a/modules/cytoid/rating.py b/modules/cytoid/rating.py index 30924b76c2..db231bd071 100644 --- a/modules/cytoid/rating.py +++ b/modules/cytoid/rating.py @@ -37,7 +37,7 @@ async def get_rating(msg: Bot.MessageSession, uid, query_type): profile_level = profile_json['exp']['currentLevel'] profile_uid = profile_json['user']['uid'] nick = profile_json['user']['name'] - if nick is None: + if not nick: nick = profile_uid if 'avatar' in profile_json['user']: avatar_img = profile_json['user']['avatar']['medium'] diff --git a/modules/cytoid/utils.py b/modules/cytoid/utils.py index e50b4025c5..29172d7c6b 100644 --- a/modules/cytoid/utils.py +++ b/modules/cytoid/utils.py @@ -7,11 +7,11 @@ async def get_profile_name(userid): try: profile_url = 'http://services.cytoid.io/profile/' + userid profile = json.loads(await get_url(profile_url, 200)) - except: + except BaseException: return False uid = profile['user']['uid'] nick = profile['user']['name'] - if nick is None: + if not nick: nick = False return uid, nick diff --git a/modules/github/repo.py b/modules/github/repo.py index 773800fc0f..3dc9dcf1e2 100644 --- a/modules/github/repo.py +++ b/modules/github/repo.py @@ -32,7 +32,7 @@ async def repo(msg: Bot.MessageSession): parent = f' (This is a fork of {parent_name} )' desc = result['description'] - if desc is None: + if not desc: desc = '' else: desc = '\n' + result['description'] diff --git a/modules/github/user.py b/modules/github/user.py index 2ef88adb29..04d98e6628 100644 --- a/modules/github/user.py +++ b/modules/github/user.py @@ -24,7 +24,7 @@ async def user(msg: Bot.MessageSession): optional.append('Location · ' + result['location']) bio = result['bio'] - if bio is None: + if not bio: bio = '' else: bio = '\n' + result['bio'] diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index 21263c25e8..884d00adcd 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -229,9 +229,9 @@ async def _(msg: Bot.MessageSession, id_or_alias: str, diff: str = None): else: message = msg.locale.t( "maimai.message.song", - artist=music['basic_info']['artist'], + artist=music['basic_info']['artist'], genre=music['basic_info']['genre'], - bpm=music['basic_info']['bpm'], + bpm=music['basic_info']['bpm'], version=music['basic_info']['from'], level='/'.join((str(ds) for ds in music['ds']))) await msg.finish(await get_info(msg, music, Plain(message))) @@ -259,10 +259,10 @@ async def _(msg: Bot.MessageSession, id_or_alias: str, username: str = None): if not music: await msg.finish(msg.locale.t("maimai.message.music_not_found")) - if username is None and msg.target.sender_from == "QQ": + if not username and msg.target.sender_from == "QQ": payload = {'qq': msg.session.sender} else: - if username is None: + if not username: await msg.finish(msg.locale.t("maimai.message.no_username")) payload = {'username': username} @@ -462,6 +462,7 @@ async def _(msg: Bot.MessageSession, base: float, score: float): if score: await msg.finish([Plain(max(0, computeRa(base, score)))]) + def computeRa(base: float, achievement: float) -> int: if achievement < 50: baseRa = 7.0 diff --git a/modules/maimai/libraries/maimaidx_music.py b/modules/maimai/libraries/maimaidx_music.py index 17a9935b6f..bc55f8edc3 100644 --- a/modules/maimai/libraries/maimaidx_music.py +++ b/modules/maimai/libraries/maimaidx_music.py @@ -160,7 +160,7 @@ def __init__(self): self.total_list = None async def get(self): - if self.total_list is None: + if not self.total_list: obj = await get_url('https://www.diving-fish.com/api/maimaidxprober/music_data', 200, fmt='json') total_list: MusicList = MusicList(obj) for __i in range(len(total_list)): diff --git a/modules/maimai/regex.py b/modules/maimai/regex.py index aa63ef4558..6d6c7696b0 100644 --- a/modules/maimai/regex.py +++ b/modules/maimai/regex.py @@ -19,6 +19,7 @@ diff_label_zhs = ['绿', '黄', '红', '紫', '白'] diff_label_zht = ['綠', '黃', '紅'] + def get_diff(diff): diff = diff.lower() diff_label_lower = [label.lower() for label in diff_label] @@ -65,11 +66,11 @@ async def _(msg: Bot.MessageSession): await msg.finish(msg.locale.t("maimai.message.music_not_found")) await msg.finish(await get_info(msg, music, Plain(msg.locale.t("maimai.message.song", - artist=music['basic_info']['artist'], - genre=music['basic_info']['genre'], - bpm=music['basic_info']['bpm'], - version=music['basic_info']['from'], - level='/'.join((str(ds) for ds in music['ds'])))))) + artist=music['basic_info']['artist'], + genre=music['basic_info']['genre'], + bpm=music['basic_info']['bpm'], + version=music['basic_info']['from'], + level='/'.join((str(ds) for ds in music['ds'])))))) @mai_regex.regex(re.compile(r"(.+)\s?有什[么麼]分\s?(.+)?"), desc='{maimai.help.maimai_regex.info}') @@ -95,10 +96,10 @@ async def _(msg: Bot.MessageSession): if not music: await msg.finish(msg.locale.t("maimai.message.music_not_found")) - if username is None and msg.target.sender_from == "QQ": + if not username and msg.target.sender_from == "QQ": payload = {'qq': msg.session.sender} else: - if username is None: + if not username: await msg.finish(msg.locale.t("maimai.message.no_username")) payload = {'username': username} @@ -154,10 +155,10 @@ async def _(msg: Bot.MessageSession): async def _(msg: Bot.MessageSession): plate = msg.matched_msg.groups()[0] + msg.matched_msg.groups()[1] username = msg.matched_msg.groups()[2] - if username is None and msg.target.sender_from == "QQ": + if not username and msg.target.sender_from == "QQ": payload = {'qq': msg.session.sender} else: - if username is None: + if not username: await msg.finish(msg.locale.t("maimai.message.no_username")) payload = {'username': username} @@ -198,10 +199,10 @@ async def _(msg: Bot.MessageSession): username = msg.matched_msg.groups()[2] if not goal: return - if username is None and msg.target.sender_from == "QQ": + if not username and msg.target.sender_from == "QQ": payload = {'qq': msg.session.sender} else: - if username is None: + if not username: await msg.finish(msg.locale.t("maimai.message.no_username")) payload = {'username': username} diff --git a/modules/mcbbs_news/__init__.py b/modules/mcbbs_news/__init__.py index 2c280c7bd2..924496b561 100644 --- a/modules/mcbbs_news/__init__.py +++ b/modules/mcbbs_news/__init__.py @@ -15,7 +15,7 @@ async def main(msg: Bot.MessageSession): res = await news(msg) Logger.debug('res' + str(res)) - if res is None: + if not res: message = msg.locale.t('mcbbs_news.message.not_found') else: lst = [] diff --git a/modules/mkey/__init__.py b/modules/mkey/__init__.py index 975b52c956..f1100481b1 100644 --- a/modules/mkey/__init__.py +++ b/modules/mkey/__init__.py @@ -25,7 +25,7 @@ async def mkey(msg: Bot.MessageSession, device: str, month: int, day: int, inqui if len(inquiry_num) not in [6, 8, 10]: await msg.finish(msg.locale.t('mkey.message.error.inquiry_num')) device_code = device_codes[device.lower()] - if device_id is None and device_code == "HAC": + if not device_id and device_code == "HAC": await msg.finish(msg.locale.t('mkey.message.error.hal')) result = get_mkey(inquiry_num, month, day, device_id, device_code) diff --git a/modules/mkey/generator.py b/modules/mkey/generator.py index ca1b6b0981..6316d6088a 100644 --- a/modules/mkey/generator.py +++ b/modules/mkey/generator.py @@ -417,9 +417,9 @@ def generate(self, inquiry, month=None, day=None, aux=None, device=None): if not inquiry.isdigit(): raise ValueError("Inquiry string must represent a decimal number.") - if month is None: + if not month: month = datetime.date.today().month - if day is None: + if not day: day = datetime.date.today().day if month < 1 or month > 12: diff --git a/modules/mod_dl/__init__.py b/modules/mod_dl/__init__.py index 1de1812559..22864f5633 100644 --- a/modules/mod_dl/__init__.py +++ b/modules/mod_dl/__init__.py @@ -27,7 +27,7 @@ async def main(msg: Bot.MessageSession, mod_name: str, version: str = None): ver = version if version is not None: match_ver = re.match(r'^\d+\.\d+\.\d+$|^\d+\.\d+$|\d+w\d+[abcd]', version) - if match_ver is None: + if not match_ver: mod_name += ' ' + version ver = False @@ -115,14 +115,14 @@ async def get_curseforge_mod_file(modid: str, ver: str): # 搜索 Mod result = await asyncio.gather(*(search_modrinth(mod_name, ver), search_curseforge(mod_name, ver))) cache_result = [] - if result[0] is None and result[1] is None: + if not result[0] and not result[1]: await msg.finish(msg.locale.t("mod_dl.message.not_found")) else: # 合并搜索结果 reply_text, count = [], 0 # 先显示 CurseForge 的结果 - if result[1] is None: + if not result[1]: reply_text.append(msg.locale.t("mod_dl.message.curseforge.not_found")) else: reply_text.append(msg.locale.t("mod_dl.message.curseforge.result")) @@ -131,7 +131,7 @@ async def get_curseforge_mod_file(modid: str, ver: str): reply_text.append(f"{count}. {mod[1]}") cache_result.append(mod) - if result[0] is None: + if not result[0]: reply_text.append(msg.locale.t("mod_dl.message.modrinth.not_found")) reply_text.append(msg.locale.t("mod_dl.message.modrinth.result")) for mod in result[0]: @@ -153,7 +153,7 @@ async def get_curseforge_mod_file(modid: str, ver: str): await msg.finish(msg.locale.t("mod_dl.message.invalid.non_digital")) if mod_info[0] == "modrinth": # modrinth mod - if ver is None: + if not ver: reply2 = await msg.wait_reply(f'{msg.locale.t("mod_dl.message.version")}\n' + "\n".join(mod_info[3]) + f'\n{msg.locale.t("mod_dl.message.version.prompt")}', delete=True) @@ -176,7 +176,7 @@ async def get_curseforge_mod_file(modid: str, ver: str): if version["gameVersion"] not in ver_list: ver_list.append(version["gameVersion"]) if version_index is not None: - if ver is None: + if not ver: reply2 = await msg.wait_reply(f'{msg.locale.t("mod_dl.message.version")}\n' + '\n'.join(ver_list) + f'\n{msg.locale.t("mod_dl.message.version.prompt")}', delete=True) diff --git a/modules/nintendo_err/ctr_results.py b/modules/nintendo_err/ctr_results.py index df8c72af3b..d982f92885 100644 --- a/modules/nintendo_err/ctr_results.py +++ b/modules/nintendo_err/ctr_results.py @@ -337,9 +337,9 @@ def construct_result(ret, mod, summary, level, desc): ret.add_field(ConsoleErrorField('Summary', message_str=summaries.get(summary, ''), supplementary_value=summary)) ret.add_field(ConsoleErrorField('Level', message_str=levels.get(level, ''), supplementary_value=level)) description = module.get_error(desc) - if description is None: + if not description: description = common.get_error(desc) - if description is None: + if not description: ret.add_field(ConsoleErrorField('Description', supplementary_value=desc)) else: ret.add_field( diff --git a/modules/nintendo_err/ctr_support.py b/modules/nintendo_err/ctr_support.py index f60eea509b..257b4ea1cc 100644 --- a/modules/nintendo_err/ctr_support.py +++ b/modules/nintendo_err/ctr_support.py @@ -272,9 +272,9 @@ def construct_result(ret, mod, desc): module = ctr_results_modules.get(mod, Module('')) ret.add_field(ConsoleErrorField('模组', message_str=module.name, supplementary_value=mod)) description = module.get_error(desc) - if description is None or not description.description: + if not description or not description.description: description = ctr_results_modules[0].get_error(desc) - if description is None or not description.description: + if not description or not description.description: ret.add_field(ConsoleErrorField('描述', supplementary_value=desc)) else: ret.add_field(ConsoleErrorField('描述', message_str=description.description, supplementary_value=desc)) @@ -294,9 +294,9 @@ def construct_result_range(ret, mod, range_desc): continue description = module.get_error(desc) - if description is None or not description.description: + if not description or not description.description: description = ctr_results_modules[0].get_error(desc) - if description is None or not description.description: + if not description or not description.description: unknown_descs.append(str(desc)) else: found_descs.append( diff --git a/modules/nintendo_err/switch.py b/modules/nintendo_err/switch.py index b171734793..c2da32d133 100644 --- a/modules/nintendo_err/switch.py +++ b/modules/nintendo_err/switch.py @@ -1783,7 +1783,7 @@ def get(error): if summary: ret.add_field(ConsoleErrorField('Summary', message_str=summary)) description = module.get_error(code) - if description is None or not description.description: + if not description or not description.description: ret.add_field(ConsoleErrorField('Description', supplementary_value=code)) else: ret.add_field(ConsoleErrorField('Description', message_str=description.description, supplementary_value=code)) diff --git a/modules/nintendo_err/wiiu_results.py b/modules/nintendo_err/wiiu_results.py index 438f520485..84cd93e042 100644 --- a/modules/nintendo_err/wiiu_results.py +++ b/modules/nintendo_err/wiiu_results.py @@ -3329,9 +3329,9 @@ def construct_result(ret, mod, summary, level, desc, is_legacy): ret.add_field(ConsoleErrorField('Level', message_str=(legacy_levels if is_legacy else levels).get(level, ''), supplementary_value=level)) description = module.get_error(desc) - if description is None: + if not description: description = common.get_error(desc) - if description is None: + if not description: ret.add_field(ConsoleErrorField('Description', supplementary_value=desc)) else: ret.add_field( diff --git a/modules/phigros/__init__.py b/modules/phigros/__init__.py index 35ac19c95e..5d9ef97b99 100644 --- a/modules/phigros/__init__.py +++ b/modules/phigros/__init__.py @@ -25,7 +25,7 @@ async def _(msg: Bot.MessageSession, sessiontoken: str): 'Discord|Channel', 'Telegram|group', 'Telegram|supergroup', - 'Kook|GROUP']: + 'Kook|GROUP']: send_msg.append(await msg.send_message(msg.locale.t("phigros.message.bind.warning"), quote=False)) need_revoke = True headers = p_headers.copy() @@ -50,7 +50,7 @@ async def _(msg: Bot.MessageSession): @phi.command('b19 {{phigros.help.b19}}') async def _(msg: Bot.MessageSession): - if (bind := PgrBindInfoManager(msg).get_bind_info()) is None: + if not (bind := PgrBindInfoManager(msg).get_bind_info()): await msg.finish(msg.locale.t("phigros.message.user_unbound", prefix=msg.prefixes[0])) else: try: diff --git a/modules/phigros/dbutils.py b/modules/phigros/dbutils.py index 97b46f2636..4ea8abeca4 100644 --- a/modules/phigros/dbutils.py +++ b/modules/phigros/dbutils.py @@ -11,7 +11,7 @@ class PgrBindInfoManager: def __init__(self, msg: Bot.MessageSession): self.target_id = msg.target.sender_id self.query = session.query(PgrBindInfo).filter_by(targetId=self.target_id).first() - if self.query is None: + if not self.query: session.add_all([PgrBindInfo(targetId=self.target_id, sessiontoken='', username='Guest')]) session.commit() self.query = session.query(PgrBindInfo).filter_by(targetId=self.target_id).first() diff --git a/modules/user/tpg.py b/modules/user/tpg.py index 1ce8a9cd8e..a530dced57 100644 --- a/modules/user/tpg.py +++ b/modules/user/tpg.py @@ -12,7 +12,7 @@ def tpg(msg, favicon, wikiname, username, gender, registertime, contributionwiki blockreason='0', bantype=None): font = ImageFont.truetype(abspath('./assets/SourceHanSansCN-Normal.ttf'), 40) font1 = ImageFont.truetype(abspath('./assets/SourceHanSansCN-Normal.ttf'), 70) - if bantype is None: + if not bantype: img = Image.open(abspath('./assets/user/base.png')) elif bantype == 'Y' or bantype == 'YN': img = Image.open(abspath('./assets/user/ban.png')) diff --git a/modules/wiki/audit.py b/modules/wiki/audit.py index f8e5b1ee39..1acf7befa0 100644 --- a/modules/wiki/audit.py +++ b/modules/wiki/audit.py @@ -40,7 +40,7 @@ async def _(msg: Bot.MessageSession): api = msg.parsed_msg[''] # 已关闭的站点无法验证有效性 if msg.parsed_msg.get('distrust', False): res = Audit(api).remove_from_AllowList() - if res is None: + if not res: await msg.finish(msg.locale.t('wiki.message.wiki_audit.remove.failed.other') + api) list_name = msg.locale.t('wiki.message.wiki_audit.list_name.allowlist') else: diff --git a/modules/wiki/search.py b/modules/wiki/search.py index 530bb54d7c..49a04a86bb 100644 --- a/modules/wiki/search.py +++ b/modules/wiki/search.py @@ -21,7 +21,7 @@ async def search_pages(session: Bot.MessageSession, title: Union[str, list, tupl headers = target.get_headers() prefix = target.get_prefix() enabled_fandom_addon = session.options.get('wiki_fandom_addon') - if start_wiki is None: + if not start_wiki: await session.send_message(session.locale.t('wiki.message.set.default', prefix=session.prefixes[0])) start_wiki = 'https://zh.minecraft.wiki/api.php' if isinstance(title, str): diff --git a/modules/wiki/utils/__init__.py b/modules/wiki/utils/__init__.py index c7d03a9e06..c564fb3e66 100644 --- a/modules/wiki/utils/__init__.py +++ b/modules/wiki/utils/__init__.py @@ -17,7 +17,7 @@ 'legacy {{wiki.help.rc.legacy}}']) async def rc_loader(msg: Bot.MessageSession): start_wiki = WikiTargetInfo(msg).get_start_wiki() - if start_wiki is None: + if not start_wiki: return await msg.finish(msg.locale.t('wiki.message.not_set')) legacy = True if not msg.parsed_msg and msg.Feature.forward and msg.target.target_from == 'QQ|Group': @@ -40,7 +40,7 @@ async def rc_loader(msg: Bot.MessageSession): 'legacy {{wiki.help.ab.legacy}}']) async def ab_loader(msg: Bot.MessageSession): start_wiki = WikiTargetInfo(msg).get_start_wiki() - if start_wiki is None: + if not start_wiki: return await msg.finish(msg.locale.t('wiki.message.not_set')) legacy = True if not msg.parsed_msg and msg.Feature.forward and msg.target.target_from == 'QQ|Group': @@ -62,7 +62,7 @@ async def ab_loader(msg: Bot.MessageSession): @n.command() async def newbie_loader(msg: Bot.MessageSession): start_wiki = WikiTargetInfo(msg).get_start_wiki() - if start_wiki is None: + if not start_wiki: return await msg.finish(msg.locale.t('wiki.message.not_set')) res = await newbie(msg, start_wiki) await msg.finish(res) diff --git a/modules/wiki/utils/dbutils.py b/modules/wiki/utils/dbutils.py index f3bba78adb..e42abefe9e 100644 --- a/modules/wiki/utils/dbutils.py +++ b/modules/wiki/utils/dbutils.py @@ -23,7 +23,7 @@ def __init__(self, msg: [MessageSession, str]): else: target_id = msg self.query = session.query(WikiTargetSetInfo).filter_by(targetId=target_id).first() - if self.query is None: + if not self.query: session.add_all([WikiTargetSetInfo(targetId=target_id, iws='{}', headers='{}')]) session.commit() self.query = session.query(WikiTargetSetInfo).filter_by(targetId=target_id).first() @@ -71,14 +71,14 @@ def config_headers(self, headers, let_it: [bool, None] = True): headers = json.loads(headers) for x in headers: headers_[x] = headers[x] - elif let_it is None: + elif not let_it: headers_ = {} else: headers_ = {k: v for k, v in headers_.items() if k not in headers} self.query.headers = json.dumps(headers_) session.commit() return True - except: + except BaseException: return False def get_headers(self): @@ -122,7 +122,7 @@ def get(self): @retry(stop=stop_after_attempt(3), reraise=True) @auto_rollback_error def update(self, info: dict): - if self.query is None: + if not self.query: session.add_all([WikiInfo(apiLink=self.api_link, siteInfo=json.dumps(info))]) else: self.query.siteInfo = json.dumps(info) diff --git a/modules/wiki/utils/screenshot_image.py b/modules/wiki/utils/screenshot_image.py index 55a2133e7c..dca84bbf70 100644 --- a/modules/wiki/utils/screenshot_image.py +++ b/modules/wiki/utils/screenshot_image.py @@ -30,7 +30,7 @@ async def generate_screenshot_v2(page_link, section=None, allow_special_page=Fal Logger.warn('[Webrender] Webrender is not configured.') return False use_local = False - if section is None: + if not section: if allow_special_page and content_mode: elements_.insert(0, '.mw-body-content') if allow_special_page and not content_mode: @@ -148,7 +148,7 @@ def join_url(base, target): for x in soup.find_all('style'): open_file.write(str(x)) - if section is None: + if not section: find_diff = None if allow_special_page: find_diff = soup.find('table', class_=re.compile('diff')) @@ -180,14 +180,14 @@ def join_url(base, target): open_file.write(f'
') open_file.write(str(find_diff)) w = 2000 - if find_diff is None: + if not find_diff: infoboxes = elements.copy() find_infobox = None for i in infoboxes: find_infobox = soup.find(class_=i[1:]) if find_infobox is not None: break - if find_infobox is None: + if not find_infobox: Logger.info('Found nothing...') return False else: @@ -275,7 +275,7 @@ def is_comment(e): bl = [] while True: b = b.next_sibling - if b is None: + if not b: break if b.name == selected_hx: diff --git a/modules/wiki/utils/wikilib.py b/modules/wiki/utils/wikilib.py index 136c5b4569..e07447f7eb 100644 --- a/modules/wiki/utils/wikilib.py +++ b/modules/wiki/utils/wikilib.py @@ -74,9 +74,9 @@ def __init__(self, in_blocklist=False, script: str = '', logo_url: str = ''): - if extensions is None: + if not extensions: extensions = [] - if interwiki is None: + if not interwiki: interwiki = {} self.api = api self.articlepath = articlepath @@ -489,7 +489,7 @@ async def parse_page_info(self, title: str = None, pageid: int = None, inline=Fa return PageInfo(title='', link=self.wiki_info.articlepath.replace("$1", ""), info=self.wiki_info, interwiki_prefix=_prefix, templates=[]) use_textextracts = True if 'TextExtracts' in self.wiki_info.extensions else False - if use_textextracts and selected_section is None: + if use_textextracts and not selected_section: query_string.update({'prop': 'info|imageinfo|langlinks|templates|extracts|pageprops', 'ppprop': 'description|displaytitle|disambiguation|infoboxes', 'explaintext': 'true', 'exsectionformat': 'plain', 'exchars': '200'}) @@ -594,7 +594,7 @@ async def search_something(srwhat): if search[0] is not None and search[0] not in searched_result: searched_result.append(search[0]) - if preferred is None and searched_result: + if not preferred and searched_result: preferred = searched_result[0] page_info.before_title = page_info.title @@ -692,7 +692,7 @@ async def search_something(srwhat): page_info.has_template_doc = True page_info.before_page_property = page_info.page_property = 'template' if get_desc: - if use_textextracts and (selected_section is None or page_info.invalid_section): + if use_textextracts and (not selected_section or page_info.invalid_section): raw_desc = page_raw.get('extract') if raw_desc is not None: page_desc = self.parse_text(raw_desc) diff --git a/modules/wiki/wiki.py b/modules/wiki/wiki.py index 931bb51baf..0088408d62 100644 --- a/modules/wiki/wiki.py +++ b/modules/wiki/wiki.py @@ -57,8 +57,6 @@ async def query_pages(session: Union[Bot.MessageSession, QueryInfo], title: Unio headers = target.get_headers() prefix = target.get_prefix() enabled_fandom_addon = session.options.get('wiki_fandom_addon') - if enabled_fandom_addon is None: - enabled_fandom_addon = False elif isinstance(session, QueryInfo): start_wiki = session.api interwiki_list = {} @@ -68,7 +66,7 @@ async def query_pages(session: Union[Bot.MessageSession, QueryInfo], title: Unio else: raise TypeError('session must be Bot.MessageSession or QueryInfo.') - if start_wiki is None: + if not start_wiki: if isinstance(session, Bot.MessageSession): await session.send_message(session.locale.t('wiki.message.set.default', prefix=session.prefixes[0])) start_wiki = 'https://zh.minecraft.wiki/api.php' @@ -218,7 +216,7 @@ async def query_pages(session: Union[Bot.MessageSession, QueryInfo], title: Unio dl_list.append(r.file) plain_slice.append(session.locale.t('wiki.message.flies') + r.file) else: - if r.link is not None and r.selected_section is None: + if r.link is not None and not r.selected_section: render_infobox_list.append( {r.link: {'url': r.info.realurl, 'in_allowlist': r.info.in_allowlist, 'content_mode': r.has_template_doc or r.title.split(':')[0] in ['User'] or diff --git a/schedulers/mcv_rss.py b/schedulers/mcv_rss.py index 1784d1569c..ef79b8c25a 100644 --- a/schedulers/mcv_rss.py +++ b/schedulers/mcv_rss.py @@ -128,7 +128,7 @@ async def mcv_rss(): @Scheduler.scheduled_job(IntervalTrigger(seconds=180)) async def mcbv_rss(): - if IP.country == 'China' or IP.country is None: + if IP.country == 'China' or not IP.country: return # 中国大陆无法访问Google Play商店 try: verlist = get_stored_list('scheduler', 'mcbv_rss') From 99cc10f4e8828a8e7a5bee33eb748997ec4ee219 Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Tue, 19 Dec 2023 16:50:45 +0800 Subject: [PATCH 155/168] update --- bot.py | 4 +-- bots/aiocqhttp/message.py | 2 +- bots/aiogram/bot.py | 2 +- bots/aiogram/message.py | 2 +- bots/discord/bot.py | 4 +-- bots/discord/message.py | 22 ++++++------ bots/kook/message.py | 4 +-- bots/lagrange/message.py | 2 +- bots/matrix/message.py | 6 ++-- core/builtins/__init__.py | 6 ++-- core/builtins/message/__init__.py | 31 ++++++++--------- core/builtins/message/chain.py | 12 +++---- core/builtins/message/internal.py | 14 ++++---- core/builtins/tasks.py | 12 ++++--- core/console/message.py | 15 +++++---- core/extra/scheduler.py | 2 +- core/loader/__init__.py | 4 +-- core/parser/args.py | 4 +-- core/parser/command.py | 4 +-- core/parser/message.py | 20 +++++------ core/tos.py | 8 +++-- core/types/message/__init__.py | 2 +- core/utils/bot.py | 2 +- core/utils/http.py | 6 ++-- core/utils/i18n.py | 6 ++-- database/__init__.py | 18 +++++----- database/local.py | 2 +- modules/bugtracker/__init__.py | 6 ++-- modules/bugtracker/bugtracker.py | 2 +- modules/chemical_code/__init__.py | 2 +- modules/color/__init__.py | 8 ++--- modules/core/modules.py | 18 +++++----- modules/cytoid/profile.py | 20 +++++------ modules/dice/dice.py | 2 +- modules/dictionary/screenshot.py | 2 +- modules/github/repo.py | 6 ++-- modules/github/user.py | 12 +++---- modules/ip/__init__.py | 14 ++++---- modules/maimai/__init__.py | 6 ++-- modules/mcbbs_news/mcbbs_news.py | 3 +- modules/mcv/mcv.py | 4 +-- modules/mod_dl/__init__.py | 20 +++++------ modules/nintendo_err/__init__.py | 2 +- modules/nintendo_err/ctr_support.py | 4 +-- modules/nintendo_err/types.py | 4 +-- modules/nintendo_err/wiiu_results.py | 2 +- modules/nintendo_err/wiiu_support.py | 2 +- modules/user/user.py | 8 ++--- modules/weekly/__init__.py | 4 +-- modules/wiki/inline.py | 6 ++-- modules/wiki/search.py | 2 +- modules/wiki/set.py | 13 ++++---- modules/wiki/utils/dbutils.py | 12 +++---- modules/wiki/utils/rc_qq.py | 2 +- modules/wiki/utils/screenshot_image.py | 6 ++-- modules/wiki/utils/wikilib.py | 46 +++++++++++++------------- modules/wiki/wiki.py | 40 +++++++++++----------- 57 files changed, 252 insertions(+), 242 deletions(-) diff --git a/bot.py b/bot.py index 478d0b8106..9c58158b2b 100644 --- a/bot.py +++ b/bot.py @@ -45,7 +45,7 @@ def enqueue_output(out, queue): def init_bot(): base_superuser = Config('base_superuser') - if base_superuser is not None: + if base_superuser: if isinstance(base_superuser, str): base_superuser = [base_superuser] for bu in base_superuser: @@ -143,7 +143,7 @@ def run_bot(): raise RestartBot # break when all processes are done. - if all(p.poll() is not None for p in runlst): + if all(p.poll() for p in runlst): break sleep(0.0001) diff --git a/bots/aiocqhttp/message.py b/bots/aiocqhttp/message.py index deeb072c04..2e543b2691 100644 --- a/bots/aiocqhttp/message.py +++ b/bots/aiocqhttp/message.py @@ -385,7 +385,7 @@ async def post_(fetch_: Bot.FetchedSession): except Exception: Logger.error(traceback.format_exc()) - if user_list is not None: + if user_list: for x in user_list: await post_(x) else: diff --git a/bots/aiogram/bot.py b/bots/aiogram/bot.py index a16a236d4f..3d60b0a670 100644 --- a/bots/aiogram/bot.py +++ b/bots/aiogram/bot.py @@ -21,7 +21,7 @@ async def msg_handler(message: types.Message): target_id = f'Telegram|{message.chat.type}|{message.chat.id}' reply_id = None - if message.reply_to_message is not None: + if message.reply_to_message: reply_id = message.reply_to_message.message_id msg = MessageSession(MsgInfo(target_id=target_id, sender_id=f'Telegram|User|{message.from_user.id}', diff --git a/bots/aiogram/message.py b/bots/aiogram/message.py index 417e9fb244..b5aa60f097 100644 --- a/bots/aiogram/message.py +++ b/bots/aiogram/message.py @@ -176,7 +176,7 @@ async def fetch_target_list(target_list: list) -> List[Bot.FetchedSession]: @staticmethod async def post_message(module_name, message, user_list: List[Bot.FetchedSession] = None, i18n=False, **kwargs): - if user_list is not None: + if user_list: for x in user_list: try: msgchain = message diff --git a/bots/discord/bot.py b/bots/discord/bot.py index 41ca3beb33..6fe956b9cb 100644 --- a/bots/discord/bot.py +++ b/bots/discord/bot.py @@ -51,7 +51,7 @@ def load_slashcommands(): elif os.path.isfile(file_path): if file_name[0] != '_' and file_name.endswith('.py'): fun_file = file_name[:-3] - if fun_file is not None: + if fun_file: Logger.info(f'Loading slash.{fun_file}...') modules = 'bots.discord.slash.' + fun_file importlib.import_module(modules) @@ -75,7 +75,7 @@ async def on_message(message): target = "Discord|DM|Channel" target_id = f"{target}|{message.channel.id}" reply_id = None - if message.reference is not None: + if message.reference: reply_id = message.reference.message_id prefix = None if match_at := re.match(r'^<@(.*?)>', message.content): diff --git a/bots/discord/message.py b/bots/discord/message.py index f15e5187f4..5886929046 100644 --- a/bots/discord/message.py +++ b/bots/discord/message.py @@ -23,25 +23,25 @@ async def convert_embed(embed: Embed): if isinstance(embed, Embed): files = [] - embeds = discord.Embed(title=embed.title if embed.title is not None else discord.Embed.Empty, - description=embed.description if embed.description is not None else discord.Embed.Empty, - color=embed.color if embed.color is not None else discord.Embed.Empty, - url=embed.url if embed.url is not None else discord.Embed.Empty, + embeds = discord.Embed(title=embed.title if embed.title else discord.Embed.Empty, + description=embed.description if embed.description else discord.Embed.Empty, + color=embed.color if embed.color else discord.Embed.Empty, + url=embed.url if embed.url else discord.Embed.Empty, timestamp=datetime.datetime.fromtimestamp( - embed.timestamp) if embed.timestamp is not None else discord.Embed.Empty, ) - if embed.image is not None: + embed.timestamp) if embed.timestamp else discord.Embed.Empty, ) + if embed.image: upload = discord.File(await embed.image.get(), filename="image.png") files.append(upload) embeds.set_image(url="attachment://image.png") - if embed.thumbnail is not None: + if embed.thumbnail: upload = discord.File(await embed.thumbnail.get(), filename="thumbnail.png") files.append(upload) embeds.set_thumbnail(url="attachment://thumbnail.png") - if embed.author is not None: + if embed.author: embeds.set_author(name=embed.author) - if embed.footer is not None: + if embed.footer: embeds.set_footer(text=embed.footer) - if embed.fields is not None: + if embed.fields: for field in embed.fields: embeds.add_field(name=field.name, value=field.value, inline=field.inline) return embeds, files @@ -212,7 +212,7 @@ async def fetch_target_list(target_list: list) -> List[Bot.FetchedSession]: @staticmethod async def post_message(module_name, message, user_list: List[Bot.FetchedSession] = None, i18n=False, **kwargs): - if user_list is not None: + if user_list: for x in user_list: try: msgchain = message diff --git a/bots/kook/message.py b/bots/kook/message.py index 162c405cba..7febb27d91 100644 --- a/bots/kook/message.py +++ b/bots/kook/message.py @@ -186,7 +186,7 @@ async def send_direct_message(self, message_chain, disable_secret_check=False, a message_chain = MessageChain(message_chain) - for x in message_chain.as_sendable(self, embed=False): + for x in message_chain.as_sendable(self.parent, embed=False): if isinstance(x, Plain): await get_channel.send(x.text) @@ -234,7 +234,7 @@ async def fetch_target_list(target_list: list) -> List[Bot.FetchedSession]: @staticmethod async def post_message(module_name, message, user_list: List[Bot.FetchedSession] = None, i18n=False, **kwargs): - if user_list is not None: + if user_list: for x in user_list: try: msgchain = message diff --git a/bots/lagrange/message.py b/bots/lagrange/message.py index c2b768128c..0fd62f7ef1 100644 --- a/bots/lagrange/message.py +++ b/bots/lagrange/message.py @@ -354,7 +354,7 @@ async def post_(fetch_: Bot.FetchedSession): except Exception: Logger.error(traceback.format_exc()) - if user_list is not None: + if user_list: for x in user_list: await post_(x) else: diff --git a/bots/matrix/message.py b/bots/matrix/message.py index 00d9413685..3faf84a646 100644 --- a/bots/matrix/message.py +++ b/bots/matrix/message.py @@ -166,7 +166,7 @@ async def check_native_permission(self): # https://spec.matrix.org/v1.7/client-server-api/#permissions power_levels = (await bot.room_get_state_event(self.session.target, 'm.room.power_levels')).content level = power_levels['users'][self.session.sender] if self.session.sender in power_levels['users'] else power_levels['users_default'] - if level is not None and int(level) >= 50: + if level and int(level) >= 50: return True return False @@ -184,7 +184,7 @@ async def to_message_chain(self): msgtype = 'm.text' if msgtype == 'm.text': # compatible with py38 text = str(content['body']) - if self.target.reply_id is not None: + if self.target.reply_id: # redact the fallback line for rich reply # https://spec.matrix.org/v1.7/client-server-api/#fallbacks-for-rich-replies while text.startswith('> '): @@ -286,7 +286,7 @@ async def fetch_target_list(target_list: list) -> List[FetchedSession]: @staticmethod async def post_message(module_name, message, user_list: List[FetchedSession] = None, i18n=False, **kwargs): - if user_list is not None: + if user_list: for x in user_list: try: msgchain = message diff --git a/core/builtins/__init__.py b/core/builtins/__init__.py index ffa273858d..0490d135ec 100644 --- a/core/builtins/__init__.py +++ b/core/builtins/__init__.py @@ -56,7 +56,7 @@ async def trigger(module_or_hook_name: str, args): if '.' in module_or_hook_name: hook_mode = True if not hook_mode: - if module_or_hook_name is not None: + if module_or_hook_name: modules = ModulesManager.modules if module_or_hook_name in modules: for hook in modules[module_or_hook_name].hooks_list.set: @@ -65,7 +65,7 @@ async def trigger(module_or_hook_name: str, args): raise ValueError("Invalid module name") else: - if module_or_hook_name is not None: + if module_or_hook_name: if module_or_hook_name in ModulesManager.modules_hooks: await asyncio.create_task(ModulesManager.modules_hooks[module_or_hook_name](Bot.FetchTarget, ModuleHookContext( @@ -90,7 +90,7 @@ def __init__(self, target_from, target_id, sender_from=None, sender_id=None): reply_id=None) self.session = Session(message=False, target=target_id, sender=sender_id) self.parent = Bot.MessageSession(self.target, self.session) - if sender_id is not None: + if sender_id: self.parent.target.sender_info = BotDBUtil.SenderInfo(f'{sender_from}|{sender_id}') diff --git a/core/builtins/message/__init__.py b/core/builtins/message/__init__.py index e629e91418..88b6d95b61 100644 --- a/core/builtins/message/__init__.py +++ b/core/builtins/message/__init__.py @@ -35,23 +35,24 @@ def __init__(self, 'timezone_offset', Config('timezone_offset', '+8')) self.timezone_offset = parse_time_string(self._tz_offset) - async def wait_confirm(self, message_chain=None, quote=True, delete=True, timeout=120, append_instruction=True) -> bool: + async def wait_confirm(self, message_chain=None, quote=True, delete=True, timeout=120, append_instruction=True) \ + -> bool: send = None ExecutionLockList.remove(self) - if message_chain is not None: + if message_chain: message_chain = MessageChain(message_chain) if append_instruction: message_chain.append(Plain(self.locale.t("message.wait.confirm.prompt.type1"))) send = await self.send_message(message_chain, quote) flag = asyncio.Event() - MessageTaskManager.add_task(self, flag) + MessageTaskManager.add_task(self, flag, timeout=timeout) try: await asyncio.wait_for(flag.wait(), timeout=timeout) except asyncio.TimeoutError: raise WaitCancelException result = MessageTaskManager.get_result(self) - if result is not None: - if message_chain is not None and delete: + if result: + if message_chain and delete: await send.delete() if result.as_display(text_only=True) in confirm_command: return True @@ -63,21 +64,21 @@ async def wait_next_message(self, message_chain=None, quote=True, delete=False, append_instruction=True) -> MessageSessionT: sent = None ExecutionLockList.remove(self) - if message_chain is not None: + if message_chain: message_chain = MessageChain(message_chain) if append_instruction: message_chain.append(Plain(self.locale.t("message.wait.confirm.prompt.type2"))) sent = await self.send_message(message_chain, quote) flag = asyncio.Event() - MessageTaskManager.add_task(self, flag) + MessageTaskManager.add_task(self, flag, timeout=timeout) try: await asyncio.wait_for(flag.wait(), timeout=timeout) except asyncio.TimeoutError: raise WaitCancelException result = MessageTaskManager.get_result(self) - if delete and sent is not None: + if delete and sent: await sent.delete() - if result is not None: + if result: return result else: raise WaitCancelException @@ -92,15 +93,15 @@ async def wait_reply(self, message_chain, quote=True, delete=False, timeout=120, message_chain.append(Plain(self.locale.t("message.reply.prompt"))) send = await self.send_message(message_chain, quote) flag = asyncio.Event() - MessageTaskManager.add_task(self, flag, reply=send.message_id, all_=all_) + MessageTaskManager.add_task(self, flag, reply=send.message_id, all_=all_, timeout=timeout) try: await asyncio.wait_for(flag.wait(), timeout=timeout) except asyncio.TimeoutError: raise WaitCancelException result = MessageTaskManager.get_result(self) - if delete and send is not None: + if delete and send: await send.delete() - if result is not None: + if result: return result else: raise WaitCancelException @@ -108,18 +109,18 @@ async def wait_reply(self, message_chain, quote=True, delete=False, timeout=120, async def wait_anyone(self, message_chain=None, quote=False, delete=False, timeout=120) -> MessageSessionT: send = None ExecutionLockList.remove(self) - if message_chain is not None: + if message_chain: message_chain = MessageChain(message_chain) send = await self.send_message(message_chain, quote) flag = asyncio.Event() - MessageTaskManager.add_task(self, flag, all_=True) + MessageTaskManager.add_task(self, flag, all_=True, timeout=timeout) try: await asyncio.wait_for(flag.wait(), timeout=timeout) except asyncio.TimeoutError: raise WaitCancelException result = MessageTaskManager.get()[self.target.target_id]['all'][self] if 'result' in result: - if send is not None and delete: + if send and delete: await send.delete() return MessageTaskManager.get()[self.target.target_id]['all'][self]['result'] else: diff --git a/core/builtins/message/chain.py b/core/builtins/message/chain.py index e02f0947db..6d24a24341 100644 --- a/core/builtins/message/chain.py +++ b/core/builtins/message/chain.py @@ -87,23 +87,23 @@ def unsafeprompt(name, secret, text): for secret in Secret.list: if secret in ["", None, True, False]: continue - if v.title is not None: + if v.title: if v.title.upper().find(secret.upper()) != -1: Logger.warn(unsafeprompt('Embed.title', secret, v.title)) return False - if v.description is not None: + if v.description: if v.description.upper().find(secret.upper()) != -1: Logger.warn(unsafeprompt('Embed.description', secret, v.description)) return False - if v.footer is not None: + if v.footer: if v.footer.upper().find(secret.upper()) != -1: Logger.warn(unsafeprompt('Embed.footer', secret, v.footer)) return False - if v.author is not None: + if v.author: if v.author.upper().find(secret.upper()) != -1: Logger.warn(unsafeprompt('Embed.author', secret, v.author)) return False - if v.url is not None: + if v.url: if v.url.upper().find(secret.upper()) != -1: Logger.warn(unsafeprompt('Embed.url', secret, v.url)) return False @@ -219,7 +219,7 @@ def match_kecode(text: str) -> List[Union[Plain, Image, Voice, Embed]]: img = Image(path=ma.group(2)) if ma.group(1) == 'headers': img.headers = json.loads(str(base64.b64decode(ma.group(2)), "UTF-8")) - if img is not None: + if img: elements.append(img) else: elements.append(Image(a)) diff --git a/core/builtins/message/internal.py b/core/builtins/message/internal.py index 1ab3ea43a0..83f99084ec 100644 --- a/core/builtins/message/internal.py +++ b/core/builtins/message/internal.py @@ -237,26 +237,26 @@ def __init__(self, def to_message_chain(self): text_lst = [] - if self.title is not None: + if self.title: text_lst.append(self.title) - if self.description is not None: + if self.description: text_lst.append(self.description) - if self.url is not None: + if self.url: text_lst.append(self.url) - if self.fields is not None: + if self.fields: for f in self.fields: if f.inline: text_lst.append(f"{f.name}: {f.value}") else: text_lst.append(f"{f.name}:\n{f.value}") - if self.author is not None: + if self.author: text_lst.append("作者：" + self.author) - if self.footer is not None: + if self.footer: text_lst.append(self.footer) message_chain = [] if text_lst: message_chain.append(Plain('\n'.join(text_lst))) - if self.image is not None: + if self.image: message_chain.append(self.image) return message_chain diff --git a/core/builtins/tasks.py b/core/builtins/tasks.py index 75313a2e1a..a49970403f 100644 --- a/core/builtins/tasks.py +++ b/core/builtins/tasks.py @@ -9,9 +9,9 @@ class MessageTaskManager: _callback_list = {} @classmethod - def add_task(cls, session: MessageSession, flag, all_=False, reply=None): + def add_task(cls, session: MessageSession, flag, all_=False, reply=None, timeout=120): sender = session.target.sender_id - task_type = 'reply' if reply is not None else 'wait' + task_type = 'reply' if reply else 'wait' if all_: sender = 'all' @@ -20,7 +20,8 @@ def add_task(cls, session: MessageSession, flag, all_=False, reply=None): if sender not in cls._list[session.target.target_id]: cls._list[session.target.target_id][sender] = {} cls._list[session.target.target_id][sender][session] = { - 'flag': flag, 'active': True, 'type': task_type, 'reply': reply, 'ts': datetime.now().timestamp()} + 'flag': flag, 'active': True, 'type': task_type, 'reply': reply, 'ts': datetime.now().timestamp(), + 'timeout': timeout} Logger.debug(cls._list) @classmethod @@ -44,7 +45,8 @@ async def bg_check(cls): for sender in cls._list[target]: for session in cls._list[target][sender]: if cls._list[target][sender][session]['active']: - if datetime.now().timestamp() - cls._list[target][sender][session]['ts'] > 3600: + if (datetime.now().timestamp() - cls._list[target][sender][session]['ts'] > + cls._list[target][sender][session].get('timeout', 3600)): cls._list[target][sender][session]['active'] = False cls._list[target][sender][session]['flag'].set() # no result = cancel for message_id in cls._callback_list: @@ -59,7 +61,7 @@ async def check(cls, session: MessageSession): senders.append(session.target.sender_id) if 'all' in cls._list[session.target.target_id]: senders.append('all') - if senders is not None: + if senders: for sender in senders: for s in cls._list[session.target.target_id][sender]: get_ = cls._list[session.target.target_id][sender][s] diff --git a/core/console/message.py b/core/console/message.py index 6c937dd2d3..1bbfc4fa6f 100644 --- a/core/console/message.py +++ b/core/console/message.py @@ -46,33 +46,34 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal Logger.info(f'[Bot] -> [{self.target.target_id}]: Image: {image_path}') return FinishedSession(self, [0], ['Should be a callable here... hmm...']) - async def wait_confirm(self, message_chain=None, quote=True, delete=True): + async def wait_confirm(self, message_chain=None, quote=True, delete=True, timeout=120, append_instruction=True): send = None - if message_chain is not None: + if message_chain: send = await self.send_message(message_chain) print(self.locale.t("message.wait.confirm.prompt.type1")) c = await aioconsole.ainput('Confirm: ') print(c) - if message_chain is not None and delete: + if message_chain and delete: await send.delete() if c in confirm_command: return True return False - async def wait_anyone(self, message_chain=None, quote=True, delete=True): + async def wait_anyone(self, message_chain=None, quote=True, delete=True, timeout=120): send = None - if message_chain is not None: + if message_chain: send = await self.send_message(message_chain) c = await aioconsole.ainput('Confirm: ') print(c) - if message_chain is not None and delete: + if message_chain and delete: await send.delete() self.session.message = c return self - async def wait_reply(self, message_chain, quote=True, all_=False, append_instruction=True): + async def wait_reply(self, message_chain, quote=True, delete=False, timeout=120, + all_=False, append_instruction=True): message_chain = MessageChain(message_chain) if append_instruction: message_chain.append(Plain(self.locale.t("message.reply.prompt"))) diff --git a/core/extra/scheduler.py b/core/extra/scheduler.py index 30cf1e9e3f..7b2258845a 100644 --- a/core/extra/scheduler.py +++ b/core/extra/scheduler.py @@ -30,7 +30,7 @@ async def clear_queue(): elif os.path.isfile(file_path): if file_name[0] != '_' and file_name.endswith('.py'): fun_file = file_name[:-3] - if fun_file is not None: + if fun_file: Logger.debug(f'Loading schedulers.{fun_file}...') modules = 'schedulers.' + fun_file importlib.import_module(modules) diff --git a/core/loader/__init__.py b/core/loader/__init__.py index 6308e25a6d..26bbc7ec43 100644 --- a/core/loader/__init__.py +++ b/core/loader/__init__.py @@ -40,7 +40,7 @@ def load_modules(): elif os.path.isfile(file_path): if file_name[0] != '_' and file_name.endswith('.py'): fun_file = file_name[:-3] - if fun_file is not None: + if fun_file: Logger.debug(f'Loading modules.{fun_file}...') all_modules.append(fun_file) if fun_file in unloaded_modules: @@ -155,7 +155,7 @@ def bind_to_module(cls, bind_prefix: str, meta: Union[CommandMeta, RegexMeta, Sc @classmethod def return_modules_list(cls, target_from: str = None) -> \ Dict[str, Module]: - if target_from is not None: + if target_from: if target_from in cls._return_cache: return cls._return_cache[target_from] returns = {} diff --git a/core/parser/args.py b/core/parser/args.py index bcd524db61..c77c06587c 100644 --- a/core/parser/args.py +++ b/core/parser/args.py @@ -171,10 +171,10 @@ def templates_to_str(templates: List[Template], with_desc=False, simplify=True) sub_arg_text.append(arg.name) elif isinstance(arg, OptionalPattern): t = '[' - if arg.flag is not None: + if arg.flag: t += arg.flag if arg.args: - if arg.flag is not None: + if arg.flag: t += ' ' t += ' '.join(templates_to_str(arg.args, simplify=False)) t += ']' diff --git a/core/parser/command.py b/core/parser/command.py index 210e37ac96..c949346b6c 100644 --- a/core/parser/command.py +++ b/core/parser/command.py @@ -21,7 +21,7 @@ def __init__(self, args: Module, command_prefixes: list, self.origin_template = args self.msg: Union[MessageSession, None] = msg self.options_desc = [] - self.lang = self.msg.locale if self.msg is not None else Locale(default_locale) + self.lang = self.msg.locale if self.msg else Locale(default_locale) help_docs = {} for match in ( args.command_list.set if not self.msg else args.command_list.get( @@ -31,7 +31,7 @@ def __init__(self, args: Module, command_prefixes: list, help_docs[m] = {'priority': match.priority, 'meta': match} else: help_docs[''] = {'priority': match.priority, 'meta': match} - if match.options_desc is not None: + if match.options_desc: for m in match.options_desc: desc = match.options_desc[m] if locale_str := re.findall(r'\{(.*)}', desc): diff --git a/core/parser/message.py b/core/parser/message.py index 5acf2c02ff..41686ccf9f 100644 --- a/core/parser/message.py +++ b/core/parser/message.py @@ -31,7 +31,7 @@ async def remove_temp_ban(msg: Bot.MessageSession): is_temp_banned = temp_ban_counter.get(msg.target.sender_id) - if is_temp_banned is not None: + if is_temp_banned: del temp_ban_counter[msg.target.sender_id] @@ -58,7 +58,7 @@ async def tos_msg_counter(msg: Bot.MessageSession, command: str): async def temp_ban_check(msg: Bot.MessageSession): is_temp_banned = temp_ban_counter.get(msg.target.sender_id) is_superuser = msg.check_super_user() - if is_temp_banned is not None and not is_superuser: + if is_temp_banned and not is_superuser: ban_time = datetime.now().timestamp() - is_temp_banned['ts'] if ban_time < TOS_TEMPBAN_TIME: if is_temp_banned['count'] < 2: @@ -96,16 +96,16 @@ async def parser(msg: Bot.MessageSession, require_enable_modules: bool = True, p return msg.prefixes = command_prefix.copy() # 复制一份作为基础命令前缀 get_custom_alias = msg.options.get('command_alias') - if get_custom_alias is not None: + if get_custom_alias: get_display_alias = get_custom_alias.get(msg.trigger_msg) - if get_display_alias is not None: + if get_display_alias: msg.trigger_msg = get_display_alias get_custom_prefix = msg.options.get('command_prefix') # 获取自定义命令前缀 - if get_custom_prefix is not None: + if get_custom_prefix: msg.prefixes = get_custom_prefix + msg.prefixes # 混合 disable_prefix = False - if prefix is not None: # 如果上游指定了命令前缀，则使用指定的命令前缀 + if prefix: # 如果上游指定了命令前缀，则使用指定的命令前缀 if '' in prefix: disable_prefix = True msg.prefixes.clear() @@ -186,7 +186,7 @@ async def parser(msg: Bot.MessageSession, require_enable_modules: bool = True, p module: Module = modules[command_first_word] if not module.command_list.set: # 如果没有可用的命令，则展示模块简介 - if module.desc is not None: + if module.desc: desc = msg.locale.t("parser.module.desc", desc=msg.locale.tl_str(module.desc)) if command_first_word not in msg.enabled_modules: @@ -254,7 +254,7 @@ async def execute_submodule(msg: Bot.MessageSession, command_first_word, command kwargs = {} func_params = inspect.signature(submodule.function).parameters - if len(func_params) > 1 and msg.parsed_msg is not None: + if len(func_params) > 1 and msg.parsed_msg: parsed_msg_ = msg.parsed_msg.copy() for param_name, param_obj in func_params.items(): if param_obj.annotation == Bot.MessageSession: @@ -405,11 +405,11 @@ async def execute_submodule(msg: Bot.MessageSession, command_first_word, command matched = False if rfunc.mode.upper() in ['M', 'MATCH']: msg.matched_msg = re.match(rfunc.pattern, msg.trigger_msg, flags=rfunc.flags) - if msg.matched_msg is not None: + if msg.matched_msg: matched = True elif rfunc.mode.upper() in ['A', 'FINDALL']: msg.matched_msg = re.findall(rfunc.pattern, msg.trigger_msg, flags=rfunc.flags) - if msg.matched_msg and msg.matched_msg is not None: + if msg.matched_msg: matched = True if matched and not (msg.target.target_from in regex_module.exclude_from or diff --git a/core/tos.py b/core/tos.py index f0c7a00de0..57ebc14f75 100644 --- a/core/tos.py +++ b/core/tos.py @@ -10,10 +10,14 @@ async def warn_target(msg: Bot.MessageSession, reason=None): current_warns = int(msg.target.sender_info.query.warns) + 1 msg.target.sender_info.edit('warns', current_warns) warn_template = [msg.locale.t("tos.warning")] - if reason is not None: + if reason: warn_template.append(msg.locale.t("tos.reason") + reason) if current_warns < WARNING_COUNTS: - warn_template.append(msg.locale.t('tos.warning.count', current_warns=current_warns, warn_counts=WARNING_COUNTS)) + warn_template.append( + msg.locale.t( + 'tos.warning.count', + current_warns=current_warns, + warn_counts=WARNING_COUNTS)) if current_warns <= 2: warn_template.append(msg.locale.t('tos.warning.appeal', issue_url=Config('issue_url'))) if current_warns == WARNING_COUNTS: diff --git a/core/types/message/__init__.py b/core/types/message/__init__.py index 7977762184..6e99dddd48 100644 --- a/core/types/message/__init__.py +++ b/core/types/message/__init__.py @@ -119,7 +119,7 @@ async def finish(self, """ ... f = None - if message_chain is not None: + if message_chain: f = await self.send_message(message_chain, disable_secret_check=disable_secret_check, quote=quote, allow_split_image=allow_split_image, callback=callback) raise FinishedException(f) diff --git a/core/utils/bot.py b/core/utils/bot.py index e9e3830b42..b124954bc4 100644 --- a/core/utils/bot.py +++ b/core/utils/bot.py @@ -44,7 +44,7 @@ async def load_secret(): for x in CFG.value: if x == 'secret': for y in CFG().value[x]: - if CFG().value[x][y] is not None: + if CFG().value[x][y]: Secret.add(str(CFG().value[x][y]).upper()) diff --git a/core/utils/http.py b/core/utils/http.py index f5da8de14f..d171af5a0d 100644 --- a/core/utils/http.py +++ b/core/utils/http.py @@ -74,7 +74,7 @@ async def get_(): Logger.error(await req.read()) raise ValueError( f'{str(req.status)}[Ke:Image,path=https://http.cat/{str(req.status)}.jpg]') - if fmt is not None: + if fmt: if hasattr(req, fmt): return await getattr(req, fmt)() else: @@ -125,7 +125,7 @@ async def _post(): Logger.error(await req.read()) raise ValueError( f'{str(req.status)}[Ke:Image,path=https://http.cat/{str(req.status)}.jpg]') - if fmt is not None: + if fmt: if hasattr(req, fmt): return await getattr(req, fmt)() else: @@ -177,7 +177,7 @@ async def download_(): timeout=timeout, attempt=1, request_private_ip=request_private_ip, logging_err_resp=logging_err_resp) - if data is not None: + if data: if not filename: ftt = ft.match(data).extension path = f'{random_cache_path()}.{ftt}' diff --git a/core/utils/i18n.py b/core/utils/i18n.py index c9c2a22fbf..aed8a87c60 100644 --- a/core/utils/i18n.py +++ b/core/utils/i18n.py @@ -122,7 +122,7 @@ def __contains__(self, key: str): def t(self, key: Union[str, dict], fallback_failed_prompt=True, *args, **kwargs) -> str: """获取本地化字符串""" if isinstance(key, dict): - if (ft := key.get(self.locale)) is not None: + if ft := key.get(self.locale): return ft elif 'fallback' in key: return key['fallback'] @@ -138,14 +138,14 @@ def get_locale_node(self, path: str): def get_string_with_fallback(self, key: str, fallback_failed_prompt) -> str: node = self.data.query_node(key) - if node is not None: + if node: return node.value # 1. 如果本地化字符串存在，直接返回 fallback_lng = list(self.fallback_lng) fallback_lng.insert(0, self.locale) for lng in fallback_lng: if lng in locale_root.children: node = locale_root.query_node(lng).query_node(key) - if node is not None: + if node: return node.value # 2. 如果在 fallback 语言中本地化字符串存在，直接返回 if fallback_failed_prompt: return f'{{{key}}}' + self.t("i18n.prompt.fallback.failed", url=Config('bug_report_url'), diff --git a/database/__init__.py b/database/__init__.py index 94a19d321d..67112b5fe8 100644 --- a/database/__init__.py +++ b/database/__init__.py @@ -78,7 +78,7 @@ def enable(self, module_name) -> bool: @retry(stop=stop_after_attempt(3)) @auto_rollback_error def disable(self, module_name) -> bool: - if self.query is not None: + if self.query: enabled_modules = self.enabled_modules.copy() if isinstance(module_name, str): if module_name in enabled_modules: @@ -114,9 +114,9 @@ def options(self): return json.loads(self.query.options) def get_option(self, k=None): - if not self.query and k is None: + if not self.query and not k: return {} - elif not self.query and k is not None: + elif not self.query and k: return None if not k: return self.options @@ -135,7 +135,7 @@ def edit_option(self, k, v) -> bool: @retry(stop=stop_after_attempt(3)) @auto_rollback_error def remove_option(self, k) -> bool: - if self.query is not None: + if self.query: options = self.options.copy() if k in options: options.pop(k) @@ -178,7 +178,7 @@ def add_custom_admin(self, sender_id) -> bool: @retry(stop=stop_after_attempt(3)) @auto_rollback_error def remove_custom_admin(self, sender_id) -> bool: - if self.query is not None: + if self.query: custom_admins = self.custom_admins.copy() if sender_id in custom_admins: custom_admins.remove(sender_id) @@ -194,7 +194,7 @@ def locale(self): @staticmethod def get_enabled_this(module_name, id_prefix=None) -> List[TargetInfo]: filter_ = [TargetInfo.enabledModules.like(f'%"{module_name}"%')] - if id_prefix is not None: + if id_prefix: filter_.append(TargetInfo.targetId.like(f'{id_prefix}%')) return session.query(TargetInfo).filter(*filter_).all() @@ -275,7 +275,7 @@ def reset(self): def isGroupInAllowList(target_id): session.expire_all() query = session.query(GroupAllowList).filter_by(targetId=target_id).first() - if query is not None: + if query: return True return False @@ -334,14 +334,14 @@ def get_first(): @staticmethod def get_data_by_times(new, old, module_name=None): filter_ = [AnalyticsData.timestamp <= new, AnalyticsData.timestamp >= old] - if module_name is not None: + if module_name: filter_.append(AnalyticsData.moduleName == module_name) return session.query(AnalyticsData).filter(*filter_).all() @staticmethod def get_count_by_times(new, old, module_name=None): filter_ = [AnalyticsData.timestamp < new, AnalyticsData.timestamp > old] - if module_name is not None: + if module_name: filter_.append(AnalyticsData.moduleName == module_name) return session.query(AnalyticsData).filter(*filter_).count() diff --git a/database/local.py b/database/local.py index 6cf525624c..458787ec72 100644 --- a/database/local.py +++ b/database/local.py @@ -53,7 +53,7 @@ def __init__(self, query_word): self.need_insert = False if not self.query: self.need_insert = True - if self.query is not None and datetime.datetime.now().timestamp() - self.query.timestamp.timestamp() > 86400: + if self.query and datetime.datetime.now().timestamp() - self.query.timestamp.timestamp() > 86400: session.delete(self.query) session.commit() self.need_insert = True diff --git a/modules/bugtracker/__init__.py b/modules/bugtracker/__init__.py index dc9a5a349e..4d75e3b65e 100644 --- a/modules/bugtracker/__init__.py +++ b/modules/bugtracker/__init__.py @@ -15,7 +15,7 @@ async def bugtracker(msg: Bot.MessageSession): if q: result = await bugtracker_get(msg, q.group(1)) await msg.send_message(result[0]) - if result[1] is not None: + if result[1]: screenshot = await make_screenshot(result[1]) if screenshot: await msg.send_message(Image(screenshot)) @@ -28,7 +28,7 @@ async def regex_bugtracker(msg: Bot.MessageSession): if len(matched_msg.group(1)) < 10: result = await bugtracker_get(msg, matched_msg.group(1) + '-' + matched_msg.group(2)) await msg.send_message(result[0]) - if result[1] is not None: + if result[1]: screenshot = await make_screenshot(result[1]) if screenshot: await msg.send_message(Image(screenshot)) @@ -44,7 +44,7 @@ async def bgtask(msg: Bot.MessageSession): if t != '': get_ = await bugtracker_get(msg, t.split('?')[0], nolink=True) await msg.send_message(get_[0]) - if get_[1] is not None: + if get_[1]: screenshot = await make_screenshot(get_[1]) if screenshot: await msg.send_message(Image(screenshot)) diff --git a/modules/bugtracker/bugtracker.py b/modules/bugtracker/bugtracker.py index ec75e1cc41..18f3cf967e 100644 --- a/modules/bugtracker/bugtracker.py +++ b/modules/bugtracker/bugtracker.py @@ -91,7 +91,7 @@ async def bugtracker_get(session, mojira_id: str, nolink=False): data["project"] = fields['project']['name'] if 'resolution' in fields: data["resolution"] = fields['resolution']['name'] if fields[ - 'resolution'] is not None else 'Unresolved' + 'resolution'] else 'Unresolved' if 'versions' in load_json['fields']: versions = fields['versions'] verlist = [] diff --git a/modules/chemical_code/__init__.py b/modules/chemical_code/__init__.py index daf4117fe4..44aa13b061 100644 --- a/modules/chemical_code/__init__.py +++ b/modules/chemical_code/__init__.py @@ -61,7 +61,7 @@ def parse_elements(formula: str) -> dict: @retry(stop=stop_after_attempt(3), reraise=True) async def search_csr(id=None): - if id is not None: + if id: answer_id = id else: answer_id = random.randint(1, CSID_RANGE_MAX) diff --git a/modules/color/__init__.py b/modules/color/__init__.py index 3605dfe968..fbf52f125d 100644 --- a/modules/color/__init__.py +++ b/modules/color/__init__.py @@ -29,9 +29,9 @@ async def _(msg: Bot.MessageSession, color: str = None): if not color: color = webcolors.HTML5SimpleColor(*(np.random.randint(0, 256, 3))) - elif css_names_to_hex.get(color) is not None: + elif css_names_to_hex.get(color): color = webcolors.html5_parse_simple_color(css_names_to_hex[color]) - elif material_colors_names_to_hex.get(color) is not None: + elif material_colors_names_to_hex.get(color): color = webcolors.html5_parse_simple_color(material_colors_names_to_hex[color]) elif re.match(r'^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$', color): # add hash if missing @@ -79,7 +79,7 @@ async def _(msg: Bot.MessageSession, color: str = None): css_color_name = f'\n{msg.locale.t("color.message.css")}{css_color_name_raw[0]}' if css_color_name_raw[0] != 'black' and css_color_name_raw[0] != 'white': css_color_name_short = f'{css_color_name_raw[0]}\n' - elif css_color_name_raw[0] is not None: + elif css_color_name_raw[0]: css_color_name = f'\n{msg.locale.t("color.message.css.approximate")}{css_color_name_raw[0]}' material_color_name_raw = get_color_name(color, material_colors_hex_to_names) @@ -88,7 +88,7 @@ async def _(msg: Bot.MessageSession, color: str = None): if material_color_name_raw[1]: material_color_name = f'\n{msg.locale.t("color.message.md")}{material_color_name_raw[0]}' material_color_name_short = f'{material_color_name_raw[0]}\n' - elif material_color_name_raw[0] is not None: + elif material_color_name_raw[0]: material_color_name = f'\n{msg.locale.t("color.message.md.approximate")}{material_color_name_raw[0]}' draw.multiline_text( diff --git a/modules/core/modules.py b/modules/core/modules.py index 23236dfe93..222382ba18 100644 --- a/modules/core/modules.py +++ b/modules/core/modules.py @@ -99,7 +99,7 @@ async def config_modules(msg: Bot.MessageSession): else: enable_list.append(module_) recommend = modules_[module_].recommend_modules - if recommend is not None: + if recommend: for r in recommend: if r not in enable_list and r not in enabled_modules_list: recommend_modules_list.append(r) @@ -118,7 +118,7 @@ async def config_modules(msg: Bot.MessageSession): else: msglist.append(msg.locale.t("core.message.module.enable.success", module=x)) support_lang = modules_[x].support_languages - if support_lang is not None: + if support_lang: if msg.locale.locale not in support_lang: msglist.append(msg.locale.t("core.message.module.unsupported_language", module=x)) @@ -128,7 +128,7 @@ async def config_modules(msg: Bot.MessageSession): recommend_modules_help_doc_list.append(msg.locale.t("core.message.module.module.help", module=m )) - if modules_[m].desc is not None: + if modules_[m].desc: recommend_modules_help_doc_list.append(msg.locale.tl_str(modules_[m].desc)) hdoc = CommandParser(modules_[m], msg=msg, bind_prefix=modules_[m].bind_prefix, command_prefixes=msg.prefixes).return_formatted_help_doc() @@ -267,7 +267,7 @@ def module_reload(module, extra_modules, base_mode=False): else: msglist.append(msg.locale.t("parser.superuser.permission.denied")) - if msglist is not None: + if msglist: if not recommend_modules_help_doc_list: await msg.finish('\n'.join(msglist)) else: @@ -294,14 +294,14 @@ async def bot_help(msg: Bot.MessageSession): module_list = ModulesManager.return_modules_list( target_from=msg.target.target_from) alias = ModulesManager.modules_aliases - if msg.parsed_msg is not None: + if msg.parsed_msg: msgs = [] help_name = msg.parsed_msg[''] if help_name in alias: help_name = alias[help_name] if help_name in module_list: module_ = module_list[help_name] - if module_.desc is not None: + if module_.desc: desc = module_.desc if locale_str := re.match(r'\{(.*)}', desc): if locale_str: @@ -333,7 +333,7 @@ async def bot_help(msg: Bot.MessageSession): if module_alias: for a in module_alias: malias.append(f'{a} -> {module_alias[a]}') - if module_.developers is not None: + if module_.developers: devs = msg.locale.t('message.delimiter').join(module_.developers) devs_msg = '\n' + msg.locale.t("core.message.help.author.type1") + devs else: @@ -378,7 +378,7 @@ async def _(msg: Bot.MessageSession): help_ = CommandParser(module_, msg=msg, bind_prefix=module_.bind_prefix, command_prefixes=msg.prefixes) - if module_.desc is not None: + if module_.desc: doc_.append(msg.locale.tl_str(module_.desc)) if help_.args: doc_.append(help_.return_formatted_help_doc()) @@ -473,7 +473,7 @@ async def modules_help(msg: Bot.MessageSession, legacy): doc_ = [] help_ = CommandParser( module_, bind_prefix=module_.bind_prefix, command_prefixes=msg.prefixes, msg=msg) - if module_.desc is not None: + if module_.desc: doc_.append(msg.locale.tl_str(module_.desc)) if help_.args: doc_.append(help_.return_formatted_help_doc()) diff --git a/modules/cytoid/profile.py b/modules/cytoid/profile.py index 9fa0230472..ee6cdfa39f 100644 --- a/modules/cytoid/profile.py +++ b/modules/cytoid/profile.py @@ -32,34 +32,34 @@ async def cytoid_profile(msg: Bot.MessageSession): grade: dict = profile['grade'] grade_t = [] max = grade.get('MAX') - if max is not None: + if max: grade_t.append(f'MAX: {max}') sss = grade.get('SSS') - if sss is not None: + if sss: grade_t.append(f'SSS: {sss}') ss = grade.get('SS') - if ss is not None: + if ss: grade_t.append(f'SS: {ss}') s = grade.get('S') - if s is not None: + if s: grade_t.append(f'S: {s}') aa = grade.get('AA') - if aa is not None: + if aa: grade_t.append(f'AA: {aa}') a = grade.get('A') - if a is not None: + if a: grade_t.append(f'A: {a}') b = grade.get('B') - if b is not None: + if b: grade_t.append(f'B: {b}') c = grade.get('C') - if c is not None: + if c: grade_t.append(f'C: {c}') d = grade.get('D') - if d is not None: + if d: grade_t.append(f'D: {d}') f = grade.get('F') - if f is not None: + if f: grade_t.append(f'F: {f}') text = f'UID: {uid}\n' + \ (f'Nickname: {nick}\n' if nick else '') + \ diff --git a/modules/dice/dice.py b/modules/dice/dice.py index 6cff8de6f0..58852e76f1 100644 --- a/modules/dice/dice.py +++ b/modules/dice/dice.py @@ -27,7 +27,7 @@ class DiceValueError(Exception): """骰子参数值错误""" def __init__(self, session, message, value=None): - if value is not None: + if value: self.message = session.locale.t("dice.message.error.value.invalid", value=value) + message else: self.message = session.locale.t("dice.message.error.value") + message diff --git a/modules/dictionary/screenshot.py b/modules/dictionary/screenshot.py index 145d415c3c..eddfb5eae7 100644 --- a/modules/dictionary/screenshot.py +++ b/modules/dictionary/screenshot.py @@ -97,7 +97,7 @@ def join_url(base, target): '.dictionaries > .dictionary, .dictionaries.dictionary') trash = content.select( '.hwd_sound, .cobuild-logo, .pronIPASymbol, .title_frequency_container') - if trash is not None: + if trash: for x in trash: x.decompose() elif source == 'yd': diff --git a/modules/github/repo.py b/modules/github/repo.py index 3dc9dcf1e2..53d15ed620 100644 --- a/modules/github/repo.py +++ b/modules/github/repo.py @@ -11,18 +11,18 @@ async def repo(msg: Bot.MessageSession): try: result = await get_url('https://api.github.com/repos/' + msg.parsed_msg[''], 200, fmt='json') rlicense = 'Unknown' - if 'license' in result and result['license'] is not None: + if 'license' in result and result['license']: if 'spdx_id' in result['license']: rlicense = result['license']['spdx_id'] is_fork = result['fork'] parent = False - if result['homepage'] is not None: + if result['homepage']: website = 'Website: ' + str(Url(result['homepage'])) + '\n' else: website = '' - if result['mirror_url'] is not None: + if result['mirror_url']: mirror = f' (This is a mirror of {str(Url(result["mirror_url"]))} )' else: mirror = '' diff --git a/modules/github/user.py b/modules/github/user.py index 04d98e6628..b262b99ee2 100644 --- a/modules/github/user.py +++ b/modules/github/user.py @@ -10,17 +10,17 @@ async def user(msg: Bot.MessageSession): try: result = await get_url('https://api.github.com/users/' + msg.parsed_msg[''], 200, fmt='json') optional = [] - if 'hireable' in result and result['hireable'] is True: + if 'hireable' in result and result['hireable']: optional.append('Hireable') - if 'is_staff' in result and result['is_staff'] is True: + if 'is_staff' in result and result['is_staff']: optional.append('GitHub Staff') - if 'company' in result and result['company'] is not None: + if 'company' in result and result['company']: optional.append('Work · ' + result['company']) - if 'twitter_username' in result and result['twitter_username'] is not None: + if 'twitter_username' in result and result['twitter_username']: optional.append('Twitter · ' + result['twitter_username']) - if 'blog' in result and result['blog'] is not None: + if 'blog' in result and result['blog']: optional.append('Site · ' + result['blog']) - if 'location' in result and result['location'] is not None: + if 'location' in result and result['location']: optional.append('Location · ' + result['location']) bio = result['bio'] diff --git a/modules/ip/__init__.py b/modules/ip/__init__.py index bbd25a7691..4b88ecd766 100644 --- a/modules/ip/__init__.py +++ b/modules/ip/__init__.py @@ -116,10 +116,10 @@ async def format_ip(msg, info: Dict[str, Any]): return f'''\ {info['ip']} {msg.locale.t('ip.message.type')}IPv{info['version']} {ip_property[info['ip_property']]}{msg.locale.t('ip.message.ip_property')}{f""" -{msg.locale.t('ip.message.real_ip')}{info['real_ip']}""" if info['real_ip'] is not None else ''}{f""" -{msg.locale.t('ip.message.location')}{f"{info['city']}, " if info['city'] is not None else ''}{f"{info['region']}, " if info['region'] is not None else ''}{info['country']}""" if info['country'] is not None else ''}{f" ({parse_coordinate('longitude', info['longitude'])}, {parse_coordinate('latitude', info['latitude'])})" if info['longitude'] is not None and info['latitude'] is not None else ''}{f""" -{msg.locale.t('ip.message.postal_code')}{info['postal_code']}""" if info['postal_code'] is not None else ''}{f""" -{msg.locale.t('ip.message.organization')}{info['organization']}""" if info['organization'] is not None else ''}{f""" -{msg.locale.t('ip.message.asn')}{info['asn']}""" if info['asn'] is not None else ''}{f" ({info['asn_organization']}) " if info['asn_organization'] is not None else ''}{f""" -{msg.locale.t('ip.message.utc')}UTC{(info['offset'] / 3600):+g}""" if info['offset'] is not None else ''}{f""" -{msg.locale.t('ip.message.reverse')}{info['reverse']}""" if info['reverse'] is not None and info['reverse'] != info['ip'] else ''}''' +{msg.locale.t('ip.message.real_ip')}{info['real_ip']}""" if info['real_ip'] else ''}{f""" +{msg.locale.t('ip.message.location')}{f"{info['city']}, " if info['city'] else ''}{f"{info['region']}, " if info['region'] else ''}{info['country']}""" if info['country'] else ''}{f" ({parse_coordinate('longitude', info['longitude'])}, {parse_coordinate('latitude', info['latitude'])})" if info['longitude'] and info['latitude'] else ''}{f""" +{msg.locale.t('ip.message.postal_code')}{info['postal_code']}""" if info['postal_code'] else ''}{f""" +{msg.locale.t('ip.message.organization')}{info['organization']}""" if info['organization'] else ''}{f""" +{msg.locale.t('ip.message.asn')}{info['asn']}""" if info['asn'] else ''}{f" ({info['asn_organization']}) " if info['asn_organization'] else ''}{f""" +{msg.locale.t('ip.message.utc')}UTC{(info['offset'] / 3600):+g}""" if info['offset'] else ''}{f""" +{msg.locale.t('ip.message.reverse')}{info['reverse']}""" if info['reverse'] and info['reverse'] != info['ip'] else ''}''' diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index 884d00adcd..05855f30a9 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -47,7 +47,7 @@ def get_diff(diff): @mai.command('base [] {{maimai.help.base}}') async def _(msg: Bot.MessageSession, constant: float, constant_max: float = None): - if constant_max is not None: + if constant_max: if constant > constant_max: await msg.finish(msg.locale.t('error.range.invalid')) result_set = await base_level_q(constant, constant_max) @@ -73,7 +73,7 @@ async def _(msg: Bot.MessageSession, constant: float, constant_max: float = None async def base_level_q(ds1, ds2=None): result_set = [] - if ds2 is not None: + if ds2: music_data = (await total_list.get()).filter(ds=(ds1, ds2)) else: music_data = (await total_list.get()).filter(ds=ds1) @@ -195,7 +195,7 @@ async def _(msg: Bot.MessageSession, id_or_alias: str, diff: str = None): if not music: await msg.finish(msg.locale.t("maimai.message.music_not_found")) - if diff is not None: + if diff: diff_index = get_diff(diff) if not diff_index or (len(music['ds']) == 4 and diff_index == 4): await msg.finish(msg.locale.t("maimai.message.chart_not_found")) diff --git a/modules/mcbbs_news/mcbbs_news.py b/modules/mcbbs_news/mcbbs_news.py index 0563689352..b62ac54039 100644 --- a/modules/mcbbs_news/mcbbs_news.py +++ b/modules/mcbbs_news/mcbbs_news.py @@ -10,6 +10,7 @@ web_render = CFG.get_url('web_render') web_render_local = CFG.get_url('web_render_local') + async def news(msg): api = 'https://www.mcbbs.net/forum-news-1.html' if web_render: @@ -20,7 +21,7 @@ async def news(msg): bs = BeautifulSoup(html, 'html.parser') results = bs.select('#threadlisttableid > tbody[id^="normalthread_"]') res = [] - if results is not None: + if results: for i in results: if len(res) == 5: break diff --git a/modules/mcv/mcv.py b/modules/mcv/mcv.py index 7a51de6a2c..4e58eb2703 100644 --- a/modules/mcv/mcv.py +++ b/modules/mcv/mcv.py @@ -82,10 +82,10 @@ async def mcbv(msg): msg2 = f'Beta: {fix.join(beta)}\nPreview: {fix.join(preview)}\nRelease: {fix.join(release)}' return \ (f"""{msg.locale.t("mcv.message.mcbv.play_store")} -{play_store_version if play_store_version is not None else msg.locale.t('mcv.message.mcbv.get_failed')} +{play_store_version if play_store_version else msg.locale.t('mcv.message.mcbv.get_failed')} """ if IP.country != 'China' else '') + \ f"""{msg.locale.t("mcv.message.mcbv.ms_store")} -{ms_store_version if ms_store_version is not None else msg.locale.t('mcv.message.mcbv.get_failed')} +{ms_store_version if ms_store_version else msg.locale.t('mcv.message.mcbv.get_failed')} """ + \ msg.locale.t("mcv.message.mcbv", jira_ver=msg2) diff --git a/modules/mod_dl/__init__.py b/modules/mod_dl/__init__.py index 22864f5633..eb6148cbbc 100644 --- a/modules/mod_dl/__init__.py +++ b/modules/mod_dl/__init__.py @@ -25,7 +25,7 @@ @mod_dl.handle(' [] {{mod_dl.help}}') async def main(msg: Bot.MessageSession, mod_name: str, version: str = None): ver = version - if version is not None: + if version: match_ver = re.match(r'^\d+\.\d+\.\d+$|^\d+\.\d+$|\d+w\d+[abcd]', version) if not match_ver: mod_name += ' ' + version @@ -38,7 +38,7 @@ async def search_modrinth(name: str, ver: str): else: url += f'&facets=[["project_type:mod"]]' resp = await get_url(url, 200, fmt="json", timeout=5, attempt=3) - if resp is not None: + if resp: results = [] if len(resp["hits"]) == 0: return None @@ -63,7 +63,7 @@ async def search_curseforge(name: str, ver: str): results = [] try: resp = await get_url(url, 200, fmt="json", timeout=5, attempt=3, headers=headers) - if resp is not None: + if resp: if not enable_mirror: # 没提供 pagination if resp["pagination"]["resultCount"] == 0: return None @@ -76,7 +76,7 @@ async def search_curseforge(name: str, ver: str): async def get_modrinth_project_version(project_id: str, ver: str): url = f'https://api.modrinth.com/v2/project/{project_id}/version?game_versions=["{ver}"]&featured=true' resp = (await get_url(url, 200, fmt="json", timeout=5, attempt=3))[0] - if resp is not None: + if resp: return resp async def get_curseforge_mod_version_index(modid: str): @@ -91,7 +91,7 @@ async def get_curseforge_mod_version_index(modid: str): } url = f'https://api.curseforge.com/v1/mods/{modid}' resp = await get_url(url, 200, fmt="json", timeout=5, attempt=3, headers=headers) - if resp is not None: + if resp: return resp["data"]['latestFilesIndexes'] async def get_curseforge_mod_file(modid: str, ver: str): @@ -107,7 +107,7 @@ async def get_curseforge_mod_file(modid: str, ver: str): try: resp = await get_url(url, 200, fmt="json", timeout=5, attempt=3, headers=headers) - if resp is not None: + if resp: return resp["data"][0] except Exception: traceback.print_exc() @@ -160,14 +160,14 @@ async def get_curseforge_mod_file(modid: str, ver: str): replied2 = reply2.as_display(text_only=True) if replied2 in mod_info[3]: version_info = await get_modrinth_project_version(mod_info[2], replied2) - if version_info is not None: + if version_info: await msg.finish( f'{" ".join(version_info["loaders"])}\n{msg.locale.t("mod_dl.message.download_url")}{version_info["files"][0]["url"]}\n{msg.locale.t("mod_dl.message.filename")}{version_info["files"][0]["filename"]}') elif ver not in mod_info[3]: await msg.finish(msg.locale.t("mod_dl.message.version.not_found")) elif ver in mod_info[3]: version_info = await get_modrinth_project_version(mod_info[2], ver) - if version_info is not None: + if version_info: await msg.finish( f'{" ".join(version_info["loaders"])}\n{msg.locale.t("mod_dl.message.download_url")}{version_info["files"][0]["url"]}\n{msg.locale.t("mod_dl.message.filename")}{version_info["files"][0]["filename"]}') else: # curseforge mod @@ -175,7 +175,7 @@ async def get_curseforge_mod_file(modid: str, ver: str): for version in version_index: if version["gameVersion"] not in ver_list: ver_list.append(version["gameVersion"]) - if version_index is not None: + if version_index: if not ver: reply2 = await msg.wait_reply(f'{msg.locale.t("mod_dl.message.version")}\n' + '\n'.join(ver_list) + @@ -186,7 +186,7 @@ async def get_curseforge_mod_file(modid: str, ver: str): if ver in ver_list: file_info = await get_curseforge_mod_file(mod_info[2], ver) - if file_info is not None: + if file_info: await msg.finish(f'{" ".join(file_info["gameVersions"])} \ \n{msg.locale.t("mod_dl.message.download_url")}{file_info["downloadUrl"]} \ \n{msg.locale.t("mod_dl.message.filename")}{file_info["fileName"]}') diff --git a/modules/nintendo_err/__init__.py b/modules/nintendo_err/__init__.py index 62c72e7302..4cc652fa8b 100644 --- a/modules/nintendo_err/__init__.py +++ b/modules/nintendo_err/__init__.py @@ -98,7 +98,7 @@ async def result(msg: Bot.MessageSession): results = Results() err = msg.parsed_msg[''] err = results.fixup_input(err) - if (meme := results.check_meme(err)) is not None: + if meme := results.check_meme(err): await msg.finish(meme) try: ret = results.fetch(err) diff --git a/modules/nintendo_err/ctr_support.py b/modules/nintendo_err/ctr_support.py index 257b4ea1cc..14dd557b1d 100644 --- a/modules/nintendo_err/ctr_support.py +++ b/modules/nintendo_err/ctr_support.py @@ -320,7 +320,7 @@ def construct_support(ret, mod, desc): else: ret.add_field(ConsoleErrorField('分类', supplementary_value=mod)) description = category.get_error(desc) - if description is not None and description.description: + if description and description.description: ret.add_field(ConsoleErrorField('描述', message_str=description.description)) if description.support_url: ret.add_field(ConsoleErrorField('更多描述', message_str=description.support_url)) @@ -349,7 +349,7 @@ def nim_handler(ret, description): # If we have a specific description for it in our knowledgebase, # show it instead of doing the rest of the processing. error = nim.get_error(description) - if error is not None and error.description: + if error and error.description: return construct_support(ret, 5, description) elif 2000 <= description < 3024: diff --git a/modules/nintendo_err/types.py b/modules/nintendo_err/types.py index 0308bd371c..42fdc4293d 100644 --- a/modules/nintendo_err/types.py +++ b/modules/nintendo_err/types.py @@ -17,7 +17,7 @@ def __init__(self, name, data={}, summaries={}): def get_error(self, error: int): value = self.data.get(error, None) - if value is not None: + if value: return value for key, value in self.data.items(): if isinstance(key, tuple) and key[0] <= error <= key[1]: @@ -28,7 +28,7 @@ def get_error(self, error: int): # If your modules require specific extra info for error ranges, add it here def get_summary(self, summary: int): value = self.summaries.get(summary, None) - if value is not None: + if value: return value for key, value in self.summaries.items(): if isinstance(key, tuple) and key[0] <= summary <= key[1]: diff --git a/modules/nintendo_err/wiiu_results.py b/modules/nintendo_err/wiiu_results.py index 84cd93e042..99acf78551 100644 --- a/modules/nintendo_err/wiiu_results.py +++ b/modules/nintendo_err/wiiu_results.py @@ -3323,7 +3323,7 @@ def construct_result(ret, mod, summary, level, desc, is_legacy): ret.add_field(ConsoleErrorField('Module', message_str=module.name, supplementary_value=mod)) if is_legacy: ret.extra_description = "Legacy result" - if is_legacy and summary is not None: + if is_legacy and summary: ret.add_field( ConsoleErrorField('Summary', message_str=legacy_summary.get(summary, ''), supplementary_value=summary)) ret.add_field(ConsoleErrorField('Level', message_str=(legacy_levels if is_legacy else levels).get(level, ''), diff --git a/modules/nintendo_err/wiiu_support.py b/modules/nintendo_err/wiiu_support.py index 84b4178454..6a8d468008 100644 --- a/modules/nintendo_err/wiiu_support.py +++ b/modules/nintendo_err/wiiu_support.py @@ -503,7 +503,7 @@ def construct_support(ret, mod, desc): if summary: ret.add_field(ConsoleErrorField('Summary', message_str=summary)) description = category.get_error(desc) - if description is not None and description.description: + if description and description.description: ret.add_field(ConsoleErrorField('Description', message_str=description.description)) if description.support_url: ret.add_field(ConsoleErrorField('Further information', message_str=description.support_url)) diff --git a/modules/user/user.py b/modules/user/user.py index f36134257f..89134ede2d 100644 --- a/modules/user/user.py +++ b/modules/user/user.py @@ -52,7 +52,7 @@ async def get_user_info(msg: MessageSession, wikiurl, username, pic=False): data['global_users_groups'].append(groups[g] if g in groups else g) data['registration_time'] = base_user_info['registration'] data['registration_time'] = msg.ts2strftime(strptime2ts(data['registration_time'])) if data[ - 'registration_time'] is not None else msg.locale.t( + 'registration_time'] else msg.locale.t( 'unknown') data['edited_count'] = str(base_user_info['editcount']) data['gender'] = base_user_info['gender'] @@ -87,17 +87,17 @@ async def get_user_info(msg: MessageSession, wikiurl, username, pic=False): data['blocked_time'] = '无限期' else: data['blocked_time'] = msg.ts2strftime(strptime2ts(data['blocked_time'])) \ - if data['blocked_time'] is not None else msg.locale.t( + if data['blocked_time'] else msg.locale.t( 'unknown') data['blocked_expires'] = base_user_info.get('blockexpiry', None) if data['blocked_expires'] in ['infinity', 'infinite']: data['blocked_expires'] = '无限期' else: data['blocked_expires'] = msg.ts2strftime(strptime2ts(data['blocked_expires'])) if data[ - 'blocked_expires'] is not None else msg.locale.t( + 'blocked_expires'] else msg.locale.t( 'unknown') data['blocked_reason'] = base_user_info['blockreason'] - data['blocked_reason'] = data['blocked_reason'] if data['blocked_reason'] is not None else msg.locale.t( + data['blocked_reason'] = data['blocked_reason'] if data['blocked_reason'] else msg.locale.t( 'unknown') if pic: diff --git a/modules/weekly/__init__.py b/modules/weekly/__init__.py index b536a560e9..ef2bf03244 100644 --- a/modules/weekly/__init__.py +++ b/modules/weekly/__init__.py @@ -46,12 +46,12 @@ async def get_weekly(with_img=False, zh_tw=False): Plain( locale.t( "weekly.message.link", - img=imglink if imglink is not None else locale.t("none"), + img=imglink if imglink else locale.t("none"), article=str( Url(f'https://zh.minecraft.wiki{page[0]}')), link=str( Url(f'https://zh.minecraft.wiki/wiki/?oldid={str(result["parse"]["revid"])}'))))) - if imglink is not None and with_img: + if imglink and with_img: msg_list.append(Image(path=imglink)) return msg_list diff --git a/modules/wiki/inline.py b/modules/wiki/inline.py index d726d9a4c7..f79b07d112 100644 --- a/modules/wiki/inline.py +++ b/modules/wiki/inline.py @@ -95,11 +95,11 @@ async def bgtask(): if not result['status']: return get_page = await wiki_.parse_page_info(title) - if get_page is not None: - if get_page.status and get_page.file is not None: + if get_page: + if get_page.status and get_page.file: dl = await download_to_cache(get_page.file) guess_type = filetype.guess(dl) - if guess_type is not None: + if guess_type: if guess_type.extension in ["png", "gif", "jpg", "jpeg", "webp", "bmp", "ico"]: if msg.Feature.image: await msg.send_message( diff --git a/modules/wiki/search.py b/modules/wiki/search.py index 49a04a86bb..e880c47055 100644 --- a/modules/wiki/search.py +++ b/modules/wiki/search.py @@ -28,7 +28,7 @@ async def search_pages(session: Bot.MessageSession, title: Union[str, list, tupl title = [title] query_task = {start_wiki: {'query': [], 'iw_prefix': ''}} for t in title: - if prefix is not None and use_prefix: + if prefix and use_prefix: t = prefix + t if t[0] == ':': if len(t) > 1: diff --git a/modules/wiki/set.py b/modules/wiki/set.py index 99ad7311bf..fa5d285e76 100644 --- a/modules/wiki/set.py +++ b/modules/wiki/set.py @@ -69,19 +69,20 @@ async def _(msg: Bot.MessageSession): query = target.get_interwikis() start_wiki = target.get_start_wiki() base_interwiki_link = None - if start_wiki is not None: + if start_wiki: base_interwiki_link_ = await WikiLib(start_wiki, target.get_headers()).parse_page_info('Special:Interwiki') if base_interwiki_link_.status: base_interwiki_link = base_interwiki_link_.link + result = '' if query != {}: if not msg.parsed_msg.get('legacy', False) and msg.Feature.image: columns = [[x, query[x]] for x in query] img = await image_table_render(ImageTable(columns, ['Interwiki', 'Url'])) else: - img = False + img = None if img: mt = msg.locale.t("wiki.message.iw.list", prefix=msg.prefixes[0]) - if base_interwiki_link is not None: + if base_interwiki_link: mt += '\n' + msg.locale.t("wiki.message.iw.list.prompt", url=str(Url(base_interwiki_link))) await msg.finish([Image(img), Plain(mt)]) else: @@ -89,7 +90,7 @@ async def _(msg: Bot.MessageSession): '\n'.join([f'{x}: {query[x]}' for x in query]) else: result = msg.locale.t("wiki.message.iw.list.none", prefix=msg.prefixes[0]) - if base_interwiki_link is not None: + if base_interwiki_link: result += '\n' + msg.locale.t("wiki.message.iw.list.prompt", url=str(Url(base_interwiki_link))) await msg.finish(result) @@ -161,7 +162,7 @@ async def _(msg: Bot.MessageSession): @wiki.command('fandom {{wiki.help.fandom}}', - required_admin=True) + required_admin=True) async def _(msg: Bot.MessageSession): fandom_addon_state = msg.data.options.get('wiki_fandom_addon') @@ -174,7 +175,7 @@ async def _(msg: Bot.MessageSession): @wiki.command('redlink {{wiki.help.redlink}}', - required_admin=True) + required_admin=True) async def _(msg: Bot.MessageSession): redlink_state = msg.data.options.get('wiki_redlink') diff --git a/modules/wiki/utils/dbutils.py b/modules/wiki/utils/dbutils.py index e42abefe9e..556f499646 100644 --- a/modules/wiki/utils/dbutils.py +++ b/modules/wiki/utils/dbutils.py @@ -37,8 +37,8 @@ def add_start_wiki(self, url): return True def get_start_wiki(self) -> Union[str, None]: - if self.query is not None: - return self.query.link if self.query.link is not None else None + if self.query: + return self.query.link if self.query.link else None @retry(stop=stop_after_attempt(3), reraise=True) @auto_rollback_error @@ -56,7 +56,7 @@ def config_interwikis(self, iw: str, iwlink: str = None, let_it=True): def get_interwikis(self) -> dict: q = self.query.iws - if q is not None: + if q: iws = json.loads(q) return iws else: @@ -82,7 +82,7 @@ def config_headers(self, headers, let_it: [bool, None] = True): return False def get_headers(self): - if self.query is not None: + if self.query: q = self.query.headers headers = json.loads(q) else: @@ -115,7 +115,7 @@ def __init__(self, api_link): self.query = session.query(WikiInfo).filter_by(apiLink=api_link).first() def get(self): - if self.query is not None: + if self.query: return self.query.siteInfo, self.query.timestamp return False @@ -170,7 +170,7 @@ def add_to_AllowList(self, date) -> bool: def remove_from_AllowList(self) -> Union[bool, None]: if not self.inAllowList: return False - if (query := session.query(WikiAllowList).filter_by(apiLink=self.api_link).first()) is not None: + if query := session.query(WikiAllowList).filter_by(apiLink=self.api_link).first(): session.delete(query) session.commit() session.expire_all() diff --git a/modules/wiki/utils/rc_qq.py b/modules/wiki/utils/rc_qq.py index cdaafce472..7b7db20258 100644 --- a/modules/wiki/utils/rc_qq.py +++ b/modules/wiki/utils/rc_qq.py @@ -77,7 +77,7 @@ async def rc_qq(msg: MessageSession, wiki_url): log = x['logaction'] + '了' + title_checked_map[x['title']] if x['logtype'] in action: a = action[x['logtype']].get(x['logaction']) - if a is not None: + if a: log = a % title_checked_map[x['title']] t.append(log) params = x['logparams'] diff --git a/modules/wiki/utils/screenshot_image.py b/modules/wiki/utils/screenshot_image.py index dca84bbf70..5059496488 100644 --- a/modules/wiki/utils/screenshot_image.py +++ b/modules/wiki/utils/screenshot_image.py @@ -23,7 +23,7 @@ async def generate_screenshot_v2(page_link, section=None, allow_special_page=False, content_mode=False, use_local=True, element=None): elements_ = elements.copy() - if element is not None and isinstance(element, List): + if element and isinstance(element, List): elements_ += element if not web_render_local: if not web_render: @@ -152,7 +152,7 @@ def join_url(base, target): find_diff = None if allow_special_page: find_diff = soup.find('table', class_=re.compile('diff')) - if find_diff is not None: + if find_diff: Logger.info('Found diff...') for x in soup.find_all('body'): if x.has_attr('class'): @@ -185,7 +185,7 @@ def join_url(base, target): find_infobox = None for i in infoboxes: find_infobox = soup.find(class_=i[1:]) - if find_infobox is not None: + if find_infobox: break if not find_infobox: Logger.info('Found nothing...') diff --git a/modules/wiki/utils/wikilib.py b/modules/wiki/utils/wikilib.py index e07447f7eb..879ffe0e1d 100644 --- a/modules/wiki/utils/wikilib.py +++ b/modules/wiki/utils/wikilib.py @@ -53,10 +53,10 @@ class WhatAreUDoingError(Exception): class QueryInfo: def __init__(self, api, headers=None, prefix=None, locale=None): self.api = api - self.headers = headers if headers is not None else { + self.headers = headers if headers else { 'accept-language': 'zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6'} self.prefix = prefix - self.locale = Locale(locale if locale is not None else default_locale) + self.locale = Locale(locale if locale else default_locale) class WikiInfo: @@ -157,7 +157,7 @@ def __init__(self, url: str, headers=None, locale='zh_cn'): async def get_json_from_api(self, api, **kwargs) -> dict: if api in redirect_list: api = redirect_list[api] - if kwargs is not None: + if kwargs: api = api + '?' + urllib.parse.urlencode(kwargs) + '&format=json' Logger.debug(api) else: @@ -287,7 +287,7 @@ async def check_wiki_info_from_database_cache(self): """检查wiki信息是否已记录在数据库缓存（由于部分wiki通过path区分语言，此处仅模糊查询域名部分，返回结果可能不准确）""" parse_url = urllib.parse.urlparse(self.url) get = DBSiteInfo.get_like_this(parse_url.netloc) - if get is not None: + if get: api_link = get.apiLink if api_link in redirect_list: api_link = redirect_list[api_link] @@ -351,7 +351,7 @@ async def get_html_to_text(self, page_name, section=None): h.ignore_tables = True h.single_line_break = True t = h.handle(get_parse['parse']['text']['*']) - if section is not None: + if section: for i in range(1, 7): s = re.split(r'(.*' + '#' * i + r'[^#].*\[.*?])', t, re.M | re.S) ls = len(s) @@ -432,7 +432,7 @@ async def parse_page_info(self, title: str = None, pageid: int = None, inline=Fa link = None if self.url.find('$1') != -1: link = self.url.replace('$1', title) - return PageInfo(title=title if title is not None else pageid, id=pageid, + return PageInfo(title=title if title else pageid, id=pageid, link=link, desc=self.locale.t("error") + str(e), info=self.wiki_info, templates=[]) ban = False if self.wiki_info.in_blocklist and not self.wiki_info.in_allowlist: @@ -500,20 +500,20 @@ async def parse_page_info(self, title: str = None, pageid: int = None, inline=Fa info=self.wiki_info) redirects_: List[Dict[str, str]] = query.get('redirects') - if redirects_ is not None: + if redirects_: for r in redirects_: if r['from'] == title: page_info.before_title = r['from'] page_info.title = r['to'] normalized_: List[Dict[str, str]] = query.get('normalized') - if normalized_ is not None: + if normalized_: for n in normalized_: if n['from'] == title: page_info.before_title = n['from'] page_info.title = n['to'] pages: Dict[str, dict] = query.get('pages') # print(pages) - if pages is not None: + if pages: for page_id in pages: page_info.status = False page_info.id = int(page_id) @@ -591,7 +591,7 @@ async def search_something(srwhat): searches.append(search_something(srwhat)) gather_search = await asyncio.gather(*searches) for search in gather_search: - if search[0] is not None and search[0] not in searched_result: + if search[0] and search[0] not in searched_result: searched_result.append(search[0]) if not preferred and searched_result: @@ -623,7 +623,7 @@ async def search_something(srwhat): page_info.status = True else: query_langlinks = False - if lang is not None: + if lang: langlinks_ = {} for x in page_raw['langlinks']: langlinks_[x['lang']] = x['url'] @@ -688,13 +688,13 @@ async def search_something(srwhat): get_desc = False get_doc_desc = await self.parse_page_info(get_doc, _doc=True) page_desc = get_doc_desc.desc - if page_desc is not None: + if page_desc: page_info.has_template_doc = True page_info.before_page_property = page_info.page_property = 'template' if get_desc: if use_textextracts and (not selected_section or page_info.invalid_section): raw_desc = page_raw.get('extract') - if raw_desc is not None: + if raw_desc: page_desc = self.parse_text(raw_desc) else: page_desc = self.parse_text(await self.get_html_to_text(title, selected_section)) @@ -716,7 +716,7 @@ async def search_something(srwhat): page_info.file = query_langlinks.file page_info.desc = query_langlinks.desc interwiki_: List[Dict[str, str]] = query.get('interwiki') - if interwiki_ is not None: + if interwiki_: for i in interwiki_: if i['title'] == page_info.title: iw_title = re.match(r'^' + i['iw'] + ':(.*)', i['title']) @@ -736,32 +736,32 @@ async def search_something(srwhat): page_info.before_title = before_page_info.title t = page_info.title if t: - if before_page_info.args is not None: + if before_page_info.args: page_info.before_title += urllib.parse.unquote(before_page_info.args) t += urllib.parse.unquote(before_page_info.args) - if page_info.link is not None: + if page_info.link: page_info.link += before_page_info.args else: page_info.link = self.wiki_info.script + f'?curid={page_info.id}' if _tried == 0: - if lang is not None and page_info.status: + if lang and page_info.status: page_info.before_title = page_info.title else: page_info.title = page_info.interwiki_prefix + t - if page_info.possible_research_title is not None: + if page_info.possible_research_title: page_info.possible_research_title = [page_info.interwiki_prefix + possible_title for possible_title in page_info.possible_research_title] - if before_page_info.selected_section is not None: + if before_page_info.selected_section: page_info.selected_section = before_page_info.selected_section if not self.wiki_info.in_allowlist: checklist = [] - if page_info.title is not None: + if page_info.title: checklist.append(page_info.title) - if page_info.before_title is not None: + if page_info.before_title: checklist.append(page_info.before_title) - if page_info.desc is not None: + if page_info.desc: checklist.append(page_info.desc) chk = await check(*checklist) for x in chk: @@ -771,7 +771,7 @@ async def search_something(srwhat): page_info.status = False page_info.title = page_info.before_title = None page_info.id = -1 - if page_info.link is not None: + if page_info.link: page_info.desc = str(Url(page_info.link, use_mm=True)) page_info.link = None return page_info diff --git a/modules/wiki/wiki.py b/modules/wiki/wiki.py index 0088408d62..102d2453a1 100644 --- a/modules/wiki/wiki.py +++ b/modules/wiki/wiki.py @@ -73,14 +73,14 @@ async def query_pages(session: Union[Bot.MessageSession, QueryInfo], title: Unio if lang in interwiki_list: start_wiki = interwiki_list[lang] lang = None - if title is not None: + if title: if isinstance(title, str): title = [title] if len(title) > 15: raise AbuseWarning(session.locale.t('tos.reason.wiki_abuse')) query_task = {start_wiki: {'query': [], 'iw_prefix': ''}} for t in title: - if prefix is not None and use_prefix: + if prefix and use_prefix: t = prefix + t if not t: continue @@ -122,7 +122,7 @@ async def query_pages(session: Union[Bot.MessageSession, QueryInfo], title: Unio matched = True if not matched: query_task[start_wiki]['query'].append(t) - elif pageid is not None: + elif pageid: if not iw: query_task = {start_wiki: {'queryid': [pageid], 'iw_prefix': ''}} else: @@ -147,7 +147,7 @@ async def query_pages(session: Union[Bot.MessageSession, QueryInfo], title: Unio render_infobox_list = [] render_section_list = [] dl_list = [] - if preset_message is not None: + if preset_message: msg_list.append(Plain(preset_message)) for q in query_task: current_task = query_task[q] @@ -179,18 +179,18 @@ async def query_pages(session: Union[Bot.MessageSession, QueryInfo], title: Unio r: PageInfo = result display_title = None display_before_title = None - if r.title is not None: + if r.title: display_title = iw_prefix + r.title - if r.before_title is not None: + if r.before_title: display_before_title = iw_prefix + r.before_title new_possible_title_list = [] - if r.possible_research_title is not None: + if r.possible_research_title: for possible in r.possible_research_title: new_possible_title_list.append(iw_prefix + possible) r.possible_research_title = new_possible_title_list if r.status: plain_slice = [] - if display_before_title is not None and display_before_title != display_title: + if display_before_title and display_before_title != display_title: if r.before_page_property == 'template' and r.page_property == 'page': plain_slice.append(session.locale.t('wiki.message.redirect.template_to_page', title=display_before_title, @@ -198,29 +198,29 @@ async def query_pages(session: Union[Bot.MessageSession, QueryInfo], title: Unio else: plain_slice.append(session.locale.t('wiki.message.redirect', title=display_before_title, redirected_title=display_title)) - if (r.link is not None and r.selected_section is not None and r.info.in_allowlist and + if (r.link and r.selected_section and r.info.in_allowlist and not r.invalid_section): render_section_list.append( {r.link: {'url': r.info.realurl, 'section': r.selected_section, 'in_allowlist': r.info.in_allowlist}}) plain_slice.append(session.locale.t("wiki.message.section.rendering")) else: - if r.desc is not None and r.desc != '': + if r.desc: plain_slice.append(r.desc) - if r.link is not None: + if r.link: plain_slice.append( str(Url(r.link, use_mm=not r.info.in_allowlist))) - if r.file is not None: + if r.file: dl_list.append(r.file) plain_slice.append(session.locale.t('wiki.message.flies') + r.file) else: - if r.link is not None and not r.selected_section: + if r.link and not r.selected_section: render_infobox_list.append( {r.link: {'url': r.info.realurl, 'in_allowlist': r.info.in_allowlist, 'content_mode': r.has_template_doc or r.title.split(':')[0] in ['User'] or - (r.templates is not None and + (r.templates and ('Template:Disambiguation' in r.templates or 'Template:Version disambiguation' in r.templates))}}) if plain_slice: @@ -252,7 +252,7 @@ async def _callback(msg: Bot.MessageSession): else: plain_slice = [] wait_plain_slice = [] - if display_title is not None and display_before_title is not None: + if display_title and display_before_title: if isinstance(session, Bot.MessageSession) and session.Feature.wait: if not session.options.get('wiki_redlink', False): if len(r.possible_research_title) > 1: @@ -275,7 +275,7 @@ async def _callback(msg: Bot.MessageSession): redirected_title=display_title)) wait_plain_slice.append(session.locale.t("message.wait.confirm.prompt.type1")) else: - if r.edit_link is not None: + if r.edit_link: plain_slice.append(r.edit_link + session.locale.t('wiki.message.redlink.not_found')) else: plain_slice.append(session.locale.t('wiki.message.redlink.not_found.uneditable', @@ -286,13 +286,13 @@ async def _callback(msg: Bot.MessageSession): redirected_title=display_title)) if len(r.possible_research_title) == 1: wait_list.append({display_title: display_before_title}) - elif r.before_title is not None: + elif r.before_title: plain_slice.append(session.locale.t('wiki.message.not_found', title=display_before_title)) elif r.id != -1: plain_slice.append(session.locale.t('wiki.message.id.not_found', id=str(r.id))) - if r.desc is not None and r.desc != '': + if r.desc: plain_slice.append(r.desc) - if r.invalid_namespace and r.before_title is not None: + if r.invalid_namespace and r.before_title: plain_slice.append( session.locale.t('wiki.message.invalid_namespace', namespace=r.invalid_namespace)) if r.before_page_property == 'template': @@ -367,7 +367,7 @@ async def image_and_voice(): for f in dl_list: dl = await download_to_cache(f) guess_type = filetype.guess(dl) - if guess_type is not None: + if guess_type: if guess_type.extension in ["png", "gif", "jpg", "jpeg", "webp", "bmp", "ico"]: if session.Feature.image: await session.send_message(Image(dl), quote=False) From 905311e8939f457f79742ada78e7269c4ec2c80f Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Tue, 19 Dec 2023 16:52:18 +0800 Subject: [PATCH 156/168] update --- modules/meme/nbnhhsh.py | 2 +- modules/meme/urban.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/meme/nbnhhsh.py b/modules/meme/nbnhhsh.py index 8d75615635..6a63c12154 100644 --- a/modules/meme/nbnhhsh.py +++ b/modules/meme/nbnhhsh.py @@ -25,7 +25,7 @@ async def nbnhhsh(term: str, locale: Locale): trans = result['trans'] count = trans.__len__() return f'[{locale.t("meme.message.nbnhhsh")}] {locale.t("meme.message.nbnhhsh.result", result=count)}{"、".join(trans)}' - elif 'inputting' in result and result['inputting'] != []: + elif 'inputting' in result and result['inputting']: inputting = result['inputting'] count = inputting.__len__() return f'[{locale.t("meme.message.nbnhhsh")}] {locale.t("meme.message.nbnhhsh.result.ai", result=count)}{"、".join(inputting)}' diff --git a/modules/meme/urban.py b/modules/meme/urban.py index 115b2e8ca4..ef56eef25d 100644 --- a/modules/meme/urban.py +++ b/modules/meme/urban.py @@ -11,6 +11,7 @@ web_render = CFG.get_url('web_render') web_render_local = CFG.get_url('web_render_local') + async def urban(term: str, locale: Locale): '''查询urban dictionary。 @@ -29,7 +30,7 @@ async def urban(term: str, locale: Locale): 'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36 Edg/96.0.1054.62'}) Logger.debug(text) data = json.loads(text)['list'] - if data == []: + if not data: return f'[{locale.t("meme.message.urban")}] {locale.t("meme.message.not_found")}' else: count = data.__len__() From 6eb5da70d606fead3306949e5e3cd214d3c1ecaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Tue, 19 Dec 2023 23:59:52 +0800 Subject: [PATCH 157/168] update slash --- bots/discord/slash/arcaea.py | 8 +-- bots/discord/slash/ask.py | 2 +- bots/discord/slash/bugtracker.py | 2 +- bots/discord/slash/color.py | 2 +- bots/discord/slash/core.py | 94 ++++++++++++++++++++--------- bots/discord/slash/cytoid.py | 10 +-- bots/discord/slash/dice.py | 4 +- bots/discord/slash/exchange_rate.py | 4 +- bots/discord/slash/github.py | 8 +-- bots/discord/slash/idlist.py | 28 --------- bots/discord/slash/ip.py | 2 +- bots/discord/slash/mcplayer.py | 2 +- bots/discord/slash/mcv.py | 10 +-- bots/discord/slash/server.py | 2 +- bots/discord/slash/tweet.py | 2 +- bots/discord/slash/whois.py | 2 +- bots/discord/slash/wiki.py | 12 ++-- bots/discord/slash/wolframalpha.py | 4 +- 18 files changed, 103 insertions(+), 95 deletions(-) delete mode 100644 bots/discord/slash/idlist.py diff --git a/bots/discord/slash/arcaea.py b/bots/discord/slash/arcaea.py index 0a50364488..14d1cf8954 100644 --- a/bots/discord/slash/arcaea.py +++ b/bots/discord/slash/arcaea.py @@ -6,12 +6,12 @@ arcaea = client.create_group("arcaea", "Queries about Arcaea.") -@arcaea.command(description="Get the latest version of game apk.") +@arcaea.command(name="download", description="Get the latest version of game apk.") async def download(ctx: discord.ApplicationContext): await slash_parser(ctx, "download") -@arcaea.command(description="Random a song.") +@arcaea.command(name="random", description="Random a song.") async def random(ctx: discord.ApplicationContext): await slash_parser(ctx, "random") @@ -19,11 +19,11 @@ async def random(ctx: discord.ApplicationContext): rank = arcaea.create_subgroup("rank", "View the current daily rank of Arcaea songs.") -@rank.command(description="View the current rank of the free packs.") +@rank.command(name="free", description="View the current rank of the free packs.") async def free(ctx: discord.ApplicationContext): await slash_parser(ctx, "rank free") -@rank.command(description="View the current rank of the paid packs.") +@rank.command(name="paid", description="View the current rank of the paid packs.") async def paid(ctx: discord.ApplicationContext): await slash_parser(ctx, "rank paid") diff --git a/bots/discord/slash/ask.py b/bots/discord/slash/ask.py index 4cd3fefec9..143c3e5efe 100644 --- a/bots/discord/slash/ask.py +++ b/bots/discord/slash/ask.py @@ -4,7 +4,7 @@ from bots.discord.slash_parser import slash_parser -@client.slash_command(description="Answer your question via ChatGPT.") +@client.slash_command(name="ask", description="Answer your question via ChatGPT.") @discord.option(name="question", description="Ask ChatGPT.") async def ask(ctx: discord.ApplicationContext, question: str): await slash_parser(ctx, question) \ No newline at end of file diff --git a/bots/discord/slash/bugtracker.py b/bots/discord/slash/bugtracker.py index c874fac882..10db5cdf8e 100644 --- a/bots/discord/slash/bugtracker.py +++ b/bots/discord/slash/bugtracker.py @@ -9,7 +9,7 @@ async def auto_search(ctx: discord.AutocompleteContext): return ['BDS-', 'MCPE-', 'MCD-', 'MCL-', 'MCLG-', 'REALMS-', 'MC-', 'WEB-'] -@client.command(description="Query the corresponding ticket on Mojira.") +@client.command(name="bugtracker", description="Query the corresponding ticket on Mojira.") @discord.option(name="mojiraid", autocomplete=auto_search) async def bugtracker(ctx: discord.ApplicationContext, mojiraid: str): await slash_parser(ctx, mojiraid) diff --git a/bots/discord/slash/color.py b/bots/discord/slash/color.py index f9905bc61b..d46ac39d95 100644 --- a/bots/discord/slash/color.py +++ b/bots/discord/slash/color.py @@ -9,7 +9,7 @@ async def auto_complete(ctx: discord.AutocompleteContext): return ['#123456', 'rgb(12,34,56)', 'hsl(123,45%,67%)'] -@client.slash_command(description="Get color information.") +@client.slash_command(name="color", description="Get color information.") @discord.option(name="color", default="", autocomplete=auto_complete, description="Color information. Support for Hex, RGB, HSL color code, or name in CSS and Material Design.") async def color(ctx: discord.ApplicationContext, color: str): diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index aca679a95b..f9ea9005ea 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -3,39 +3,34 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser -@client.slash_command(description="View details of a module.") -@discord.option(name="module", default="", description="The module you want to know about.") -async def help(ctx: discord.ApplicationContext, module: str): - await slash_parser(ctx, module) - -@client.slash_command(description="Set the bot running languages.") +@client.slash_command(name="locale", description="Set the bot running languages.") @discord.option(name="lang", default="", description="Supported language codes.") async def locale(ctx: discord.ApplicationContext, lang: str): await slash_parser(ctx, lang) -@client.slash_command(description="Make the bot stop sending message.") +@client.slash_command(name="mute", description="Make the bot stop sending message.") async def mute(ctx: discord.ApplicationContext): await slash_parser(ctx, "") -@client.slash_command(description="Get bot status.") +@client.slash_command(name="ping", description="Get bot status.") async def ping(ctx: discord.ApplicationContext): await slash_parser(ctx, "") -@client.slash_command(description="Get the number of petals in the current channel.") +@client.slash_command(name="petal", description="Get the number of petals in the current channel.") async def petal(ctx: discord.ApplicationContext): await slash_parser(ctx, "") -@client.slash_command(description="View bot version.") +@client.slash_command(name="version", description="View bot version.") async def version(ctx: discord.ApplicationContext): await slash_parser(ctx, "") -@client.slash_command(description="Get the ID of the user account that sent the command inside the bot.") +@client.slash_command(name="whoami", description="Get the ID of the user account that sent the command inside the bot.") async def whoami(ctx: discord.ApplicationContext): await slash_parser(ctx, "") @@ -43,30 +38,30 @@ async def whoami(ctx: discord.ApplicationContext): admin = client.create_group("admin", "Commands available to bot administrators.") -@admin.command(description="Set members as bot administrators.") +@admin.command(name="add", description="Set members as bot administrators.") @discord.option(name="userid", description="The user ID.") async def add(ctx: discord.ApplicationContext, userid: str): await slash_parser(ctx, f"add {userid}") -@admin.command(description="Remove bot administrator from member.") +@admin.command(name="remove", description="Remove bot administrator from member.") @discord.option(name="userid", description="The user ID.") async def remove(ctx: discord.ApplicationContext, userid: str): await slash_parser(ctx, f"remove {userid}") -@admin.command(description="View all bot administrators.") -async def list(ctx: discord.ApplicationContext): +@admin.command(name="list", description="View all bot administrators.") +async def lst(ctx: discord.ApplicationContext): await slash_parser(ctx, "list") -@admin.command(description="Limit someone to use bot in the channel.") +@admin.command(name="ban", description="Limit someone to use bot in the channel.") @discord.option(name="userid", description="The user ID.") async def ban(ctx: discord.ApplicationContext, userid: str): await slash_parser(ctx, f"ban {userid}") -@admin.command(description="Remove limit someone to use bot in the channel.") +@admin.command(name="unban", description="Remove limit someone to use bot in the channel.") @discord.option(name="userid", description="The user ID.") async def unban(ctx: discord.ApplicationContext, userid: str): await slash_parser(ctx, f"unban {userid}") @@ -75,50 +70,91 @@ async def unban(ctx: discord.ApplicationContext, userid: str): ali = client.create_group("alias", "Set custom command alias.") -@ali.command(description="Add custom command alias.") +@ali.command(name="add", description="Add custom command alias.") @discord.option(name="alias", description="The custom alias.") @discord.option(name="command", description="The command you want to refer to.") async def add(ctx: discord.ApplicationContext, alias: str, command: str): await slash_parser(ctx, f"add {alias} {command}") -@ali.command(description="Remove custom command alias.") +@ali.command(name="remove", description="Remove custom command alias.") @discord.option(name="alias", description="The custom alias.") async def remove(ctx: discord.ApplicationContext, alias: str): await slash_parser(ctx, f"remove {alias}") -@ali.command(description="View custom command alias.") -async def list(ctx: discord.ApplicationContext): +@ali.command(name="list", description="View custom command alias.") +async def lst(ctx: discord.ApplicationContext): await slash_parser(ctx, "list") -@ali.command(description="Reset custom command alias.") +@ali.command(name="reset", description="Reset custom command alias.") async def reset(ctx: discord.ApplicationContext): await slash_parser(ctx, "reset") +hlp = client.create_group("help", "Get bot help.") + + +@hlp.command(name="list", description="View help list.") +@discord.option(name="legacy", choices=[('true', 'legacy'), ('false', '')], description="Whether to use legacy mode.") +async def lst(ctx: discord.ApplicationContext, legacy: str): + await slash_parser(ctx, legacy) + + +@hlp.command(name="detail", description="View details of a module.") +@discord.option(name="module", default="", description="The module you want to know about.") +async def detail(ctx: discord.ApplicationContext, legacy: str): + await slash_parser(ctx, legacy) + + +@hlp.command(name="detail", description="View details of a module.") +@discord.option(name="module", default="", description="The module you want to know about.") +async def detail(ctx: discord.ApplicationContext, module: str): + await slash_parser(ctx, module) + + +m = client.create_group("module", "Set about modules.") + + +@m.command(name="enable", description="Enable module.") +@discord.option(name="module", description="The module name.") +async def add(ctx: discord.ApplicationContext, module: str): + await slash_parser(ctx, f"enable {module}") + + +@m.command(name="disable", description="Disable module.") +@discord.option(name="module", description="The module name.") +async def add(ctx: discord.ApplicationContext, module: str): + await slash_parser(ctx, f"disable {module}") + + +@m.command(name="list", description="View all available modules.") +async def lst(ctx: discord.ApplicationContext): + await slash_parser(ctx, "list") + + p = client.create_group("prefix", "Set custom command prefix.") -@p.command(description="Add custom command prefix.") +@p.command(name="add", description="Add custom command prefix.") @discord.option(name="prefix", description="The custom prefix.") async def add(ctx: discord.ApplicationContext, prefix: str): await slash_parser(ctx, f"add {prefix}") @p.command(description="Remove custom command prefix.") -@discord.option(name="prefix", description="The custom prefix.") +@discord.option(name="remove", name="prefix", description="The custom prefix.") async def remove(ctx: discord.ApplicationContext, prefix: str): await slash_parser(ctx, f"remove {prefix}") -@p.command(description="View custom command prefix.") -async def list(ctx: discord.ApplicationContext): +@p.command(name="list", description="View custom command prefix.") +async def lst(ctx: discord.ApplicationContext): await slash_parser(ctx, "list") -@p.command(description="Reset custom command prefix.") +@p.command(name="reset", description="Reset custom command prefix.") async def reset(ctx: discord.ApplicationContext): await slash_parser(ctx, "reset") @@ -126,12 +162,12 @@ async def reset(ctx: discord.ApplicationContext): setup = client.create_group("setup", "Set up bot actions.") -@setup.command(description="Set up whether to display input prompts.") +@setup.command(name="typing", description="Set up whether to display input prompts.") async def typing(ctx: discord.ApplicationContext): await slash_parser(ctx, "typing") -@setup.command(description="Set the time offset.") +@setup.command(name="timeoffset", description="Set the time offset.") @discord.option(name="offset", description="The timezone offset.") async def offset(ctx: discord.ApplicationContext, offset: str): await slash_parser(ctx, f"timeoffset {offset}") diff --git a/bots/discord/slash/cytoid.py b/bots/discord/slash/cytoid.py index f0bc3b8c61..df5f276caa 100644 --- a/bots/discord/slash/cytoid.py +++ b/bots/discord/slash/cytoid.py @@ -6,27 +6,27 @@ cytoid = client.create_group("cytoid", "Query about Cytoid.") -@cytoid.command(description="Query the Best 30 list.") +@cytoid.command(name="b30", description="Query the Best 30 list.") async def b30(ctx: discord.ApplicationContext): await slash_parser(ctx, "b30") -@cytoid.command(description="Query the Recent 30 list.") +@cytoid.command(name="r30", description="Query the Recent 30 list.") async def r30(ctx: discord.ApplicationContext): await slash_parser(ctx, "r30") -@cytoid.command(description="Query user profile.") +@cytoid.command(name="profile", description="Query user profile.") async def profile(ctx: discord.ApplicationContext): await slash_parser(ctx, "profile") -@cytoid.command(description="Bind user.") +@cytoid.command(name="bind", description="Bind user.") @discord.option(name="username", description="Your Cytoid username.") async def bind(ctx: discord.ApplicationContext, username: str): await slash_parser(ctx, f"bind {username}") -@cytoid.command(description="Unbind user.") +@cytoid.command(name="unbind", description="Unbind user.") async def unbind(ctx: discord.ApplicationContext): await slash_parser(ctx, "unbind") diff --git a/bots/discord/slash/dice.py b/bots/discord/slash/dice.py index e61abdb35e..dc6961f9a8 100644 --- a/bots/discord/slash/dice.py +++ b/bots/discord/slash/dice.py @@ -12,13 +12,13 @@ async def auto_complete(ctx: discord.AutocompleteContext): dice = client.create_group("dice", "Random dice.") -@dice.command(description="Roll the specified dice.") +@dice.command(name="roll", description="Roll the specified dice.") @discord.option(name="dices", autocomplete=auto_complete, description="Dice expression.") @discord.option(name="dc", default="", description="Difficulty class.") async def roll(ctx: discord.ApplicationContext, dices: str, dc: str): await slash_parser(ctx, f'{dices} {dc}') -@dice.command(description="Modify the checking rule of dc.") +@dice.command(name="rule", description="Modify the checking rule of dc.") async def rule(ctx: discord.ApplicationContext): await slash_parser(ctx, 'rule') diff --git a/bots/discord/slash/exchange_rate.py b/bots/discord/slash/exchange_rate.py index 04dd9f432d..061e5228f1 100644 --- a/bots/discord/slash/exchange_rate.py +++ b/bots/discord/slash/exchange_rate.py @@ -3,9 +3,9 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser -@client.slash_command(description="Convert currency prices according to the exchange rate of the day.") +@client.slash_command(name="exchange_rate", description="Convert currency prices according to the exchange rate of the day.") @discord.option(name="amount", description="The amount of base currency.") @discord.option(name="base", description="The base currency unit.") @discord.option(name="target", description="The target currency unit.") -async def exchange_rate(ctx: discord.ApplicationContext, amount: float, base: str, target: str): +async def excr(ctx: discord.ApplicationContext, amount: float, base: str, target: str): await slash_parser(ctx, f"{amount}{base} {target}") diff --git a/bots/discord/slash/github.py b/bots/discord/slash/github.py index e3d11e191d..27fd349bcb 100644 --- a/bots/discord/slash/github.py +++ b/bots/discord/slash/github.py @@ -7,25 +7,25 @@ github = client.create_group("github", "Github query tool.") -@github.command(description="Trying to automatically identifying and distinguishing repo/user.") +@github.command(name="get", description="Trying to automatically identifying and distinguishing repo/user.") @discord.option(name="name", description="GitHub user or repository name.") async def get(ctx: discord.ApplicationContext, name: str): await slash_parser(ctx, name) -@github.command(description="Get GitHub repository information.") +@github.command(name="repo", description="Get GitHub repository information.") @discord.option(name="name", description="GitHub repository name.") async def repo(ctx: discord.ApplicationContext, name: str): await slash_parser(ctx, f'repo {name}') -@github.command(description="Get GitHub user or organization information.") +@github.command(name="user", description="Get GitHub user or organization information.") @discord.option(name="name", description="GitHub user name.") async def user(ctx: discord.ApplicationContext, name: str): await slash_parser(ctx, f'user {name}') -@github.command(description="Search repositories on GitHub.") +@github.command(name="search", description="Search repositories on GitHub.") @discord.option(name="query", description="Search keywords.") async def search(ctx: discord.ApplicationContext, query: str): await slash_parser(ctx, f'search {keyword}') diff --git a/bots/discord/slash/idlist.py b/bots/discord/slash/idlist.py deleted file mode 100644 index acb5fecc2f..0000000000 --- a/bots/discord/slash/idlist.py +++ /dev/null @@ -1,28 +0,0 @@ -import urllib.parse - -import discord - -from bots.discord.client import client -from bots.discord.slash_parser import slash_parser -from core.utils.http import get_url - -api = 'https://ca.projectxero.top/idlist/search' - - -async def auto_search(ctx: discord.AutocompleteContext): - title = ctx.options["keywords"] - query_options = {'q': title, 'limit': '5'} - query_url = api + '?' + urllib.parse.urlencode(query_options) - resp = await get_url(query_url, 200, fmt='json') - result_ = resp['data']['result'] - results = [title] - if result_: - for x in result_: - results.append(f'{x["enumName"]} {x["key"]}') - return results - - -@client.slash_command(description="查询MCBEID表") -@discord.option(name="keywords", description="关键词", autocomplete=auto_search) -async def idlist(ctx: discord.ApplicationContext, keywords: str): - await slash_parser(ctx, keywords) diff --git a/bots/discord/slash/ip.py b/bots/discord/slash/ip.py index 2c6932ddb3..a6ccce477f 100644 --- a/bots/discord/slash/ip.py +++ b/bots/discord/slash/ip.py @@ -4,7 +4,7 @@ from bots.discord.slash_parser import slash_parser -@client.slash_command(description="Query the information of IP.") +@client.slash_command(name="ip", description="Query the information of IP.") @discord.option(name="ip_address", description="The IP address.") async def ip(ctx: discord.ApplicationContext, ip_address: str): await slash_parser(ctx, ip_address) diff --git a/bots/discord/slash/mcplayer.py b/bots/discord/slash/mcplayer.py index babaeed3d8..665f5a1823 100644 --- a/bots/discord/slash/mcplayer.py +++ b/bots/discord/slash/mcplayer.py @@ -4,7 +4,7 @@ from bots.discord.slash_parser import slash_parser -@client.slash_command(description="Get Minecraft player information.") +@client.slash_command(name="mcplayer", description="Get Minecraft player information.") @discord.option(name="username_or_uuid", description="The name or UUID of Minecraft player.") async def mcplayer(ctx: discord.ApplicationContext, username_or_uuid: str): await slash_parser(ctx, username_or_uuid) diff --git a/bots/discord/slash/mcv.py b/bots/discord/slash/mcv.py index b41cd91a98..bd00978845 100644 --- a/bots/discord/slash/mcv.py +++ b/bots/discord/slash/mcv.py @@ -4,26 +4,26 @@ from bots.discord.slash_parser import slash_parser -@client.slash_command(description="Get the latest version of Minecraft: Java Edition in the launcher.") +@client.slash_command(name="mcv", description="Get the latest version of Minecraft: Java Edition in the launcher.") async def mcv(ctx: discord.ApplicationContext): await slash_parser(ctx, '') -@client.slash_command(description="Get the latest version of Minecraft: Bedrock Edition on Mojira.") +@client.slash_command(name="mcbv", description="Get the latest version of Minecraft: Bedrock Edition on Mojira.") async def mcbv(ctx: discord.ApplicationContext): await slash_parser(ctx, '') -@client.slash_command(description="Get the latest version of Minecraft Dungeons on Mojira.") +@client.slash_command(name="mcdv", description="Get the latest version of Minecraft Dungeons on Mojira.") async def mcdv(ctx: discord.ApplicationContext): await slash_parser(ctx, '') -@client.slash_command(description="Get the latest version of Minecraft: Education Edition in Windows Edition.") +@client.slash_command(name="mcev", description="Get the latest version of Minecraft: Education Edition in Windows Edition.") async def mcev(ctx: discord.ApplicationContext): await slash_parser(ctx, '') -@client.slash_command(description="Get the latest version of Minecraft Legends on Mojira.") +@client.slash_command(name="mclgv", description="Get the latest version of Minecraft Legends on Mojira.") async def mclgv(ctx: discord.ApplicationContext): await slash_parser(ctx, '') \ No newline at end of file diff --git a/bots/discord/slash/server.py b/bots/discord/slash/server.py index 02ea118c1d..8846884d73 100644 --- a/bots/discord/slash/server.py +++ b/bots/discord/slash/server.py @@ -10,7 +10,7 @@ async def auto_search(ctx: discord.AutocompleteContext): return [ctx.options["address"]] -@client.slash_command(description="Get Minecraft: Java/Bedrock Edition server motd.") +@client.slash_command(name="server", description="Get Minecraft: Java/Bedrock Edition server motd.") @discord.option(name="address", description="The server address.", autocomplete=auto_search) async def server(ctx: discord.ApplicationContext, address: str): await slash_parser(ctx, address) diff --git a/bots/discord/slash/tweet.py b/bots/discord/slash/tweet.py index fb1ccdf7f2..82df52e684 100644 --- a/bots/discord/slash/tweet.py +++ b/bots/discord/slash/tweet.py @@ -3,7 +3,7 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser -@client.slash_command(description="Get tweet image from tweet ID or link.") +@client.slash_command(name="tweet", description="Get tweet image from tweet ID or link.") @discord.option(name="tweet", description="The tweet ID or tweet link.") async def tweet(ctx: discord.ApplicationContext, tweetid: str): await slash_parser(ctx, tweet) diff --git a/bots/discord/slash/whois.py b/bots/discord/slash/whois.py index 24385d99ed..f58af5533d 100644 --- a/bots/discord/slash/whois.py +++ b/bots/discord/slash/whois.py @@ -4,7 +4,7 @@ from bots.discord.slash_parser import slash_parser -@client.slash_command(description="Query the information of WHOIS.") +@client.slash_command(name="whois", description="Query the information of WHOIS.") @discord.option(name="domain", description="The domain.") async def whois(ctx: discord.ApplicationContext, domain: str): await slash_parser(ctx, domain) diff --git a/bots/discord/slash/wiki.py b/bots/discord/slash/wiki.py index a09c1557fd..45d06cc9ba 100644 --- a/bots/discord/slash/wiki.py +++ b/bots/discord/slash/wiki.py @@ -59,25 +59,25 @@ async def default_wiki(ctx: discord.AutocompleteContext): return ['https://zh.minecraft.wiki/'] -@wiki.command(description="Query a wiki page.") +@wiki.command(name="query", description="Query a wiki page.") @discord.option(name="pagename", description="The title of wiki page.", autocomplete=auto_search) async def query(ctx: discord.ApplicationContext, pagename: str): await slash_parser(ctx, pagename) -@wiki.command(name="id", description="Query a Wiki page based on page ID.") +@wiki.command(name="id", name="id", description="Query a Wiki page based on page ID.") @discord.option(name="pageid", description="The wiki page ID.") async def byid(ctx: discord.ApplicationContext, pageid: str): await slash_parser(ctx, f'id {pageid}') -@wiki.command(description="Search a wiki page.") +@wiki.command(name="search", description="Search a wiki page.") @discord.option(name="pagename", description="The title of wiki page.", autocomplete=auto_search) async def search(ctx: discord.ApplicationContext, pagename: str): await slash_parser(ctx, f'search {pagename}') -@wiki.command(name="set", description="Set up start wiki.") +@wiki.command(name="set", name="set", description="Set up start wiki.") @discord.option(name="wikiurl", description="The URL of wiki.", autocomplete=default_wiki) async def set_base(ctx: discord.ApplicationContext, wikiurl: str): await slash_parser(ctx, f'set {wikiurl}') @@ -150,11 +150,11 @@ async def reset_prefix(ctx: discord.ApplicationContext): await slash_parser(ctx, 'prefix reset') -@wiki.command(description="Toggle whether to use Fandom global Interwiki queries.") +@wiki.command(name="fandom", description="Toggle whether to use Fandom global Interwiki queries.") async def fandom(ctx: discord.ApplicationContext): await slash_parser(ctx, 'fandom') -@wiki.command(description="Toggle whether to return the edit link when the page does not exist.") +@wiki.command(name="redlink", description="Toggle whether to return the edit link when the page does not exist.") async def redlink(ctx: discord.ApplicationContext): await slash_parser(ctx, 'redlink') diff --git a/bots/discord/slash/wolframalpha.py b/bots/discord/slash/wolframalpha.py index 33651d9bac..768cf2da26 100644 --- a/bots/discord/slash/wolframalpha.py +++ b/bots/discord/slash/wolframalpha.py @@ -6,13 +6,13 @@ wolframalpha = client.create_group("wolframalpha", "Use WolframAlpha.") -@wolframalpha.command(description="Input a question or formula to search for WolframAlpha.") +@wolframalpha.command(name="query", description="Input a question or formula to search for WolframAlpha.") @discord.option(name="query", description="Enter what you want to calculate.") async def query(ctx: discord.ApplicationContext, query: str): await slash_parser(ctx, query) -@wolframalpha.command(description="Answer the question via WolframAlpha.") +@wolframalpha.command(name="ask", description="Answer the question via WolframAlpha.") @discord.option(name="question", description="Ask WolframAlpha.") async def ask(ctx: discord.ApplicationContext, question: str): await slash_parser(ctx, f"ask {question}") \ No newline at end of file From 87c5f764281b3c5d9a9447dc70f26c652d88cbe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 20 Dec 2023 00:03:04 +0800 Subject: [PATCH 158/168] fx --- bots/discord/slash/core.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index f9ea9005ea..be322fb328 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -102,12 +102,6 @@ async def lst(ctx: discord.ApplicationContext, legacy: str): await slash_parser(ctx, legacy) -@hlp.command(name="detail", description="View details of a module.") -@discord.option(name="module", default="", description="The module you want to know about.") -async def detail(ctx: discord.ApplicationContext, legacy: str): - await slash_parser(ctx, legacy) - - @hlp.command(name="detail", description="View details of a module.") @discord.option(name="module", default="", description="The module you want to know about.") async def detail(ctx: discord.ApplicationContext, module: str): From 1a4b59d7c4aab2887dd6e2614b76c5f6db4502ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 20 Dec 2023 00:05:53 +0800 Subject: [PATCH 159/168] upd thonc --- bots/discord/slash/core.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index be322fb328..07e1eca621 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -97,8 +97,9 @@ async def reset(ctx: discord.ApplicationContext): @hlp.command(name="list", description="View help list.") -@discord.option(name="legacy", choices=[('true', 'legacy'), ('false', '')], description="Whether to use legacy mode.") +@discord.option(name="legacy", choices=['true', 'false'], description="Whether to use legacy mode.") async def lst(ctx: discord.ApplicationContext, legacy: str): + legacy = "legacy" if legacy == "true" else "" await slash_parser(ctx, legacy) From 34838d424872b910fd06d58a537bd882a3f7cf51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 20 Dec 2023 00:10:50 +0800 Subject: [PATCH 160/168] fix --- bots/discord/slash/core.py | 4 ++-- bots/discord/slash/wiki.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index 07e1eca621..b6049458f0 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -138,8 +138,8 @@ async def add(ctx: discord.ApplicationContext, prefix: str): await slash_parser(ctx, f"add {prefix}") -@p.command(description="Remove custom command prefix.") -@discord.option(name="remove", name="prefix", description="The custom prefix.") +@p.command(name="remove", description="Remove custom command prefix.") +@discord.option(name="prefix", description="The custom prefix.") async def remove(ctx: discord.ApplicationContext, prefix: str): await slash_parser(ctx, f"remove {prefix}") diff --git a/bots/discord/slash/wiki.py b/bots/discord/slash/wiki.py index 45d06cc9ba..1c1f12de66 100644 --- a/bots/discord/slash/wiki.py +++ b/bots/discord/slash/wiki.py @@ -65,7 +65,7 @@ async def query(ctx: discord.ApplicationContext, pagename: str): await slash_parser(ctx, pagename) -@wiki.command(name="id", name="id", description="Query a Wiki page based on page ID.") +@wiki.command(name="id", description="Query a Wiki page based on page ID.") @discord.option(name="pageid", description="The wiki page ID.") async def byid(ctx: discord.ApplicationContext, pageid: str): await slash_parser(ctx, f'id {pageid}') @@ -77,7 +77,7 @@ async def search(ctx: discord.ApplicationContext, pagename: str): await slash_parser(ctx, f'search {pagename}') -@wiki.command(name="set", name="set", description="Set up start wiki.") +@wiki.command(name="set", description="Set up start wiki.") @discord.option(name="wikiurl", description="The URL of wiki.", autocomplete=default_wiki) async def set_base(ctx: discord.ApplicationContext, wikiurl: str): await slash_parser(ctx, f'set {wikiurl}') @@ -105,7 +105,7 @@ async def iw_list(ctx: discord.ApplicationContext, legacy: str): await slash_parser(ctx, f'iw list {legacy}') -@iw.command(name="show", description="Get the API address corresponding to the set Interwiki.") +@iw.command(name="get", description="Get the API address corresponding to the set Interwiki.") @discord.option(name="interwiki", description="The custom Interwiki.", autocomplete=auto_get_custom_iw_list) async def get(ctx: discord.ApplicationContext, interwiki: str): await slash_parser(ctx, f'iw get {interwiki}') From 01db6c4959ba903249e84d0c5231324c6dd86fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 20 Dec 2023 00:28:51 +0800 Subject: [PATCH 161/168] update --- bots/discord/slash/core.py | 42 +++++++++++++++++++++++++-------- bots/discord/slash/wiki.py | 3 ++- modules/wiki/locales/en_us.json | 4 ++-- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index b6049458f0..3162ac688e 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -2,10 +2,28 @@ from bots.discord.client import client from bots.discord.slash_parser import slash_parser +from core.loader import ModulesManager +from core.utils.i18n import get_available_locales + +async def auto_get_module_list(ctx: discord.AutocompleteContext): + module_ = [] + module_list = ModulesManager.return_modules_list() + + for x in module_list: + if x not (module_list[x].required_superuser or module_list[x].required_base_superuser): + module_.append(x) + + return module_ + + +async def auto_get_lang(ctx: discord.AutocompleteContext): + + if not ctx.options["lang"]: + return get_available_locales() @client.slash_command(name="locale", description="Set the bot running languages.") -@discord.option(name="lang", default="", description="Supported language codes.") +@discord.option(name="lang", default="", description="Supported language codes.", autocomplete=auto_get_lang) async def locale(ctx: discord.ApplicationContext, lang: str): await slash_parser(ctx, lang) @@ -84,8 +102,10 @@ async def remove(ctx: discord.ApplicationContext, alias: str): @ali.command(name="list", description="View custom command alias.") -async def lst(ctx: discord.ApplicationContext): - await slash_parser(ctx, "list") +@discord.option(name="legacy", choices=['true', 'false'], description="Whether to use legacy mode.") +async def lst(ctx: discord.ApplicationContext, legacy: str): + legacy = "legacy" if legacy == "true" else "" + await slash_parser(ctx, f"list {legacy}") @ali.command(name="reset", description="Reset custom command alias.") @@ -104,7 +124,7 @@ async def lst(ctx: discord.ApplicationContext, legacy: str): @hlp.command(name="detail", description="View details of a module.") -@discord.option(name="module", default="", description="The module you want to know about.") +@discord.option(name="module", description="The module you want to know about.", autocomplete=auto_get_module_list) async def detail(ctx: discord.ApplicationContext, module: str): await slash_parser(ctx, module) @@ -112,21 +132,23 @@ async def detail(ctx: discord.ApplicationContext, module: str): m = client.create_group("module", "Set about modules.") -@m.command(name="enable", description="Enable module.") -@discord.option(name="module", description="The module name.") +@m.command(name="enable", description="Enable module(s).") +@discord.option(name="module", description="The modules you want to enable.", autocomplete=auto_get_module_list) async def add(ctx: discord.ApplicationContext, module: str): await slash_parser(ctx, f"enable {module}") -@m.command(name="disable", description="Disable module.") -@discord.option(name="module", description="The module name.") +@m.command(name="disable", description="Disable module(s).") +@discord.option(name="module", description="The modules you want to disable.", autocomplete=auto_get_module_list) async def add(ctx: discord.ApplicationContext, module: str): await slash_parser(ctx, f"disable {module}") @m.command(name="list", description="View all available modules.") -async def lst(ctx: discord.ApplicationContext): - await slash_parser(ctx, "list") +@discord.option(name="legacy", choices=['true', 'false'], description="Whether to use legacy mode.") +async def lst(ctx: discord.ApplicationContext, legacy: str): + legacy = "legacy" if legacy == "true" else "" + await slash_parser(ctx, f"list {legacy}") p = client.create_group("prefix", "Set custom command prefix.") diff --git a/bots/discord/slash/wiki.py b/bots/discord/slash/wiki.py index 1c1f12de66..bb52948304 100644 --- a/bots/discord/slash/wiki.py +++ b/bots/discord/slash/wiki.py @@ -100,8 +100,9 @@ async def iwremove(ctx: discord.ApplicationContext, interwiki: str): @iw.command(name="list", description="Lists the currently configured Interwiki.") -@discord.option(name="legacy", choices=[('true', 'legacy'), ('false', '')], description="Whether to use legacy mode.") +@discord.option(name="legacy", choices=['true', 'false'], description="Whether to use legacy mode.") async def iw_list(ctx: discord.ApplicationContext, legacy: str): + legacy = "legacy" if legacy == "true" else "" await slash_parser(ctx, f'iw list {legacy}') diff --git a/modules/wiki/locales/en_us.json b/modules/wiki/locales/en_us.json index 70386d5652..1e4564d61e 100644 --- a/modules/wiki/locales/en_us.json +++ b/modules/wiki/locales/en_us.json @@ -4,11 +4,11 @@ "wiki.help": "Query a wiki page.", "wiki.help.ab": "Get recent abuse logs for the default wiki.", "wiki.help.ab.legacy": "Get recent abuse logs for the default wiki. (Legacy)", - "wiki.help.fandom": "Toggles whether to use Fandom global Interwiki queries.", + "wiki.help.fandom": "Toggle whether to use Fandom global Interwiki queries.", "wiki.help.headers.remove": "Remove custom request headers.", "wiki.help.headers.reset": "Reset custom request headers.", "wiki.help.headers.add": "Add custom request headers.", - "wiki.help.headers.show": "Lists the currently set request headers.", + "wiki.help.headers.show": "View the currently set request headers.", "wiki.help.id": "Query a Wiki page based on page ID.", "wiki.help.iw.add": "Add custom Interwiki.", "wiki.help.iw.get": "Get the API address corresponding to the set Interwiki.", From dca6e19539b20301969ce49af50d996f66a4a46f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 20 Dec 2023 00:30:22 +0800 Subject: [PATCH 162/168] fix --- bots/discord/slash/core.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index 3162ac688e..a14b3dd088 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -10,14 +10,13 @@ async def auto_get_module_list(ctx: discord.AutocompleteContext): module_list = ModulesManager.return_modules_list() for x in module_list: - if x not (module_list[x].required_superuser or module_list[x].required_base_superuser): - module_.append(x) + if x not (module_list[x].required_superuser or module_list[x].required_base_superuser): + module_.append(x) return module_ async def auto_get_lang(ctx: discord.AutocompleteContext): - if not ctx.options["lang"]: return get_available_locales() From 54cfd9eabba905dac69d7c580aaa87410e12357f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 20 Dec 2023 00:34:44 +0800 Subject: [PATCH 163/168] * --- bots/discord/slash/core.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index a14b3dd088..ff82d8ed48 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -5,15 +5,6 @@ from core.loader import ModulesManager from core.utils.i18n import get_available_locales -async def auto_get_module_list(ctx: discord.AutocompleteContext): - module_ = [] - module_list = ModulesManager.return_modules_list() - - for x in module_list: - if x not (module_list[x].required_superuser or module_list[x].required_base_superuser): - module_.append(x) - - return module_ async def auto_get_lang(ctx: discord.AutocompleteContext): @@ -123,7 +114,7 @@ async def lst(ctx: discord.ApplicationContext, legacy: str): @hlp.command(name="detail", description="View details of a module.") -@discord.option(name="module", description="The module you want to know about.", autocomplete=auto_get_module_list) +@discord.option(name="module", description="The module you want to know about.") async def detail(ctx: discord.ApplicationContext, module: str): await slash_parser(ctx, module) @@ -132,13 +123,13 @@ async def detail(ctx: discord.ApplicationContext, module: str): @m.command(name="enable", description="Enable module(s).") -@discord.option(name="module", description="The modules you want to enable.", autocomplete=auto_get_module_list) +@discord.option(name="module", description="The modules you want to enable.") async def add(ctx: discord.ApplicationContext, module: str): await slash_parser(ctx, f"enable {module}") @m.command(name="disable", description="Disable module(s).") -@discord.option(name="module", description="The modules you want to disable.", autocomplete=auto_get_module_list) +@discord.option(name="module", description="The modules you want to disable.") async def add(ctx: discord.ApplicationContext, module: str): await slash_parser(ctx, f"disable {module}") From 692077c0c340b61c810ef480c524a37db1fdd24e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 20 Dec 2023 00:41:43 +0800 Subject: [PATCH 164/168] upd --- bots/discord/slash/core.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index ff82d8ed48..3c79a63f05 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -5,6 +5,16 @@ from core.loader import ModulesManager from core.utils.i18n import get_available_locales +async def auto_get_module_list(ctx: discord.AutocompleteContext): + module_list = ModulesManager.return_modules_list() + module_ = [] + for x in module_list: + if x[0] == '_': + continue + if module_list[x].required_superuser or module_list[x].required_base_superuser: + continue + module_.append(module_list[x]) + return module_ async def auto_get_lang(ctx: discord.AutocompleteContext): @@ -114,7 +124,7 @@ async def lst(ctx: discord.ApplicationContext, legacy: str): @hlp.command(name="detail", description="View details of a module.") -@discord.option(name="module", description="The module you want to know about.") +@discord.option(name="module", description="The module you want to know about.", autocomplete=auto_get_module_list) async def detail(ctx: discord.ApplicationContext, module: str): await slash_parser(ctx, module) @@ -123,13 +133,13 @@ async def detail(ctx: discord.ApplicationContext, module: str): @m.command(name="enable", description="Enable module(s).") -@discord.option(name="module", description="The modules you want to enable.") +@discord.option(name="module", description="The modules you want to enable.", autocomplete=auto_get_module_list) async def add(ctx: discord.ApplicationContext, module: str): await slash_parser(ctx, f"enable {module}") @m.command(name="disable", description="Disable module(s).") -@discord.option(name="module", description="The modules you want to disable.") +@discord.option(name="module", description="The modules you want to disable.", autocomplete=auto_get_module_list) async def add(ctx: discord.ApplicationContext, module: str): await slash_parser(ctx, f"disable {module}") From 0565c40a2e4337834d8d5b21a409cd6f9bafd15c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 20 Dec 2023 00:47:27 +0800 Subject: [PATCH 165/168] upd change true/false --- bots/discord/slash/core.py | 6 +++--- bots/discord/slash/wiki.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bots/discord/slash/core.py b/bots/discord/slash/core.py index 3c79a63f05..2b508febc0 100644 --- a/bots/discord/slash/core.py +++ b/bots/discord/slash/core.py @@ -102,7 +102,7 @@ async def remove(ctx: discord.ApplicationContext, alias: str): @ali.command(name="list", description="View custom command alias.") -@discord.option(name="legacy", choices=['true', 'false'], description="Whether to use legacy mode.") +@discord.option(name="legacy", choices=['false', 'true'], description="Whether to use legacy mode.") async def lst(ctx: discord.ApplicationContext, legacy: str): legacy = "legacy" if legacy == "true" else "" await slash_parser(ctx, f"list {legacy}") @@ -117,7 +117,7 @@ async def reset(ctx: discord.ApplicationContext): @hlp.command(name="list", description="View help list.") -@discord.option(name="legacy", choices=['true', 'false'], description="Whether to use legacy mode.") +@discord.option(name="legacy", choices=['false', 'true'], description="Whether to use legacy mode.") async def lst(ctx: discord.ApplicationContext, legacy: str): legacy = "legacy" if legacy == "true" else "" await slash_parser(ctx, legacy) @@ -145,7 +145,7 @@ async def add(ctx: discord.ApplicationContext, module: str): @m.command(name="list", description="View all available modules.") -@discord.option(name="legacy", choices=['true', 'false'], description="Whether to use legacy mode.") +@discord.option(name="legacy", choices=['false', 'true'], description="Whether to use legacy mode.") async def lst(ctx: discord.ApplicationContext, legacy: str): legacy = "legacy" if legacy == "true" else "" await slash_parser(ctx, f"list {legacy}") diff --git a/bots/discord/slash/wiki.py b/bots/discord/slash/wiki.py index bb52948304..d2df9cf9ab 100644 --- a/bots/discord/slash/wiki.py +++ b/bots/discord/slash/wiki.py @@ -100,7 +100,7 @@ async def iwremove(ctx: discord.ApplicationContext, interwiki: str): @iw.command(name="list", description="Lists the currently configured Interwiki.") -@discord.option(name="legacy", choices=['true', 'false'], description="Whether to use legacy mode.") +@discord.option(name="legacy", choices=['false', 'true'], description="Whether to use legacy mode.") async def iw_list(ctx: discord.ApplicationContext, legacy: str): legacy = "legacy" if legacy == "true" else "" await slash_parser(ctx, f'iw list {legacy}') From 29674d4778b4062fd63e6892069b06fa8c1d9e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 20 Dec 2023 00:53:31 +0800 Subject: [PATCH 166/168] fix --- bots/discord/slash/tweet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/discord/slash/tweet.py b/bots/discord/slash/tweet.py index 82df52e684..ff037e8845 100644 --- a/bots/discord/slash/tweet.py +++ b/bots/discord/slash/tweet.py @@ -4,6 +4,6 @@ from bots.discord.slash_parser import slash_parser @client.slash_command(name="tweet", description="Get tweet image from tweet ID or link.") -@discord.option(name="tweet", description="The tweet ID or tweet link.") +@discord.option(name="tweetid", description="The tweet ID or tweet link.") async def tweet(ctx: discord.ApplicationContext, tweetid: str): await slash_parser(ctx, tweet) From 307940c2e46b0c9a34998f17134663489b6c7030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E7=BE=85=E7=8B=BC?= Date: Wed, 20 Dec 2023 01:01:02 +0800 Subject: [PATCH 167/168] upd --- modules/core/alias.py | 4 ++-- modules/core/utils.py | 2 +- modules/maimai/__init__.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/core/alias.py b/modules/core/alias.py index c007cd1941..40300724fe 100644 --- a/modules/core/alias.py +++ b/modules/core/alias.py @@ -1,4 +1,4 @@ -from core.builtins import Bot, Image, command_prefix +from core.builtins import Bot, Image from core.component import module from core.utils.image_table import image_table_render, ImageTable @@ -25,7 +25,7 @@ async def set_alias(msg: Bot.MessageSession): break if not has_prefix: await msg.finish(msg.locale.t("core.message.alias.add.invalid_prefix")) - command = command_prefix[0] + command[1:] + command = msg.prefixes[0] + command[1:] aliases[alias] = command msg.data.edit_option('command_alias', aliases) await msg.finish(msg.locale.t("core.message.alias.add.success", alias=alias, command=command)) diff --git a/modules/core/utils.py b/modules/core/utils.py index e185e1f9cb..bd2b286aa1 100644 --- a/modules/core/utils.py +++ b/modules/core/utils.py @@ -132,7 +132,7 @@ async def config_ban(msg: Bot.MessageSession): async def _(msg: Bot.MessageSession): avaliable_lang = msg.locale.t("message.delimiter").join(get_available_locales()) await msg.finish( - f"{msg.locale.t('core.message.locale')}{msg.locale.t('language')}\n{msg.locale.t('core.message.locale.set.prompt', langlist=avaliable_lang, prefix=command_prefix[0])}") + f"{msg.locale.t('core.message.locale')}{msg.locale.t('language')}\n{msg.locale.t('core.message.locale.set.prompt', langlist=avaliable_lang, prefix=msg.prefixes[0])}") @locale.command(' {{core.help.locale.set}}', required_admin=True) diff --git a/modules/maimai/__init__.py b/modules/maimai/__init__.py index 05855f30a9..e25e7db4a6 100644 --- a/modules/maimai/__init__.py +++ b/modules/maimai/__init__.py @@ -2,7 +2,7 @@ import traceback from config import Config -from core.builtins import Bot, command_prefix, Plain, Image as BImage +from core.builtins import Bot, Plain, Image as BImage from core.scheduler import CronTrigger from core.utils.image import msgchain2image from modules.maimai.libraries.maimai_best_50 import generate @@ -454,7 +454,7 @@ async def _(msg: Bot.MessageSession, diff: str, sid: str, score: float): b2t_2000_great=b2t_2000_great, b2t_2000_great_prop=b2t_2000_great_prop)}''') except ValueError: - await msg.finish(msg.locale.t('maimai.message.scoreline.error', prefix=command_prefix[0])) + await msg.finish(msg.locale.t('maimai.message.scoreline.error', prefix=msg.prefixes[0])) @mai.command('rating {{maimai.help.rating}}') From 21e9da993a3079b962f3aadf751cf1d410e7a7b1 Mon Sep 17 00:00:00 2001 From: yzhh <31803608+OasisAkari@users.noreply.github.com> Date: Wed, 20 Dec 2023 11:41:45 +0800 Subject: [PATCH 168/168] move purge scheduler to schedulers directory --- modules/core/su_utils.py | 12 +----------- schedulers/purge.py | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 schedulers/purge.py diff --git a/modules/core/su_utils.py b/modules/core/su_utils.py index bc310a6db3..c15cbdab9c 100644 --- a/modules/core/su_utils.py +++ b/modules/core/su_utils.py @@ -15,9 +15,8 @@ from core.component import module from core.exceptions import TestException from core.loader import ModulesManager -from core.logger import logger +from core.logger import Logger from core.parser.message import remove_temp_ban -from core.scheduler import CronTrigger from core.tos import pardon_user, warn_user from core.utils.cache import random_cache_path from core.utils.info import Info @@ -167,15 +166,6 @@ async def _(msg: Bot.MessageSession): await msg.finish(msg.locale.t("core.message.purge.empty")) -@purge.schedule(CronTrigger.from_crontab('0 0 * * *')) -async def _(): - cache_path = os.path.abspath(Config('cache_path')) - Logger.info('Start purging cache...') - if os.path.exists(cache_path): - shutil.rmtree(cache_path) - os.mkdir(cache_path) - - set_ = module('set', required_superuser=True, base=True) diff --git a/schedulers/purge.py b/schedulers/purge.py new file mode 100644 index 0000000000..30be86d333 --- /dev/null +++ b/schedulers/purge.py @@ -0,0 +1,15 @@ +import os +import shutil + +from config import Config +from core.logger import Logger +from core.scheduler import Scheduler, CronTrigger + + +@Scheduler.scheduled_job(CronTrigger.from_crontab('0 0 * * *')) +async def _(): + cache_path = os.path.abspath(Config('cache_path')) + Logger.info('Start purging cache...') + if os.path.exists(cache_path): + shutil.rmtree(cache_path) + os.mkdir(cache_path)