diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index e8a396a35..86d8c6ac8 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -1975,6 +1975,9 @@ class BBCode
$text = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism",
'$1$3',
$text);
+ $text = preg_replace("/([#])\[url\=(.*?)\](.*?)\[\/url\]/ism",
+ '$1$3',
+ $text);
} else {
$text = preg_replace("/([#@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '$1$3', $text);
}
diff --git a/src/Object/Api/Mastodon/Status.php b/src/Object/Api/Mastodon/Status.php
index ced691964..b0832f0c3 100644
--- a/src/Object/Api/Mastodon/Status.php
+++ b/src/Object/Api/Mastodon/Status.php
@@ -109,7 +109,7 @@ class Status extends BaseDataTransferObject
}
$this->sensitive = $sensitive;
- $this->spoiler_text = $item['title'] ?: $item['content-warning'];
+ $this->spoiler_text = ($item['title'] ?: $item['content-warning']) ?: '';
$visibility = ['public', 'private', 'unlisted'];
$this->visibility = $visibility[$item['private']];