harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix chat member list when one or members are connected via access tokens

Browse Source
This commit is contained in:
zotlabs 2017-01-02 23:35:40 -08:00
parent 1ceca4ae19
commit ae563e2b1c
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Zotlabs/Module/Chatsvc.php
View File

@ -111,8 +111,22 @@ class Chatsvc extends \Zotlabs\Web\Controller {
intval(\App::$data['chat']['room_id']) intval(\App::$data['chat']['room_id'])
); );
if($r) { if($r) {
foreach($r as $rr) { foreach($r as $rv) {
switch($rr['cp_status']) { if(! $rv['xchan_name']) {
$rv['xchan_hash'] = $rv['cp_xchan'];
$rv['xchan_name'] = substr($rv['cp_xchan'],strrpos($rv['cp_xchan'],'.')+1);
$rv['xchan_addr'] = '';
$rv['xchan_network'] = 'unknown';
$rv['xchan_url'] = z_root();
$rv['xchan_hidden'] = 1;
$rv['xchan_photo_mimetype'] = 'image/jpeg';
$rv['xchan_photo_l'] = get_default_profile_photo(300);
$rv['xchan_photo_m'] = get_default_profile_photo(80);
$rv['xchan_photo_s'] = get_default_profile_photo(48);
}
switch($rv['cp_status']) {
case 'away': case 'away':
$status = t('Away'); $status = t('Away');
$status_class = 'away'; $status_class = 'away';
@ -124,7 +138,7 @@ class Chatsvc extends \Zotlabs\Web\Controller {
break; break;
} }
$inroom[] = array('img' => zid($rr['xchan_photo_m']), 'img_type' => $rr['xchan_photo_mimetype'],'name' => $rr['xchan_name'], 'status' => $status, 'status_class' => $status_class); $inroom[] = array('img' => zid($rv['xchan_photo_m']), 'img_type' => $rv['xchan_photo_mimetype'],'name' => $rv['xchan_name'], 'status' => $status, 'status_class' => $status_class);
} }
} }