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

Moved the share interpretation

This commit is contained in:
Michael 2022-10-07 07:41:03 +00:00
parent 1ef5730d3d
commit ef934db614
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1021,6 +1021,19 @@ class BBCode
public static function fetchShareAttributes(string $text): array public static function fetchShareAttributes(string $text): array
{ {
DI::profiler()->startRecording('rendering'); DI::profiler()->startRecording('rendering');
if (preg_match('#(.*?)\[share](.*)\[/share]#', $text, $matches)) {
return [
'author' => '',
'profile' => '',
'avatar' => '',
'link' => '',
'posted' => '',
'guid' => '',
'message_id' => $matches[2],
'comment' => trim($matches[1]),
'shared' => '',
];
}
// See Issue https://github.com/friendica/friendica/issues/10454 // See Issue https://github.com/friendica/friendica/issues/10454
// Hashtags in usernames are expanded to links. This here is a quick fix. // Hashtags in usernames are expanded to links. This here is a quick fix.
$text = preg_replace('~([@!#])\[url=.*?](.*?)\[/url]~ism', '$1$2', $text); $text = preg_replace('~([@!#])\[url=.*?](.*?)\[/url]~ism', '$1$2', $text);

17
src/Model/Item.php
View File

@ -3666,19 +3666,10 @@ class Item
*/ */
public static function improveSharedDataInBody(array $item): string public static function improveSharedDataInBody(array $item): string
{ {
if (preg_match('#\[share](.*)\[/share]#', $item['body'], $matches)) { $shared = BBCode::fetchShareAttributes($item['body']);
$shared = [ if (empty($shared['link']) && empty($shared['message_id'])) {
'message_id' => $matches[1], return $item['body'];
'link' => '', }
'guid' => '',
'profile' => '',
];
} else {
$shared = BBCode::fetchShareAttributes($item['body']);
if (empty($shared['link']) && empty($shared['message_id'])) {
return $item['body'];
}
}
$id = self::fetchByLink($shared['link'] ?: $shared['message_id']); $id = self::fetchByLink($shared['link'] ?: $shared['message_id']);
Logger::debug('Fetched shared post', ['uri-id' => $item['uri-id'], 'id' => $id, 'author' => $shared['profile'], 'url' => $shared['link'], 'guid' => $shared['guid'], 'uri' => $shared['message_id'], 'callstack' => System::callstack()]); Logger::debug('Fetched shared post', ['uri-id' => $item['uri-id'], 'id' => $id, 'author' => $shared['profile'], 'url' => $shared['link'], 'guid' => $shared['guid'], 'uri' => $shared['message_id'], 'callstack' => System::callstack()]);