Feature/message dialog flags

.editorconfig

@@ -0,0 +1,28 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+
+[*.{diff,md}]
+trim_trailing_whitespace = false
+
+[*.{php,xml,json}]
+indent_size = 4
+
+[{tsconfig.json,prettierrc.json,package.json}]
+indent_size = 4
+
+[*.neon]
+indent_style = tab
+
+[*.less]
+indent_size = 2

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "flarum/flags",
+    "name": "envolutions/dialog-flags",
     "description": "Allow users to flag posts for moderator review.",
     "type": "flarum-extension",
     "keywords": [
@@ -8,7 +8,7 @@
     "license": "MIT",
     "support": {
         "issues": "https://github.com/flarum/framework/issues",
-        "source": "https://github.com/flarum/flags",
+        "source": "https://github.com/Envolutions/flarum-ext-dialog-flags",
         "forum": "https://discuss.flarum.org"
     },
     "homepage": "https://flarum.org",
@@ -23,18 +23,18 @@
     },
     "autoload": {
         "psr-4": {
-            "Flarum\\Flags\\": "src/"
+            "Envolutions\\DialogFlags\\": "src/"
         }
     },
     "extra": {
         "branch-alias": {
             "dev-main": "2.x-dev"
         },
         "flarum-extension": {
-            "title": "Flags",
+            "title": "Dialog Flags",
             "category": "feature",
             "icon": {
-                "name": "fas fa-flag",
+                "name": "far fa-flag",
                 "backgroundColor": "#D659B5",
                 "color": "#fff"
             }

extend.php

@@ -10,61 +10,83 @@
 use Flarum\Api\Endpoint;
 use Flarum\Api\Resource;
 use Flarum\Extend;
-use Flarum\Flags\Access\ScopeFlagVisibility;
-use Flarum\Flags\Api\Controller\DeleteFlagsController;
-use Flarum\Flags\Api\ForumResourceFields;
-use Flarum\Flags\Api\PostResourceFields;
-use Flarum\Flags\Api\Resource\FlagResource;
-use Flarum\Flags\Api\UserResourceFields;
-use Flarum\Flags\Flag;
-use Flarum\Flags\Listener;
+use Envolutions\DialogFlags\Access\ScopeFlagVisibility;
+use Envolutions\DialogFlags\Access\ScopeDialogVisibilityForFlags;
+use Envolutions\DialogFlags\Api\Controller\DeleteFlagsController;
+use Envolutions\DialogFlags\Api\DialogMessageResourceFields;
+use Envolutions\DialogFlags\Api\ForumResourceFields;
+use Envolutions\DialogFlags\Api\Resource\DialogMessageFlagResource;
+use Envolutions\DialogFlags\Api\UserResourceFields;
+use Envolutions\DialogFlags\DialogMessageFlag;
+use Flarum\Api\Context;
+use Flarum\Api\Schema\Boolean;
 use Flarum\Forum\Content\AssertRegistered;
-use Flarum\Post\Event\Deleted;
-use Flarum\Post\Post;
+use Flarum\Messages\Api\Resource\DialogMessageResource;
+use Flarum\Messages\Api\Resource\DialogResource;
+use Flarum\Messages\Dialog;
+use Flarum\Messages\DialogMessage;
 use Flarum\User\User;
 
 return [
     (new Extend\Frontend('forum'))
-        ->js(__DIR__.'/js/dist/forum.js')
-        ->css(__DIR__.'/less/forum.less')
-        ->route('/flags', 'flags', AssertRegistered::class),
+        ->js(__DIR__ . '/js/dist/forum.js')
+        ->css(__DIR__ . '/less/forum.less')
+        ->route('/dialog_flags', 'dialog_flags', AssertRegistered::class),
 
     (new Extend\Frontend('admin'))
-        ->js(__DIR__.'/js/dist/admin.js'),
+        ->js(__DIR__ . '/js/dist/admin.js'),
 
     (new Extend\Routes('api'))
-        ->delete('/posts/{id}/flags', 'flags.delete', DeleteFlagsController::class),
+        ->delete('/dialog-messages/{id}/flags', 'dialog_flags.delete', DeleteFlagsController::class),
 
     (new Extend\Model(User::class))
-        ->cast('read_flags_at', 'datetime'),
+        ->cast('read_dialog_message_flags_at', 'datetime'),
 
-    (new Extend\Model(Post::class))
-        ->hasMany('flags', Flag::class, 'post_id'),
+    (new Extend\Model(DialogMessage::class))
+        ->hasMany('dialogMessageFlags', DialogMessageFlag::class, 'dialog_message_id'),
 
-    new Extend\ApiResource(FlagResource::class),
+    new Extend\ApiResource(DialogMessageFlagResource::class),
 
-    (new Extend\ApiResource(Resource\PostResource::class))
-        ->fields(PostResourceFields::class),
+    (new Extend\ApiResource(DialogMessageResource::class))
+        ->fields(DialogMessageResourceFields::class),
 
     (new Extend\ApiResource(Resource\UserResource::class))
         ->fields(UserResourceFields::class),
 
     (new Extend\ApiResource(Resource\ForumResource::class))
         ->fields(ForumResourceFields::class),
 
-    (new Extend\ApiResource(Resource\PostResource::class))
+    (new Extend\ApiResource(DialogMessageResource::class))
         ->endpoint([Endpoint\Index::class, Endpoint\Show::class], function (Endpoint\Index|Endpoint\Show $endpoint) {
-            return $endpoint->addDefaultInclude(['flags', 'flags.user']);
+            return $endpoint->addDefaultInclude(['dialogMessageFlags', 'dialogMessageFlags.user']);
         }),
+    (new Extend\ApiResource(DialogResource::class))
+        ->fields(fn() => [
+            Boolean::make('hasAccessDueToFlagging')
+                ->get(function (object $dialog, Context $context) {
+                    // User is already part of conversation
+                    if ($dialog->users->contains($context->getActor())) return false;
+
+                    // User has access due to reported flag
+                    return $dialog->messages()
+                        ->whereHas('dialogMessageFlags')
+                        ->exists();
+                })
+                ->visible(
+                    function (object $dialog, Context $context) {
+                        return $context->getActor()->hasPermission("dialog.viewFlags");
+                    }
+                )
+        ]),
 
     (new Extend\Settings())
-        ->serializeToForum('guidelinesUrl', 'flarum-flags.guidelines_url'),
+        ->serializeToForum('dialogGuidelinesUrl', 'flarum-dialog-flags.guidelines_url'),
 
-    (new Extend\Event())
-        ->listen(Deleted::class, Listener\DeleteFlags::class),
-
-    (new Extend\ModelVisibility(Flag::class))
+    (new Extend\ModelVisibility(DialogMessageFlag::class))
         ->scope(ScopeFlagVisibility::class),
 
-    new Extend\Locales(__DIR__.'/locale'),
+    (new Extend\ModelVisibility(Dialog::class))
+        ->scope(ScopeDialogVisibilityForFlags::class),
+
+    new Extend\Locales(__DIR__ . '/locale'),
 ];