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

checkAuthorship events, Ostatus_profile rewrite to handle it

Browse Source 
Lost dependency of OStatus plugin for lib/microappplugin.php, whoo!

also noting which plugins should be upgraded to new saveActivity support.

Favorite plugin won't work with the new system just yet, it doesn't have
the necessary functions to extract activity objects, but that's coming
in the next (few) commits.
This commit is contained in:
Mikael Nordfeldth
2014-07-01 15:48:34 +02:00
parent acb07ef52f
commit 9f4bcbad8a
10 changed files with 128 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/activityutils.php
View File

@@ -402,4 +402,35 @@ class ActivityUtils
}
return $object;
}
// Check authorship by supplying a Profile as a default and letting plugins
// set it to something else if the activity's author is actually someone
// else (like with a group or peopletag feed as handled in OStatus).
//
// NOTE: Returned is not necessarily the supplied profile! For example,
// the "feed author" may be a group, but the "activity author" is a person!
static function checkAuthorship(Activity $activity, Profile $profile)
{
if (Event::handle('CheckActivityAuthorship', array($activity, &$profile))) {
// if (empty($activity->actor)), then we generated this Activity ourselves and can trust $profile
$actor_uri = $profile->getUri();
if (!in_array($actor_uri, array($activity->actor->id, $activity->actor->link))) {
// A mismatch between our locally stored URI and the supplied author?
// Probably not more than a blog feed or something (with multiple authors or so)
// but log it for future inspection.
common_log(LOG_WARNING, "Got an actor '{$activity->actor->title}' ({$activity->actor->id}) on single-user feed for " . $actor_uri);
} elseif (empty($activity->actor->id)) {
// Plain <author> without ActivityStreams actor info.
// We'll just ignore this info for now and save the update under the feed's identity.
}
}
if (!$profile instanceof Profile) {
throw new ServerException('Could not get an author Profile for activity');
}
return $profile;
}
}