Simplified share element

This commit is contained in:
Michael 2022-10-07 05:51:36 +00:00
parent 8e9acfe210
commit d7a9745ffd
2 changed files with 13 additions and 4 deletions

View file

@ -44,7 +44,7 @@ function share_init(App $a) {
$pos = strpos($item['body'], "[share"); $pos = strpos($item['body'], "[share");
$o = substr($item['body'], $pos); $o = substr($item['body'], $pos);
} else { } else {
$o = "[share message_id='" . $item['uri'] . "'][/share]"; $o = "[share]" . $item['uri'] . "[/share]";
} }
echo $o; echo $o;

View file

@ -3666,10 +3666,19 @@ 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 = [
'message_id' => $matches[1],
'link' => '',
'guid' => '',
'profile' => '',
];
} else {
$shared = BBCode::fetchShareAttributes($item['body']); $shared = BBCode::fetchShareAttributes($item['body']);
if (empty($shared['link']) && empty($shared['message_id'])) { if (empty($shared['link']) && empty($shared['message_id'])) {
return $item['body']; 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()]);