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

Handling bottom anchor and top anchor

This commit is contained in:
Michael 2021-04-29 19:29:29 +00:00
parent eb8e6c5b22
commit b88c9f9d67
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,8 @@ class BBCode
const BACKLINK = 8; const BACKLINK = 8;
const ACTIVITYPUB = 9; const ACTIVITYPUB = 9;
const ANCHOR = '<br class="anchor">'; const TOP_ANCHOR = '<br class="top-anchor">';
const BOTTOM_ANCHOR = '<br class="button-anchor">';
/** /**
* Fetches attachment data that were generated the old way * Fetches attachment data that were generated the old way
* *
@ -1089,7 +1090,7 @@ class BBCode
'$guid' => $attributes['guid'], '$guid' => $attributes['guid'],
'$network_name' => ContactSelector::networkToName($network, $attributes['profile']), '$network_name' => ContactSelector::networkToName($network, $attributes['profile']),
'$network_icon' => ContactSelector::networkToIcon($network, $attributes['profile']), '$network_icon' => ContactSelector::networkToIcon($network, $attributes['profile']),
'$content' => self::setMentions(trim($content), 0, $network) . self::ANCHOR, '$content' => self::TOP_ANCHOR . self::setMentions(trim($content), 0, $network) . self::BOTTOM_ANCHOR,
]); ]);
break; break;
} }

13
src/Model/Item.php
View File

@ -2799,13 +2799,18 @@ class Item
'attachment' => $attachment, 'attachment' => $attachment,
], ],
]); ]);
$trailing .= $media; // On Diaspora posts the attached pictures are leading
if ($item['network'] == Protocol::DIASPORA) {
$leading .= $media;
} else {
$trailing .= $media;
}
} }
} }
if ($shared) { if ($shared) {
$content = str_replace(BBCode::ANCHOR, '<div class="body-attach">' . $leading . '<div class="clear"></div></div>' . BBCode::ANCHOR, $content); $content = str_replace(BBCode::TOP_ANCHOR, '<div class="body-attach">' . $leading . '<div class="clear"></div></div>' . BBCode::TOP_ANCHOR, $content);
$content = str_replace(BBCode::ANCHOR, BBCode::ANCHOR . '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>', $content); $content = str_replace(BBCode::BOTTOM_ANCHOR, '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>' . BBCode::BOTTOM_ANCHOR, $content);
} else { } else {
if ($leading != '') { if ($leading != '') {
$content = '<div class="body-attach">' . $leading . '<div class="clear"></div></div>' . $content; $content = '<div class="body-attach">' . $leading . '<div class="clear"></div></div>' . $content;
@ -2881,7 +2886,7 @@ class Item
// @todo Use a template // @todo Use a template
$rendered = BBCode::convertAttachment('', BBCode::INTERNAL, false, $data); $rendered = BBCode::convertAttachment('', BBCode::INTERNAL, false, $data);
if ($shared) { if ($shared) {
return str_replace(BBCode::ANCHOR, BBCode::ANCHOR . $rendered, $content); return str_replace(BBCode::BOTTOM_ANCHOR, BBCode::BOTTOM_ANCHOR . $rendered, $content);
} else { } else {
return $content . $rendered; return $content . $rendered;
} }