From 8bbf3f3699beefe6dccce0b349ce7912a28f1bc2 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 23 Nov 2022 21:10:57 +0000 Subject: [PATCH 1/3] "MIRROR_FORWARDED" is no more --- src/Model/Item.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 48c578e85f..911e4216f0 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -2312,7 +2312,7 @@ class Item $datarray2 = $datarray; Logger::info('remote-self start', ['contact' => $contact['url'], 'remote_self'=> $contact['remote_self'], 'item' => $datarray]); - if ($contact['remote_self'] == Contact::MIRROR_OWN_POST) { + if (in_array($contact['remote_self'], [Contact::MIRROR_OWN_POST, Contact::MIRROR_FORWARDED])) { $self = DBA::selectFirst('contact', ['id', 'name', 'url', 'thumb'], ['uid' => $contact['uid'], 'self' => true]); if (DBA::isResult($self)) { @@ -2358,8 +2358,8 @@ class Item $result = self::insert($datarray2); Logger::info('remote-self post original item', ['contact' => $contact['url'], 'result'=> $result, 'item' => $datarray2]); } else { - $datarray["app"] = "Feed"; - $result = true; + Logger::info('No valid mirroring option', ['uid' => $contact['uid'], 'id' => $contact['id'], 'network' => $contact['network'], 'remote_self' => $contact['remote_self']]); + return false; } return (bool)$result; From a6ff817f47b0ced88d996c464ca6c1a11920356e Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 23 Nov 2022 21:47:47 +0000 Subject: [PATCH 2/3] Update added --- src/Model/Item.php | 2 +- static/dbstructure.config.php | 2 +- update.php | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 911e4216f0..0390730fd8 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -2312,7 +2312,7 @@ class Item $datarray2 = $datarray; Logger::info('remote-self start', ['contact' => $contact['url'], 'remote_self'=> $contact['remote_self'], 'item' => $datarray]); - if (in_array($contact['remote_self'], [Contact::MIRROR_OWN_POST, Contact::MIRROR_FORWARDED])) { + if ($contact['remote_self'] == Contact::MIRROR_OWN_POST) { $self = DBA::selectFirst('contact', ['id', 'name', 'url', 'thumb'], ['uid' => $contact['uid'], 'self' => true]); if (DBA::isResult($self)) { diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 53289addfb..942f2237d5 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -55,7 +55,7 @@ use Friendica\Database\DBA; if (!defined('DB_UPDATE_VERSION')) { - define('DB_UPDATE_VERSION', 1490); + define('DB_UPDATE_VERSION', 1491); } return [ diff --git a/update.php b/update.php index c7e2428af9..2ee753ead2 100644 --- a/update.php +++ b/update.php @@ -1121,3 +1121,9 @@ function update_1481() DBA::e("UPDATE `post-collection` INNER JOIN `post` ON `post`.`uri-id` = `post-collection`.`uri-id` SET `post-collection`.`author-id` = `post`.`author-id` WHERE `post-collection`.`author-id` IS null"); return Update::SUCCESS; } + +function update_1491() +{ + DBA::update('contact', ['remote_self' => Contact::MIRROR_OWN_POST], ['remote_self' => Contact::MIRROR_FORWARDED]); + return Update::SUCCESS; +} \ No newline at end of file From 3ee594bb1fd2cd523ac8ac2a7c4ef83a768f3a7d Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 23 Nov 2022 22:05:36 +0000 Subject: [PATCH 3/3] Updated database.sql --- database.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database.sql b/database.sql index 1a7c0f3731..8fa20be52c 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ -- Friendica 2022.12-dev (Giant Rhubarb) --- DB_UPDATE_VERSION 1490 +-- DB_UPDATE_VERSION 1491 -- ------------------------------------------