fix?: Allow mentions from non-post objects (#79)

flarum · Nov 28, 2021 · 96a7e20 · 96a7e20
1 parent 8154f29
commit 96a7e20
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/Formatter/FormatUserMentions.php b/src/Formatter/FormatUserMentions.php
@@ -10,6 +10,7 @@
 namespace Flarum\Mentions\Formatter;
 
 use Flarum\Http\SlugManager;
+use Flarum\Post\Post;
 use Flarum\User\User;
 use s9e\TextFormatter\Renderer;
 use s9e\TextFormatter\Utils;
@@ -43,10 +44,10 @@ public function __construct(SlugManager $slugManager, TranslatorInterface $trans
      */
     public function __invoke(Renderer $renderer, $context, string $xml)
     {
-        $post = $context;
-
-        return Utils::replaceAttributes($xml, 'USERMENTION', function ($attributes) use ($post) {
-            $user = $post->mentionsUsers->find($attributes['id']);
+        return Utils::replaceAttributes($xml, 'USERMENTION', function ($attributes) use ($context) {
+            $user = (isset($context->getRelations()['mentionsUsers']) || $context instanceof Post)
+                ? $context->mentionsUsers->find($attributes['id'])
+                : User::find($attributes['id']);
 
             $attributes['deleted'] = false;
 

diff --git a/src/Formatter/UnparseUserMentions.php b/src/Formatter/UnparseUserMentions.php
@@ -9,6 +9,7 @@
 
 namespace Flarum\Mentions\Formatter;
 
+use Flarum\Post\Post;
 use Flarum\User\User;
 use s9e\TextFormatter\Utils;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -49,10 +50,10 @@ public function __invoke($context, string $xml)
      */
     protected function updateUserMentionTags($context, string $xml): string
     {
-        $post = $context;
-
-        return Utils::replaceAttributes($xml, 'USERMENTION', function ($attributes) use ($post) {
-            $user = $post->mentionsUsers->find($attributes['id']);
+        return Utils::replaceAttributes($xml, 'USERMENTION', function ($attributes) use ($context) {
+            $user = (isset($context->getRelations()['mentionsUsers']) || $context instanceof Post)
+                ? $context->mentionsUsers->find($attributes['id'])
+                : User::find($attributes['id']);
 
             if ($user) {
                 $attributes['displayname'] = $user->display_name;