From 2b17e36a6762c205c2cd777e0386c42ae83610f2 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 15 Feb 2021 10:29:58 +0000 Subject: [PATCH] Rever item reshare handling, fixed database --- src/Model/Item.php | 2 +- src/Worker/ExpirePosts.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 397ea0b315..8fc7ce1357 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -1146,7 +1146,7 @@ class Item } $cid = Contact::getIdForURL($author['url'], $item['uid']); - if (empty($cid) || (!Contact::isSharing($cid, $item['uid'] && in_array($author['network'], Protocol::FEDERATED)))) { + if (empty($cid) || !Contact::isSharing($cid, $item['uid'])) { Logger::info('The resharer is not a following contact: quit', ['resharer' => $author['url'], 'uid' => $item['uid'], 'cid' => $cid]); return; } diff --git a/src/Worker/ExpirePosts.php b/src/Worker/ExpirePosts.php index 33c8e542ab..8d50c5d9d5 100644 --- a/src/Worker/ExpirePosts.php +++ b/src/Worker/ExpirePosts.php @@ -61,7 +61,7 @@ class ExpirePosts AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `post-user` WHERE (`origin` OR `event-id` != 0 OR `post-type` = ?) AND `parent-uri-id` = `post-thread`.`uri-id`) AND NOT `uri-id` IN (SELECT `uri-id` FROM `post-content` - WHERE `resource-id` != 0 AND `uri-id` = `post-thread`.`uri-id`) + WHERE `resource-id` != 0 AND `uri-id` = `post-thread`.`uri-id`)) ORDER BY `id` LIMIT ?", $expire_days, Item::PT_PERSONAL_NOTE, $limit); $rows = DBA::affectedRows();