From 0dc959d9fe40bddce5e99b8162bb0e770fc28ed9 Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Sun, 24 Mar 2024 09:58:21 +0000
Subject: Deprecate *_config() functions in core.

---
 Zotlabs/Module/Sse_bs.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'Zotlabs/Module/Sse_bs.php')

diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php
index 9fb295c4b..a18301a1a 100644
--- a/Zotlabs/Module/Sse_bs.php
+++ b/Zotlabs/Module/Sse_bs.php
@@ -4,6 +4,7 @@ namespace Zotlabs\Module;
 
 use App;
 use Zotlabs\Lib\Apps;
+use Zotlabs\Lib\Config;
 use Zotlabs\Web\Controller;
 use Zotlabs\Lib\Enotify;
 use Zotlabs\Lib\XConfig;
@@ -424,7 +425,7 @@ class Sse_bs extends Controller {
 			return $result;
 		}
 
-		if(! intval(get_config('system','open_pubstream',1))) {
+		if(! intval(Config::Get('system','open_pubstream',1))) {
 			if(! get_observer_hash()) {
 				$result['pubs']['offset'] = -1;
 				return $result;
@@ -459,7 +460,7 @@ class Sse_bs extends Controller {
 
 		$uids = " AND uid IN ( " . $sys['channel_id'] . " ) ";
 
-		$site_firehose = get_config('system', 'site_firehose', 0);
+		$site_firehose = Config::Get('system', 'site_firehose', 0);
 		if($site_firehose) {
 			$uids = " AND uid IN ( " . stream_perms_api_uids(PERMS_PUBLIC) . " ) AND item_private = 0 AND item_wall = 1 ";
 		}
@@ -732,7 +733,7 @@ class Sse_bs extends Controller {
 		if(! self::$uid && ! is_site_admin())
 			return $result;
 
-		$policy  = intval(get_config('system','register_policy'));
+		$policy  = intval(Config::Get('system','register_policy'));
 		if(($policy & REGISTER_APPROVE) != REGISTER_APPROVE)
 			return $result;
 
-- 
cgit v1.2.3


From 3b812f25703a496c91fb92409db173b38d4cc115 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Wed, 17 Apr 2024 10:00:40 +0000
Subject: comment out deprecated way to find forum items and do not count
 announce activities

---
 Zotlabs/Module/Sse_bs.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Zotlabs/Module/Sse_bs.php')

diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php
index a18301a1a..09c4ed614 100644
--- a/Zotlabs/Module/Sse_bs.php
+++ b/Zotlabs/Module/Sse_bs.php
@@ -590,6 +590,7 @@ class Sse_bs extends Controller {
 
 		if($forums) {
 			$item_normal = item_normal();
+			$p_sql = '';
 
 			$sql_extra = '';
 			if(! (self::$vnotify & VNOTIFY_LIKE))
@@ -599,6 +600,7 @@ class Sse_bs extends Controller {
 			$i = 0;
 
 			for($x = 0; $x < $fcount; $x ++) {
+				/*
 				$p = q("SELECT oid AS parent FROM term WHERE uid = %d AND ttype = %d AND term = '%s'",
 					intval(self::$uid),
 					intval(TERM_FORUM),
@@ -607,14 +609,16 @@ class Sse_bs extends Controller {
 
 				$p_str = ids_to_querystr($p, 'parent');
 				$p_sql = (($p_str) ? "OR parent IN ( $p_str )" : '');
+				*/
 
 				$r = q("select count(*) as total from item
-					where uid = %d and ( owner_xchan = '%s' OR author_xchan = '%s' $p_sql ) and item_unseen = 1 $sql_extra $item_normal",
+					where uid = %d and ( owner_xchan = '%s' OR author_xchan = '%s' $p_sql ) and verb != 'Announce' and item_unseen = 1 $sql_extra $item_normal",
 					intval(self::$uid),
 					dbesc($forums[$x]['xchan_hash']),
 					dbesc($forums[$x]['xchan_hash'])
 				);
 
+
 				if($r[0]['total']) {
 
 					$forums[$x]['notify_link'] = z_root() . '/network/?f=&pf=1&unseen=1&cid=' . $forums[$x]['abook_id'];
-- 
cgit v1.2.3