some work on bringing bang tags back for forums

3 files changed, 19 insertions, 7 deletions

diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index dc868c93e..60284c56d 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -570,7 +570,12 @@ class Activity {
 							break;
 
 						case 'Mention':
-							$ret[] = ['ttype' => TERM_MENTION, 'url' => $t['href'], 'term' => escape_tags((substr($t['name'], 0, 1) === '@') ? substr($t['name'], 1) : $t['name'])];
+							$mention_type = substr($t['name'], 0, 1);
+							if ($mention_type === '!') {
+								$ret[] = ['ttype' => TERM_FORUM, 'url' => $t['href'], 'term' => escape_tags(substr($t['name'], 1))];
+							} else {
+								$ret[] = ['ttype' => TERM_MENTION, 'url' => $t['href'], 'term' => escape_tags((substr($t['name'], 0, 1) === '@') ? substr($t['name'], 1) : $t['name'])];
+							}
 							break;
 
 						case 'Bookmark':
@@ -605,6 +610,10 @@ class Activity {
 						$ret[] = ['type' => 'Mention', 'href' => $t['url'], 'name' => '@' . $t['term']];
 						break;
 
+					case TERM_FORUM:
+						$ret[] = ['type' => 'Mention', 'href' => $t['url'], 'name' => '!' . $t['term']];
+						break;
+
 					case TERM_BOOKMARK:
 						$ret[] = ['type' => 'Bookmark', 'href' => $t['url'], 'name' => $t['term']];
 						break;
@@ -936,7 +945,7 @@ class Activity {
 				if (!$t['url']) {
 					continue;
 				}
-				if ($t['ttype'] == TERM_MENTION) {
+				if (in_array($t['ttype'], [TERM_MENTION, TERM_FORUM])) {
 					$url    = self::lookup_term_url($t['url']);
 					$list[] = (($url) ? $url : $t['url']);
 				}
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php
index b98f5621e..e7a1e6706 100644
--- a/Zotlabs/Module/Acl.php
+++ b/Zotlabs/Module/Acl.php
@@ -69,6 +69,7 @@ class Acl extends \Zotlabs\Web\Controller {
 		$sql_extra = '';
 		$sql_extra2 = '';
 		$sql_extra3 = '';
+		$sql_extra4 = (($type === 'f') ? ' AND xchan_pubforum = 1 ' : '');
 		$sql_extra2_xchan = '';
 		$order_extra2 = '';
 
@@ -219,7 +220,7 @@ class Acl extends \Zotlabs\Web\Controller {
 
 				$r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_network as net, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, xchan_pubforum, abook_flags, abook_self
 					FROM abook left join xchan on abook_xchan = xchan_hash
-					WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
+					WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra2 $sql_extra4 order by $order_extra2 xchan_name asc" ,
 					intval(local_channel())
 				);
 
@@ -337,6 +338,7 @@ class Acl extends \Zotlabs\Web\Controller {
 		else
 			$r = array();
 
+
 		if($r) {
 			$i = count($contacts);
 			$x = [];
@@ -367,10 +369,12 @@ class Acl extends \Zotlabs\Web\Controller {
 						"nick"     => substr($g['nick'],0,strpos($g['nick'],'@')),
 						"self"     => (intval($g['abook_self']) ? 'abook-self' : ''),
 						"taggable" => 'taggable',
-						"label"    => t('network')
+						"label"    => t('network'),
+						"net"      => $g['net'] ?? ''
+
 					);
 				}
-				if($type !== 'f') {
+				//if($type !== 'f') {
 					if (! array_key_exists($x[$lkey], $contacts) || ($contacts[$x[$lkey]]['net'] !== 'zot6' && $g['net'] == 'zot6')) {
 						$contacts[$x[$lkey]] = array(
 							"type"     => "c",
@@ -387,7 +391,7 @@ class Acl extends \Zotlabs\Web\Controller {
 							"net"      => $g['net'] ?? ''
 						);
 					}
-				}
+				//}
 				$i++;
 			}
 		}
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 27fc62ee6..0643cc447 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -840,7 +840,6 @@ class Item extends Controller {
 			// Look for tags and linkify them
 
 			$results = linkify_tags($body, ($uid) ? $uid : $profile_uid);
-
 			if ($results) {
 
 				// Set permissions based on tag replacements