Fix: "Create private discussions with users that block it" permission…

… not working for non-admin users (#194)

* fix: `startPrivateDiscussionWithBlockers` key

* chore: extend User model types and convert canStartPrivateDiscussion to TypeScript

* fix: remove non-existing attribute that causes permission issue

extend.php

@@ -99,9 +99,6 @@
     (new Extend\ApiSerializer(Serializer\UserSerializer::class))
         ->attribute('blocksPd', function ($serializer, $user) {
             return (bool) $user->blocks_byobu_pd;
-        })
-        ->attribute('cannotBeDirectMessaged', function ($serializer, $user) {
-            return (bool) $serializer->getActor()->can('cannotBeDirectMessaged', $user);
         }),
 
     (new Extend\ApiSerializer(Serializer\CurrentUserSerializer::class))

js/src/@types/Model/User.d.ts

@@ -0,0 +1,8 @@
+export * from 'flarum/common/models/User';
+
+declare module 'flarum/common/models/User' {
+  export default interface User {
+    blocksPd(): boolean;
+    unreadPrivateMessagesCount(): number;
+  }
+}

js/src/admin/addPrivateDiscussionPermission.ts

@@ -38,7 +38,7 @@ export default function () {
       {
         icon: 'far fa-map',
         label: app.translator.trans('fof-byobu.admin.permission.create_private_discussions_with_blocking_users'),
-        permission: 'startPrivateDiscussionWithBlockers',
+        permission: 'discussion.startPrivateDiscussionWithBlockers',
         tagScoped: false,
       },
       'start',

js/src/forum/extend.ts

@@ -24,5 +24,5 @@ export default [
     .attribute<boolean>('canMakePublic')
     .attribute<boolean>('isPrivateDiscussion'),
 
-  new Extend.Model(User).attribute<boolean>('blocksPd').attribute<boolean>('cannotBeDirectMessaged').attribute<number>('unreadPrivateMessagesCount'),
+  new Extend.Model(User).attribute<boolean>('blocksPd').attribute<number>('unreadPrivateMessagesCount'),
 ];

js/src/forum/helpers/canStartPrivateDiscussion.ts

@@ -0,0 +1,11 @@
+import app from 'flarum/forum/app';
+import type User from 'flarum/common/models/User';
+
+export default function canStartPrivateDiscussion(recipient: User) {
+  return (
+    app.session.user &&
+    app.session.user.id() !== recipient.id() &&
+    app.forum.attribute<boolean>('canStartPrivateDiscussion') &&
+    (!recipient.blocksPd() || app.forum.attribute<boolean>('canStartPrivateDiscussionWithBlockers'))
+  );
+}