X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2FOStatus%2Fclasses%2FOstatus_profile.php;h=4d1b95e2b76eeedd30c5d31847f73a4be2b19a23;hb=a39f51c0441b22951412b2c00d88c34f39cb39c9;hp=bead2b068e8765508e8bbd50f84f330e76e1b0ac;hpb=3f9a16dc587b86b8912bc5a00dd1800c6475f73d;p=quix0rs-gnu-social.git diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index bead2b068e..4d1b95e2b7 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -51,12 +51,12 @@ class Ostatus_profile extends Managed_DataObject { 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), @@ -81,6 +81,14 @@ class Ostatus_profile extends Managed_DataObject 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 locally stored profile for this feed * @return Profile @@ -88,11 +96,15 @@ class Ostatus_profile extends Managed_DataObject */ public function localProfile() { + if ($this->isGroup()) { + return $this->localGroup()->getProfile(); + } + $profile = Profile::getKV('id', $this->profile_id); - if ($profile instanceof Profile) { - return $profile; + if (!$profile instanceof Profile) { + throw new NoProfileException($this->profile_id); } - throw new NoProfileException($this->profile_id); + return $profile; } /** @@ -101,10 +113,13 @@ class Ostatus_profile extends Managed_DataObject */ public function localGroup() { - if ($this->group_id) { - return User_group::getKV('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; } /** @@ -132,7 +147,7 @@ class Ostatus_profile extends Managed_DataObject } else if ($this->isPeopletag()) { return ActivityObject::fromPeopletag($this->localPeopletag()); } else { - return ActivityObject::fromProfile($this->localProfile()); + return $this->localProfile()->asActivityObject(); } } @@ -156,7 +171,7 @@ class Ostatus_profile extends Managed_DataObject $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); } } @@ -478,7 +493,7 @@ class Ostatus_profile extends Managed_DataObject // The "WithProfile" events were added later. - if (Event::handle('StartHandleFeedEntryWithProfile', array($activity, $this, &$notice)) && + if (Event::handle('StartHandleFeedEntryWithProfile', array($activity, $this->localProfile(), &$notice)) && Event::handle('StartHandleFeedEntry', array($activity))) { switch ($activity->verb) { @@ -498,9 +513,6 @@ class Ostatus_profile extends Managed_DataObject throw new ClientException(_m('Cannot handle that kind of post.')); } break; - case ActivityVerb::SHARE: - $notice = $this->processShare($activity, $source); - break; default: common_log(LOG_INFO, "Ignoring activity with unrecognized verb $activity->verb"); } @@ -512,215 +524,6 @@ class Ostatus_profile extends Managed_DataObject 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; - } - /** * Process an incoming post activity from this remote feed. * @param Activity $activity @@ -732,11 +535,7 @@ class Ostatus_profile extends Managed_DataObject { $notice = null; - $oprofile = $this->checkAuthorship($activity); - - if (!$oprofile instanceof Ostatus_profile) { - return null; - } + $profile = ActivityUtils::checkAuthorship($activity, $this->localProfile()); // It's not always an ActivityObject::NOTE, but... let's just say it is. @@ -778,8 +577,8 @@ class Ostatus_profile extends Managed_DataObject // 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); @@ -790,7 +589,7 @@ class Ostatus_profile extends Managed_DataObject 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; } @@ -839,7 +638,7 @@ class Ostatus_profile extends Managed_DataObject if ($activity->context) { // TODO: context->attention list($options['groups'], $options['replies']) - = $this->filterAttention($oprofile, $activity->context->attention); + = self::filterAttention($profile, $activity->context->attention); // Maintain direct reply associations // @todo FIXME: What about conversation ID? @@ -849,6 +648,10 @@ class Ostatus_profile extends Managed_DataObject $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) { @@ -882,14 +685,14 @@ class Ostatus_profile extends Managed_DataObject } try { - $saved = Notice::saveNew($oprofile->profile_id, + $saved = Notice::saveNew($profile->id, $content, 'ostatus', $options); if ($saved instanceof Notice) { Ostatus_source::saveNew($saved, $this, $method); - if (!empty($attachment)) { - File_to_post::processNew($attachment->id, $saved->id); + if ($attachment instanceof File) { + File_to_post::processNew($attachment, $saved); } } } catch (Exception $e) { @@ -900,24 +703,13 @@ class Ostatus_profile extends Managed_DataObject 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 filterAttention($sender, array $attention) + static public function filterAttention(Profile $sender, array $attention) { common_log(LOG_DEBUG, "Original reply recipients: " . implode(', ', array_keys($attention))); $groups = array(); @@ -937,16 +729,11 @@ class Ostatus_profile extends Managed_DataObject if ($id) { $group = User_group::getKV('id', $id); if ($group instanceof User_group) { - try { - // Deliver to all members of this local group if allowed. - $profile = $sender->localProfile(); - if ($profile->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"); - } - } catch (NoProfileException $e) { - // Sender has no profile! Do some garbage collection, please. + // Deliver to all members of this local group if allowed. + if ($sender->isMember($group)) { + $groups[] = $group->id; + } else { + common_log(LOG_DEBUG, sprintf('Skipping reply to local group %s as sender %d is not a member', $group->getNickname(), $sender->id)); } continue; } else { @@ -987,7 +774,7 @@ class Ostatus_profile extends Managed_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()) + public static function ensureProfileURL($profile_url, array $hints=array()) { $oprofile = self::getFromProfileURL($profile_url); @@ -1082,17 +869,17 @@ class Ostatus_profile extends Managed_DataObject return null; } - // Is it a known Ostatus profile? - $oprofile = Ostatus_profile::getKV('profile_id', $profile->id); - if ($oprofile instanceof Ostatus_profile) { + try { + $oprofile = self::getFromProfile($profile); + // We found the profile, return it! return $oprofile; - } - - // Is it a local user? - $user = User::getKV('id', $profile->id); - if ($user instanceof User) { - // @todo i18n FIXME: use sprintf and add i18n (?) - throw new OStatusShadowException($profile, "'$profile_url' is the profile for local user '{$user->nickname}'."); + } catch (NoResultException $e) { + // Could not find an OStatus profile, is it instead a local user? + $user = User::getKV('id', $profile->id); + if ($user instanceof User) { + // @todo i18n FIXME: use sprintf and add i18n (?) + throw new OStatusShadowException($profile, "'$profile_url' is the profile for local user '{$user->nickname}'."); + } } // Continue discovery; it's a remote profile @@ -1102,6 +889,16 @@ class Ostatus_profile extends Managed_DataObject return null; } + static function getFromProfile(Profile $profile) + { + $oprofile = new Ostatus_profile(); + $oprofile->profile_id = $profile->id; + if (!$oprofile->find(true)) { + throw new NoResultException($oprofile); + } + return $oprofile; + } + /** * Look up and if necessary create an Ostatus_profile for remote entity * with the given update feed. This should never return null -- you will @@ -1110,8 +907,13 @@ class Ostatus_profile extends Managed_DataObject * @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); @@ -1125,8 +927,9 @@ class Ostatus_profile extends Managed_DataObject ?: $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(); } @@ -1153,7 +956,7 @@ class Ostatus_profile extends Managed_DataObject * @return Ostatus_profile * @throws Exception */ - public static function ensureAtomFeed($feedEl, $hints) + public static function ensureAtomFeed(DOMElement $feedEl, array $hints) { $author = ActivityUtils::getFeedAuthor($feedEl); @@ -1179,7 +982,7 @@ class Ostatus_profile extends Managed_DataObject * @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. @@ -1214,49 +1017,47 @@ class Ostatus_profile extends Managed_DataObject * 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()) { - // FIXME: throw exception for localGroup - $self = $this->localGroup(); - } else { - // this throws an exception already - $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->getUri())); - } + $self = $this->localProfile(); // @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; } - // @todo FIXME: Should we be using different ids? - $imagefile = new ImageFile($id, $temp_filename); + $imagefile = new ImageFile(null, $temp_filename); $filename = Avatar::filename($id, image_type_to_extension($imagefile->type), null, @@ -1279,6 +1080,8 @@ class Ostatus_profile extends Managed_DataObject $orig = clone($this); $this->avatar = $url; $this->update($orig); + + return Avatar::getUploaded($self); } /** @@ -1288,7 +1091,7 @@ class Ostatus_profile extends Managed_DataObject * @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; @@ -1317,7 +1120,7 @@ class Ostatus_profile extends Managed_DataObject * @param DOMElement $feed * @return string */ - protected static function getAvatar($actor, $feed) + protected static function getAvatar(ActivityObject $actor, DOMElement $feed) { $url = ''; $icon = ''; @@ -1368,7 +1171,7 @@ class Ostatus_profile extends Managed_DataObject * @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); } @@ -1384,10 +1187,10 @@ class Ostatus_profile extends Managed_DataObject * @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); @@ -1400,7 +1203,7 @@ class Ostatus_profile extends Managed_DataObject * @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); } @@ -1410,7 +1213,7 @@ class Ostatus_profile extends Managed_DataObject * @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::getKV('uri', $uri); @@ -1425,7 +1228,7 @@ class Ostatus_profile extends Managed_DataObject * @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)) { @@ -1458,7 +1261,7 @@ class Ostatus_profile extends Managed_DataObject * * @return Ostatus_profile */ - protected static function createActivityObjectProfile($object, $hints=array()) + protected static function createActivityObjectProfile(ActivityObject $object, array $hints=array()) { $homeuri = $object->id; $discover = false; @@ -1518,7 +1321,7 @@ class Ostatus_profile extends Managed_DataObject $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(); } @@ -1623,7 +1426,7 @@ class Ostatus_profile extends Managed_DataObject * @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(); @@ -1646,7 +1449,7 @@ class Ostatus_profile extends Managed_DataObject } } - public static function updateProfile($profile, $object, $hints=array()) + public static function updateProfile(Profile $profile, ActivityObject $object, array $hints=array()) { $orig = clone($profile); @@ -1711,7 +1514,7 @@ class Ostatus_profile extends Managed_DataObject } } - protected static function updateGroup(User_group $group, $object, $hints=array()) + protected static function updateGroup(User_group $group, ActivityObject $object, array $hints=array()) { $orig = clone($group); @@ -1735,7 +1538,7 @@ class Ostatus_profile extends Managed_DataObject } } - 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; @@ -1756,7 +1559,7 @@ class Ostatus_profile extends Managed_DataObject } } - protected static function getActivityObjectHomepage($object, $hints=array()) + protected static function getActivityObjectHomepage(ActivityObject $object, array $hints=array()) { $homepage = null; $poco = $object->poco; @@ -1773,7 +1576,7 @@ class Ostatus_profile extends Managed_DataObject return $homepage; } - protected static function getActivityObjectLocation($object, $hints=array()) + protected static function getActivityObjectLocation(ActivityObject $object, array $hints=array()) { $location = null; @@ -1785,8 +1588,8 @@ class Ostatus_profile extends Managed_DataObject } 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) . ' … '; } } @@ -1795,7 +1598,7 @@ class Ostatus_profile extends Managed_DataObject return $location; } - protected static function getActivityObjectBio($object, $hints=array()) + protected static function getActivityObjectBio(ActivityObject $object, array $hints=array()) { $bio = null; @@ -1819,7 +1622,7 @@ class Ostatus_profile extends Managed_DataObject 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)) { @@ -1922,7 +1725,7 @@ class Ostatus_profile extends Managed_DataObject } // Try looking it up - $oprofile = Ostatus_profile::getKV('uri', 'acct:'.$addr); + $oprofile = Ostatus_profile::getKV('uri', Discovery::normalize($addr)); if ($oprofile instanceof Ostatus_profile) { self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->getUri()); @@ -1959,7 +1762,9 @@ class Ostatus_profile extends Managed_DataObject } // 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); @@ -1972,7 +1777,9 @@ class Ostatus_profile extends Managed_DataObject } // 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); @@ -2009,7 +1816,7 @@ class Ostatus_profile extends Managed_DataObject $profile->nickname = self::nicknameFromUri($uri); $profile->created = common_sql_now(); - if (isset($profileUrl)) { + if (!is_null($profileUrl)) { $profile->profileurl = $profileUrl; } @@ -2028,13 +1835,14 @@ class Ostatus_profile extends Managed_DataObject $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 === 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)); @@ -2072,13 +1880,15 @@ class Ostatus_profile extends Managed_DataObject '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'; @@ -2125,7 +1935,6 @@ class Ostatus_profile extends Managed_DataObject 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. @@ -2135,7 +1944,7 @@ class Ostatus_profile extends Managed_DataObject return $oprofile; } - function checkAuthorship($activity) + public function checkAuthorship(Activity $activity) { if ($this->isGroup() || $this->isPeopletag()) { // A group or propletag feed will contain posts from multiple authors. @@ -2145,7 +1954,7 @@ class Ostatus_profile extends Managed_DataObject common_log(LOG_WARNING, "OStatus: skipping post with group listed ". "as author: " . $oprofile->getUri() . " in feed from " . $this->getUri()); - return false; + throw new ServerException('Activity author is a non-actor'); } } else { $actor = $activity->actor; @@ -2170,7 +1979,7 @@ class Ostatus_profile extends Managed_DataObject $oprofile = $this; } - return $oprofile; + return $oprofile->localProfile(); } }