From: Michael Date: Fri, 1 Sep 2023 22:28:25 +0000 (+0000) Subject: Configuration is now stored in the "channel" section X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=59a822ee872647b3680220ead282438c857d5f5b;p=friendica.git Configuration is now stored in the "channel" section --- diff --git a/src/Model/Contact/Relation.php b/src/Model/Contact/Relation.php index 94b5f63ffd..a8d093bc72 100644 --- a/src/Model/Contact/Relation.php +++ b/src/Model/Contact/Relation.php @@ -781,7 +781,7 @@ class Relation */ public static function calculateInteractionScore(int $uid) { - $days = DI::config()->get('system', 'interaction_score_days'); + $days = DI::config()->get('channel', 'interaction_score_days'); $contact_id = Contact::getPublicIdByUserId($uid); Logger::debug('Calculation - start', ['uid' => $uid, 'cid' => $contact_id, 'days' => $days]); diff --git a/src/Model/Post/Engagement.php b/src/Model/Post/Engagement.php index 84d106b7ab..2d1f40b6ce 100644 --- a/src/Model/Post/Engagement.php +++ b/src/Model/Post/Engagement.php @@ -25,6 +25,7 @@ use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Database\Database; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Item; use Friendica\Model\Post; @@ -69,7 +70,7 @@ class Engagement return; } - if ($parent['created'] < DateTimeFormat::utc('now - 1 day')) { + if ($parent['created'] < DateTimeFormat::utc('now - ' . DI::config()->get('channel', 'engagement_hours') . ' 24 hour')) { Logger::debug('Post is too old', ['uri-id' => $item['uri-id'], 'parent-uri-id' => $item['parent-uri-id'], 'created' => $parent['created']]); return; } @@ -92,7 +93,7 @@ class Engagement public static function expire() { - DBA::delete('post-engagement', ["`created` < ?", DateTimeFormat::utc('now - 1 day')]); + DBA::delete('post-engagement', ["`created` < ?", DateTimeFormat::utc('now - ' . DI::config()->get('channel', 'engagement_hours') . ' 24 hour')]); Logger::notice('Cleared expired engagements', ['rows' => DBA::affectedRows()]); } } diff --git a/src/Module/Conversation/Channel.php b/src/Module/Conversation/Channel.php index 5881cafdaa..3503a96d46 100644 --- a/src/Module/Conversation/Channel.php +++ b/src/Module/Conversation/Channel.php @@ -237,9 +237,8 @@ class Channel extends BaseModule */ protected static function getItems() { - $post = DBA::selectToArray('post-engagement', ['comments'], [], ['order' => ['comments' => true], 'limit' => [100, 1]]); - if (self::$content == self::WHATSHOT) { + $post = DBA::selectToArray('post-engagement', ['comments'], [], ['order' => ['comments' => true], 'limit' => [DI::config()->get('channel', 'hot_posts_item_limit'), 1]]); $comments = $post[0]['comments'] ?? 0; if (!is_null(self::$accountType)) { $condition = ["`comments` >= ? AND `contact-type` = ?", $comments, self::$accountType];