GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

URIFIX in Ostatus_profile, handle missing feedsub

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-06-25 11:59:31 +02:00
parent f93f02f424
commit d0c26fb1a4
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/OStatus/classes/Ostatus_profile.php
View File

@ -1842,22 +1842,28 @@ class Ostatus_profile extends Managed_DataObject
{ {
$orig = clone($this); $orig = clone($this);
common_debug('URIFIX These identities both say they are each other: "'.$orig->uri.'" and "'.$profile_uri.'"'); common_debug('URIFIX These identities both say they are each other: '._ve($orig->uri).' and '._ve($profile_uri));
$this->uri = $profile_uri; $this->uri = $profile_uri;
if (array_key_exists('feedurl', $hints)) { if (array_key_exists('feedurl', $hints) && common_valid_http_url($hints['feedurl'])) {
if (!empty($this->feeduri)) { try {
common_debug('URIFIX Changing FeedSub ['.$feedsub->id.'] feeduri "'.$feedsub->uri.'" to "'.$hints['feedurl']); $feedsub = FeedSub::getByUri($this->feeduri);
$feedsub = FeedSub::getKV('uri', $this->feeduri); common_debug('URIFIX Changing FeedSub id==['._ve($feedsub->id).'] feeduri '._ve($feedsub->uri).' to '._ve($hints['feedurl']));
$feedorig = clone($feedsub); $feedorig = clone($feedsub);
$feedsub->uri = $hints['feedurl']; $feedsub->uri = $hints['feedurl'];
$feedsub->updateWithKeys($feedorig); $feedsub->updateWithKeys($feedorig);
} else { } catch (EmptyPkeyValueException $e) {
common_debug('URIFIX Old Ostatus_profile did not have feedurl set, ensuring feed: '.$hints['feedurl']); common_debug('URIFIX Old Ostatus_profile did not have feedurl set, ensuring new feedurl: '._ve($hints['feedurl']));
FeedSub::ensureFeed($hints['feedurl']);
} catch (NoResultException $e) {
common_debug('URIFIX Missing FeedSub entry for the Ostatus_profile, ensuring new feedurl: '._ve($hints['feedurl']));
FeedSub::ensureFeed($hints['feedurl']); FeedSub::ensureFeed($hints['feedurl']);
} }
$this->feeduri = $hints['feedurl']; $this->feeduri = $hints['feedurl'];
} elseif (array_key_exists('feedurl')) {
common_log(LOG_WARN, 'The feedurl hint we got was not a valid HTTP URL: '._ve($hints['feedurl']));
} }
if (array_key_exists('salmon', $hints)) { if (array_key_exists('salmon', $hints)) {
common_debug('URIFIX Changing Ostatus_profile salmonuri from "'.$this->salmonuri.'" to "'.$hints['salmon'].'"'); common_debug('URIFIX Changing Ostatus_profile salmonuri from "'.$this->salmonuri.'" to "'.$hints['salmon'].'"');
$this->salmonuri = $hints['salmon']; $this->salmonuri = $hints['salmon'];