Merge pull request #105 from HanSon/analysis-8nvMEO

Apply fixes from StyleCI
Hanson · May 3, 2017 · 3a55ecd · 3a55ecd
2 parents 513ee72 + 25f69f4
commit 3a55ecd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/demo/vbot.php b/demo/vbot.php
@@ -223,7 +223,7 @@ function isAdmin($message)
     // 请求添加信息
     if ($message instanceof RequestFriend) {
         /** @var $message RequestFriend */
-        if(in_array($message->info['Content'], ['echo', 'var_dump', 'print', 'print_r', 'sprintf'])){
+        if (in_array($message->info['Content'], ['echo', 'var_dump', 'print', 'print_r', 'sprintf'])) {
             $message->verifyUser($message::VIA);
         }
     }
@@ -236,7 +236,7 @@ function isAdmin($message)
             $reply .= "\n来源APP：{$message->app}";
         }
 
-        if(str_contains($message->url, 'meituan.com') && !($message->from['NickName'] !== '三年二班')){
+        if (str_contains($message->url, 'meituan.com') && !($message->from['NickName'] !== '三年二班')) {
             Text::send(group()->getUsernameByNickname('三年二班'), '收到美团红包：'.$message->url);
         }
 
@@ -278,6 +278,7 @@ function isAdmin($message)
             //            \Hanson\Vbot\Support\Console::log($message->from['NickName'] . ' 改名为 ' . $message->rename);
             if (group()->getUsernameById(1) == $message->from['UserName'] && $message->rename !== 'Vbot 体验群') {
                 group()->setGroupName($message->from['UserName'], 'Vbot 体验群');
+
                 return '行不改名,坐不改姓！';
             }
         } elseif ($message->action === 'BE_REMOVE') {

diff --git a/src/Core/MessageFactory.php b/src/Core/MessageFactory.php
@@ -24,7 +24,6 @@
 use Hanson\Vbot\Message\Entity\Video;
 use Hanson\Vbot\Message\Entity\Voice;
 use Hanson\Vbot\Message\ShareFactory;
-use Hanson\Vbot\Support\FileManager;
 
 class MessageFactory
 {

diff --git a/src/Message/UploadAble.php b/src/Message/UploadAble.php
@@ -88,7 +88,8 @@ public static function send($username, $file)
 
         $mediaId = $response['MediaId'];
 
-        $url = server()->baseUri . '/webwxsendappmsg?fun=async&f=json&pass_ticket=' . server()->passTicket;$explode = explode('.', $file);
+        $url = server()->baseUri.'/webwxsendappmsg?fun=async&f=json&pass_ticket='.server()->passTicket;
+        $explode = explode('.', $file);
         $fileName = end($explode);
         $data = [
             'BaseRequest'=> server()->baseRequest,