diff options
| author | Mario <mario@mariovavti.com> | 2023-03-02 21:15:19 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-03-02 21:15:19 +0000 |
| commit | da034045cc1bba74287b7c3e83f4a94ff5359150 (patch) | |
| tree | 10e2ae77b7ab81811cf8e63cf5a38cf04761ebf4 /include/text.php | |
| parent | 65f001b4b7dcf23ee80e137cfca64993a3da5318 (diff) | |
| download | volse-hubzilla-da034045cc1bba74287b7c3e83f4a94ff5359150.tar.gz volse-hubzilla-da034045cc1bba74287b7c3e83f4a94ff5359150.tar.bz2 volse-hubzilla-da034045cc1bba74287b7c3e83f4a94ff5359150.zip | |
some work on bringing bang tags back for forums
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/include/text.php b/include/text.php index d7ffa5550..415a51790 100644 --- a/include/text.php +++ b/include/text.php @@ -1652,7 +1652,7 @@ function format_hashtags(&$item) { function format_mentions(&$item) { $s = ''; - $terms = isset($item['term']) ? get_terms_oftype($item['term'], TERM_MENTION) : []; + $terms = isset($item['term']) ? get_terms_oftype($item['term'], [TERM_MENTION, TERM_FORUM]) : []; if($terms) { foreach($terms as $t) { if(! isset($t['term'])) @@ -2876,7 +2876,7 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true) $termtype = ((strpos($tag,'#') === 0) ? TERM_HASHTAG : TERM_UNKNOWN); $termtype = ((strpos($tag,'@') === 0) ? TERM_MENTION : $termtype); -// $termtype = ((strpos($tag,'!') === 0) ? TERM_FORUM : $termtype); + $termtype = ((strpos($tag,'!') === 0) ? TERM_FORUM : $termtype); $termtype = ((strpos($tag,'#^[') === 0) ? TERM_BOOKMARK : $termtype); // Is it a hashtag of some kind? @@ -2943,7 +2943,7 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true) // BEGIN mentions - if ($termtype === TERM_MENTION) { + if (in_array($termtype, [TERM_MENTION, TERM_FORUM])) { // The @! tag will alter permissions @@ -3051,8 +3051,15 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true) $profile = str_replace(',','%2c',$profile); $url = $profile; - $newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]'; - $body = str_replace('@' . (($exclusive) ? '!' : '') . $name, $newtag, $body); + if($termtype === TERM_FORUM) { + $newtag = '!' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]'; + $body = str_replace('!' . (($exclusive) ? '!' : '') . $name, $newtag, $body); + } + + if ($termtype === TERM_MENTION) { + $newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]'; + $body = str_replace('@' . (($exclusive) ? '!' : '') . $name, $newtag, $body); + } // append tag to str_tags if(! stristr($str_tags,$newtag)) { @@ -3110,12 +3117,12 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true) //create profile link $profile = str_replace(',','%2c',$profile); $url = $profile; -/* + if($termtype === TERM_FORUM) { $newtag = '!' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]'; $body = str_replace('!' . (($exclusive) ? '!' : '') . $name, $newtag, $body); } -*/ + if ($termtype === TERM_MENTION) { $newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]'; $body = str_replace('@' . (($exclusive) ? '!' : '') . $name, $newtag, $body); |