Merge pull request #78 from kj415j45/patch-2.5

Patch 2.5
kj415j45 · Jul 26, 2018 · c67539a · c67539a
2 parents 5ce3812 + d6b550e
commit c67539a
Show file tree

Hide file tree

Showing 272 changed files with 130 additions and 19 deletions.
diff --git a/module/help/osu.php b/module/help/osu.php
@@ -5,7 +5,7 @@
 $msg=<<<EOT
 osu! 系列命令
 用法：
-!osu.{bind|bp|listen|me|recent} [参数列表]
+!osu.{bind|bp|listen|me|recent|setMode} [参数列表]
 
 具体用法请查看下一级 help
 EOT;

diff --git a/module/help/osu/me.php b/module/help/osu/me.php
@@ -5,7 +5,12 @@
 $msg=<<<EOT
 展示你的 osu! 个人资料
 用法：
-!osu.me
+!osu.me [...]
+
+参数列表：
+-user "用 户 名"    查看别人的资料
+-{std|mania|ctb|taiko}    指定模式
+-withMe    同时显示 me! 的内容（实验性功能）
 EOT;
 
 $Queue[]= sendBack($msg);

diff --git a/module/help/pixiv.php b/module/help/pixiv.php
@@ -4,7 +4,7 @@
 $msg=<<<EOT
 Pixiv !
 用法：
-!pixiv.search
+!pixiv.{search|IID}
 
 具体用法请查看下一级 help
 EOT;

diff --git a/module/osu/Exo2-Bold.ttf b/module/osu/Exo2-Bold.ttf
diff --git a/module/osu/Exo2-Italic.ttf b/module/osu/Exo2-Italic.ttf
diff --git a/module/osu/Exo2-Regular.ttf b/module/osu/Exo2-Regular.ttf
diff --git a/module/osu/Yahei.ttf b/module/osu/Yahei.ttf
diff --git a/module/osu/flags/A1.png b/module/osu/flags/A1.png
diff --git a/module/osu/flags/A2.png b/module/osu/flags/A2.png
diff --git a/module/osu/flags/AD.png b/module/osu/flags/AD.png
diff --git a/module/osu/flags/AE.png b/module/osu/flags/AE.png
diff --git a/module/osu/flags/AF.png b/module/osu/flags/AF.png
diff --git a/module/osu/flags/AG.png b/module/osu/flags/AG.png
diff --git a/module/osu/flags/AI.png b/module/osu/flags/AI.png
diff --git a/module/osu/flags/AL.png b/module/osu/flags/AL.png
diff --git a/module/osu/flags/AM.png b/module/osu/flags/AM.png
diff --git a/module/osu/flags/AN.png b/module/osu/flags/AN.png
diff --git a/module/osu/flags/AO.png b/module/osu/flags/AO.png
diff --git a/module/osu/flags/AP.png b/module/osu/flags/AP.png
diff --git a/module/osu/flags/AQ.png b/module/osu/flags/AQ.png
diff --git a/module/osu/flags/AR.png b/module/osu/flags/AR.png
diff --git a/module/osu/flags/AS.png b/module/osu/flags/AS.png
diff --git a/module/osu/flags/AT.png b/module/osu/flags/AT.png
diff --git a/module/osu/flags/AU.png b/module/osu/flags/AU.png
diff --git a/module/osu/flags/AW.png b/module/osu/flags/AW.png
diff --git a/module/osu/flags/AX.png b/module/osu/flags/AX.png
diff --git a/module/osu/flags/AZ.png b/module/osu/flags/AZ.png
diff --git a/module/osu/flags/BA.png b/module/osu/flags/BA.png
diff --git a/module/osu/flags/BB.png b/module/osu/flags/BB.png
diff --git a/module/osu/flags/BD.png b/module/osu/flags/BD.png
diff --git a/module/osu/flags/BE.png b/module/osu/flags/BE.png
diff --git a/module/osu/flags/BF.png b/module/osu/flags/BF.png
diff --git a/module/osu/flags/BG.png b/module/osu/flags/BG.png
diff --git a/module/osu/flags/BH.png b/module/osu/flags/BH.png
diff --git a/module/osu/flags/BI.png b/module/osu/flags/BI.png
diff --git a/module/osu/flags/BJ.png b/module/osu/flags/BJ.png
diff --git a/module/osu/flags/BL.png b/module/osu/flags/BL.png
diff --git a/module/osu/flags/BM.png b/module/osu/flags/BM.png
diff --git a/module/osu/flags/BN.png b/module/osu/flags/BN.png
diff --git a/module/osu/flags/BO.png b/module/osu/flags/BO.png
diff --git a/module/osu/flags/BR.png b/module/osu/flags/BR.png
diff --git a/module/osu/flags/BS.png b/module/osu/flags/BS.png
diff --git a/module/osu/flags/BT.png b/module/osu/flags/BT.png
diff --git a/module/osu/flags/BV.png b/module/osu/flags/BV.png
diff --git a/module/osu/flags/BW.png b/module/osu/flags/BW.png
diff --git a/module/osu/flags/BY.png b/module/osu/flags/BY.png
diff --git a/module/osu/flags/BZ.png b/module/osu/flags/BZ.png
diff --git a/module/osu/flags/CA.png b/module/osu/flags/CA.png
diff --git a/module/osu/flags/CC.png b/module/osu/flags/CC.png
diff --git a/module/osu/flags/CD.png b/module/osu/flags/CD.png
diff --git a/module/osu/flags/CF.png b/module/osu/flags/CF.png
diff --git a/module/osu/flags/CG.png b/module/osu/flags/CG.png
diff --git a/module/osu/flags/CH.png b/module/osu/flags/CH.png
diff --git a/module/osu/flags/CI.png b/module/osu/flags/CI.png
diff --git a/module/osu/flags/CK.png b/module/osu/flags/CK.png
diff --git a/module/osu/flags/CL.png b/module/osu/flags/CL.png
diff --git a/module/osu/flags/CM.png b/module/osu/flags/CM.png
diff --git a/module/osu/flags/CN.png b/module/osu/flags/CN.png
diff --git a/module/osu/flags/CO.png b/module/osu/flags/CO.png
diff --git a/module/osu/flags/CR.png b/module/osu/flags/CR.png
diff --git a/module/osu/flags/CU.png b/module/osu/flags/CU.png
diff --git a/module/osu/flags/CV.png b/module/osu/flags/CV.png
diff --git a/module/osu/flags/CX.png b/module/osu/flags/CX.png
diff --git a/module/osu/flags/CY.png b/module/osu/flags/CY.png
diff --git a/module/osu/flags/CZ.png b/module/osu/flags/CZ.png
diff --git a/module/osu/flags/DE.png b/module/osu/flags/DE.png
diff --git a/module/osu/flags/DJ.png b/module/osu/flags/DJ.png
diff --git a/module/osu/flags/DK.png b/module/osu/flags/DK.png
diff --git a/module/osu/flags/DM.png b/module/osu/flags/DM.png
diff --git a/module/osu/flags/DO.png b/module/osu/flags/DO.png
diff --git a/module/osu/flags/DZ.png b/module/osu/flags/DZ.png
diff --git a/module/osu/flags/EC.png b/module/osu/flags/EC.png
diff --git a/module/osu/flags/EE.png b/module/osu/flags/EE.png
diff --git a/module/osu/flags/EG.png b/module/osu/flags/EG.png
diff --git a/module/osu/flags/EH.png b/module/osu/flags/EH.png
diff --git a/module/osu/flags/ER.png b/module/osu/flags/ER.png
diff --git a/module/osu/flags/ES.png b/module/osu/flags/ES.png
diff --git a/module/osu/flags/ET.png b/module/osu/flags/ET.png
diff --git a/module/osu/flags/EU.png b/module/osu/flags/EU.png
diff --git a/module/osu/flags/FI.png b/module/osu/flags/FI.png
diff --git a/module/osu/flags/FJ.png b/module/osu/flags/FJ.png
diff --git a/module/osu/flags/FK.png b/module/osu/flags/FK.png
diff --git a/module/osu/flags/FM.png b/module/osu/flags/FM.png
diff --git a/module/osu/flags/FO.png b/module/osu/flags/FO.png
diff --git a/module/osu/flags/FR.png b/module/osu/flags/FR.png
diff --git a/module/osu/flags/FX.png b/module/osu/flags/FX.png
diff --git a/module/osu/flags/GA.png b/module/osu/flags/GA.png
diff --git a/module/osu/flags/GB.png b/module/osu/flags/GB.png
diff --git a/module/osu/flags/GD.png b/module/osu/flags/GD.png
diff --git a/module/osu/flags/GE.png b/module/osu/flags/GE.png
diff --git a/module/osu/flags/GF.png b/module/osu/flags/GF.png
diff --git a/module/osu/flags/GG.png b/module/osu/flags/GG.png
diff --git a/module/osu/flags/GH.png b/module/osu/flags/GH.png
diff --git a/module/osu/flags/GI.png b/module/osu/flags/GI.png
diff --git a/module/osu/flags/GL.png b/module/osu/flags/GL.png
diff --git a/module/osu/flags/GM.png b/module/osu/flags/GM.png
diff --git a/module/osu/flags/GN.png b/module/osu/flags/GN.png
diff --git a/module/osu/flags/GP.png b/module/osu/flags/GP.png
diff --git a/module/osu/flags/GQ.png b/module/osu/flags/GQ.png
diff --git a/module/osu/flags/GR.png b/module/osu/flags/GR.png
diff --git a/module/osu/flags/GS.png b/module/osu/flags/GS.png
diff --git a/module/osu/flags/GT.png b/module/osu/flags/GT.png
diff --git a/module/osu/flags/GU.png b/module/osu/flags/GU.png
diff --git a/module/osu/flags/GW.png b/module/osu/flags/GW.png
diff --git a/module/osu/flags/GY.png b/module/osu/flags/GY.png
diff --git a/module/osu/flags/HK.png b/module/osu/flags/HK.png
diff --git a/module/osu/flags/HM.png b/module/osu/flags/HM.png
diff --git a/module/osu/flags/HN.png b/module/osu/flags/HN.png
diff --git a/module/osu/flags/HR.png b/module/osu/flags/HR.png
diff --git a/module/osu/flags/HT.png b/module/osu/flags/HT.png
diff --git a/module/osu/flags/HU.png b/module/osu/flags/HU.png
diff --git a/module/osu/flags/ID.png b/module/osu/flags/ID.png
diff --git a/module/osu/flags/IE.png b/module/osu/flags/IE.png
diff --git a/module/osu/flags/IL.png b/module/osu/flags/IL.png
diff --git a/module/osu/flags/IM.png b/module/osu/flags/IM.png
diff --git a/module/osu/flags/IN.png b/module/osu/flags/IN.png
diff --git a/module/osu/flags/IO.png b/module/osu/flags/IO.png
diff --git a/module/osu/flags/IQ.png b/module/osu/flags/IQ.png
diff --git a/module/osu/flags/IR.png b/module/osu/flags/IR.png
diff --git a/module/osu/flags/IS.png b/module/osu/flags/IS.png
diff --git a/module/osu/flags/IT.png b/module/osu/flags/IT.png
diff --git a/module/osu/flags/JE.png b/module/osu/flags/JE.png
diff --git a/module/osu/flags/JM.png b/module/osu/flags/JM.png
diff --git a/module/osu/flags/JO.png b/module/osu/flags/JO.png
diff --git a/module/osu/flags/JP.png b/module/osu/flags/JP.png
diff --git a/module/osu/flags/KE.png b/module/osu/flags/KE.png
diff --git a/module/osu/flags/KG.png b/module/osu/flags/KG.png
diff --git a/module/osu/flags/KH.png b/module/osu/flags/KH.png
diff --git a/module/osu/flags/KI.png b/module/osu/flags/KI.png
diff --git a/module/osu/flags/KM.png b/module/osu/flags/KM.png
diff --git a/module/osu/flags/KN.png b/module/osu/flags/KN.png
diff --git a/module/osu/flags/KP.png b/module/osu/flags/KP.png
diff --git a/module/osu/flags/KR.png b/module/osu/flags/KR.png
diff --git a/module/osu/flags/KW.png b/module/osu/flags/KW.png
diff --git a/module/osu/flags/KY.png b/module/osu/flags/KY.png
diff --git a/module/osu/flags/KZ.png b/module/osu/flags/KZ.png
diff --git a/module/osu/flags/LA.png b/module/osu/flags/LA.png
diff --git a/module/osu/flags/LB.png b/module/osu/flags/LB.png
diff --git a/module/osu/flags/LC.png b/module/osu/flags/LC.png
diff --git a/module/osu/flags/LI.png b/module/osu/flags/LI.png
diff --git a/module/osu/flags/LK.png b/module/osu/flags/LK.png
diff --git a/module/osu/flags/LR.png b/module/osu/flags/LR.png
diff --git a/module/osu/flags/LS.png b/module/osu/flags/LS.png
diff --git a/module/osu/flags/LT.png b/module/osu/flags/LT.png
diff --git a/module/osu/flags/LU.png b/module/osu/flags/LU.png
diff --git a/module/osu/flags/LV.png b/module/osu/flags/LV.png
diff --git a/module/osu/flags/LY.png b/module/osu/flags/LY.png
diff --git a/module/osu/flags/MA.png b/module/osu/flags/MA.png
diff --git a/module/osu/flags/MC.png b/module/osu/flags/MC.png
diff --git a/module/osu/flags/MD.png b/module/osu/flags/MD.png
diff --git a/module/osu/flags/ME.png b/module/osu/flags/ME.png
diff --git a/module/osu/flags/MF.png b/module/osu/flags/MF.png
diff --git a/module/osu/flags/MG.png b/module/osu/flags/MG.png
diff --git a/module/osu/flags/MH.png b/module/osu/flags/MH.png
diff --git a/module/osu/flags/MK.png b/module/osu/flags/MK.png
diff --git a/module/osu/flags/ML.png b/module/osu/flags/ML.png
diff --git a/module/osu/flags/MM.png b/module/osu/flags/MM.png
diff --git a/module/osu/flags/MN.png b/module/osu/flags/MN.png
diff --git a/module/osu/flags/MO.png b/module/osu/flags/MO.png
diff --git a/module/osu/flags/MP.png b/module/osu/flags/MP.png
diff --git a/module/osu/flags/MQ.png b/module/osu/flags/MQ.png
diff --git a/module/osu/flags/MR.png b/module/osu/flags/MR.png
diff --git a/module/osu/flags/MS.png b/module/osu/flags/MS.png
diff --git a/module/osu/flags/MT.png b/module/osu/flags/MT.png
diff --git a/module/osu/flags/MU.png b/module/osu/flags/MU.png
diff --git a/module/osu/flags/MV.png b/module/osu/flags/MV.png
diff --git a/module/osu/flags/MW.png b/module/osu/flags/MW.png
diff --git a/module/osu/flags/MX.png b/module/osu/flags/MX.png
diff --git a/module/osu/flags/MY.png b/module/osu/flags/MY.png
diff --git a/module/osu/flags/MZ.png b/module/osu/flags/MZ.png
diff --git a/module/osu/flags/NA.png b/module/osu/flags/NA.png
diff --git a/module/osu/flags/NC.png b/module/osu/flags/NC.png
diff --git a/module/osu/flags/NE.png b/module/osu/flags/NE.png
diff --git a/module/osu/flags/NF.png b/module/osu/flags/NF.png
diff --git a/module/osu/flags/NG.png b/module/osu/flags/NG.png
diff --git a/module/osu/flags/NI.png b/module/osu/flags/NI.png
diff --git a/module/osu/flags/NL.png b/module/osu/flags/NL.png
diff --git a/module/osu/flags/NO.png b/module/osu/flags/NO.png
diff --git a/module/osu/flags/NP.png b/module/osu/flags/NP.png
diff --git a/module/osu/flags/NR.png b/module/osu/flags/NR.png
diff --git a/module/osu/flags/NU.png b/module/osu/flags/NU.png
diff --git a/module/osu/flags/NZ.png b/module/osu/flags/NZ.png
diff --git a/module/osu/flags/O1.png b/module/osu/flags/O1.png
diff --git a/module/osu/flags/OM.png b/module/osu/flags/OM.png
diff --git a/module/osu/flags/PA.png b/module/osu/flags/PA.png
diff --git a/module/osu/flags/PE.png b/module/osu/flags/PE.png
diff --git a/module/osu/flags/PF.png b/module/osu/flags/PF.png
diff --git a/module/osu/flags/PG.png b/module/osu/flags/PG.png
diff --git a/module/osu/flags/PH.png b/module/osu/flags/PH.png
diff --git a/module/osu/flags/PK.png b/module/osu/flags/PK.png
diff --git a/module/osu/flags/PL.png b/module/osu/flags/PL.png
diff --git a/module/osu/flags/PM.png b/module/osu/flags/PM.png
diff --git a/module/osu/flags/PN.png b/module/osu/flags/PN.png
diff --git a/module/osu/flags/PR.png b/module/osu/flags/PR.png
diff --git a/module/osu/flags/PS.png b/module/osu/flags/PS.png
diff --git a/module/osu/flags/PT.png b/module/osu/flags/PT.png
diff --git a/module/osu/flags/PW.png b/module/osu/flags/PW.png
diff --git a/module/osu/flags/PY.png b/module/osu/flags/PY.png
diff --git a/module/osu/flags/QA.png b/module/osu/flags/QA.png
diff --git a/module/osu/flags/RE.png b/module/osu/flags/RE.png
diff --git a/module/osu/flags/RO.png b/module/osu/flags/RO.png
diff --git a/module/osu/flags/RS.png b/module/osu/flags/RS.png
diff --git a/module/osu/flags/RU.png b/module/osu/flags/RU.png
diff --git a/module/osu/flags/RW.png b/module/osu/flags/RW.png
diff --git a/module/osu/flags/SA.png b/module/osu/flags/SA.png
diff --git a/module/osu/flags/SB.png b/module/osu/flags/SB.png
diff --git a/module/osu/flags/SC.png b/module/osu/flags/SC.png
diff --git a/module/osu/flags/SD.png b/module/osu/flags/SD.png
diff --git a/module/osu/flags/SE.png b/module/osu/flags/SE.png
diff --git a/module/osu/flags/SG.png b/module/osu/flags/SG.png
diff --git a/module/osu/flags/SH.png b/module/osu/flags/SH.png
diff --git a/module/osu/flags/SI.png b/module/osu/flags/SI.png
diff --git a/module/osu/flags/SJ.png b/module/osu/flags/SJ.png
diff --git a/module/osu/flags/SK.png b/module/osu/flags/SK.png
diff --git a/module/osu/flags/SL.png b/module/osu/flags/SL.png
diff --git a/module/osu/flags/SM.png b/module/osu/flags/SM.png
diff --git a/module/osu/flags/SN.png b/module/osu/flags/SN.png
diff --git a/module/osu/flags/SO.png b/module/osu/flags/SO.png
diff --git a/module/osu/flags/SR.png b/module/osu/flags/SR.png
diff --git a/module/osu/flags/SS.png b/module/osu/flags/SS.png
diff --git a/module/osu/flags/ST.png b/module/osu/flags/ST.png
diff --git a/module/osu/flags/SV.png b/module/osu/flags/SV.png
diff --git a/module/osu/flags/SY.png b/module/osu/flags/SY.png
diff --git a/module/osu/flags/SZ.png b/module/osu/flags/SZ.png
diff --git a/module/osu/flags/TC.png b/module/osu/flags/TC.png
diff --git a/module/osu/flags/TD.png b/module/osu/flags/TD.png
diff --git a/module/osu/flags/TF.png b/module/osu/flags/TF.png
diff --git a/module/osu/flags/TG.png b/module/osu/flags/TG.png
diff --git a/module/osu/flags/TH.png b/module/osu/flags/TH.png
diff --git a/module/osu/flags/TJ.png b/module/osu/flags/TJ.png
diff --git a/module/osu/flags/TK.png b/module/osu/flags/TK.png
diff --git a/module/osu/flags/TL.png b/module/osu/flags/TL.png
diff --git a/module/osu/flags/TM.png b/module/osu/flags/TM.png
diff --git a/module/osu/flags/TN.png b/module/osu/flags/TN.png
diff --git a/module/osu/flags/TO.png b/module/osu/flags/TO.png
diff --git a/module/osu/flags/TR.png b/module/osu/flags/TR.png
diff --git a/module/osu/flags/TT.png b/module/osu/flags/TT.png
diff --git a/module/osu/flags/TV.png b/module/osu/flags/TV.png
diff --git a/module/osu/flags/TW.png b/module/osu/flags/TW.png
diff --git a/module/osu/flags/TZ.png b/module/osu/flags/TZ.png
diff --git a/module/osu/flags/UA.png b/module/osu/flags/UA.png
diff --git a/module/osu/flags/UG.png b/module/osu/flags/UG.png
diff --git a/module/osu/flags/UM.png b/module/osu/flags/UM.png
diff --git a/module/osu/flags/US.png b/module/osu/flags/US.png
diff --git a/module/osu/flags/UY.png b/module/osu/flags/UY.png
diff --git a/module/osu/flags/UZ.png b/module/osu/flags/UZ.png
diff --git a/module/osu/flags/VA.png b/module/osu/flags/VA.png
diff --git a/module/osu/flags/VC.png b/module/osu/flags/VC.png
diff --git a/module/osu/flags/VE.png b/module/osu/flags/VE.png
diff --git a/module/osu/flags/VG.png b/module/osu/flags/VG.png
diff --git a/module/osu/flags/VI.png b/module/osu/flags/VI.png
diff --git a/module/osu/flags/VN.png b/module/osu/flags/VN.png
diff --git a/module/osu/flags/VU.png b/module/osu/flags/VU.png
diff --git a/module/osu/flags/WF.png b/module/osu/flags/WF.png
diff --git a/module/osu/flags/WS.png b/module/osu/flags/WS.png
diff --git a/module/osu/flags/XK.png b/module/osu/flags/XK.png
diff --git a/module/osu/flags/XX.png b/module/osu/flags/XX.png
diff --git a/module/osu/flags/YE.png b/module/osu/flags/YE.png
diff --git a/module/osu/flags/YT.png b/module/osu/flags/YT.png
diff --git a/module/osu/flags/ZA.png b/module/osu/flags/ZA.png
diff --git a/module/osu/flags/ZM.png b/module/osu/flags/ZM.png
diff --git a/module/osu/flags/ZW.png b/module/osu/flags/ZW.png
diff --git a/module/osu/flags/__.png b/module/osu/flags/__.png
diff --git a/module/osu/heart.png b/module/osu/heart.png
diff --git a/module/osu/levelbadge.png b/module/osu/levelbadge.png
diff --git a/module/osu/me.php b/module/osu/me.php
@@ -6,16 +6,46 @@
 
 Image::configure(array('driver' => 'imagick'));
 
-$osuid = getOsuID($Event['user_id']);
+$withMeText = false;
+
+do{
+    $arg = nextArg();
+    switch($arg){
+        case '-withMe':
+            $withMeText = true;
+            break;
+        case '-osu':
+        case '-std':
+            $mode = 'osu';
+            break;
+        case '-taiko':
+            $mode = 'taiko';
+            break;
+        case '-ctb':
+        case '-fruit':
+        case '-fruits':
+            $mode = 'fruits';
+            break;
+        case '-mania':
+            $mode = 'mania';
+            break;
+        case '-user':
+            $osuid = nextArg();
+            break;
+        default:
+
+    }
+}while($arg !== NULL);
+
+$osuid = $osuid??getOsuID($Event['user_id']);
 
 if($osuid == ''){
     throw new \Exception('未绑定 osu!');
-}else{
-    $osuid = urlencode($osuid);
 }
 
+$osuid = OsuUsernameEscape($osuid);
 
-$web = file_get_contents('https://osu.ppy.sh/users/'.$osuid);
+$web = file_get_contents('https://osu.ppy.sh/users/'.$osuid.'/'.$mode);
 
 $target = '<script id="json-user" type="application/json">';
 
@@ -25,14 +55,86 @@
 
 $userJson = substr($web, $start+strlen($target), $end-strlen($target));
 
-$user = json_decode($userJson, true);
-
-$img = Image::make($user['cover_url']);
-
-
+$user = json_decode($userJson);
+
+//初始化绘图环境
+$here = __DIR__.'/';
+$exo2 = $here.'Exo2-Regular.ttf';
+$exo2_italic = $here.'Exo2-Italic.ttf';
+$exo2_bold = $here.'Exo2-Bold.ttf';
+$yahei = $here.'Yahei.ttf';
+$white = '#ffffff';
+$mode = $mode??$user->playmode;
+$badges = $user->badges;
+$badge = $badges[rand(0, count($badges)-1)];
+$flag = file_exists($here."flags/{$user->country->code}.png")?($here."flags/{$user->country->code}.png"):($here.'flags/__.png');
+$stats_key = imageFont($yahei, 12, $white);
+$statics = $user->statistics;
+$playtime = [
+    'hours' => sprintf('%d', $statics->play_time/3600),
+    'minutes' => sprintf('%d', ($statics->play_time%3600)/60),
+    'seconds' => sprintf('%d', $statics->play_time%60),
+];
+$stat = [
+    'Ranked 谱面总分' => number_format($statics->ranked_score),
+    '准确率' => sprintf('%.2f%%', $statics->hit_accuracy),
+    '游戏次数' => number_format($statics->play_count),
+    '总分' => number_format($statics->total_score),
+    '总命中次数' => number_format($statics->total_hits),
+    '最大连击' => number_format($statics->maximum_combo),
+    '回放被观看次数' => number_format($statics->replays_watched_by_others),
+];
+$grade = [
+    'XH' => $statics->grade_counts->ssh,
+    'X' => $statics->grade_counts->ss,
+    'SH' => $statics->grade_counts->sh,
+    'S' => $statics->grade_counts->s,
+    'A' => $statics->grade_counts->a,
+];
+//开始绘图
+$img = Image::make($user->cover_url);
+$img->resize(1000, 350)
+    ->insert(Image::canvas(1000, 350)->fill([0, 0, 0, 0.5])) //背景暗化50%
+    ->insert(Image::make('https://a.ppy.sh/'.$user->id)->resize(110, 110), 'top-left', 40, 220) //插入头像
+    ->text($user->username, 170, 256, imageFont($exo2_italic, 24, $white, 'left', 'top')) //插入用户名
+    ;
+if($badge!=NULL)$img->insert(Image::make($badge->image_url), 'top-left', 40, 168); //插入狗牌
+if($user->is_supporter){
+    $img->insert(Image::make($here.'heart.png')->resize(28, 28), 'top-left', 170, 223) //插入支持者标志
+        ->insert(Image::make($here."modes/{$mode}.png")->resize(28, 28), 'top-left', 210, 223) //插入模式标志
+        ;
+}else{
+    $img->insert(Image::make($here."modes/{$mode}.png")->resize(28, 28), 'top-left', 170, 223); //插入模式标志
+}
+$img->insert(Image::make($flag)->resize(30, 20), 'top-left', 170, 310) //插入国旗
+    ->insert(Image::canvas(280, 323)->fill([0, 0, 0, 0.3]), 'top-left', 670, 27) //绘制右侧暗化
+    ->text('游戏时间', 690, 50, $stats_key)
+    ->text("{$playtime['hours']}小时 {$playtime['minutes']}分钟 {$playtime['seconds']}秒", 690, 72, imageFont($yahei, 18, '#ffcc22'))
+    ->insert(Image::make($here.'levelbadge.png')->resize(50, 50), 'top-left', 880, 30)
+    ->text($statics->level->current, 905, 45, imageFont($exo2_bold, 18, $white, 'center', 'middle'))
+;
+$yIndex = 120;
+foreach($stat as $key => $value){
+    $img->text($key, 690, $yIndex, $stats_key);
+    $img->text($value, 930, $yIndex, imageFont($exo2_bold, 16, $white, 'right'));
+    $yIndex+=20;
+}
+$img->text(sprintf('%.2f', $statics->pp), 690, 280, imageFont($exo2_bold, 40, $white));
+$img->text('PP', 740, 300, imageFont($exo2_bold, 20, $white));
+$img->text('#'.number_format($statics->rank->global), 930, 280, imageFont($exo2_bold, 20, $white, 'right'));
+$img->text($user->country->code.' '.'#'.number_format($statics->rank->country), 930, 300, imageFont($exo2_bold, 20, $white, 'right'));
+$xIndex = 675;
+foreach($grade as $key => $value){
+    $img->insert(Image::make($here."{$key}.png")->resize(50, 50), 'top-left', $xIndex, 300);
+    $img->text($value, $xIndex+20, 350, imageFont($exo2_bold, 16, $white, 'center', 'buttom'));
+    $xIndex+=55;
+}
 $img->save('../storage/cache/'.$Event['message_id']);
 
-$Queue[]= sendBack(sendImg(getCache($Event['message_id']))."\n".preg_replace('/\n+/', "\n", str_replace('<br />', "\n", htmlspecialchars_decode(strip_tags($user['page']['html'], '<br>')))));
+$msg = sendImg(getCache($Event['message_id']));
+if($withMeText)$msg.="\n".preg_replace('/\n+/', "\n", str_replace('<br />', "\n", htmlspecialchars_decode(strip_tags($user->page->html, '<br>'))));
+
+$Queue[]= sendBack($msg);
 
 
 ?>
diff --git a/module/osu/modes/fruits.png b/module/osu/modes/fruits.png
diff --git a/module/osu/modes/mania.png b/module/osu/modes/mania.png
diff --git a/module/osu/modes/osu.png b/module/osu/modes/osu.png
diff --git a/module/osu/modes/taiko.png b/module/osu/modes/taiko.png
diff --git a/module/osu/tools.php b/module/osu/tools.php
@@ -113,7 +113,7 @@ function getSSPP($map, $stat){
 }
 
 function get_user_recent($k, $u, $m = OsuMode::std){
-    $u=urlencode($u);
+    $u=OsuUsernameEscape($u);
     $result = json_decode(file_get_contents("https://osu.ppy.sh/api/get_user_recent?k={$k}&u={$u}&m={$m}"), true)[0];
     if(NULL === $result){
         throw new \Exception('玩家最近没有成绩');
@@ -122,7 +122,7 @@ function get_user_recent($k, $u, $m = OsuMode::std){
 }
 
 function get_user_best($k, $u, $bp, $m = OsuMode::std){
-    $u=urlencode($u);
+    $u=OsuUsernameEscape($u);
     $result = json_decode(file_get_contents("https://osu.ppy.sh/api/get_user_best?k={$k}&u={$u}&limit={$bp}&m={$m}"), true)[$bp-1];
     if(NULL === $result){
         throw new \Exception('没有这个bp');
@@ -131,7 +131,7 @@ function get_user_best($k, $u, $bp, $m = OsuMode::std){
 }
 
 function get_user($k, $u, $m = OsuMode::std){
-    $u=urlencode($u);
+    $u=OsuUsernameEscape($u);
     $result = json_decode(file_get_contents("https://osu.ppy.sh/api/get_user?k={$k}&u={$u}&m={$m}"), true)[0];
     if(NULL === $result){
         throw new \Exception('无效的 osu! ID，请检查用户名是否正确（或者被 ban 了');
@@ -151,6 +151,10 @@ function get_map($id, $mod){
     return array_merge($map, json_decode($result[0], true));
 }
 
+function OsuUsernameEscape($osuid){
+    return str_replace('+', '%20', urlencode($osuid));
+}
+
 function getOsuID($qq){
     return rtrim(getData('osu/id/'.$qq));
 }
@@ -180,9 +184,9 @@ function imageFont($file = 1, $size = 12, $color = '#000000', $align = 'left', $
 function drawScore($recent, $map, $u){
     Image::configure(array('driver' => 'imagick'));
 
-    $exo2 = '/usr/share/fonts/truetype/exo2/exo2.ttf';
-    $exo2b = '/usr/share/fonts/truetype/exo2/exo2-bold.ttf';
     $here = __DIR__.'/';
+    $exo2 = $here.'Exo2-Regular.ttf';
+    $exo2b = $here.'Exo2-Bold.ttf';
     $venera = $here.'Venera.ttf';
     $blue = '#44AADD';
     $gray = '#AAAAAA';

diff --git a/module/pixiv/search.php b/module/pixiv/search.php
@@ -28,7 +28,7 @@
 
 $webStr = 'https://www.pixiv.net/search.php?type=illust'
 .'&p='.$page
-.'&mode='.$mode
+.'&mode='.strtolower($mode)
 .'&word='.$word
 ;