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

57
plugins/OStatus/classes/Ostatus_profile.php
View File

@@ -478,7 +478,7 @@ class Ostatus_profile extends Managed_DataObject
// The "WithProfile" events were added later.
if (Event::handle('StartHandleFeedEntryWithProfile', array($activity, $this, &$notice)) &&
if (Event::handle('StartHandleFeedEntryWithProfile', array($activity, $this->localProfile(), &$notice)) &&
Event::handle('StartHandleFeedEntry', array($activity))) {
switch ($activity->verb) {
@@ -516,10 +516,9 @@ class Ostatus_profile extends Managed_DataObject
{
$notice = null;
$oprofile = $this->checkAuthorship($activity);
if (!$oprofile instanceof Ostatus_profile) {
common_log(LOG_INFO, "No author matched share activity");
try {
$profile = ActivityUtils::checkAuthorship($activity, $this->localProfile());
} catch (ServerException $e) {
return null;
}
@@ -670,7 +669,7 @@ class Ostatus_profile extends Managed_DataObject
if ($activity->context) {
// TODO: context->attention
list($options['groups'], $options['replies'])
= self::filterAttention($oprofile->localProfile(), $activity->context->attention);
= self::filterAttention($profile, $activity->context->attention);
// Maintain direct reply associations
// @todo FIXME: What about conversation ID?
@@ -713,7 +712,7 @@ class Ostatus_profile extends Managed_DataObject
$options['urls'][] = $href;
}
$notice = Notice::saveNew($oprofile->profile_id,
$notice = Notice::saveNew($profile->id,
$content,
'ostatus',
$options);
@@ -732,11 +731,7 @@ class Ostatus_profile extends Managed_DataObject
{
$notice = null;
$oprofile = $this->checkAuthorship($activity);
if (!$oprofile instanceof Ostatus_profile) {
return null;
}
$profile = $this->checkAuthorship($activity, $this->localProfile());
// It's not always an ActivityObject::NOTE, but... let's just say it is.
@@ -839,7 +834,7 @@ class Ostatus_profile extends Managed_DataObject
if ($activity->context) {
// TODO: context->attention
list($options['groups'], $options['replies'])
= self::filterAttention($oprofile->localProfile(), $activity->context->attention);
= self::filterAttention($profile, $activity->context->attention);
// Maintain direct reply associations
// @todo FIXME: What about conversation ID?
@@ -882,7 +877,7 @@ class Ostatus_profile extends Managed_DataObject
}
try {
$saved = Notice::saveNew($oprofile->profile_id,
$saved = Notice::saveNew($profile->id,
$content,
'ostatus',
$options);
@@ -1077,17 +1072,17 @@ class Ostatus_profile extends Managed_DataObject
return null;
}
// Is it a known Ostatus profile?
$oprofile = Ostatus_profile::getKV('profile_id', $profile->id);
if ($oprofile instanceof Ostatus_profile) {
try {
$oprofile = self::getFromProfile($profile);
// We found the profile, return it!
return $oprofile;
}
// Is it a local user?
$user = User::getKV('id', $profile->id);
if ($user instanceof User) {
// @todo i18n FIXME: use sprintf and add i18n (?)
throw new OStatusShadowException($profile, "'$profile_url' is the profile for local user '{$user->nickname}'.");
} catch (NoResultException $e) {
// Could not find an OStatus profile, is it instead a local user?
$user = User::getKV('id', $profile->id);
if ($user instanceof User) {
// @todo i18n FIXME: use sprintf and add i18n (?)
throw new OStatusShadowException($profile, "'$profile_url' is the profile for local user '{$user->nickname}'.");
}
}
// Continue discovery; it's a remote profile
@@ -1097,6 +1092,16 @@ class Ostatus_profile extends Managed_DataObject
return null;
}
static function getFromProfile(Profile $profile)
{
$oprofile = new Ostatus_profile();
$oprofile->profile_id = $profile->id;
if (!$oprofile->find(true)) {
throw new NoResultException($oprofile);
}
return $oprofile;
}
/**
* Look up and if necessary create an Ostatus_profile for remote entity
* with the given update feed. This should never return null -- you will
@@ -2130,7 +2135,7 @@ class Ostatus_profile extends Managed_DataObject
return $oprofile;
}
function checkAuthorship($activity)
public function checkAuthorship(Activity $activity)
{
if ($this->isGroup() || $this->isPeopletag()) {
// A group or propletag feed will contain posts from multiple authors.
@@ -2165,7 +2170,7 @@ class Ostatus_profile extends Managed_DataObject
$oprofile = $this;
}
return $oprofile;
return $oprofile->localProfile();
}
}