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

Use new hooks for Notice::asActivity()

Browse Source 
Changed the atom activity generation code so it uses the new hooks
built into Notice::asActivity() rather than the hooks in the old
Notice::asAtomEntry().
This commit is contained in:
Evan Prodromou
2010-12-06 15:21:34 -05:00
parent 2c5de55b4b
commit 65bbd991c2
1 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
ActivityPlugin.php
View File

@@ -219,64 +219,50 @@ class ActivityPlugin extends Plugin
return true;
}
function onStartActivityVerb(&$notice, &$xs, &$verb)
function onEndNoticeAsActivity($notice, &$activity)
{
$act = Notice_activity::staticGet('notice_id', $notice->id);
$na = Notice_activity::staticGet('notice_id', $notice->id);
if (!empty($act)) {
$verb = $act->verb;
}
if (!empty($na)) {
return true;
}
$activity->verb = $na->verb;
function onStartActivityDefaultObjectType(&$notice, &$xs, &$type)
{
$act = Notice_activity::staticGet('notice_id', $notice->id);
// wipe the old object!
if (!empty($act)) {
// no default object
return false;
}
$activity->objects = array();
return true;
}
function onStartActivityObjects(&$notice, &$xs, &$objects)
{
$act = Notice_activity::staticGet('notice_id', $notice->id);
if (!empty($act)) {
switch ($act->verb)
switch ($na->verb)
{
case ActivityVerb::FOLLOW:
case ActivityVerb::UNFOLLOW:
$profile = Profile::fromURI($act->object);
$profile = Profile::fromURI($na->object);
if (!empty($profile)) {
$objects[] = ActivityObject::fromProfile($profile);
$activity->objects[] = ActivityObject::fromProfile($profile);
}
break;
case ActivityVerb::FAVORITE:
case ActivityVerb::UNFAVORITE:
$notice = Notice::staticGet('uri', $act->object);
if (!empty($notice)) {
$objects[] = $notice->asActivity();
$target = Notice::staticGet('uri', $na->object);
if (!empty($target)) {
$activity->objects[] = ActivityObject::fromNotice($target);
}
break;
case ActivityVerb::JOIN:
case ActivityVerb::LEAVE:
$group = User_group::staticGet('uri', $act->object);
$group = User_group::staticGet('uri', $na->object);
if (!empty($notice)) {
$objects[] = ActivityObject::fromGroup($group);
$activity->objects[] = ActivityObject::fromGroup($group);
}
break;
default:
break;
}
}
return true;
}
function onPluginVersion(&$versions)
{
$versions[] = array('name' => 'Activity',