fix: prevent starting a PD with users blocking them (#175)

FriendsOfFlarum · Jul 31, 2022 · 23dcf93 · 23dcf93
1 parent 2e99cdb
commit 23dcf93
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/js/src/forum/extend/User.js b/js/src/forum/extend/User.js
@@ -8,6 +8,7 @@ import Button from 'flarum/common/components/Button';
 import ItemList from 'flarum/common/utils/ItemList';
 import UserPage from 'flarum/forum/components/UserPage';
 import LinkButton from 'flarum/common/components/LinkButton';
+import canStartPrivateDiscussion from '../helpers/canStartPrivateDiscussion';
 
 export default () => {
   attributes();
@@ -17,12 +18,7 @@ export default () => {
 
 function message() {
   extend(UserControls, 'userControls', function (items, user) {
-    if (
-      app.session.user &&
-      app.session.user.id() !== user.id() &&
-      app.forum.attribute('canStartPrivateDiscussion') &&
-      (user.blocksPd() === false || (app.forum.attribute('canStartPrivateDiscussionWithBlockers') && user.cannotBeDirectMessaged()))
-    ) {
+    if (canStartPrivateDiscussion(user)) {
       items.add(
         'private-discussion',
         Button.component(

diff --git a/js/src/forum/helpers/canStartPrivateDiscussion.js b/js/src/forum/helpers/canStartPrivateDiscussion.js
@@ -0,0 +1,10 @@
+import app from 'flarum/forum/app';
+
+export default function canStartPrivateDiscussion(recipient) {
+  return (
+    app.session.user &&
+    app.session.user.id() !== recipient.id() &&
+    app.forum.attribute('canStartPrivateDiscussion') &&
+    (!recipient.blocksPd() || (app.forum.attribute('canStartPrivateDiscussionWithBlockers') && recipient.cannotBeDirectMessaged()))
+  );
+}
diff --git a/js/src/forum/pages/PrivateDiscussionsUserPage.js b/js/src/forum/pages/PrivateDiscussionsUserPage.js
@@ -7,6 +7,7 @@ import ItemList from 'flarum/common/utils/ItemList';
 import listItems from 'flarum/common/helpers/listItems';
 import PrivateDiscussionList from './discussions/PrivateDiscussionList';
 import PrivateComposing from './PrivateComposing';
+import canStartPrivateDiscussion from '../helpers/canStartPrivateDiscussion';
 
 export default class PrivateDiscussionsUserPage extends UserPage {
   oninit(vnode) {
@@ -57,7 +58,7 @@ export default class PrivateDiscussionsUserPage extends UserPage {
 
     const items = new ItemList();
 
-    if (app.session.user && app.forum.attribute('canStartPrivateDiscussion')) {
+    if (canStartPrivateDiscussion(this.user)) {
       items.add('start_private', composing.component());
     }
 

diff --git a/src/Discussion/Screener.php b/src/Discussion/Screener.php
@@ -107,7 +107,7 @@ public function hasBlockingUsers(): bool
     {
         return $this->users
             ->first(function (User $user) {
-                return $user->getPreference('blocksPd', false);
+                return boolval($user->blocks_byobu_pd);
             }) !== null;
     }