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

Merge pull request #12116 from annando/issue-11846 

Issue 11846: Fix client behaviour when following hash tags
This commit is contained in:
Hypolite Petovan 2022-11-05 19:13:31 -04:00 committed by GitHub
parent 5bc0480fc2 52f74b6312
commit b9f0985467
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Content/Text/BBCode.php
View File

@ -1305,7 +1305,7 @@ class BBCode
/**
* Callback: Expands links from given $match array
*
* @param arrat $match Array with link match
* @param array $match Array with link match
* @return string BBCode
*/
private static function expandLinksCallback(array $match): string
@ -1320,7 +1320,7 @@ class BBCode
/**
* Callback: Cleans picture links
*
* @param arrat $match Array with link match
* @param array $match Array with link match
* @return string BBCode
*/
private static function cleanPictureLinksCallback(array $match): string
@ -1975,6 +1975,9 @@ class BBCode
$text = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism",
'<bdi>$1<a href="$2" class="userinfo mention" title="$3">$3</a></bdi>',
$text);
$text = preg_replace("/([#])\[url\=(.*?)\](.*?)\[\/url\]/ism",
'<a class="mention hashtag status-link" href="$2" rel="tag">$1<span>$3</span></a>',
$text);
} else {
$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->spoiler_text = $item['title'] ?: $item['content-warning'];
$this->spoiler_text = $item['title'] ?: $item['content-warning'] ?: '';
$visibility = ['public', 'private', 'unlisted'];
$this->visibility = $visibility[$item['private']];