X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOStatus%2Fclasses%2FOstatus_profile.php;h=7ab5b7c8f030818d3e6fd32ff4caaf230123cd23;hb=bbada781b70d78d5c85b675c7add80a9263c5b30;hp=c4d857f22cdb57a4baac1825519d7b48ac246fd9;hpb=dc424ab63a91bf4c29198452d54543b8737b65ac;p=quix0rs-gnu-social.git diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index c4d857f22c..7ab5b7c8f0 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -25,7 +25,7 @@ if (!defined('STATUSNET')) { * @package OStatusPlugin * @maintainer Brion Vibber */ -class Ostatus_profile extends Memcached_DataObject +class Ostatus_profile extends Managed_DataObject { public $__table = 'ostatus_profile'; @@ -33,6 +33,7 @@ class Ostatus_profile extends Memcached_DataObject public $profile_id; public $group_id; + public $peopletag_id; public $feeduri; public $salmonuri; @@ -41,80 +42,43 @@ class Ostatus_profile extends Memcached_DataObject public $created; public $modified; - public /*static*/ function staticGet($k, $v=null) - { - return parent::staticGet(__CLASS__, $k, $v); - } - /** - * return table definition for DB_DataObject - * - * DB_DataObject needs to know something about the table to manipulate - * instances. This method provides all the DB_DataObject needs to know. + * Return table definition for Schema setup and DB_DataObject usage. * * @return array array of column definitions */ - function table() - { - return array('uri' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, - 'profile_id' => DB_DATAOBJECT_INT, - 'group_id' => DB_DATAOBJECT_INT, - 'feeduri' => DB_DATAOBJECT_STR, - 'salmonuri' => DB_DATAOBJECT_STR, - 'avatar' => DB_DATAOBJECT_STR, - 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL, - 'modified' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL); - } - static function schemaDef() { - return array(new ColumnDef('uri', 'varchar', - 255, false, 'PRI'), - new ColumnDef('profile_id', 'integer', - null, true, 'UNI'), - new ColumnDef('group_id', 'integer', - null, true, 'UNI'), - new ColumnDef('feeduri', 'varchar', - 255, true, 'UNI'), - new ColumnDef('salmonuri', 'text', - null, true), - new ColumnDef('avatar', 'text', - null, true), - new ColumnDef('created', 'datetime', - null, false), - new ColumnDef('modified', 'datetime', - null, false)); + return array( + 'fields' => array( + 'uri' => array('type' => 'varchar', 'length' => 255, '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), + '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'), + ), + 'foreign keys' => array( + 'ostatus_profile_profile_id_fkey' => array('profile', array('profile_id' => 'id')), + 'ostatus_profile_group_id_fkey' => array('user_group', array('group_id' => 'id')), + 'ostatus_profile_peopletag_id_fkey' => array('profile_list', array('peopletag_id' => 'id')), + ), + ); } - /** - * return key definitions for DB_DataObject - * - * DB_DataObject needs to know about keys that the table has; this function - * defines them. - * - * @return array key definitions - */ - function keys() + public function getUri() { - return array_keys($this->keyTypes()); - } - - /** - * return key definitions for Memcached_DataObject - * - * Our caching system uses the same key definitions, but uses a different - * method to get them. - * - * @return array key definitions - */ - function keyTypes() - { - return array('uri' => 'K', 'profile_id' => 'U', 'group_id' => 'U', 'feeduri' => 'U'); - } - - function sequenceKey() - { - return array(false, false, false); + return $this->uri; } /** @@ -124,7 +88,7 @@ class Ostatus_profile extends Memcached_DataObject public function localProfile() { if ($this->profile_id) { - return Profile::staticGet('id', $this->profile_id); + return Profile::getKV('id', $this->profile_id); } return null; } @@ -136,7 +100,19 @@ class Ostatus_profile extends Memcached_DataObject public function localGroup() { if ($this->group_id) { - return User_group::staticGet('id', $this->group_id); + return User_group::getKV('id', $this->group_id); + } + return null; + } + + /** + * Fetch the StatusNet-side peopletag for this feed + * @return Profile + */ + public function localPeopletag() + { + if ($this->peopletag_id) { + return Profile_list::getKV('id', $this->peopletag_id); } return null; } @@ -151,6 +127,8 @@ class Ostatus_profile extends Memcached_DataObject { if ($this->isGroup()) { return ActivityObject::fromGroup($this->localGroup()); + } else if ($this->isPeopletag()) { + return ActivityObject::fromPeopletag($this->localPeopletag()); } else { return ActivityObject::fromProfile($this->localProfile()); } @@ -162,7 +140,7 @@ class Ostatus_profile extends Memcached_DataObject * * 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 @@ -172,6 +150,9 @@ class Ostatus_profile extends Memcached_DataObject if ($this->isGroup()) { $noun = ActivityObject::fromGroup($this->localGroup()); return $noun->asString('activity:' . $element); + } else if ($this->isPeopletag()) { + $noun = ActivityObject::fromPeopletag($this->localPeopletag()); + return $noun->asString('activity:' . $element); } else { $noun = ActivityObject::fromProfile($this->localProfile()); return $noun->asString('activity:' . $element); @@ -183,16 +164,34 @@ class Ostatus_profile extends Memcached_DataObject */ function isGroup() { - if ($this->profile_id && !$this->group_id) { + if ($this->profile_id || $this->peopletag_id && !$this->group_id) { return false; - } else if ($this->group_id && !$this->profile_id) { + } else if ($this->group_id && !$this->profile_id && !$this->peopletag_id) { return true; - } else if ($this->group_id && $this->profile_id) { - // TRANS: Server exception. %s is a URI. - throw new ServerException(sprintf(_m('Invalid ostatus_profile state: both group and profile IDs set for %s.'),$this->uri)); + } 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->getUri())); } else { - // TRANS: Server exception. %s is a URI. - throw new ServerException(sprintf(_m('Invalid ostatus_profile state: both group and profile IDs empty for %s.'),$this->uri)); + // TRANS: Server exception. %s is a URI + throw new ServerException(sprintf(_m('Invalid ostatus_profile state: All IDs empty for %s.'), $this->getUri())); + } + } + + /** + * @return boolean true if this is a remote peopletag + */ + function isPeopletag() + { + if ($this->profile_id || $this->group_id && !$this->peopletag_id) { + return false; + } else if ($this->peopletag_id && !$this->profile_id && !$this->group_id) { + 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->getUri())); + } else { + // TRANS: Server exception. %s is a URI + throw new ServerException(sprintf(_m('Invalid ostatus_profile state: All IDs empty for %s.'), $this->getUri())); } } @@ -234,7 +233,7 @@ class Ostatus_profile extends Memcached_DataObject */ public function garbageCollect() { - $feedsub = FeedSub::staticGet('uri', $this->feeduri); + $feedsub = FeedSub::getKV('uri', $this->feeduri); return $feedsub->garbageCollect(); } @@ -252,8 +251,15 @@ class Ostatus_profile extends Memcached_DataObject if ($this->isGroup()) { $members = $this->localGroup()->getMembers(0, 1); $count = $members->N; + } else if ($this->isPeopletag()) { + $subscribers = $this->localPeopletag()->getSubscribers(0, 1); + $count = $subscribers->N; } else { - $count = $this->localProfile()->subscriberCount(); + $profile = $this->localProfile(); + $count = $profile->subscriberCount(); + if ($profile->hasLocalTags()) { + $count = 1; + } } common_log(LOG_INFO, __METHOD__ . " SUB COUNT BEFORE: $count"); @@ -273,7 +279,7 @@ class Ostatus_profile extends Memcached_DataObject * @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) + public function notify($actor, $verb, $object=null, $target=null) { if (!($actor instanceof Profile)) { $type = gettype($actor); @@ -288,14 +294,13 @@ class Ostatus_profile extends Memcached_DataObject $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 + // @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', @@ -315,6 +320,9 @@ class Ostatus_profile extends Memcached_DataObject $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(); @@ -334,12 +342,13 @@ class Ostatus_profile extends Memcached_DataObject * @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); } + common_debug(__CLASS__.' error: No salmonuri for Ostatus_profile uri: '.$this->uri); return false; } @@ -384,6 +393,8 @@ class Ostatus_profile extends Memcached_DataObject { if ($this->isGroup()) { return $this->localGroup()->getBestName(); + } else if ($this->isPeopletag()) { + return $this->localPeopletag()->getBestName(); } else { return $this->localProfile()->getBestName(); } @@ -403,7 +414,7 @@ class Ostatus_profile extends Memcached_DataObject 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. @@ -452,37 +463,263 @@ class Ostatus_profile extends Memcached_DataObject * @param DOMElement $entry * @param DOMElement $feed for context * @param string $source identifier ("push" or "salmon") + * + * @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; - if (Event::handle('StartHandleFeedEntryWithProfile', array($activity, $this)) && + // The "WithProfile" events were added later. + + if (Event::handle('StartHandleFeedEntryWithProfile', array($activity, $this, &$notice)) && Event::handle('StartHandleFeedEntry', array($activity))) { - // @todo process all activity objects - switch ($activity->objects[0]->type) { - case ActivityObject::ARTICLE: - case ActivityObject::BLOGENTRY: - case ActivityObject::NOTE: - case ActivityObject::STATUS: - case ActivityObject::COMMENT: - case null: - if ($activity->verb == ActivityVerb::POST) { - $this->processPost($activity, $source); - } else { - common_log(LOG_INFO, "Ignoring activity with unrecognized verb $activity->verb"); + switch ($activity->verb) { + case ActivityVerb::POST: + // @todo process all activity objects + switch ($activity->objects[0]->type) { + case ActivityObject::ARTICLE: + case ActivityObject::BLOGENTRY: + case ActivityObject::NOTE: + case ActivityObject::STATUS: + case ActivityObject::COMMENT: + case null: + $notice = $this->processPost($activity, $source); + break; + default: + // TRANS: Client exception. + throw new ClientException(_m('Cannot handle that kind of post.')); } break; + case ActivityVerb::SHARE: + $notice = $this->processShare($activity, $source); + break; default: - // TRANS: Client exception. - throw new ClientException(_m('Can\'t handle that kind of post.')); + common_log(LOG_INFO, "Ignoring activity with unrecognized verb $activity->verb"); } Event::handle('EndHandleFeedEntry', array($activity)); - Event::handle('EndHandleFeedEntryWithProfile', array($activity, $this)); + Event::handle('EndHandleFeedEntryWithProfile', array($activity, $this, $notice)); } + + return $notice; + } + + public function processShare($activity, $method) + { + $notice = null; + + $oprofile = $this->checkAuthorship($activity); + + if (!$oprofile instanceof Ostatus_profile) { + common_log(LOG_INFO, "No author matched share activity"); + 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) { + // 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) { + // TRANS: Client exception thrown when trying to share a non-activity object. + throw new ClientException(_m('Can only handle shared activities.')); + } + + $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')); + } + + // 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 want to save a web link to the original notice, if provided. + + $sourceUrl = null; + if ($activity->link) { + $sourceUrl = $activity->link; + } else if ($activity->link) { + $sourceUrl = $activity->link; + } else if (preg_match('!^https?://!', $activity->id)) { + $sourceUrl = $activity->id; + } + + // Use summary as fallback for content + + if (!empty($activity->content)) { + $sourceContent = $activity->content; + } else if (!empty($activity->summary)) { + $sourceContent = $activity->summary; + } else if (!empty($activity->title)) { + $sourceContent = $activity->title; + } else { + // @todo FIXME: Fetch from $sourceUrl? + // TRANS: Client exception. %s is a source URI. + 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'); + + $shortened = common_shorten_links($content); + + // If it's too long, try using the summary, and make the + // HTML an attachment. + + $attachment = null; + + if (Notice::contentTooLong($shortened)) { + $attachment = $this->saveHTMLFile($activity->title, $rendered); + $summary = html_entity_decode(strip_tags($activity->summary), ENT_QUOTES, 'UTF-8'); + if (empty($summary)) { + $summary = $content; + } + $shortSummary = common_shorten_links($summary); + if (Notice::contentTooLong($shortSummary)) { + $url = common_shorten_url($sourceUrl); + $shortSummary = substr($shortSummary, + 0, + Notice::maxContent() - (mb_strlen($url) + 2)); + $content = $shortSummary . ' ' . $url; + + // We mark up the attachment link specially for the HTML output + // so we can fold-out the full version inline. + + // @todo FIXME i18n: This tooltip will be saved with the site's default language + // TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime + // TRANS: this will usually be replaced with localised text from StatusNet core messages. + $showMoreText = _m('Show more'); + $attachUrl = common_local_url('attachment', + array('attachment' => $attachment->id)); + $rendered = common_render_text($shortSummary) . + '' . + '…' . + ''; + } + } + + $options = array('is_local' => Notice::REMOTE, + 'url' => $sourceUrl, + 'uri' => $activity->id, + 'rendered' => $rendered, + 'replies' => array(), + 'groups' => array(), + 'peopletags' => array(), + 'tags' => array(), + 'urls' => array(), + 'repeat_of' => $sharedNotice->id, + 'scope' => $sharedNotice->scope); + + // Check for optional attributes... + + if (!empty($activity->time)) { + $options['created'] = common_sql_date($activity->time); + } + + if ($activity->context) { + // TODO: context->attention + list($options['groups'], $options['replies']) + = $this->filterAttention($oprofile, $activity->context->attention); + + // Maintain direct reply associations + // @todo FIXME: What about conversation ID? + if (!empty($activity->context->replyToID)) { + $orig = Notice::getKV('uri', + $activity->context->replyToID); + if ($orig instanceof Notice) { + $options['reply_to'] = $orig->id; + } + } + + $location = $activity->context->location; + if ($location) { + $options['lat'] = $location->lat; + $options['lon'] = $location->lon; + if ($location->location_id) { + $options['location_ns'] = $location->location_ns; + $options['location_id'] = $location->location_id; + } + } + } + + if ($this->isPeopletag()) { + $options['peopletags'][] = $this->localPeopletag(); + } + + // Atom categories <-> hashtags + foreach ($activity->categories as $cat) { + if ($cat->term) { + $term = common_canonical_tag($cat->term); + if ($term) { + $options['tags'][] = $term; + } + } + } + + // Atom enclosures -> attachment URLs + foreach ($activity->enclosures as $href) { + // @todo FIXME: Save these locally or....? + $options['urls'][] = $href; + } + + $notice = Notice::saveNew($oprofile->profile_id, + $content, + 'ostatus', + $options); + + return $notice; } /** @@ -490,28 +727,30 @@ class Ostatus_profile extends Memcached_DataObject * @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 false; + if (!$oprofile instanceof Ostatus_profile) { + return null; } // 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 false; + return $dupe; } // We'll also want to save a web link to the original notice, if provided. @@ -533,7 +772,7 @@ class Ostatus_profile extends Memcached_DataObject } 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)); } @@ -567,7 +806,7 @@ class Ostatus_profile extends Memcached_DataObject // We mark up the attachment link specially for the HTML output // so we can fold-out the full version inline. - // @fixme I18N this tooltip will be saved with the site's default language + // @todo FIXME i18n: This tooltip will be saved with the site's default language // TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime // TRANS: this will usually be replaced with localised text from StatusNet core messages. $showMoreText = _m('Show more'); @@ -582,12 +821,13 @@ class Ostatus_profile extends Memcached_DataObject } } - $options = array('is_local' => Notice::REMOTE_OMB, + $options = array('is_local' => Notice::REMOTE, 'url' => $sourceUrl, 'uri' => $sourceUri, 'rendered' => $rendered, 'replies' => array(), 'groups' => array(), + 'peopletags' => array(), 'tags' => array(), 'urls' => array()); @@ -598,17 +838,15 @@ class Ostatus_profile extends Memcached_DataObject } 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']) + = $this->filterAttention($oprofile, $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; } } @@ -624,6 +862,10 @@ class Ostatus_profile extends Memcached_DataObject } } + if ($this->isPeopletag()) { + $options['peopletags'][] = $this->localPeopletag(); + } + // Atom categories <-> hashtags foreach ($activity->categories as $cat) { if ($cat->term) { @@ -636,7 +878,7 @@ class Ostatus_profile extends Memcached_DataObject // Atom enclosures -> attachment URLs foreach ($activity->enclosures as $href) { - // @fixme save these locally or....? + // @todo FIXME: Save these locally or....? $options['urls'][] = $href; } @@ -645,7 +887,7 @@ class Ostatus_profile extends Memcached_DataObject $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); @@ -676,26 +918,26 @@ class Ostatus_profile extends Memcached_DataObject * @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) + protected function filterAttention($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)) { @@ -711,14 +953,14 @@ class Ostatus_profile extends Memcached_DataObject // 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) { @@ -727,10 +969,9 @@ class Ostatus_profile extends Memcached_DataObject } } - $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); } /** @@ -743,12 +984,11 @@ class Ostatus_profile extends Memcached_DataObject * @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()) { $oprofile = self::getFromProfileURL($profile_url); - if (!empty($oprofile)) { + if ($oprofile instanceof Ostatus_profile) { return $oprofile; } @@ -776,7 +1016,7 @@ class Ostatus_profile extends Memcached_DataObject $oprofile = self::getFromProfileURL($finalUrl); - if (!empty($oprofile)) { + if ($oprofile instanceof Ostatus_profile) { return $oprofile; } } @@ -793,14 +1033,14 @@ class Ostatus_profile extends Memcached_DataObject // 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. @@ -834,25 +1074,20 @@ class Ostatus_profile extends Memcached_DataObject */ 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)) { + $oprofile = Ostatus_profile::getKV('profile_id', $profile->id); + if ($oprofile instanceof Ostatus_profile) { return $oprofile; } // Is it a local user? - - $user = User::staticGet('id', $profile->id); - - if (!empty($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}'."); } @@ -881,7 +1116,10 @@ class Ostatus_profile extends Memcached_DataObject $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')) { @@ -908,11 +1146,10 @@ class Ostatus_profile extends Memcached_DataObject * * @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) { $author = ActivityUtils::getFeedAuthor($feedEl); @@ -920,7 +1157,7 @@ class Ostatus_profile extends Memcached_DataObject if (empty($author)) { // XXX: make some educated guesses here // TRANS: Feed sub exception. - throw new FeedSubException(_m('Can\'t find enough profile '. + throw new FeedSubException(_m('Cannot find enough profile '. 'information to make a feed.')); } @@ -935,7 +1172,7 @@ class Ostatus_profile extends Memcached_DataObject * * @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 */ @@ -961,7 +1198,7 @@ class Ostatus_profile extends Memcached_DataObject } } - // @fixme we should check whether this feed has elements + // @todo FIXME: We should check whether this feed has elements // with different or elements, and... I dunno. // Do something about that. @@ -984,7 +1221,7 @@ class Ostatus_profile extends Memcached_DataObject } if (!common_valid_http_url($url)) { // TRANS: Server exception. %s is a URL. - throw new ServerException(sprintf(_m("Invalid avatar URL %s."), $url)); + throw new ServerException(sprintf(_m('Invalid avatar URL %s.'), $url)); } if ($this->isGroup()) { @@ -995,17 +1232,17 @@ class Ostatus_profile extends Memcached_DataObject 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)); + _m('Tried to update avatar for unsaved remote profile %s.'), + $this->getUri())); } - // @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)); + throw new ServerException(sprintf(_m('Unable to fetch avatar from %s.'), $url)); } if ($this->isGroup()) { @@ -1013,7 +1250,7 @@ class Ostatus_profile extends Memcached_DataObject } 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), @@ -1024,7 +1261,7 @@ class Ostatus_profile extends Memcached_DataObject 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: @@ -1046,7 +1283,6 @@ class Ostatus_profile extends Memcached_DataObject * @param array $hints * @return mixed URL string or false */ - public static function getActivityObjectAvatar($object, $hints=array()) { if ($object->avatarLinks) { @@ -1076,7 +1312,6 @@ class Ostatus_profile extends Memcached_DataObject * @param DOMElement $feed * @return string */ - protected static function getAvatar($actor, $feed) { $url = ''; @@ -1108,7 +1343,7 @@ class Ostatus_profile extends Memcached_DataObject } if ($url) { $opts = array('allowed_schemes' => array('http', 'https')); - if (Validate::uri($url, $opts)) { + if (common_valid_http_url($url)) { return $url; } } @@ -1128,7 +1363,6 @@ class Ostatus_profile extends Memcached_DataObject * @return Ostatus_profile * @throws Exception */ - public static function ensureActorProfile($activity, $hints=array()) { return self::ensureActivityObjectProfile($activity->actor, $hints); @@ -1145,7 +1379,6 @@ class Ostatus_profile extends Memcached_DataObject * @return Ostatus_profile * @throws Exception */ - public static function ensureActivityObjectProfile($object, $hints=array()) { $profile = self::getActivityObjectProfile($object); @@ -1175,7 +1408,7 @@ class Ostatus_profile extends Memcached_DataObject protected static function getActivityObjectProfile($object) { $uri = self::getActivityObjectProfileURI($object); - return Ostatus_profile::staticGet('uri', $uri); + return Ostatus_profile::getKV('uri', $uri); } /** @@ -1201,11 +1434,12 @@ class Ostatus_profile extends Memcached_DataObject if ($object->link && common_valid_http_url($object->link)) { return $object->link; } - throw new ServerException("No author ID URI found."); + // TRANS: Server exception. + throw new ServerException(_m('No author ID URI found.')); } /** - * @fixme validate stuff somewhere + * @todo FIXME: Validate stuff somewhere. */ /** @@ -1226,18 +1460,28 @@ class Ostatus_profile extends Memcached_DataObject if (!$homeuri) { common_log(LOG_DEBUG, __METHOD__ . " empty actor profile URI: " . var_export($activity, true)); - throw new Exception("No profile URI"); + // TRANS: Exception. + 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 can\'t be referenced as remote.')); + throw new Exception(_m('Local user cannot be referenced as remote.')); } if (OStatusPlugin::localGroupFromUrl($homeuri)) { // TRANS: Exception. - throw new Exception(_m('Local group can\'t be referenced as remote.')); + throw new Exception(_m('Local group cannot be referenced as remote.')); + } + + $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.')); + } } if (array_key_exists('feedurl', $hints)) { @@ -1254,7 +1498,9 @@ class Ostatus_profile extends Memcached_DataObject $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)) { @@ -1287,28 +1533,69 @@ class Ostatus_profile extends Memcached_DataObject self::updateProfile($profile, $object, $hints); $oprofile->profile_id = $profile->insert(); - if (!$oprofile->profile_id) { - // TRANS: Server exception. - throw new ServerException(_m('Can\'t save local profile.')); + if ($oprofile->profile_id === false) { + // TRANS: Server exception. + throw new ServerException(_m('Cannot save local profile.')); } - } else { + } 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; + $ptag->created = common_sql_now(); + self::updatePeopletag($ptag, $object, $hints); + + $oprofile->peopletag_id = $ptag->insert(); + if ($oprofile->peopletag_id === false) { // TRANS: Server exception. - throw new ServerException(_m('Can\'t save local profile.')); + throw new ServerException(_m('Cannot save local list.')); } } $ok = $oprofile->insert(); - if (!$ok) { + if ($ok === false) { // TRANS: Server exception. - throw new ServerException(_m('Can\'t save OStatus profile.')); + throw new ServerException(_m('Cannot save OStatus profile.')); } $avatar = self::getActivityObjectAvatar($object, $hints); @@ -1336,12 +1623,16 @@ class Ostatus_profile extends Memcached_DataObject if ($this->isGroup()) { $group = $this->localGroup(); self::updateGroup($group, $object, $hints); + } else if ($this->isPeopletag()) { + $ptag = $this->localPeopletag(); + self::updatePeopletag($ptag, $object, $hints); } else { $profile = $this->localProfile(); self::updateProfile($profile, $object, $hints); } + $avatar = self::getActivityObjectAvatar($object, $hints); - if ($avatar) { + if ($avatar && !isset($ptag)) { try { $this->updateAvatar($avatar); } catch (Exception $ex) { @@ -1376,7 +1667,7 @@ class Ostatus_profile extends Memcached_DataObject $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; } @@ -1406,7 +1697,7 @@ class Ostatus_profile extends Memcached_DataObject } } - // @fixme tags/categories + // @todo FIXME: tags/categories // @todo tags from categories if ($profile->id) { @@ -1415,7 +1706,7 @@ class Ostatus_profile extends Memcached_DataObject } } - protected static function updateGroup($group, $object, $hints=array()) + protected static function updateGroup(User_group $group, $object, $hints=array()) { $orig = clone($group); @@ -1433,12 +1724,33 @@ class Ostatus_profile extends Memcached_DataObject $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()) { + $orig = clone($tag); + + $tag->tag = $object->title; + + if (!empty($object->link)) { + $tag->mainpage = $object->link; + } else if (array_key_exists('profileurl', $hints)) { + $tag->mainpage = $hints['profileurl']; + } + + $tag->description = $object->summary; + $tagger = self::ensureActivityObjectProfile($object->owner); + $tag->tagger = $tagger->profile_id; + + if ($tag->id) { + common_log(LOG_DEBUG, "Updating OStatus peopletag $tag->id from remote info $object->id: " . var_export($object, true) . var_export($hints, true)); + $tag->update($orig); + } + } + protected static function getActivityObjectHomepage($object, $hints=array()) { $homepage = null; @@ -1598,18 +1910,17 @@ class Ostatus_profile extends Memcached_DataObject // 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::getKV('uri', 'acct:'.$addr); - $oprofile = Ostatus_profile::staticGet('uri', 'acct:'.$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; } @@ -1621,9 +1932,9 @@ class Ostatus_profile extends Memcached_DataObject $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. + // TRANS: Exception. throw new Exception(_m('Not a valid webfinger address.')); } @@ -1634,7 +1945,6 @@ class Ostatus_profile extends Memcached_DataObject $hints = array_merge($hints, $dhints); // If there's an Hcard, let's grab its info - if (array_key_exists('hcard', $hints)) { if (!array_key_exists('profileurl', $hints) || $hints['hcard'] != $hints['profileurl']) { @@ -1644,12 +1954,11 @@ class Ostatus_profile extends Memcached_DataObject } // If we got a feed URL, try that - if (array_key_exists('feedurl', $hints)) { 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()); @@ -1658,23 +1967,22 @@ class Ostatus_profile extends Memcached_DataObject } // If we got a profile page, try that! - if (array_key_exists('profileurl', $hints)) { 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. } @@ -1684,7 +1992,6 @@ class Ostatus_profile extends Memcached_DataObject // XXX: try FOAF if (array_key_exists('salmon', $hints)) { - $salmonEndpoint = $hints['salmon']; // An account URL, a salmon endpoint, and a dream? Not much to go @@ -1703,10 +2010,10 @@ class Ostatus_profile extends Memcached_DataObject $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('Couldn\'t save profile for "%s".'),$addr)); + throw new Exception(sprintf(_m('Could not save profile for "%s".'),$addr)); } $oprofile = new Ostatus_profile(); @@ -1722,18 +2029,18 @@ class Ostatus_profile extends Memcached_DataObject $result = $oprofile->insert(); - if (!$result) { + if ($result === false) { common_log_db_error($oprofile, 'INSERT', __FILE__); // TRANS: Exception. %s is a webfinger address. - throw new Exception(sprintf(_m('Couldn\'t save ostatus_profile for "%s".'),$addr)); + 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; } // TRANS: Exception. %s is a webfinger address. - throw new Exception(sprintf(_m('Couldn\'t find a valid profile for "%s".'),$addr)); + throw new Exception(sprintf(_m('Could not find a valid profile for "%s".'),$addr)); } /** @@ -1788,30 +2095,36 @@ class Ostatus_profile extends Memcached_DataObject // 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: - throw new ServerException("Unrecognized URI protocol for profile: $protocol ($uri)"); - break; - } - } else { - throw new ServerException("No URI protocol for profile: ($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; @@ -1819,15 +2132,14 @@ class Ostatus_profile extends Memcached_DataObject function checkAuthorship($activity) { - if ($this->isGroup()) { - // A group feed will contain posts from multiple authors. - // @fixme validate these profiles in some way! + if ($this->isGroup() || $this->isPeopletag()) { + // A group or propletag feed will contain posts from multiple authors. $oprofile = self::ensureActorProfile($activity); - if ($oprofile->isGroup()) { + if ($oprofile->isGroup() || $oprofile->isPeopletag()) { // 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"); + common_log(LOG_WARNING, + "OStatus: skipping post with group listed ". + "as author: " . $oprofile->getUri() . " in feed from " . $this->getUri()); return false; } } else { @@ -1835,7 +2147,7 @@ class Ostatus_profile extends Memcached_DataObject 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. @@ -1844,7 +2156,7 @@ class Ostatus_profile extends Memcached_DataObject // 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 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 without ActivityStreams actor info. // We'll just ignore this info for now and save the update under the feed's identity.