GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

JOINs and FOLLOWs would have null titles in Activity representation of notices

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-07-30 00:21:00 +02:00
parent e61e11a973
commit 9018fd75c6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/Activity/ActivityPlugin.php
View File

@ -311,9 +311,10 @@ class ActivityPlugin extends Plugin
// FIXME: do something here // FIXME: do something here
break; break;
case ActivityVerb::JOIN: case ActivityVerb::JOIN:
$mem = Group_member::getKV('uri', $stored->uri); $mem = Group_member::getKV('uri', $stored->getUri());
if (!empty($mem)) { if ($mem instanceof Group_member) {
$group = $mem->getGroup(); $group = $mem->getGroup();
$act->title = $stored->getTitle();
$act->objects = array(ActivityObject::fromGroup($group)); $act->objects = array(ActivityObject::fromGroup($group));
} }
break; break;
@ -322,9 +323,10 @@ class ActivityPlugin extends Plugin
break; break;
case ActivityVerb::FOLLOW: case ActivityVerb::FOLLOW:
$sub = Subscription::getKV('uri', $stored->uri); $sub = Subscription::getKV('uri', $stored->uri);
if (!empty($sub)) { if ($sub instanceof Subscription) {
$profile = Profile::getKV('id', $sub->subscribed); $profile = Profile::getKV('id', $sub->subscribed);
if (!empty($profile)) { if ($profile instanceof Profile) {
$act->title = $stored->getTitle();
$act->objects = array($profile->asActivityObject()); $act->objects = array($profile->asActivityObject());
} }
} }