支持 notification

app/Console/Commands/MqPr.php

@@ -3,19 +3,22 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
+
 use App\Http\Api\Mq;
 use App\Models\Sentence;
 use App\Models\WebHook;
 use App\Models\PaliSentence;
 use App\Tools\WebHook as WebHookSend;
 use App\Http\Api\MdRender;
-use Illuminate\Support\Facades\Log;
+use App\Http\Api\PaliTextApi;
 
 class MqPr extends Command
 {
     /**
      * The name and signature of the console command.
-     *
+     * php artisan mq:pr
      * @var string
      */
     protected $signature = 'mq:pr';
@@ -53,28 +56,71 @@ class MqPr extends Command
         Log::debug("mq:pr start.");
         Mq::worker($exchange,$queue,function ($message){
             /**生成消息内容 */
+
             $msgTitle = '修改建议';
-            $username = $message->editor->nickName;
-            $palitext = PaliSentence::where('book',$message->book)
-                                ->where('paragraph',$message->paragraph)
-                                ->where('word_begin',$message->word_start)
-                                ->where('word_end',$message->word_end)
+            $prData = $message->data;
+            $sent_num = "{$prData->book}-{$prData->paragraph}-{$prData->word_start}-{$prData->word_end}";
+            $this->info('request'.$sent_num);
+
+            $username = $prData->editor->nickName;
+            $palitext = PaliSentence::where('book',$prData->book)
+                                ->where('paragraph',$prData->paragraph)
+                                ->where('word_begin',$prData->word_start)
+                                ->where('word_end',$prData->word_end)
                                 ->value('text');
-            $prtext = mb_substr($message->content,0,140,"UTF-8");
-            $sent_num = "{$message->book}-{$message->paragraph}-{$message->word_start}-{$message->word_end}";
-            $link = config('app.url')."/pcd/article/para/{$message->book}-{$message->paragraph}";
-            $link .= "?book={$message->book}&par={$message->paragraph}&channel={$message->channel->id}";
+            $orgText = Sentence::where('book_id',$prData->book)
+                                ->where('paragraph',$prData->paragraph)
+                                ->where('word_start',$prData->word_start)
+                                ->where('word_end',$prData->word_end)
+                                ->where('channel_uid',$prData->channel->id)
+                                ->value('content');
+            $prtext = mb_substr($prData->content,0,140,"UTF-8");
+
+            $link = config('app.url')."/pcd/article/para/{$prData->book}-{$prData->paragraph}";
+            $link .= "?book={$prData->book}&par={$prData->paragraph}&channel={$prData->channel->id}";
 
             $msgContent = "{$username} 就文句`{$palitext}`提出了修改建议：\n";
             $msgContent .= ">内容摘要：<font color=\"comment\">{$prtext}</font>，\n";
             $msgContent .= ">句子编号：<font color=\"info\">{$sent_num}</font>\n";
             $msgContent .= "欢迎大家[点击链接]({$link})查看并讨论。";
 
-            $webhooks = WebHook::where('res_id',$message->channel->id)
+            //标题
+            if($prData->book<1000){
+                $path = json_decode(PaliTextApi::getChapterPath($prData->book,$prData->paragraph)) ;
+                $title = $path[0]->title;
+            }else{
+                $title = '';
+            }
+
+            $notificationContent = "**{$title}**\n\n";
+            $notificationContent .= ">{$orgText}\n\n";
+            $notificationContent .= "{$prtext}";
+            $result=0;
+            //发送站内信
+            $url = config('app.url').'/api/v2/notification';
+            $response = Http::withToken($message->token)
+                            ->post($url,
+                            [
+                                'to'=> $prData->channel->studio_id,
+                                'title'=> $msgTitle,
+                                'content'=> $notificationContent,
+                                'url'=>$link,
+                                'res_type'=> 'suggestion',
+                                'res_id'=> $prData->uid,
+                            ]);
+            if($response->failed()){
+                Log::error('send notification failed');
+            }else{
+                $this->info("send notification");
+            }
+
+            //发送webhook
+
+            $webhooks = WebHook::where('res_id',$prData->channel->id)
                             ->where('status','active')
                             ->get();
 
-            $result=0;
+
             foreach ($webhooks as $key => $hook) {
                 $event = json_decode($hook->event);
                 if(!in_array('pr',$event)){