From: Michael <heluecht@pirati.ca>
Date: Sun, 7 Jan 2024 18:36:47 +0000 (+0000)
Subject: New field "publish" for channels
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0f1ce4be28722dad5c256b816c80a035e75e7bf7;p=friendica.git

New field "publish" for channels
---

diff --git a/src/Content/Conversation/Repository/UserDefinedChannel.php b/src/Content/Conversation/Repository/UserDefinedChannel.php
index d78d1cc1a0..5b8317b865 100644
--- a/src/Content/Conversation/Repository/UserDefinedChannel.php
+++ b/src/Content/Conversation/Repository/UserDefinedChannel.php
@@ -354,4 +354,15 @@ class UserDefinedChannel extends BaseRepository
 		}
 		return $condition;
 	}
+
+	private function getUserCondition()
+	{
+		$condition = ["`verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired` AND `user`.`uid` > ?", 0];
+
+		$abandon_days = intval($this->config->get('system', 'account_abandon_days'));
+		if (!empty($abandon_days)) {
+			$condition = DBA::mergeConditions($condition, ["`last-activity` > ?", DateTimeFormat::utc('now - ' . $abandon_days . ' days')]);
+		}
+		return $condition;
+	}
 }
diff --git a/src/Model/Item.php b/src/Model/Item.php
index c17d7d4b02..9c76b59fca 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1934,6 +1934,7 @@ class Item
 			}
 		}
 
+		$result = self::compactLanguages($result);
 		if (empty($result)) {
 			return ['un' => 1];
 		}