Merge pull request #87 from kj415j45/patch-2.6

Patch 2.6
kj415j45 · Jul 28, 2018 · afbba71 · afbba71
2 parents c1c54dd + 19de9a3
commit afbba71
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -54,7 +54,6 @@ php build.php
 如果你需要试用 kjBot 的全部功能，请继续运行 `php composer.phar install`
 
 仅作为框架使用时，在确保 module 与 middleWare 文件夹下没有你的文件后：`composer run-script framework-only`
-然后重建 module 文件夹与 middleWare/Chain.php 文件。
 
 ### 入门
 

diff --git a/composer.json b/composer.json
@@ -48,6 +48,7 @@
         "optimize-autoloader": true
     },
     "require-dev": {
+        "ext-json": "^1.6",
         "intervention/image": "^2.4",
         "knplabs/github-api": "^2.9",
         "lcobucci/jwt": "^3.2",

diff --git a/composer.lock b/composer.lock
diff --git a/framework-only.php b/framework-only.php
@@ -2,4 +2,7 @@
 function delDir($directory){if(file_exists($directory)){if($dir_handle=@opendir($directory)){while($filename=readdir($dir_handle)){if($filename!='.'&&$filename!='..'){$subFile=$directory."/".$filename;if(is_dir($subFile)){delDir($subFile);}if(is_file($subFile)){unlink($subFile);}}}closedir($dir_handle);rmdir($directory);}}}
 delDir('module');
 delDir('middleWare');
+mkdir('module');
+mkdir('middleWare');
+file_put_contents('middleWare/Chain.php', "<?php\n");
 ?>
diff --git a/module/osu/avatar-guest.png b/module/osu/avatar-guest.png
diff --git a/module/osu/bind.php b/module/osu/bind.php
@@ -1,15 +1,17 @@
 <?php
 
-global $Queue, $Event, $Command;
+global $Queue, $Event, $Command, $osu_api_key;
 use kjBot\SDK\CQCode;
 loadModule('osu.tools');
 
 $length = strpos($Event['message'], "\r");
 if(false===$length)$length=strlen($Event['message']);
 $username = substr($Event['message'], strpos($Event['message'], nextArg()), $length-strlen($Command[0]));
 
-setOsuID($Event['user_id'], $username);
+$userRealname = json_decode(get_user($osu_api_key, $username))[0]->username;
 
-$Queue[]= sendBack(CQCode::At($Event['user_id']).' 成功绑定 '.$username);
+setOsuID($Event['user_id'], $userRealname);
+
+$Queue[]= sendBack(CQCode::At($Event['user_id']).' 成功绑定 '.$userRealname);
 
 ?>
diff --git a/module/osu/me.php b/module/osu/me.php
@@ -50,6 +50,7 @@
 $target = '<script id="json-user" type="application/json">';
 
 $start = strpos($web, $target);
+if($start === false)leave('指定的用户不存在');
 
 $end = strpos(substr($web, $start), '</script>');
 
@@ -70,6 +71,11 @@
 $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;
+try{
+    $avatar = Image::make('https://a.ppy.sh/'.$user->id);
+}catch(\Exception $e){
+    $avatar = Image::make($here.'avatar-guest.png');
+}
 $playtime = [
     'hours' => sprintf('%d', $statics->play_time/3600),
     'minutes' => sprintf('%d', ($statics->play_time%3600)/60),
@@ -95,8 +101,9 @@
 $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) //插入头像
+    ->insert($avatar->resize(110, 110), 'top-left', 40, 220) //插入头像
     ->text($user->username, 170, 256, imageFont($exo2_italic, 24, $white, 'left', 'top')) //插入用户名
+    ->text($user->title, 170, 285, imageFont($exo2_italic, 15, $white, 'left', 'top')) //插入title
     ;
 if($badge!=NULL)$img->insert(Image::make($badge->image_url), 'top-left', 40, 168); //插入狗牌
 if($user->is_supporter){

diff --git a/module/osu/tools.php b/module/osu/tools.php
@@ -44,7 +44,7 @@ function ACCof($m){
 
 function getBG($map){
     try{
-        $bg = Image::make('https://bloodcat.com/osu/i/'.$map)->resize(1280, 720);
+        $bg = Image::make('https://bloodcat.com/osu/i/'.$map)->fit(1280, 720);
     }catch(\Exception $e){
         return Image::make(__DIR__.'/bg.jpg')->resize(1280, 720); //Fallback 背景
     }