Unwrap link previews nested in paragraphs

See https://www.woltlab.com/community/thread/301006-leading-rich-embeds-yield-empty-paragraphs/
WoltLab · Aug 5, 2023 · db7d228 · db7d228
1 parent 6238b55
commit db7d228
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 6 deletions.
diff --git a/com.woltlab.wcf/templates/unfurlUrl.tpl b/com.woltlab.wcf/templates/unfurlUrl.tpl
@@ -1,4 +1,4 @@
-{if $object->status == "SUCCESSFUL"}
+{if $object->hasFetchedContent()}
 	{if $object->isPlainUrl()}
 		<a {anchorAttributes url=$object->url isUgc=$enableUgc}>{$object->title}</a>
 	{else}

diff --git a/wcfsetup/install/files/lib/data/unfurl/url/UnfurlUrl.class.php b/wcfsetup/install/files/lib/data/unfurl/url/UnfurlUrl.class.php
@@ -151,6 +151,14 @@ private function getImageType(): string
         return self::IMAGE_COVER;
     }
 
+    /**
+     * @since 6.0
+     */
+    public function hasFetchedContent(): bool
+    {
+        return $this->status === self::STATUS_SUCCESSFUL;
+    }
+
     /**
      * Returns the unfurl url object for a given url.
      *

diff --git a/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputUnfurlUrlNode.class.php b/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputUnfurlUrlNode.class.php
@@ -2,6 +2,7 @@
 
 namespace wcf\system\html\output\node;
 
+use wcf\data\unfurl\url\UnfurlUrl;
 use wcf\system\html\AbstractHtmlProcessor;
 use wcf\system\html\node\AbstractHtmlNodeProcessor;
 use wcf\system\html\node\HtmlNodeUnfurlLink;
@@ -62,7 +63,18 @@ public function process(array $elements, AbstractHtmlNodeProcessor $htmlNodeProc
                     'enableUgc' => $enableUgc,
                 ]);
 
+                $parentParagraph = null;
+                if ($this->getUnfurlUrl($attribute)->hasFetchedContent() && $element->parentNode->nodeName === 'p') {
+                    $parentParagraph = $element->parentNode;
+                    $parentParagraph->parentNode->insertBefore($element, $parentParagraph);
+                }
+
                 $htmlNodeProcessor->renameTag($element, $tagName);
+
+                if ($parentParagraph !== null && !$parentParagraph->hasChildNodes()) {
+                    /** @var \DOMElement $parentParagraph */
+                    $parentParagraph->remove();
+                }
             }
         }
     }
@@ -72,9 +84,14 @@ public function process(array $elements, AbstractHtmlNodeProcessor $htmlNodeProc
      */
     public function replaceTag(array $data)
     {
-        /** @var \wcf\data\unfurl\url\UnfurlUrl $object */
-        $object = MessageEmbeddedObjectManager::getInstance()->getObject('com.woltlab.wcf.unfurlUrl', $data['urlId']);
+        return $this->getUnfurlUrl($data['urlId'])->render($data['enableUgc']);
+    }
 
-        return $object->render($data['enableUgc']);
+    /**
+     * @since 6.0
+     */
+    protected function getUnfurlUrl(int $id): UnfurlUrl
+    {
+        return MessageEmbeddedObjectManager::getInstance()->getObject('com.woltlab.wcf.unfurlUrl', $id);
     }
 }
diff --git a/wcfsetup/install/files/style/ui/unfurlUrl.scss b/wcfsetup/install/files/style/ui/unfurlUrl.scss
@@ -1,10 +1,12 @@
 .unfurlUrlCard {
 	background-color: var(--wcfContentBackground);
 	border-radius: 3px;
-	box-shadow: 0 0 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
+	box-shadow:
+		0 0 3px rgba(0, 0, 0, 0.12),
+		0 1px 2px rgba(0, 0, 0, 0.24);
 	color: var(--wcfContentText);
 	display: inline-block;
-	margin: 10px 0;
+	margin: 1em 0 0 0;
 	max-width: 100%;
 	overflow: hidden;
 	position: relative;