From a0b00aee304c7ac183cc61ea0fd727214ed9e856 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 9 Mar 2020 06:50:01 +0100 Subject: [PATCH] Additional logging and additional path for fetching posts --- src/Protocol/Diaspora.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index fd20991108..bddca062e8 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -1476,7 +1476,8 @@ class Diaspora public static function fetchByURL($url, $uid = 0) { // Check for Diaspora (and Friendica) typical paths - if (!preg_match("=(https?://.+)/(?:posts|display)/([a-zA-Z0-9-_@.:%]+[a-zA-Z0-9])=i", $url, $matches)) { + if (!preg_match("=(https?://.+)/(?:posts|display|objects)/([a-zA-Z0-9-_@.:%]+[a-zA-Z0-9])=i", $url, $matches)) { + Logger::info('Invalid url', ['url' => $url]); return false; } @@ -1484,15 +1485,20 @@ class Diaspora $item = Item::selectFirst(['id'], ['guid' => $guid, 'uid' => $uid]); if (DBA::isResult($item)) { + Logger::info('Found', ['id' => $item['id']]); return $item['id']; } - self::storeByGuid($guid, $matches[1], $uid); + Logger::info('Fetch GUID from origin', ['guid' => $guid, 'server' => $matches[1]]); + $ret = self::storeByGuid($guid, $matches[1], $uid); + Logger::info('Result', ['ret' => $ret]); $item = Item::selectFirst(['id'], ['guid' => $guid, 'uid' => $uid]); if (DBA::isResult($item)) { + Logger::info('Found', ['id' => $item['id']]); return $item['id']; } else { + Logger::info('Not found', ['guid' => $guid, 'uid' => $uid]); return false; } }