* @package OStatusPlugin
* @maintainer Brion Vibber <brion@status.net>
*/
-
class Ostatus_profile extends Managed_DataObject
{
public $__table = 'ostatus_profile';
public $created;
public $modified;
- public /*static*/ function staticGet($k, $v=null)
- {
- return parent::staticGet(__CLASS__, $k, $v);
- }
-
/**
* Return table definition for Schema setup and DB_DataObject usage.
*
{
return array(
'fields' => array(
- 'uri' => array('type' => 'varchar', 'length' => 255, 'not null' => true),
+ 'uri' => array('type' => 'varchar', 'length' => 191, 'not null' => true),
'profile_id' => array('type' => 'integer'),
'group_id' => array('type' => 'integer'),
'peopletag_id' => array('type' => 'integer'),
- 'feeduri' => array('type' => 'varchar', 'length' => 255),
- 'salmonuri' => array('type' => 'varchar', 'length' => 255),
+ 'feeduri' => array('type' => 'varchar', 'length' => 191),
+ 'salmonuri' => array('type' => 'varchar', 'length' => 191),
'avatar' => array('type' => 'text'),
'created' => array('type' => 'datetime', 'not null' => true),
'modified' => array('type' => 'datetime', 'not null' => true),
),
'primary key' => array('uri'),
'unique keys' => array(
- 'ostatus_profile_profile_id_idx' => array('profile_id'),
- 'ostatus_profile_group_id_idx' => array('group_id'),
- 'ostatus_profile_peopletag_id_idx' => array('peopletag_id'),
- 'ostatus_profile_feeduri_idx' => array('feeduri'),
+ 'ostatus_profile_profile_id_key' => array('profile_id'),
+ 'ostatus_profile_group_id_key' => array('group_id'),
+ 'ostatus_profile_peopletag_id_key' => array('peopletag_id'),
+ 'ostatus_profile_feeduri_key' => array('feeduri'),
),
'foreign keys' => array(
'ostatus_profile_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
);
}
+ public function getUri()
+ {
+ return $this->uri;
+ }
+
+ public function fromProfile(Profile $profile)
+ {
+ $oprofile = Ostatus_profile::getKV('profile_id', $profile->id);
+ if (!$oprofile instanceof Ostatus_profile) {
+ throw new Exception('No Ostatus_profile for Profile ID: '.$profile->id);
+ }
+ }
+
/**
- * Fetch the StatusNet-side profile for this feed
+ * Fetch the locally stored profile for this feed
* @return Profile
+ * @throws NoProfileException if it was not found
*/
public function localProfile()
{
- if ($this->profile_id) {
- return Profile::staticGet('id', $this->profile_id);
+ if ($this->isGroup()) {
+ return $this->localGroup()->getProfile();
}
- return null;
+
+ $profile = Profile::getKV('id', $this->profile_id);
+ if (!$profile instanceof Profile) {
+ throw new NoProfileException($this->profile_id);
+ }
+ return $profile;
}
/**
*/
public function localGroup()
{
- if ($this->group_id) {
- return User_group::staticGet('id', $this->group_id);
+ $group = User_group::getKV('id', $this->group_id);
+
+ if (!$group instanceof User_group) {
+ throw new NoSuchGroupException(array('id'=>$this->group_id));
}
- return null;
+
+ return $group;
}
/**
public function localPeopletag()
{
if ($this->peopletag_id) {
- return Profile_list::staticGet('id', $this->peopletag_id);
+ return Profile_list::getKV('id', $this->peopletag_id);
}
return null;
}
} else if ($this->isPeopletag()) {
return ActivityObject::fromPeopletag($this->localPeopletag());
} else {
- return ActivityObject::fromProfile($this->localProfile());
+ return $this->localProfile()->asActivityObject();
}
}
*
* Assumes that 'activity' namespace has been previously defined.
*
- * @fixme replace with wrappers on asActivityObject when it's got everything.
+ * @todo FIXME: Replace with wrappers on asActivityObject when it's got everything.
*
* @param string $element one of 'actor', 'subject', 'object', 'target'
* @return string
$noun = ActivityObject::fromPeopletag($this->localPeopletag());
return $noun->asString('activity:' . $element);
} else {
- $noun = ActivityObject::fromProfile($this->localProfile());
+ $noun = $this->localProfile()->asActivityObject();
return $noun->asString('activity:' . $element);
}
}
return true;
} else if ($this->group_id && ($this->profile_id || $this->peopletag_id)) {
// TRANS: Server exception. %s is a URI
- throw new ServerException(sprintf(_m('Invalid ostatus_profile state: Two or more IDs set for %s.'), $this->uri));
+ throw new ServerException(sprintf(_m('Invalid ostatus_profile state: Two or more IDs set for %s.'), $this->getUri()));
} else {
// TRANS: Server exception. %s is a URI
- throw new ServerException(sprintf(_m('Invalid ostatus_profile state: All IDs empty for %s.'), $this->uri));
+ throw new ServerException(sprintf(_m('Invalid ostatus_profile state: All IDs empty for %s.'), $this->getUri()));
}
}
return true;
} else if ($this->peopletag_id && ($this->profile_id || $this->group_id)) {
// TRANS: Server exception. %s is a URI
- throw new ServerException(sprintf(_m('Invalid ostatus_profile state: Two or more IDs set for %s.'), $this->uri));
+ throw new ServerException(sprintf(_m('Invalid ostatus_profile state: Two or more IDs set for %s.'), $this->getUri()));
} else {
// TRANS: Server exception. %s is a URI
- throw new ServerException(sprintf(_m('Invalid ostatus_profile state: All IDs empty for %s.'), $this->uri));
+ throw new ServerException(sprintf(_m('Invalid ostatus_profile state: All IDs empty for %s.'), $this->getUri()));
}
}
* Send a subscription request to the hub for this feed.
* The hub will later send us a confirmation POST to /main/push/callback.
*
- * @return bool true on success, false on failure
- * @throws ServerException if feed state is not valid
+ * @return void
+ * @throws ServerException if feed state is not valid or subscription fails.
*/
public function subscribe()
{
$feedsub = FeedSub::ensureFeed($this->feeduri);
if ($feedsub->sub_state == 'active') {
// Active subscription, we don't need to do anything.
- return true;
- } else {
- // Inactive or we got left in an inconsistent state.
- // Run a subscription request to make sure we're current!
- return $feedsub->subscribe();
+ return;
}
+
+ // Inactive or we got left in an inconsistent state.
+ // Run a subscription request to make sure we're current!
+ return $feedsub->subscribe();
}
/**
* Check if this remote profile has any active local subscriptions, and
* if not drop the PuSH subscription feed.
*
- * @return bool true on success, false on failure
+ * @return boolean true if subscription is removed, false if there are still subscribers to the feed
+ * @throws Exception of various kinds on failure.
*/
public function unsubscribe() {
- $this->garbageCollect();
+ return $this->garbageCollect();
}
/**
* Check if this remote profile has any active local subscriptions, and
* if not drop the PuSH subscription feed.
*
- * @return boolean
+ * @return boolean true if subscription is removed, false if there are still subscribers to the feed
+ * @throws Exception of various kinds on failure.
*/
public function garbageCollect()
{
- $feedsub = FeedSub::staticGet('uri', $this->feeduri);
- return $feedsub->garbageCollect();
+ $feedsub = FeedSub::getKV('uri', $this->feeduri);
+ if ($feedsub instanceof FeedSub) {
+ return $feedsub->garbageCollect();
+ }
+ // Since there's no FeedSub we can assume it's already garbage collected
+ return true;
}
/**
* FeedSub::garbageCollect().
*
* @return int
+ * @throws NoProfileException if there is no local profile for the object
*/
public function subscriberCount()
{
$count = $subscribers->N;
} else {
$profile = $this->localProfile();
- $count = $profile->subscriberCount();
if ($profile->hasLocalTags()) {
$count = 1;
+ } else {
+ $count = $profile->subscriberCount();
}
}
common_log(LOG_INFO, __METHOD__ . " SUB COUNT BEFORE: $count");
* @param string $verb Activity::SUBSCRIBE or Activity::JOIN
* @param Object $object object of the action; must define asActivityNoun($tag)
*/
- public function notify($actor, $verb, $object=null, $target=null)
+ public function notify(Profile $actor, $verb, $object=null, $target=null)
{
- if (!($actor instanceof Profile)) {
- $type = gettype($actor);
- if ($type == 'object') {
- $type = get_class($actor);
- }
- // TRANS: Server exception.
- // TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
- throw new ServerException(sprintf(_m('Invalid actor passed to %1$s: %2$s.'),__METHOD__,$type));
- }
if ($object == null) {
$object = $this;
}
- if ($this->salmonuri) {
- $text = 'update';
- $id = TagURI::mint('%s:%s:%s',
- $verb,
- $actor->getURI(),
- common_date_iso8601(time()));
-
- // @fixme consolidate all these NS settings somewhere
- $attributes = array('xmlns' => Activity::ATOM,
- 'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/',
- 'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
- 'xmlns:georss' => 'http://www.georss.org/georss',
- 'xmlns:ostatus' => 'http://ostatus.org/schema/1.0',
- 'xmlns:poco' => 'http://portablecontacts.net/spec/1.0',
- 'xmlns:media' => 'http://purl.org/syndication/atommedia');
-
- $entry = new XMLStringer();
- $entry->elementStart('entry', $attributes);
- $entry->element('id', null, $id);
- $entry->element('title', null, $text);
- $entry->element('summary', null, $text);
- $entry->element('published', null, common_date_w3dtf(common_sql_now()));
-
- $entry->element('activity:verb', null, $verb);
- $entry->raw($actor->asAtomAuthor());
- $entry->raw($actor->asActivityActor());
- $entry->raw($object->asActivityNoun('object'));
- if ($target != null) {
- $entry->raw($target->asActivityNoun('target'));
- }
- $entry->elementEnd('entry');
-
- $xml = $entry->getString();
- common_log(LOG_INFO, "Posting to Salmon endpoint $this->salmonuri: $xml");
-
- $salmon = new Salmon(); // ?
- return $salmon->post($this->salmonuri, $xml, $actor);
+ if (empty($this->salmonuri)) {
+ return false;
}
- return false;
+ $text = 'update';
+ $id = TagURI::mint('%s:%s:%s',
+ $verb,
+ $actor->getURI(),
+ common_date_iso8601(time()));
+
+ // @todo FIXME: Consolidate all these NS settings somewhere.
+ $attributes = array('xmlns' => Activity::ATOM,
+ 'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/',
+ 'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
+ 'xmlns:georss' => 'http://www.georss.org/georss',
+ 'xmlns:ostatus' => 'http://ostatus.org/schema/1.0',
+ 'xmlns:poco' => 'http://portablecontacts.net/spec/1.0',
+ 'xmlns:media' => 'http://purl.org/syndication/atommedia');
+
+ $entry = new XMLStringer();
+ $entry->elementStart('entry', $attributes);
+ $entry->element('id', null, $id);
+ $entry->element('title', null, $text);
+ $entry->element('summary', null, $text);
+ $entry->element('published', null, common_date_w3dtf(common_sql_now()));
+
+ $entry->element('activity:verb', null, $verb);
+ $entry->raw($actor->asAtomAuthor());
+ $entry->raw($actor->asActivityActor());
+ $entry->raw($object->asActivityNoun('object'));
+ if ($target != null) {
+ $entry->raw($target->asActivityNoun('target'));
+ }
+ $entry->elementEnd('entry');
+
+ $xml = $entry->getString();
+ common_log(LOG_INFO, "Posting to Salmon endpoint $this->salmonuri: $xml");
+
+ Salmon::post($this->salmonuri, $xml, $actor->getUser());
}
/**
* @param Profile $actor
* @return boolean success
*/
- public function notifyActivity($entry, $actor)
+ public function notifyActivity($entry, Profile $actor)
{
if ($this->salmonuri) {
- $salmon = new Salmon();
- return $salmon->post($this->salmonuri, $this->notifyPrepXml($entry), $actor);
+ return Salmon::post($this->salmonuri, $this->notifyPrepXml($entry), $actor->getUser());
}
+ common_debug(__CLASS__.' error: No salmonuri for Ostatus_profile uri: '.$this->uri);
return false;
}
if ($feed->localName == 'feed' && $feed->namespaceURI == Activity::ATOM) {
$this->processAtomFeed($feed, $source);
- } else if ($feed->localName == 'rss') { // @fixme check namespace
+ } else if ($feed->localName == 'rss') { // @todo FIXME: Check namespace.
$this->processRssFeed($feed, $source);
} else {
// TRANS: Exception.
*
* @return Notice Notice representing the new (or existing) activity
*/
-
public function processEntry($entry, $feed, $source)
{
$activity = new Activity($entry, $feed);
return $this->processActivity($activity, $source);
}
+ // TODO: Make this throw an exception
public function processActivity($activity, $source)
{
$notice = null;
// 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) {
Event::handle('EndHandleFeedEntry', array($activity));
Event::handle('EndHandleFeedEntryWithProfile', array($activity, $this, $notice));
}
-
+
return $notice;
}
{
$notice = null;
- $oprofile = $this->checkAuthorship($activity);
-
- if (empty($oprofile)) {
- common_log(LOG_INFO, "No author matched share activity");
+ try {
+ $profile = ActivityUtils::checkAuthorship($activity, $this->localProfile());
+ } catch (ServerException $e) {
return null;
}
+ // The id URI will be used as a unique identifier for the notice,
+ // protecting against duplicate saves. It isn't required to be a URL;
+ // tag: URIs for instance are found in Google Buzz feeds.
+ $dupe = Notice::getKV('uri', $activity->id);
+ if ($dupe instanceof Notice) {
+ common_log(LOG_INFO, "OStatus: ignoring duplicate post: {$activity->id}");
+ return $dupe;
+ }
+
if (count($activity->objects) != 1) {
- throw new ClientException(_m("Can only handle share activities with exactly one object."));
+ // TRANS: Client exception thrown when trying to share multiple activities at once.
+ throw new ClientException(_m('Can only handle share activities with exactly one object.'));
}
$shared = $activity->objects[0];
- if (!($shared instanceof Activity)) {
- throw new ClientException(_m("Can only handle shared activities."));
+ if (!$shared instanceof Activity) {
+ // TRANS: Client exception thrown when trying to share a non-activity object.
+ throw new ClientException(_m('Can only handle shared activities.'));
}
- $other = Ostatus_profile::ensureActivityObjectProfile($shared->actor);
-
- // Save the item (or check for a dupe)
-
- $sharedNotice = $other->processActivity($shared, $method);
-
- if (empty($sharedNotice)) {
- $sharedId = ($shared->id) ? $shared->id : $shared->objects[0]->id;
- throw new ClientException(sprintf(_m("Failed to save activity %s"),
- $sharedId));
+ $sharedId = $shared->id;
+ if (!empty($shared->objects[0]->id)) {
+ // Because StatusNet since commit 8cc4660 sets $shared->id to a TagURI which
+ // fucks up federation, because the URI is no longer recognised by the origin.
+ // So we set it to the object ID if it exists, otherwise we trust $shared->id
+ $sharedId = $shared->objects[0]->id;
+ }
+ if (empty($sharedId)) {
+ throw new ClientException(_m('Shared activity does not have an id'));
}
- // The id URI will be used as a unique identifier for for the notice,
- // protecting against duplicate saves. It isn't required to be a URL;
- // tag: URIs for instance are found in Google Buzz feeds.
-
- $sourceUri = $activity->id;
-
- $dupe = Notice::staticGet('uri', $sourceUri);
- if ($dupe) {
- common_log(LOG_INFO, "OStatus: ignoring duplicate post: $sourceUri");
- return $dupe;
+ // First check if we have the shared activity. This has to be done first, because
+ // we can't use these functions to "ensureActivityObjectProfile" of a local user,
+ // who might be the creator of the shared activity in question.
+ $sharedNotice = Notice::getKV('uri', $sharedId);
+ if (!$sharedNotice instanceof Notice) {
+ // If no locally stored notice is found, process it!
+ // TODO: Remember to check Deleted_notice!
+ // TODO: If a post is shared that we can't retrieve - what to do?
+ try {
+ $other = self::ensureActivityObjectProfile($shared->actor);
+ $sharedNotice = $other->processActivity($shared, $method);
+ if (!$sharedNotice instanceof Notice) {
+ // And if we apparently can't get the shared notice, we'll abort the whole thing.
+ // TRANS: Client exception thrown when saving an activity share fails.
+ // TRANS: %s is a share ID.
+ throw new ClientException(sprintf(_m('Failed to save activity %s.'), $sharedId));
+ }
+ } catch (FeedSubException $e) {
+ // Remote feed could not be found or verified, should we
+ // transform this into an "RT @user Blah, blah, blah..."?
+ common_log(LOG_INFO, __METHOD__ . ' got a ' . get_class($e) . ': ' . $e->getMessage());
+ return null;
+ }
}
- // We'll also want to save a web link to the original notice, if provided.
+ // We'll want to save a web link to the original notice, if provided.
$sourceUrl = null;
if ($activity->link) {
} else if (!empty($activity->title)) {
$sourceContent = $activity->title;
} else {
- // @fixme fetch from $sourceUrl?
+ // @todo FIXME: Fetch from $sourceUrl?
// TRANS: Client exception. %s is a source URI.
- throw new ClientException(sprintf(_m('No content for notice %s.'),$sourceUri));
+ throw new ClientException(sprintf(_m('No content for notice %s.'), $activity->id));
}
// Get (safe!) HTML and text versions of the content
- $rendered = $this->purify($sourceContent);
- $content = html_entity_decode(strip_tags($rendered), ENT_QUOTES, 'UTF-8');
+ $rendered = common_purify($sourceContent);
+ $content = common_strip_html($rendered);
$shortened = common_shorten_links($content);
if (Notice::contentTooLong($shortened)) {
$attachment = $this->saveHTMLFile($activity->title, $rendered);
- $summary = html_entity_decode(strip_tags($activity->summary), ENT_QUOTES, 'UTF-8');
+ $summary = common_strip_html($activity->summary);
if (empty($summary)) {
$summary = $content;
}
$options = array('is_local' => Notice::REMOTE,
'url' => $sourceUrl,
- 'uri' => $sourceUri,
+ 'uri' => $activity->id,
'rendered' => $rendered,
'replies' => array(),
'groups' => array(),
}
if ($activity->context) {
- // Any individual or group attn: targets?
- $replies = $activity->context->attention;
- $options['groups'] = $this->filterReplies($oprofile, $replies);
- $options['replies'] = $replies;
+ // TODO: context->attention
+ list($options['groups'], $options['replies'])
+ = self::filterAttention($profile, $activity->context->attention);
// Maintain direct reply associations
- // @fixme what about conversation ID?
+ // @todo FIXME: What about conversation ID?
if (!empty($activity->context->replyToID)) {
- $orig = Notice::staticGet('uri',
+ $orig = Notice::getKV('uri',
$activity->context->replyToID);
- if (!empty($orig)) {
+ if ($orig instanceof Notice) {
$options['reply_to'] = $orig->id;
}
}
// Atom enclosures -> attachment URLs
foreach ($activity->enclosures as $href) {
- // @fixme save these locally or....?
+ // @todo FIXME: Save these locally or....?
$options['urls'][] = $href;
}
- $notice = Notice::saveNew($oprofile->profile_id,
+ $notice = Notice::saveNew($profile->id,
$content,
'ostatus',
$options);
* @param Activity $activity
* @param string $method 'push' or 'salmon'
* @return mixed saved Notice or false
- * @fixme break up this function, it's getting nasty long
+ * @todo FIXME: Break up this function, it's getting nasty long
*/
public function processPost($activity, $method)
{
$notice = null;
- $oprofile = $this->checkAuthorship($activity);
-
- if (empty($oprofile)) {
- return null;
- }
+ $profile = ActivityUtils::checkAuthorship($activity, $this->localProfile());
// It's not always an ActivityObject::NOTE, but... let's just say it is.
$note = $activity->objects[0];
- // The id URI will be used as a unique identifier for for the notice,
+ // The id URI will be used as a unique identifier for the notice,
// protecting against duplicate saves. It isn't required to be a URL;
// tag: URIs for instance are found in Google Buzz feeds.
$sourceUri = $note->id;
- $dupe = Notice::staticGet('uri', $sourceUri);
- if ($dupe) {
+ $dupe = Notice::getKV('uri', $sourceUri);
+ if ($dupe instanceof Notice) {
common_log(LOG_INFO, "OStatus: ignoring duplicate post: $sourceUri");
return $dupe;
}
} else if (!empty($note->title)) {
$sourceContent = $note->title;
} else {
- // @fixme fetch from $sourceUrl?
+ // @todo FIXME: Fetch from $sourceUrl?
// TRANS: Client exception. %s is a source URI.
throw new ClientException(sprintf(_m('No content for notice %s.'),$sourceUri));
}
// Get (safe!) HTML and text versions of the content
- $rendered = $this->purify($sourceContent);
- $content = html_entity_decode(strip_tags($rendered), ENT_QUOTES, 'UTF-8');
+ $rendered = common_purify($sourceContent);
+ $content = common_strip_html($rendered);
$shortened = common_shorten_links($content);
if (Notice::contentTooLong($shortened)) {
$attachment = $this->saveHTMLFile($note->title, $rendered);
- $summary = html_entity_decode(strip_tags($note->summary), ENT_QUOTES, 'UTF-8');
+ $summary = common_strip_html($note->summary);
if (empty($summary)) {
$summary = $content;
}
}
if ($activity->context) {
- // Any individual or group attn: targets?
- $replies = $activity->context->attention;
- $options['groups'] = $this->filterReplies($oprofile, $replies);
- $options['replies'] = $replies;
+ // TODO: context->attention
+ list($options['groups'], $options['replies'])
+ = self::filterAttention($profile, $activity->context->attention);
// Maintain direct reply associations
- // @fixme what about conversation ID?
+ // @todo FIXME: What about conversation ID?
if (!empty($activity->context->replyToID)) {
- $orig = Notice::staticGet('uri',
- $activity->context->replyToID);
- if (!empty($orig)) {
+ $orig = Notice::getKV('uri', $activity->context->replyToID);
+ if ($orig instanceof Notice) {
$options['reply_to'] = $orig->id;
}
}
+ if (!empty($activity->context->conversation)) {
+ // we store the URI here, Notice class can look it up later
+ $options['conversation'] = $activity->context->conversation;
+ }
$location = $activity->context->location;
if ($location) {
// Atom enclosures -> attachment URLs
foreach ($activity->enclosures as $href) {
- // @fixme save these locally or....?
+ // @todo FIXME: Save these locally or....?
$options['urls'][] = $href;
}
try {
- $saved = Notice::saveNew($oprofile->profile_id,
+ $saved = Notice::saveNew($profile->id,
$content,
'ostatus',
$options);
- if ($saved) {
+ if ($saved instanceof Notice) {
Ostatus_source::saveNew($saved, $this, $method);
if (!empty($attachment)) {
File_to_post::processNew($attachment->id, $saved->id);
return $saved;
}
- /**
- * Clean up HTML
- */
- protected function purify($html)
- {
- require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
- $config = array('safe' => 1,
- 'deny_attribute' => 'id,style,on*');
- return htmLawed($html, $config);
- }
-
/**
* Filters a list of recipient ID URIs to just those for local delivery.
- * @param Ostatus_profile local profile of sender
+ * @param Profile local profile of sender
* @param array in/out &$attention_uris set of URIs, will be pruned on output
* @return array of group IDs
*/
- protected function filterReplies($sender, &$attention_uris)
+ static public function filterAttention(Profile $sender, array $attention)
{
- common_log(LOG_DEBUG, "Original reply recipients: " . implode(', ', $attention_uris));
+ common_log(LOG_DEBUG, "Original reply recipients: " . implode(', ', array_keys($attention)));
$groups = array();
$replies = array();
- foreach (array_unique($attention_uris) as $recipient) {
+ foreach ($attention as $recipient=>$type) {
// Is the recipient a local user?
- $user = User::staticGet('uri', $recipient);
- if ($user) {
- // @fixme sender verification, spam etc?
+ $user = User::getKV('uri', $recipient);
+ if ($user instanceof User) {
+ // @todo FIXME: Sender verification, spam etc?
$replies[] = $recipient;
continue;
}
// Is the recipient a local group?
- // $group = User_group::staticGet('uri', $recipient);
+ // TODO: $group = User_group::getKV('uri', $recipient);
$id = OStatusPlugin::localGroupFromUrl($recipient);
if ($id) {
- $group = User_group::staticGet('id', $id);
- if ($group) {
+ $group = User_group::getKV('id', $id);
+ if ($group instanceof User_group) {
// Deliver to all members of this local group if allowed.
- $profile = $sender->localProfile();
- if ($profile->isMember($group)) {
+ if ($sender->isMember($group)) {
$groups[] = $group->id;
} else {
- common_log(LOG_DEBUG, "Skipping reply to local group $group->nickname as sender $profile->id is not a member");
+ common_log(LOG_DEBUG, sprintf('Skipping reply to local group %s as sender %d is not a member', $group->getNickname(), $sender->id));
}
continue;
} else {
// Is the recipient a remote user or group?
try {
- $oprofile = Ostatus_profile::ensureProfileURI($recipient);
+ $oprofile = self::ensureProfileURI($recipient);
if ($oprofile->isGroup()) {
// Deliver to local members of this remote group.
- // @fixme sender verification?
+ // @todo FIXME: Sender verification?
$groups[] = $oprofile->group_id;
} else {
// may be canonicalized or something
- $replies[] = $oprofile->uri;
+ $replies[] = $oprofile->getUri();
}
continue;
} catch (Exception $e) {
}
}
- $attention_uris = $replies;
common_log(LOG_DEBUG, "Local reply recipients: " . implode(', ', $replies));
common_log(LOG_DEBUG, "Local group recipients: " . implode(', ', $groups));
- return $groups;
+ return array($groups, $replies);
}
/**
* @throws Exception on various error conditions
* @throws OStatusShadowException if this reference would obscure a local user/group
*/
- public static function ensureProfileURL($profile_url, $hints=array())
+ public static function ensureProfileURL($profile_url, array $hints=array())
{
$oprofile = self::getFromProfileURL($profile_url);
- if (!empty($oprofile)) {
+ if ($oprofile instanceof Ostatus_profile) {
return $oprofile;
}
$oprofile = self::getFromProfileURL($finalUrl);
- if (!empty($oprofile)) {
+ if ($oprofile instanceof Ostatus_profile) {
return $oprofile;
}
}
// Check if they've got an LRDD header
- $lrdd = LinkHeader::getLink($response, 'lrdd', 'application/xrd+xml');
-
- if (!empty($lrdd)) {
-
- $xrd = Discovery::fetchXrd($lrdd);
+ $lrdd = LinkHeader::getLink($response, 'lrdd');
+ try {
+ $xrd = new XML_XRD();
+ $xrd->loadFile($lrdd);
$xrdHints = DiscoveryHints::fromXRD($xrd);
-
$hints = array_merge($hints, $xrdHints);
+ } catch (Exception $e) {
+ // No hints available from XRD
}
// If discovery found a feedurl (probably from LRDD), use it.
*/
static function getFromProfileURL($profile_url)
{
- $profile = Profile::staticGet('profileurl', $profile_url);
-
- if (empty($profile)) {
+ $profile = Profile::getKV('profileurl', $profile_url);
+ if (!$profile instanceof Profile) {
return null;
}
- // Is it a known Ostatus profile?
-
- $oprofile = Ostatus_profile::staticGet('profile_id', $profile->id);
-
- if (!empty($oprofile)) {
+ try {
+ $oprofile = self::getFromProfile($profile);
+ // We found the profile, return it!
return $oprofile;
- }
-
- // Is it a local user?
-
- $user = User::staticGet('id', $profile->id);
-
- if (!empty($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
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
* @return Ostatus_profile
* @throws Exception
*/
- public static function ensureFeedURL($feed_url, $hints=array())
+ public static function ensureFeedURL($feed_url, array $hints=array())
{
+ $oprofile = Ostatus_profile::getKV('feeduri', $feed_url);
+ if ($oprofile instanceof Ostatus_profile) {
+ return $oprofile;
+ }
+
$discover = new FeedDiscovery();
$feeduri = $discover->discoverFromFeedURL($feed_url);
$huburi = $discover->getHubLink();
$hints['hub'] = $huburi;
- $salmonuri = $discover->getAtomLink(Salmon::NS_REPLIES);
+
+ // XXX: NS_REPLIES is deprecated anyway, so let's remove it in the future.
+ $salmonuri = $discover->getAtomLink(Salmon::REL_SALMON)
+ ?: $discover->getAtomLink(Salmon::NS_REPLIES);
$hints['salmon'] = $salmonuri;
- if (!$huburi && !common_config('feedsub', 'fallback_hub')) {
+ if (!$huburi && !common_config('feedsub', 'fallback_hub') && !common_config('feedsub', 'nohub')) {
// We can only deal with folks with a PuSH hub
+ // unless we have something similar available locally.
throw new FeedSubNoHubException();
}
*
* @param DOMElement $feedEl root element of a loaded Atom feed
* @param array $hints additional discovery information passed from higher levels
- * @fixme should this be marked public?
+ * @todo FIXME: Should this be marked public?
* @return Ostatus_profile
* @throws Exception
*/
- public static function ensureAtomFeed($feedEl, $hints)
+ public static function ensureAtomFeed(DOMElement $feedEl, array $hints)
{
$author = ActivityUtils::getFeedAuthor($feedEl);
*
* @param DOMElement $feedEl root element of a loaded RSS feed
* @param array $hints additional discovery information passed from higher levels
- * @fixme should this be marked public?
+ * @todo FIXME: Should this be marked public?
* @return Ostatus_profile
* @throws Exception
*/
- public static function ensureRssChannel($feedEl, $hints)
+ public static function ensureRssChannel(DOMElement $feedEl, array $hints)
{
// Special-case for Posterous. They have some nice metadata in their
// posterous:author elements. We should use them instead of the channel.
}
}
- // @fixme we should check whether this feed has elements
+ // @todo FIXME: We should check whether this feed has elements
// with different <author> or <dc:creator> elements, and... I dunno.
// Do something about that.
* Download and update given avatar image
*
* @param string $url
+ * @return Avatar The Avatar we have on disk. (seldom used)
* @throws Exception in various failure cases
*/
- protected function updateAvatar($url)
+ public function updateAvatar($url, $force=false)
{
- if ($url == $this->avatar) {
- // We've already got this one.
- return;
+ try {
+ // If avatar URL differs: update. If URLs were identical but we're forced: update.
+ if ($url == $this->avatar && !$force) {
+ // If there's no locally stored avatar, throw an exception and continue fetching below.
+ $avatar = Avatar::getUploaded($this->localProfile()) instanceof Avatar;
+ return $avatar;
+ }
+ } catch (NoAvatarException $e) {
+ // No avatar available, let's fetch it.
}
+
if (!common_valid_http_url($url)) {
// TRANS: Server exception. %s is a URL.
throw new ServerException(sprintf(_m('Invalid avatar URL %s.'), $url));
}
- if ($this->isGroup()) {
- $self = $this->localGroup();
- } else {
- $self = $this->localProfile();
- }
- if (!$self) {
- throw new ServerException(sprintf(
- // TRANS: Server exception. %s is a URI.
- _m('Tried to update avatar for unsaved remote profile %s.'),
- $this->uri));
- }
+ $self = $this->localProfile();
- // @fixme this should be better encapsulated
+ // @todo FIXME: This should be better encapsulated
// ripped from oauthstore.php (for old OMB client)
$temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
try {
- if (!copy($url, $temp_filename)) {
- // TRANS: Server exception. %s is a URL.
- throw new ServerException(sprintf(_m('Unable to fetch avatar from %s.'), $url));
+ $imgData = HTTPClient::quickGet($url);
+ // Make sure it's at least an image file. ImageFile can do the rest.
+ if (false === getimagesizefromstring($imgData)) {
+ throw new UnsupportedMediaException(_('Downloaded group avatar was not an image.'));
}
+ file_put_contents($temp_filename, $imgData);
+ unset($imgData); // No need to carry this in memory.
if ($this->isGroup()) {
$id = $this->group_id;
} else {
$id = $this->profile_id;
}
- // @fixme should we be using different ids?
+ // @todo FIXME: Should we be using different ids?
$imagefile = new ImageFile($id, $temp_filename);
$filename = Avatar::filename($id,
image_type_to_extension($imagefile->type),
unlink($temp_filename);
throw $e;
}
- // @fixme hardcoded chmod is lame, but seems to be necessary to
+ // @todo FIXME: Hardcoded chmod is lame, but seems to be necessary to
// keep from accidentally saving images from command-line (queues)
// that can't be read from web server, which causes hard-to-notice
// problems later on:
// http://status.net/open-source/issues/2663
chmod(Avatar::path($filename), 0644);
- $profile = $this->localProfile();
-
- if (!empty($profile)) {
- $profile->setOriginal($filename);
- }
+ $self->setOriginal($filename);
$orig = clone($this);
$this->avatar = $url;
$this->update($orig);
+
+ return Avatar::getUploaded($self);
}
/**
* @param array $hints
* @return mixed URL string or false
*/
- public static function getActivityObjectAvatar($object, $hints=array())
+ public static function getActivityObjectAvatar(ActivityObject $object, array $hints=array())
{
if ($object->avatarLinks) {
$best = false;
* @param DOMElement $feed
* @return string
*/
- protected static function getAvatar($actor, $feed)
+ protected static function getAvatar(ActivityObject $actor, DOMElement $feed)
{
$url = '';
$icon = '';
}
if ($url) {
$opts = array('allowed_schemes' => array('http', 'https'));
- if (Validate::uri($url, $opts)) {
+ if (common_valid_http_url($url)) {
return $url;
}
}
* @return Ostatus_profile
* @throws Exception
*/
- public static function ensureActorProfile($activity, $hints=array())
+ public static function ensureActorProfile(Activity $activity, array $hints=array())
{
return self::ensureActivityObjectProfile($activity->actor, $hints);
}
* @return Ostatus_profile
* @throws Exception
*/
- public static function ensureActivityObjectProfile($object, $hints=array())
+ public static function ensureActivityObjectProfile(ActivityObject $object, array $hints=array())
{
$profile = self::getActivityObjectProfile($object);
- if ($profile) {
+ if ($profile instanceof Ostatus_profile) {
$profile->updateFromActivityObject($object, $hints);
} else {
$profile = self::createActivityObjectProfile($object, $hints);
* @return mixed matching Ostatus_profile or false if none known
* @throws ServerException if feed info invalid
*/
- public static function getActorProfile($activity)
+ public static function getActorProfile(Activity $activity)
{
return self::getActivityObjectProfile($activity->actor);
}
* @return mixed matching Ostatus_profile or false if none known
* @throws ServerException if feed info invalid
*/
- protected static function getActivityObjectProfile($object)
+ protected static function getActivityObjectProfile(ActivityObject $object)
{
$uri = self::getActivityObjectProfileURI($object);
- return Ostatus_profile::staticGet('uri', $uri);
+ return Ostatus_profile::getKV('uri', $uri);
}
/**
* @return string
* @throws ServerException if feed info invalid
*/
- protected static function getActivityObjectProfileURI($object)
+ protected static function getActivityObjectProfileURI(ActivityObject $object)
{
if ($object->id) {
if (ActivityUtils::validateUri($object->id)) {
}
/**
- * @fixme validate stuff somewhere
+ * @todo FIXME: Validate stuff somewhere.
*/
/**
*
* @return Ostatus_profile
*/
- protected static function createActivityObjectProfile($object, $hints=array())
+ protected static function createActivityObjectProfile(ActivityObject $object, array $hints=array())
{
$homeuri = $object->id;
$discover = false;
throw new Exception(_m('No profile URI.'));
}
- $user = User::staticGet('uri', $homeuri);
- if ($user) {
+ $user = User::getKV('uri', $homeuri);
+ if ($user instanceof User) {
// TRANS: Exception.
throw new Exception(_m('Local user cannot be referenced as remote.'));
}
throw new Exception(_m('Local group cannot be referenced as remote.'));
}
- $ptag = Profile_list::staticGet('uri', $homeuri);
- if ($ptag) {
- $local_user = User::staticGet('id', $ptag->tagger);
- if (!empty($local_user)) {
+ $ptag = Profile_list::getKV('uri', $homeuri);
+ if ($ptag instanceof Profile_list) {
+ $local_user = User::getKV('id', $ptag->tagger);
+ if ($local_user instanceof User) {
// TRANS: Exception.
throw new Exception(_m('Local list cannot be referenced as remote.'));
}
$discover = new FeedDiscovery();
$discover->discoverFromFeedURL($hints['feedurl']);
}
- $salmonuri = $discover->getAtomLink(Salmon::NS_REPLIES);
+ // XXX: NS_REPLIES is deprecated anyway, so let's remove it in the future.
+ $salmonuri = $discover->getAtomLink(Salmon::REL_SALMON)
+ ?: $discover->getAtomLink(Salmon::NS_REPLIES);
}
if (array_key_exists('hub', $hints)) {
$huburi = $discover->getHubLink();
}
- if (!$huburi && !common_config('feedsub', 'fallback_hub')) {
+ if (!$huburi && !common_config('feedsub', 'fallback_hub') && !common_config('feedsub', 'nohub')) {
// We can only deal with folks with a PuSH hub
throw new FeedSubNoHubException();
}
self::updateProfile($profile, $object, $hints);
$oprofile->profile_id = $profile->insert();
- if (!$oprofile->profile_id) {
- // TRANS: Server exception.
+ if ($oprofile->profile_id === false) {
+ // TRANS: Server exception.
throw new ServerException(_m('Cannot save local profile.'));
}
} else if ($object->type == ActivityObject::GROUP) {
+ $profile = new Profile();
+ $profile->query('BEGIN');
+
$group = new User_group();
$group->uri = $homeuri;
$group->created = common_sql_now();
self::updateGroup($group, $object, $hints);
+ // TODO: We should do this directly in User_group->insert()!
+ // currently it's duplicated in User_group->update()
+ // AND User_group->register()!!!
+ $fields = array(/*group field => profile field*/
+ 'nickname' => 'nickname',
+ 'fullname' => 'fullname',
+ 'mainpage' => 'profileurl',
+ 'homepage' => 'homepage',
+ 'description' => 'bio',
+ 'location' => 'location',
+ 'created' => 'created',
+ 'modified' => 'modified',
+ );
+ foreach ($fields as $gf=>$pf) {
+ $profile->$pf = $group->$gf;
+ }
+ $profile_id = $profile->insert();
+ if ($profile_id === false) {
+ $profile->query('ROLLBACK');
+ throw new ServerException(_('Profile insertion failed.'));
+ }
+
+ $group->profile_id = $profile_id;
+
$oprofile->group_id = $group->insert();
- if (!$oprofile->group_id) {
+ if ($oprofile->group_id === false) {
+ $profile->query('ROLLBACK');
// TRANS: Server exception.
throw new ServerException(_m('Cannot save local profile.'));
}
+
+ $profile->query('COMMIT');
} else if ($object->type == ActivityObject::_LIST) {
$ptag = new Profile_list();
$ptag->uri = $homeuri;
self::updatePeopletag($ptag, $object, $hints);
$oprofile->peopletag_id = $ptag->insert();
- if (!$oprofile->peopletag_id) {
- // TRANS: Server exception.
+ if ($oprofile->peopletag_id === false) {
+ // TRANS: Server exception.
throw new ServerException(_m('Cannot save local list.'));
}
}
$ok = $oprofile->insert();
- if (!$ok) {
+ if ($ok === false) {
// TRANS: Server exception.
throw new ServerException(_m('Cannot save OStatus profile.'));
}
* @param ActivityObject $object
* @param array $hints
*/
- public function updateFromActivityObject($object, $hints=array())
+ public function updateFromActivityObject(ActivityObject $object, array $hints=array())
{
if ($this->isGroup()) {
$group = $this->localGroup();
}
}
- public static function updateProfile($profile, $object, $hints=array())
+ public static function updateProfile(Profile $profile, ActivityObject $object, array $hints=array())
{
$orig = clone($profile);
$profile->profileurl = $object->link;
} else if (array_key_exists('profileurl', $hints)) {
$profile->profileurl = $hints['profileurl'];
- } else if (Validate::uri($object->id, array('allowed_schemes' => array('http', 'https')))) {
+ } else if (common_valid_http_url($object->id)) {
$profile->profileurl = $object->id;
}
}
}
- // @fixme tags/categories
+ // @todo FIXME: tags/categories
// @todo tags from categories
if ($profile->id) {
}
}
- protected static function updateGroup($group, $object, $hints=array())
+ protected static function updateGroup(User_group $group, ActivityObject $object, array $hints=array())
{
$orig = clone($group);
$group->location = self::getActivityObjectLocation($object, $hints);
$group->homepage = self::getActivityObjectHomepage($object, $hints);
- if ($group->id) {
+ if ($group->id) { // If no id, we haven't called insert() yet, so don't run update()
common_log(LOG_DEBUG, "Updating OStatus group $group->id from remote info $object->id: " . var_export($object, true) . var_export($hints, true));
$group->update($orig);
}
}
- protected static function updatePeopletag($tag, $object, $hints=array()) {
+ protected static function updatePeopletag($tag, ActivityObject $object, array $hints=array()) {
$orig = clone($tag);
$tag->tag = $object->title;
}
}
- protected static function getActivityObjectHomepage($object, $hints=array())
+ protected static function getActivityObjectHomepage(ActivityObject $object, array $hints=array())
{
$homepage = null;
$poco = $object->poco;
return $homepage;
}
- protected static function getActivityObjectLocation($object, $hints=array())
+ protected static function getActivityObjectLocation(ActivityObject $object, array $hints=array())
{
$location = null;
}
if (!empty($location)) {
- if (mb_strlen($location) > 255) {
- $location = mb_substr($note, 0, 255 - 3) . ' … ';
+ if (mb_strlen($location) > 191) { // not 255 because utf8mb4 takes more space
+ $location = mb_substr($note, 0, 191 - 3) . ' … ';
}
}
return $location;
}
- protected static function getActivityObjectBio($object, $hints=array())
+ protected static function getActivityObjectBio(ActivityObject $object, array $hints=array())
{
$bio = null;
return $bio;
}
- public static function getActivityObjectNickname($object, $hints=array())
+ public static function getActivityObjectNickname(ActivityObject $object, array $hints=array())
{
if ($object->poco) {
if (!empty($object->poco->preferredUsername)) {
// TRANS: Exception.
throw new Exception(_m('Not a valid webfinger address.'));
}
- $oprofile = Ostatus_profile::staticGet('uri', $uri);
- if (!empty($oprofile)) {
+ $oprofile = Ostatus_profile::getKV('uri', $uri);
+ if ($oprofile instanceof Ostatus_profile) {
return $oprofile;
}
}
// Try looking it up
- $oprofile = Ostatus_profile::staticGet('uri', 'acct:'.$addr);
+ $oprofile = Ostatus_profile::getKV('uri', Discovery::normalize($addr));
- if (!empty($oprofile)) {
- self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
+ if ($oprofile instanceof Ostatus_profile) {
+ self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->getUri());
return $oprofile;
}
$xrd = $disco->lookup($addr);
} catch (Exception $e) {
// Save negative cache entry so we don't waste time looking it up again.
- // @fixme distinguish temporary failures?
+ // @todo FIXME: Distinguish temporary failures?
self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), null);
// TRANS: Exception.
throw new Exception(_m('Not a valid webfinger address.'));
}
// If we got a feed URL, try that
+ $feedUrl = null;
if (array_key_exists('feedurl', $hints)) {
+ $feedUrl = $hints['feedurl'];
try {
common_log(LOG_INFO, "Discovery on acct:$addr with feed URL " . $hints['feedurl']);
$oprofile = self::ensureFeedURL($hints['feedurl'], $hints);
- self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
+ self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->getUri());
return $oprofile;
} catch (Exception $e) {
common_log(LOG_WARNING, "Failed creating profile from feed URL '$feedUrl': " . $e->getMessage());
}
// If we got a profile page, try that!
+ $profileUrl = null;
if (array_key_exists('profileurl', $hints)) {
+ $profileUrl = $hints['profileurl'];
try {
common_log(LOG_INFO, "Discovery on acct:$addr with profile URL $profileUrl");
$oprofile = self::ensureProfileURL($hints['profileurl'], $hints);
- self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
+ self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->getUri());
return $oprofile;
} catch (OStatusShadowException $e) {
// We've ended up with a remote reference to a local user or group.
- // @fixme ideally we should be able to say who it was so we can
+ // @todo FIXME: Ideally we should be able to say who it was so we can
// go back and refer to it the regular way
throw $e;
} catch (Exception $e) {
common_log(LOG_WARNING, "Failed creating profile from profile URL '$profileUrl': " . $e->getMessage());
// keep looking
//
- // @fixme this means an error discovering from profile page
+ // @todo FIXME: This means an error discovering from profile page
// may give us a corrupt entry using the webfinger URI, which
// will obscure the correct page-keyed profile later on.
}
$profile->nickname = self::nicknameFromUri($uri);
$profile->created = common_sql_now();
- if (isset($profileUrl)) {
+ if (!is_null($profileUrl)) {
$profile->profileurl = $profileUrl;
}
$profile_id = $profile->insert();
- if (!$profile_id) {
+ if ($profile_id === false) {
common_log_db_error($profile, 'INSERT', __FILE__);
// TRANS: Exception. %s is a webfinger address.
throw new Exception(sprintf(_m('Could not save profile for "%s".'),$addr));
$oprofile->profile_id = $profile_id;
$oprofile->created = common_sql_now();
- if (isset($feedUrl)) {
- $profile->feeduri = $feedUrl;
+ if (!is_null($feedUrl)) {
+ $oprofile->feeduri = $feedUrl;
}
$result = $oprofile->insert();
- if (!$result) {
+ if ($result === false) {
+ $profile->delete();
common_log_db_error($oprofile, 'INSERT', __FILE__);
// TRANS: Exception. %s is a webfinger address.
throw new Exception(sprintf(_m('Could not save OStatus profile for "%s".'),$addr));
}
- self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
+ self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->getUri());
return $oprofile;
}
'text/html');
$filepath = File::path($filename);
+ $fileurl = File::url($filename);
file_put_contents($filepath, $final);
$file = new File;
$file->filename = $filename;
- $file->url = File::url($filename);
+ $file->urlhash = File::hashurl($fileurl);
+ $file->url = $fileurl;
$file->size = filesize($filepath);
$file->date = time();
$file->mimetype = 'text/html';
// First, try to query it
- $oprofile = Ostatus_profile::staticGet('uri', $uri);
+ $oprofile = Ostatus_profile::getKV('uri', $uri);
- // If unfound, do discovery stuff
+ if ($oprofile instanceof Ostatus_profile) {
+ return $oprofile;
+ }
- if (empty($oprofile)) {
- if (preg_match("/^(\w+)\:(.*)/", $uri, $match)) {
- $protocol = $match[1];
- switch ($protocol) {
- case 'http':
- case 'https':
- $oprofile = Ostatus_profile::ensureProfileURL($uri);
- break;
- case 'acct':
- case 'mailto':
- $rest = $match[2];
- $oprofile = Ostatus_profile::ensureWebfinger($rest);
- break;
- default:
- // TRANS: Server exception.
- // TRANS: %1$s is a protocol, %2$s is a URI.
- throw new ServerException(sprintf(_m('Unrecognized URI protocol for profile: %1$s (%2$s).'),
- $protocol,
- $uri));
- break;
- }
- } else {
- // TRANS: Server exception. %s is a URI.
- throw new ServerException(sprintf(_m('No URI protocol for profile: %s.'),$uri));
+ // If unfound, do discovery stuff
+ if (preg_match("/^(\w+)\:(.*)/", $uri, $match)) {
+ $protocol = $match[1];
+ switch ($protocol) {
+ case 'http':
+ case 'https':
+ $oprofile = self::ensureProfileURL($uri);
+ break;
+ case 'acct':
+ case 'mailto':
+ $rest = $match[2];
+ $oprofile = self::ensureWebfinger($rest);
+ break;
+ default:
+ // TRANS: Server exception.
+ // TRANS: %1$s is a protocol, %2$s is a URI.
+ throw new ServerException(sprintf(_m('Unrecognized URI protocol for profile: %1$s (%2$s).'),
+ $protocol,
+ $uri));
+ break;
}
+ } else {
+ // TRANS: Server exception. %s is a URI.
+ throw new ServerException(sprintf(_m('No URI protocol for profile: %s.'),$uri));
}
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.
// Groups can't post notices in StatusNet.
common_log(LOG_WARNING,
"OStatus: skipping post with group listed ".
- "as author: $oprofile->uri in feed from $this->uri");
- return false;
+ "as author: " . $oprofile->getUri() . " in feed from " . $this->getUri());
+ throw new ServerException('Activity author is a non-actor');
}
} else {
$actor = $activity->actor;
if (empty($actor)) {
// OK here! assume the default
- } else if ($actor->id == $this->uri || $actor->link == $this->uri) {
+ } else if ($actor->id == $this->getUri() || $actor->link == $this->getUri()) {
$this->updateFromActivityObject($actor);
} else if ($actor->id) {
// We have an ActivityStreams actor with an explicit ID that doesn't match the feed owner.
// Most likely this is a plain ol' blog feed of some kind which
// doesn't match our expectations. We'll take the entry, but ignore
// the <author> info.
- common_log(LOG_WARNING, "Got an actor '{$actor->title}' ({$actor->id}) on single-user feed for {$this->uri}");
+ common_log(LOG_WARNING, "Got an actor '{$actor->title}' ({$actor->id}) on single-user feed for " . $this->getUri());
} else {
// Plain <author> without ActivityStreams actor info.
// We'll just ignore this info for now and save the update under the feed's identity.
$oprofile = $this;
}
- return $oprofile;
+ return $oprofile->localProfile();
}
}
projects / quix0rs-gnu-social.git / blobdiff