首页推荐修改，评论判断是否拉黑

application/api/controller/Index.php

@@ -165,7 +165,7 @@ class Index extends Api
         $where = [
             'user.id' => ['neq',$this->auth->id],
             'user.status' => 1,
-            'power.yinshen' => 0,
+          //  'power.yinshen' => 0,
         ];
 
         //搜索条件 性别
@@ -289,10 +289,11 @@ class Index extends Api
 
             $val['active_info'] = $this->user_activeinfo($val['id'],$val['requesttime']);
             
-            //vip如果开了隐私保护，需要隐藏距离
+            //vip如果开了隐私保护，需要隐藏距离,隐藏所在城市
             $yinsi = $this->user_power($val['id'],'yinsi');
             if($yinsi == 1){
                 $val['distance'] = '';
+                $val['cityname'] = '';
             }
         }
 

application/api/controller/Topicdongtai.php

@@ -487,14 +487,30 @@ class Topicdongtai extends Api
             $this->error();
         }
 
-        //关键字替换
-        $content = Keyworld::sensitive($content);
-
         //判断
         if($level == 2 && $floor == 0){
             $this->error('楼层错误');
         }
 
+        //黑名单判断
+        //是否被动态发布者拉黑
+        $dongtai_user_id = Db::name('topic_dongtai')->where('id',$id)->value('user_id');
+        $black_check = $this->is_black($dongtai_user_id,$this->auth->id);
+        if($black_check){
+            $this->error('您已被对方拉黑，禁止评论此动态');
+        }
+        //是否被层主拉黑
+        if($level == 2){
+            $answer_info = Db::name('topic_dongtai_answer')->where(['dt_id'=>$id,'level'=>1,'floor'=>$floor])->find();
+            $black_check = $this->is_black($answer_info['user_id'],$this->auth->id);
+            if($black_check){
+                $this->error('您已被对方拉黑，禁止点评此评论');
+            }
+        }
+
+        //关键字替换
+        $content = Keyworld::sensitive($content);
+
         //回复楼主，最新楼层
         if($level == 1 || $floor == 0){
             $to_user_id = 0;