|
@@ -108,7 +108,8 @@ class member_talkControl extends mbMemberControl
|
|
|
$friends[] = $user;
|
|
|
$friends = array_unique($friends);
|
|
|
|
|
|
- $members = $this->get_members($friends);
|
|
|
+ $talks_helper = new room\talks_helper();
|
|
|
+ $members = $talks_helper->get_friends($friends);
|
|
|
usort($members,['member_info','alpha_compare']);
|
|
|
|
|
|
$uids = [];
|
|
@@ -122,6 +123,7 @@ class member_talkControl extends mbMemberControl
|
|
|
'mobile_page' => mobile_page(1)]);
|
|
|
}
|
|
|
|
|
|
+ ///////////////////////
|
|
|
public function msgsOp()
|
|
|
{
|
|
|
$msgid = intval($_GET['msgid']);
|
|
@@ -245,7 +247,6 @@ class member_talkControl extends mbMemberControl
|
|
|
return ['uids' => $uids,'msgs' => $msgs];
|
|
|
}
|
|
|
|
|
|
-
|
|
|
private function chatwomsg($msgid,$user)
|
|
|
{
|
|
|
$mod_room = Model('room');
|
|
@@ -265,6 +266,8 @@ class member_talkControl extends mbMemberControl
|
|
|
return ['uids' => [$left,$right],'msgs' => $msgs];
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ /////////////////////////
|
|
|
public function create_roomOp()
|
|
|
{
|
|
|
$creator = session_helper::memberid();
|
|
@@ -308,7 +311,6 @@ class member_talkControl extends mbMemberControl
|
|
|
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
-
|
|
|
public function talksOp()
|
|
|
{
|
|
|
$talks_helper = new room\talks_helper();
|
|
@@ -318,28 +320,25 @@ class member_talkControl extends mbMemberControl
|
|
|
return self::outsuccess($result);
|
|
|
}
|
|
|
|
|
|
- private function get_members($uids)
|
|
|
+
|
|
|
+ public function talks_detailOp()
|
|
|
{
|
|
|
- if(empty($uids)) return [];
|
|
|
+ $talk_type = trim($_GET['talk_type']);
|
|
|
+ $talk_id = intval($_GET['talk_id']);
|
|
|
|
|
|
- $uids = array_unique($uids);
|
|
|
- $items = Model('member')->getMemberList(['member_id' => ['in',$uids]]);
|
|
|
- foreach ($items as $item)
|
|
|
- {
|
|
|
- try
|
|
|
- {
|
|
|
- $info = new member_info($item);
|
|
|
- $members[] = $info->filter();
|
|
|
- }
|
|
|
- catch (Exception $ex) {
|
|
|
- Log::record($ex->getMessage(),Log::ERR);
|
|
|
- }
|
|
|
+ if(empty($talk_type) || $talk_id <=0){
|
|
|
+ return self::outerr(errcode::ErrParamter);
|
|
|
}
|
|
|
|
|
|
- return $members;
|
|
|
- }
|
|
|
-
|
|
|
+ $talk_helper = new \room\talks_helper();
|
|
|
+ $result = $talk_helper->talk_detail($talk_type,$talk_id);
|
|
|
|
|
|
+ if($result){
|
|
|
+ return self::outsuccess(["name" => $result['name'],"avatar" => $result['avatar']]);
|
|
|
+ }else{
|
|
|
+ return self::outerr(errcode::ErrTalk);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
public function friend_detailOp()
|