From e1863951986ba5be173758324a00652bc5af870c Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 2 Sep 2023 05:22:44 +0000
Subject: [PATCH] Update function / rearrange tab order
---
doc/Accesskeys.md | 2 +-
src/Model/Post/Engagement.php | 4 ++++
src/Module/Conversation/Channel.php | 20 ++++++++++----------
update.php | 13 +++++++++++++
4 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/doc/Accesskeys.md b/doc/Accesskeys.md
index 255c7f65ca..df9629dc50 100644
--- a/doc/Accesskeys.md
+++ b/doc/Accesskeys.md
@@ -31,9 +31,9 @@ General
../channel
--------
-* h - what's hot
* y - for you
* f - followers
+* h - what's hot
../profile
--------
diff --git a/src/Model/Post/Engagement.php b/src/Model/Post/Engagement.php
index 48ce024d49..8c9ce1537a 100644
--- a/src/Model/Post/Engagement.php
+++ b/src/Model/Post/Engagement.php
@@ -87,6 +87,10 @@ class Engagement
Verb::getID(Activity::FOLLOW), Verb::getID(Activity::VIEW), Verb::getID(Activity::READ)
])
];
+ if (($engagement['comments'] == 0) && ($engagement['activities'] == 0)) {
+ Logger::debug('No comments nor activities. Engagement not stored', ['fields' => $engagement]);
+ return;
+ }
$ret = DBA::insert('post-engagement', $engagement, Database::INSERT_UPDATE);
Logger::debug('Engagement stored', ['fields' => $engagement, 'ret' => $ret]);
}
diff --git a/src/Module/Conversation/Channel.php b/src/Module/Conversation/Channel.php
index a6c20ef3d8..d6f3088fee 100644
--- a/src/Module/Conversation/Channel.php
+++ b/src/Module/Conversation/Channel.php
@@ -78,15 +78,6 @@ class Channel extends BaseModule
if (empty($_GET['mode']) || ($_GET['mode'] != 'raw')) {
$tabs = [];
- $tabs[] = [
- 'label' => DI::l10n()->t('Whats Hot'),
- 'url' => 'channel/' . self::WHATSHOT,
- 'sel' => self::$content == self::WHATSHOT ? 'active' : '',
- 'title' => DI::l10n()->t('Posts with a lot of interactions'),
- 'id' => 'channel-whatshot-tab',
- 'accesskey' => 'h'
- ];
-
$tabs[] = [
'label' => DI::l10n()->t('For you'),
'url' => 'channel/' . self::FORYOU,
@@ -104,6 +95,15 @@ class Channel extends BaseModule
'id' => 'channel-followers-tab',
'accesskey' => 'f'
];
+
+ $tabs[] = [
+ 'label' => DI::l10n()->t('Whats Hot'),
+ 'url' => 'channel/' . self::WHATSHOT,
+ 'sel' => self::$content == self::WHATSHOT ? 'active' : '',
+ 'title' => DI::l10n()->t('Posts with a lot of interactions'),
+ 'id' => 'channel-whatshot-tab',
+ 'accesskey' => 'h'
+ ];
$tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
$o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
@@ -189,7 +189,7 @@ class Channel extends BaseModule
self::$content = $this->parameters['content'] ?? '';
if (!self::$content) {
- self::$content = self::WHATSHOT;
+ self::$content = self::FORYOU;
}
if (!in_array(self::$content, [self::WHATSHOT, self::FORYOU, self::FOLLOWERS])) {
diff --git a/update.php b/update.php
index 59340eed83..9af01fd0fe 100644
--- a/update.php
+++ b/update.php
@@ -62,6 +62,7 @@ use Friendica\Model\User;
use Friendica\Protocol\Activity;
use Friendica\Protocol\Delivery;
use Friendica\Security\PermissionSet\Repository\PermissionSet;
+use Friendica\Util\DateTimeFormat;
// Post-update script of PR 5751
function update_1298()
@@ -1377,3 +1378,15 @@ function update_1525(): int
return Update::SUCCESS;
}
+
+function update_1531()
+{
+ $threads = Post::selectThread(Item::DELIVER_FIELDLIST, ["`uid` = ? AND `created` > ?", 0, DateTimeFormat::utc('now - ' . DI::config()->get('channel', 'engagement_hours') . ' hour')]);
+ while ($post = Post::fetch($threads)) {
+ $post['gravity'] = Item::GRAVITY_COMMENT;
+ Post\Engagement::storeFromItem($post);
+ }
+ DBA::close($threads);
+
+ return Update::SUCCESS;
+}
\ No newline at end of file
--
2.39.5