X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOStatus%2Fclasses%2FOstatus_profile.php;h=b94950138fd15d8acd8d615f1f4c38de4f66d0a2;hb=e45c784451f9a63e4cf87255d13ed90d568fb621;hp=2bcb9b4071495e5d4e95b82bcccce4836b141aa4;hpb=d0da552722ecf8395ec3438ed21c5e8b7b7be3a1;p=quix0rs-gnu-social.git diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index 2bcb9b4071..b94950138f 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -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; } /** @@ -132,7 +144,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 +168,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 +490,7 @@ class Ostatus_profile extends Managed_DataObject // The "WithProfile" events were added later. - if (Event::handle('StartHandleFeedEntryWithProfile', array($activity, $this, &$notice)) && + if (Event::handle('StartHandleFeedEntryWithProfile', array($activity, $this->localProfile(), &$notice)) && Event::handle('StartHandleFeedEntry', array($activity))) { switch ($activity->verb) { @@ -516,10 +528,9 @@ class Ostatus_profile extends Managed_DataObject { $notice = null; - $oprofile = $this->checkAuthorship($activity); - - if (!$oprofile instanceof Ostatus_profile) { - common_log(LOG_INFO, "No author matched share activity"); + try { + $profile = ActivityUtils::checkAuthorship($activity, $this->localProfile()); + } catch (ServerException $e) { return null; } @@ -608,7 +619,7 @@ 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'); + $content = common_strip_html($rendered); $shortened = common_shorten_links($content); @@ -619,7 +630,7 @@ class Ostatus_profile extends Managed_DataObject if (Notice::contentTooLong($shortened)) { $attachment = $this->saveHTMLFile($activity->title, $rendered); - $summary = html_entity_decode(strip_tags($activity->summary), ENT_QUOTES, 'UTF-8'); + $summary = common_strip_html($activity->summary); if (empty($summary)) { $summary = $content; } @@ -670,7 +681,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? @@ -713,7 +724,7 @@ class Ostatus_profile extends Managed_DataObject $options['urls'][] = $href; } - $notice = Notice::saveNew($oprofile->profile_id, + $notice = Notice::saveNew($profile->id, $content, 'ostatus', $options); @@ -732,11 +743,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. @@ -779,7 +786,7 @@ 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'); + $content = common_strip_html($rendered); $shortened = common_shorten_links($content); @@ -790,7 +797,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 +846,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 +856,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,7 +893,7 @@ class Ostatus_profile extends Managed_DataObject } try { - $saved = Notice::saveNew($oprofile->profile_id, + $saved = Notice::saveNew($profile->id, $content, 'ostatus', $options); @@ -913,11 +924,11 @@ class Ostatus_profile extends Managed_DataObject /** * 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 +948,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 +993,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 +1088,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 +1108,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,7 +1126,7 @@ 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()) { $discover = new FeedDiscovery(); @@ -1125,8 +1141,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 +1170,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 +1196,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. @@ -1288,7 +1305,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 +1334,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 +1385,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,7 +1401,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) { @@ -1400,7 +1417,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 +1427,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 +1442,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 +1475,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 +1535,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 +1640,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 +1663,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 +1728,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 +1752,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 +1773,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 +1790,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; @@ -1795,7 +1812,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 +1836,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 +1939,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 +1976,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 +1991,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 +2030,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 +2049,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)); @@ -2135,7 +2157,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 +2167,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 +2192,7 @@ class Ostatus_profile extends Managed_DataObject $oprofile = $this; } - return $oprofile; + return $oprofile->localProfile(); } }