X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOStatus%2Fclasses%2FOstatus_profile.php;h=c63bf84dd155d5d1bc15eb901cc2b407bb8cbcab;hb=200721a2f45dbfa5463ba32165c7f60e517f0622;hp=7ddf1f4d8a8646abd4d5b908c677d5753b333e95;hpb=3bf1478f97162676ffc90e4c1306c0fd9e16cf01;p=quix0rs-gnu-social.git diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index 7ddf1f4d8a..c63bf84dd1 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 @@ -93,10 +101,10 @@ class Ostatus_profile extends Managed_DataObject } $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; } /** @@ -105,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; } /** @@ -361,9 +372,10 @@ class Ostatus_profile extends Managed_DataObject * send immediately but won't get the return value. * * @param mixed $entry XML string, Notice, or Activity + * @param Profile $actor Acting profile * @return boolean success */ - public function notifyDeferred($entry, $actor) + public function notifyDeferred($entry, Profile $actor) { if ($this->salmonuri) { $data = array('salmonuri' => $this->salmonuri, @@ -469,14 +481,14 @@ class Ostatus_profile extends Managed_DataObject * * @return Notice Notice representing the new (or existing) activity */ - public function processEntry($entry, $feed, $source) + public function processEntry(DOMElement $entry, DOMElement $feed, $source) { $activity = new Activity($entry, $feed); return $this->processActivity($activity, $source); } // TODO: Make this throw an exception - public function processActivity($activity, $source) + public function processActivity(Activity $activity, $source) { $notice = null; @@ -502,9 +514,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"); } @@ -516,214 +525,6 @@ class Ostatus_profile extends Managed_DataObject return $notice; } - public function processShare($activity, $method) - { - $notice = null; - - 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) { - // 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 = common_strip_html($rendered); - - $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 = common_strip_html($activity->summary); - 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']) - = self::filterAttention($profile, $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($profile->id, - $content, - 'ostatus', - $options); - - return $notice; - } - /** * Process an incoming post activity from this remote feed. * @param Activity $activity @@ -731,7 +532,7 @@ class Ostatus_profile extends Managed_DataObject * @return mixed saved Notice or false * @todo FIXME: Break up this function, it's getting nasty long */ - public function processPost($activity, $method) + public function processPost(Activity $activity, $method) { $notice = null; @@ -777,7 +578,7 @@ class Ostatus_profile extends Managed_DataObject // Get (safe!) HTML and text versions of the content - $rendered = $this->purify($sourceContent); + $rendered = common_purify($sourceContent); $content = common_strip_html($rendered); $shortened = common_shorten_links($content); @@ -848,6 +649,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) { @@ -899,17 +704,6 @@ 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 Profile local profile of sender @@ -918,7 +712,7 @@ class Ostatus_profile extends Managed_DataObject */ static public function filterAttention(Profile $sender, array $attention) { - common_log(LOG_DEBUG, "Original reply recipients: " . implode(', ', array_keys($attention))); + common_debug("Original reply recipients: " . implode(', ', array_keys($attention))); $groups = array(); $replies = array(); foreach ($attention as $recipient=>$type) { @@ -940,11 +734,11 @@ class Ostatus_profile extends Managed_DataObject 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)); + common_debug(sprintf('Skipping reply to local group %s as sender %d is not a member', $group->getNickname(), $sender->id)); } continue; } else { - common_log(LOG_DEBUG, "Skipping reply to bogus group $recipient"); + common_debug("Skipping reply to bogus group $recipient"); } } @@ -962,12 +756,12 @@ class Ostatus_profile extends Managed_DataObject continue; } catch (Exception $e) { // Neither a recognizable local nor remote user! - common_log(LOG_DEBUG, "Skipping reply to unrecognized profile $recipient: " . $e->getMessage()); + common_debug("Skipping reply to unrecognized profile $recipient: " . $e->getMessage()); } } - common_log(LOG_DEBUG, "Local reply recipients: " . implode(', ', $replies)); - common_log(LOG_DEBUG, "Local group recipients: " . implode(', ', $groups)); + common_debug("Local reply recipients: " . implode(', ', $replies)); + common_debug("Local group recipients: " . implode(', ', $groups)); return array($groups, $replies); } @@ -981,7 +775,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); @@ -1114,8 +908,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); @@ -1129,8 +928,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(); } @@ -1157,7 +957,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); @@ -1183,7 +983,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. @@ -1218,49 +1018,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'); + $temp_filename = tempnam(common_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, @@ -1283,6 +1081,8 @@ class Ostatus_profile extends Managed_DataObject $orig = clone($this); $this->avatar = $url; $this->update($orig); + + return Avatar::getUploaded($self); } /** @@ -1292,7 +1092,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; @@ -1321,7 +1121,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 = ''; @@ -1372,7 +1172,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); } @@ -1388,7 +1188,7 @@ 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 instanceof Ostatus_profile) { @@ -1404,7 +1204,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); } @@ -1414,7 +1214,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); @@ -1429,7 +1229,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)) { @@ -1462,13 +1262,13 @@ 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; if (!$homeuri) { - common_log(LOG_DEBUG, __METHOD__ . " empty actor profile URI: " . var_export($activity, true)); + common_debug(__METHOD__ . " empty actor profile URI: " . var_export($activity, true)); // TRANS: Exception. throw new Exception(_m('No profile URI.')); } @@ -1522,7 +1322,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(); } @@ -1627,7 +1427,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(); @@ -1650,7 +1450,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); @@ -1710,12 +1510,12 @@ class Ostatus_profile extends Managed_DataObject // @todo tags from categories if ($profile->id) { - common_log(LOG_DEBUG, "Updating OStatus profile $profile->id from remote info $object->id: " . var_export($object, true) . var_export($hints, true)); + common_debug("Updating OStatus profile $profile->id from remote info $object->id: " . var_export($object, true) . var_export($hints, true)); $profile->update($orig); } } - 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); @@ -1734,12 +1534,12 @@ class Ostatus_profile extends Managed_DataObject $group->homepage = self::getActivityObjectHomepage($object, $hints); 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)); + common_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(Peopletag $tag, ActivityObject $object, array $hints=array()) { $orig = clone($tag); $tag->tag = $object->title; @@ -1755,12 +1555,12 @@ class Ostatus_profile extends Managed_DataObject $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)); + common_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()) + protected static function getActivityObjectHomepage(ActivityObject $object, array $hints=array()) { $homepage = null; $poco = $object->poco; @@ -1777,7 +1577,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; @@ -1789,8 +1589,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) . ' … '; } } @@ -1799,7 +1599,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; @@ -1823,7 +1623,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)) { @@ -2081,13 +1881,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'; @@ -2134,7 +1936,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. @@ -2159,7 +1960,7 @@ class Ostatus_profile extends Managed_DataObject } else { $actor = $activity->actor; - if (empty($actor)) { + if (!$actor instanceof Profile) { // OK here! assume the default } else if ($actor->id == $this->getUri() || $actor->link == $this->getUri()) { $this->updateFromActivityObject($actor);