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

processFeed would abort on certain errors where findLocalObject failed

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-01-05 15:00:07 +01:00
parent ab93bb009c
commit 3471213d1c
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Favorite/classes/Fave.php
View File

@ -353,6 +353,8 @@ class Fave extends Managed_DataObject
*/ */
static public function parseActivityObject(ActivityObject $actobj, Notice $stored) static public function parseActivityObject(ActivityObject $actobj, Notice $stored)
{ {
// throws exception if nothing was found, but it could also be a non-Notice...
// FIXME: This should only test _one_ URI (and not the links etc.) though a function like this could be useful in other cases
$local = ActivityUtils::findLocalObject($actobj->getIdentifiers()); $local = ActivityUtils::findLocalObject($actobj->getIdentifiers());
if (!$local instanceof Notice) { if (!$local instanceof Notice) {
// $local always returns something, but this was not what we expected. Something is wrong. // $local always returns something, but this was not what we expected. Something is wrong.

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

@ -473,6 +473,9 @@ class Ostatus_profile extends Managed_DataObject
$this->processEntry($entry, $feed, $source); $this->processEntry($entry, $feed, $source);
} catch (AlreadyFulfilledException $e) { } catch (AlreadyFulfilledException $e) {
common_debug('We already had this entry: '.$e->getMessage()); common_debug('We already had this entry: '.$e->getMessage());
} catch (ServerException $e) {
// FIXME: This should be UnknownUriException and the ActivityUtils:: findLocalObject should only test one URI
common_log(LOG_ERR, 'Entry threw exception while processing a feed from '.$source.': '.$e->getMessage());
} }
} }
} }