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

Start/End NoticeAsActivity modifications

Browse Source 
More 'scoped' profiles and typing to the functions.
Also, there's no need to send an object as a reference.
This commit is contained in:
Mikael Nordfeldth
2014-07-28 09:40:07 +02:00
parent eb2f93ad2b
commit 6e481d35ed
5 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/Activity/ActivityPlugin.php
View File

@@ -308,22 +308,21 @@ class ActivityPlugin extends Plugin
return true;
}
function onEndNoticeAsActivity($notice, &$activity)
public function onEndNoticeAsActivity(Notice $stored, Activity $act, Profile $scoped=null)
{
switch ($notice->verb) {
switch ($stored->verb) {
case ActivityVerb::FAVORITE:
$fave = Fave::getKV('uri', $notice->uri);
$fave = Fave::getKV('uri', $stored->uri);
if (!empty($fave)) {
$notice = Notice::getKV('id', $fave->notice_id);
if (!empty($notice)) {
$cur = common_current_user();
$target = $notice->asActivity($cur->getProfile());
$stored = Notice::getKV('id', $fave->notice_id);
if (!empty($stored)) {
$target = $stored->asActivity($scoped);
if ($target->verb == ActivityVerb::POST) {
// "I like the thing you posted"
$activity->objects = $target->objects;
$act->objects = $target->objects;
} else {
// "I like that you did whatever you did"
$activity->objects = array($target);
$act->objects = array($target);
}
}
}
@@ -332,21 +331,21 @@ class ActivityPlugin extends Plugin
// FIXME: do something here
break;
case ActivityVerb::JOIN:
$mem = Group_member::getKV('uri', $notice->uri);
$mem = Group_member::getKV('uri', $stored->uri);
if (!empty($mem)) {
$group = $mem->getGroup();
$activity->objects = array(ActivityObject::fromGroup($group));
$act->objects = array(ActivityObject::fromGroup($group));
}
break;
case ActivityVerb::LEAVE:
// FIXME: ????
break;
case ActivityVerb::FOLLOW:
$sub = Subscription::getKV('uri', $notice->uri);
$sub = Subscription::getKV('uri', $stored->uri);
if (!empty($sub)) {
$profile = Profile::getKV('id', $sub->subscribed);
if (!empty($profile)) {
$activity->objects = array($profile->asActivityObject());
$act->objects = array($profile->asActivityObject());
}
}
break;