Handling bottom anchor and top anchor

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 44ef6e7f1b39341fc535f95f97d451fcd8dfe1ba..48fda6296c268d245f10240f094b0b7cf0fa1433 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -61,7 +61,8 @@ class BBCode
        const BACKLINK = 8;
        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
         *
@@ -1089,7 +1090,7 @@ class BBCode
                                        '$guid'         => $attributes['guid'],
                                        '$network_name' => ContactSelector::networkToName($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;
                }

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 3516a57bdeba6a10fa453d9740fd728e24fb3bb3..9fa657a69fafded55b92ffdc3054240727d6198d 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -2799,13 +2799,18 @@ class Item
                                                'attachment'   => $attachment,
                                        ],
                                ]);
-                               $trailing .= $media;
+                               // On Diaspora posts the attached pictures are leading
+                               if ($item['network'] == Protocol::DIASPORA) {
+                                       $leading .= $media;
+                               } else {
+                                       $trailing .= $media;
+                               }
                        }
                }
 
                if ($shared) {
-                       $content = str_replace(BBCode::ANCHOR, '<div class="body-attach">' . $leading . '<div class="clear"></div></div>' . BBCode::ANCHOR, $content);
-                       $content = str_replace(BBCode::ANCHOR, BBCode::ANCHOR . '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>', $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::BOTTOM_ANCHOR, '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>' . BBCode::BOTTOM_ANCHOR, $content);
                } else {
                        if ($leading != '') {
                                $content = '<div class="body-attach">' . $leading . '<div class="clear"></div></div>' . $content;
@@ -2881,7 +2886,7 @@ class Item
                        // @todo Use a template
                        $rendered = BBCode::convertAttachment('', BBCode::INTERNAL, false, $data);
                        if ($shared) {
-                               return str_replace(BBCode::ANCHOR, BBCode::ANCHOR . $rendered, $content);
+                               return str_replace(BBCode::BOTTOM_ANCHOR, BBCode::BOTTOM_ANCHOR . $rendered, $content);
                        } else {
                                return $content . $rendered;
                        }