Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/community-service into develop

app/Http/Controllers/V1/PostController.php

@@ -252,7 +252,7 @@ class PostController extends Controller
         }
         $detail = $this->postRepositories->detail($request['id']);
         if (!$detail) {
-            return jsonError('获取内容信息失败');
+            return jsonError('内容飞走了');
         }
         $fractal = new Manager();
         $res = new Item($detail, new DetailTransformer($userInfo['uid'], $userInfo['invite_code']));

app/Transformers/FeedTransformer.php

@@ -13,6 +13,7 @@ use App\Models\Feed;
 use App\Repositories\PostRepositories;
 use App\Traits\PostTrait;
 use App\Traits\UserTrait;
+use Illuminate\Support\Facades\Redis;
 use League\Fractal\TransformerAbstract;
 use Carbon\Carbon;
 use App\Models\PostDislike;
@@ -23,6 +24,14 @@ class FeedTransformer extends TransformerAbstract {
     use PostTrait;
     public function transform(Feed $feed)
     {
+        $content = null;
+        if($feed['content']){
+            $content = json_decode($feed['content']);
+            if(isset($content->comment_id) && Redis::SISMEMBER('delete_post_comment_ids', $content->comment_id)){
+                $content->comment_desc = '该评论已被删除';
+                unset($content->comment_id);
+            }
+        }
         return [
             'id' => $feed['id'],
             'uid' => $feed['uid'],
@@ -33,7 +42,7 @@ class FeedTransformer extends TransformerAbstract {
             'type' => $feed['type'],
             'relate_id' => $feed['relate_id'],
             'relate_data' => !empty($feed['relate_data'])?$feed['relate_data']:null,
-            'content' => !empty($feed['content'])?json_decode($feed['content']):null,
+            'content' => $content,
             'created_at' => Carbon::parse($feed['created_at'])->diffForHumans(),
         ];
     }