keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Issue 11846: Fix client behaviour when following hash tags

Browse source
This commit is contained in:
Michael 2022-11-05 22:35:35 +00:00
parent c107c5ff0d
commit aa2b4e15a3
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Content/Text/BBCode.php
View file

@ -1975,6 +1975,9 @@ class BBCode
$text = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", $text = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism",
'<bdi>$1<a href="$2" class="userinfo mention" title="$3">$3</a></bdi>', '<bdi>$1<a href="$2" class="userinfo mention" title="$3">$3</a></bdi>',
$text); $text);
$text = preg_replace("/([#])\[url\=(.*?)\](.*?)\[\/url\]/ism",
'<a class="mention hashtag status-link" href="$2" rel="tag">$1<span>$3</span></a>',
$text);
} else { } else {
$text = preg_replace("/([#@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '$1$3', $text); $text = preg_replace("/([#@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '$1$3', $text);
} }

2
src/Object/Api/Mastodon/Status.php
View file

@ -109,7 +109,7 @@ class Status extends BaseDataTransferObject
} }
$this->sensitive = $sensitive; $this->sensitive = $sensitive;
$this->spoiler_text = $item['title'] ?: $item['content-warning']; $this->spoiler_text = ($item['title'] ?: $item['content-warning']) ?: '';
$visibility = ['public', 'private', 'unlisted']; $visibility = ['public', 'private', 'unlisted'];
$this->visibility = $visibility[$item['private']]; $this->visibility = $visibility[$item['private']];