lizhen_gitee 1 rok temu
rodzic
commit
e6cd2fff5a

+ 0 - 15
application/api/controller/Topicdongtai.php

@@ -155,21 +155,6 @@ class Topicdongtai extends Api
         }
     }
 
-    //用户是否拉黑
-    private function is_black($uid,$black_uid){
-        $where = [
-            'user_id'       => $uid,
-            'black_user_id' => $black_uid,
-        ];
-        $check = Db::name('user_blacklist')->where($where)->find();
-        if($check){
-            return 1;
-        }else{
-            return 0;
-        }
-    }
-
-
 
     //详情
     public function info(){

+ 0 - 193
application/api/controller/Usercenter.php

@@ -168,96 +168,8 @@ class UserCenter extends Common
         $this->success("获取成功!",$userInfo);
     }
 
-    /**
-     * 添加关注
-     */
-    public function addFollows() {
-        $user_id = $this->request->request("user_id",0,"intval");// 被关注者ID
-        $type = $this->request->request("type",1);// 类型:1=关注,2=取消关注
-        if (!$user_id || $user_id<=0) {
-            $this->error(__('Invalid parameters'));
-        }
-        if($type == 1) {
-            if($user_id == $this->auth->id) {
-                $this->error("不需要关注自己哦!");
-            }
-            $fansfollowModel = new \app\common\model\UserFansFollow();
-            $data = [];
-            $data["user_id"] = $user_id;
-            $data["fans_id"] = $this->auth->id;
-            if($fansfollowModel->where($data)->find()) {
-                $this->error("你已经关注过ta啦!");
-            }
-            $data["createtime"] = time();
-            $id = $fansfollowModel->insertGetId($data);
-
-            //关注通知
-            $msgdata = [
-                'user_id'=>$user_id,
-                'title'  => '有人刚刚关注了你',
-                'content'=> '打开[消息][最新关注]即可查看',
-                'createtime' => time(),
-            ];
-            Db::name('message')->insertGetId($msgdata);
-
-            if($id > 0) {
-                // 增加任务进度 +exp
-                \app\common\model\TaskLog::tofinish($this->auth->id,"ebxLwnXj3L",1);
-                // 增加任务进度 +exp
-                \app\common\model\TaskLog::tofinish($this->auth->id,"iA1QgRhL",1);
-                // 增加任务进度 +exp
-                \app\common\model\TaskLog::tofinish($this->auth->id,"ghopE4Ou",1);
-                // 增加任务进度 +exp
-                \app\common\model\TaskLog::tofinish($this->auth->id,"TryNGc1x",1);
-
-                $this->success("关注成功!");
-            } else {
-                $this->error("网络错误,请稍后重试!");
-            }
-        } else {
-            $fansfollowModel = new \app\common\model\UserFansFollow();
-            $where = [];
-            $where["user_id"] = $user_id;
-            $where["fans_id"] = $this->auth->id;
-            $fansfollowInfo = $fansfollowModel->where($where)->find();
-            if(!$fansfollowInfo) {
-                $this->error("关注信息获取失败!");
-            }
 
-            $res = $fansfollowModel->where($where)->delete();
-            if($res > 0) {
-                $this->success("取消成功!");
-            } else {
-                $this->error("网络错误,请稍后重试!");
-            }
-        }
-
-    }
-
-    /**
-     * 是否关注
-     */
-    public function isFollows() {
-        $user_id = $this->request->request("user_id",0,"intval");// 关注者ID
-
-        if (!$user_id || $user_id<=0) {
-            $this->error(__('Invalid parameters'));
-        }
-
-        $fansfollowModel = new \app\common\model\UserFansFollow();
-        $where = [];
-        $where["user_id"] = $user_id;
-        $where["fans_id"] = $this->auth->id;
-        $fansfollowInfo = $fansfollowModel->where($where)->find();
-        $data = [];
-        if($fansfollowInfo) {
-            $data["is_show_follow"] = 0;
-        } else {
-            $data["is_show_follow"] = 1;
-        }
-        $this->success("获取成功!",$data);
 
-    }
 
     /**
      * 获取关注人列表.派对信息
@@ -307,112 +219,7 @@ class UserCenter extends Common
 
     }
 
-    /**
-     * 获取关注列表
-     * (个人中心模块)(消息-最新关注)
-     */
-    public function getFollowsUser() {
-        $type = $this->request->request('type',1); // 1=关注,2=粉丝,3=好友
-        $page = $this->request->request('page',1); // 分页
-        $pageNum = $this->request->request('pageNum',10); // 分页
-        // 分页搜索构建
-        $pageStart = ($page-1)*$pageNum;
-        $pageEnd = $pageStart + $pageNum;
-
-        $fanfollowModel = new \app\common\model\UserFansFollow();
-
-        // 获取关注列表
-        $where = [];
-        $where["a.fans_id"] = $this->auth->id;
-        $followlist = $fanfollowModel->alias("a")
-            ->field("a.id,a.user_id,a.createtime,u.avatar,u.nickname,u.level,u.gender,u.desc")
-            ->join("hx_user u","u.id = a.user_id")
-//            ->limit($pageStart,$pageNum)
-            ->where($where)->order('a.id desc')->select();
-        $followlist = list_domain_image($followlist,['avatar']);
 
-        // 获取粉丝列表
-        $where = [];
-        $where["a.user_id"] = $this->auth->id;
-        $fanslist = $fanfollowModel->alias("a")
-            ->field("a.id,a.fans_id,a.createtime,u.avatar,u.nickname,u.level,u.gender,u.desc")
-            ->join("hx_user u","u.id = a.fans_id")
-//            ->limit($pageStart,$pageNum)
-            ->where($where)->order('a.id desc')->select();
-        $fanslist = list_domain_image($fanslist,['avatar']);
-
-//        print_r(json_encode($followlist));exit;
-        if($type == 1) {
-            $ids = [];
-            if($fanslist) {
-                foreach($fanslist as $k => $v) {
-                    $ids[] = $v["fans_id"];
-                }
-            }
-            if($followlist) {
-                foreach($followlist as $k => $v) {
-                    $followlist[$k]['createtime_text'] = get_last_time($v['createtime']);
-                    $followlist[$k]["is_follow"] = 1;
-                    if(in_array($v["user_id"],$ids)) {
-                        $followlist[$k]["is_hu"] = 1;
-                    } else {
-                        $followlist[$k]["is_hu"] = 0;
-                    }
-                }
-            }
-            $fansfollow = $followlist;
-        } elseif($type == 2) {
-            $ids = [];
-            if($followlist) {
-                foreach($followlist as $k => $v) {
-                    $ids[] = $v["user_id"];
-                }
-            }
-            if($fanslist) {
-                foreach($fanslist as $k => $v) {
-                    $fanslist[$k]['createtime_text'] = get_last_time($v['createtime']);
-                    if(in_array($v["fans_id"],$ids)) {
-                        $fanslist[$k]["is_hu"] = 1;
-                        $fanslist[$k]["is_follow"] = 1;
-                    } else {
-                        $fanslist[$k]["is_hu"] = 0;
-                    }
-                }
-            }
-            $fansfollow = $fanslist;
-        }else {
-            $ids = [];
-            if($followlist) {
-                foreach($followlist as $k => $v) {
-                    $ids[] = $v["user_id"];
-                }
-            }
-            if($fanslist) {
-                foreach($fanslist as $k => $v) {
-                    $fanslist[$k]['createtime_text'] = get_last_time($v['createtime']);
-                    $fanslist[$k]["is_follow"] = 1;
-                    if(in_array($v["fans_id"],$ids)) {
-                        $fanslist[$k]["is_hu"] = 1;
-                    } else {
-                        unset($fanslist[$k]); //不是好友的 直接unset掉
-                    }
-                }
-            }
-            $fansfollow = $fanslist;
-        }
-
-        if($fansfollow) {
-            $data = [];
-            foreach($fansfollow as $k => $v) {
-                if($k >= $pageStart && $k < $pageEnd) {
-                    $data[] = $v;
-                }
-            }
-            $this->success("获取成功!",$data);
-        } else {
-            $this->success("数据为空!",[]);
-        }
-    }
 
     /**
      * 获取最近访客

+ 164 - 0
application/api/controller/Userfollow.php

@@ -0,0 +1,164 @@
+<?php
+
+namespace app\api\controller;
+
+use app\common\controller\Api;
+use think\Db;
+/**
+ * 关注
+ */
+class Userfollow extends Api
+{
+    protected $noNeedLogin = [];
+    protected $noNeedRight = ['*'];
+
+    //我的关注列表
+    public function my_follow_list(){
+        $list = Db::name('user_follow')
+            ->alias('follow')
+            ->join('user','follow.follow_uid = user.id','LEFT')
+            ->field('user.id,user.u_id,user.username,user.nickname,user.avatar,user.desc,user.gender,follow.createtime')
+            ->where('follow.uid',$this->auth->id)->order('follow.id desc')->autopage()->select();
+
+        $list = list_domain_image($list,['avatar']);
+
+        if(!empty($list)){
+            foreach($list as $key => &$val){
+                $val['createtime_text'] = get_last_time($val['createtime']);
+                //是否关注
+                $val['is_follow'] = 1;
+            }
+        }
+
+        $this->success('success',$list);
+    }
+
+    //我的粉丝列表
+    public function my_fans_list(){
+        $list = Db::name('user_follow')
+            ->alias('follow')
+            ->join('user','follow.uid = user.id','LEFT')
+            ->field('user.id,user.u_id,user.username,user.nickname,user.avatar,user.desc,user.gender,follow.createtime')
+            ->where('follow.follow_uid',$this->auth->id)->order('follow.id desc')->autopage()->select();
+
+        $list = list_domain_image($list,['avatar']);
+
+        //我的关注uids
+        $my_follow_uids = $this->my_follow_uids();
+
+        if(!empty($list)){
+            foreach($list as $key => &$val){
+                $val['createtime_text'] = get_last_time($val['createtime']);
+                //是否关注
+                $val['is_follow'] = in_array($val['id'],$my_follow_uids) ? 1 : 0;
+            }
+        }
+
+        $this->success('success',$list);
+    }
+
+    //我的好友,拿粉丝列表改的
+    public function my_friend_list(){
+        $list = Db::name('user_follow')
+            ->alias('follow')
+            ->join('user','follow.uid = user.id','LEFT')
+            ->field('user.id,user.u_id,user.username,user.nickname,user.avatar,user.desc,user.gender')
+            ->where('follow.follow_uid',$this->auth->id)->order('follow.id desc')->autopage()->select();
+
+        $list = list_domain_image($list,['avatar']);
+
+        //我的关注uids
+        $my_follow_uids = $this->my_follow_uids();
+
+        $new_rs = []; //另起
+        if(!empty($list)){
+            foreach($list as $key => &$val){
+
+                //是否关注
+                $val['is_follow'] = in_array($val['id'],$my_follow_uids) ? 1 : 0;
+                //我的粉丝,且是我的关注的,另起
+                if($val['is_follow'] == 1){
+                    $new_rs[] = $val;
+                }
+            }
+
+        }
+
+        $this->success('success',$new_rs);
+    }
+
+
+
+    //关注某人
+    public function follow_one(){
+        $follow_uid = input('follow_uid',0);
+        if(!$follow_uid){
+            $this->error(__('Invalid parameters'));
+        }
+
+        $checkuser = Db::name('user')->find($follow_uid);
+        if(empty($checkuser)){
+            $this->error('此用户不存在');
+        }
+
+        if($follow_uid == $this->auth->id){
+            $this->error('不能关注自己');
+        }
+
+        $map = [
+            'uid' => $this->auth->id,
+            'follow_uid' => $follow_uid,
+        ];
+
+        $check = Db::name('user_follow')->where($map)->find();
+        if($check){
+            //取关
+            $rs = Db::name('user_follow')->where($map)->delete();
+            $this->success('操作成功');
+        }
+
+        Db::startTrans();
+        $map['createtime'] = time();
+        $id = Db::name('user_follow')->insertGetId($map);
+        if(!$id){
+            Db::rollback();
+            $this->error('关注失败');
+        }
+
+        Db::commit();
+        $this->success('操作成功',$id);
+    }
+
+    //取关某人
+    public function un_follow_one(){
+        $follow_uid = input('follow_uid',0);
+        if(!$follow_uid){
+            $this->error(__('Invalid parameters'));
+        }
+
+        $checkuser = Db::name('user')->find($follow_uid);
+        if(empty($checkuser)){
+            $this->error('此用户不存在');
+        }
+
+        $map = [
+            'uid' => $this->auth->id,
+            'follow_uid' => $follow_uid,
+        ];
+
+        //不检查,全删
+
+        $rs = Db::name('user_follow')->where($map)->delete();
+        $this->success('操作成功');
+    }
+
+    //我的关注uids
+    private function my_follow_uids(){
+        return Db::name('user_follow')->where('uid',$this->auth->id)->column('follow_uid');
+    }
+
+    //我的粉丝uids
+    private function my_fans_uids(){
+        return Db::name('user_follow')->where('follow_uid',$this->auth->id)->column('uid');
+    }
+}