fix: mass message bypass notification settings + mass message bypass …

…purification
NamelessMC · Mar 9, 2024 · 32b67ee · 32b67ee
1 parent bfb08ad
commit 32b67ee
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/core/classes/Core/Alert.php b/core/classes/Core/Alert.php
@@ -53,10 +53,11 @@ public static function create(int $user_id, string $type, array $text_short, arr
      * @param  int         $userId
      * @param  string      $title
      * @param  string      $content
-     * @param  string|null $link    Optional link to redirect the user to on click
+     * @param  string|null $link       Optional link to redirect the user to on click
+     * @param  bool        $skipPurify If true the content will not be purified before displaying to user - use with care
      * @return void
      */
-    public static function send(int $userId, string $title, string $content, ?string $link = '')
+    public static function send(int $userId, string $title, string $content, ?string $link = '', bool $skipPurify = false)
     {
         DB::getInstance()->insert('alerts', [
             'user_id' => $userId,
@@ -66,6 +67,7 @@ public static function send(int $userId, string $title, string $content, ?string
             'content' => $title,
             'content_rich' => $content,
             'created' => date('U'),
+            'bypass_purify' => $skipPurify,
         ]);
     }
 

diff --git a/core/migrations/20240309204948_add_purify_bypass_colum_to_alerts_table.php b/core/migrations/20240309204948_add_purify_bypass_colum_to_alerts_table.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class AddPurifyBypassColumToAlertsTable extends AbstractMigration
+{
+    public function change(): void
+    {
+        $this->table('nl2_alerts')
+            ->addColumn('bypass_purify', 'boolean', ['default' => false])
+            ->update();
+    }
+}
diff --git a/modules/Core/classes/Core/Notification.php b/modules/Core/classes/Core/Notification.php
@@ -13,6 +13,7 @@ class Notification {
 
     private int $_authorId;
     private array $_recipients = [];
+    private bool $_skipPurify;
     private string $_title;
     private string $_type;
 
@@ -45,6 +46,7 @@ public function __construct(
         }
 
         $this->_authorId = $authorId;
+        $this->_skipPurify = $skipPurify;
         $this->_title = $title;
         $this->_type = $type;
 
@@ -83,7 +85,7 @@ public function send(): void {
     }
 
     private function sendAlert(int $userId, string $content): void {
-        Alert::send($userId, $this->_title, $content);
+        Alert::send($userId, $this->_title, $content, null, $this->_skipPurify);
     }
 
     private function sendEmail(int $userId, string $content): void {

diff --git a/modules/Core/pages/panel/mass_message.php b/modules/Core/pages/panel/mass_message.php
@@ -132,11 +132,13 @@
                         [...$excludedUsers, ...$includedUsers]
                     );
                 } else {
+                    $where = $clause ? "WHERE $clause" : '';
+
                     $users = DB::getInstance()->query(
                         <<<SQL
                         SELECT u.id FROM nl2_users u
                         $join
-                        WHERE $clause
+                        $where
                         SQL
                     );
                 }

diff --git a/modules/Core/pages/user/alerts.php b/modules/Core/pages/user/alerts.php
@@ -155,7 +155,7 @@
         'DELETE' => $language->get('general', 'delete'),
         'DELETE_LINK' => URL::build('/user/alerts/', 'view=' . $alert->id . '&delete'),
         'ALERT_TITLE' => Output::getClean($alert->content),
-        'ALERT_CONTENT' => Output::getPurified($alert->content_rich),
+        'ALERT_CONTENT' => $alert->bypass_purify ? $alert->content_rich : Output::getPurified($alert->content_rich),
         'ALERT_DATE' => date(DATE_FORMAT, $alert->created),
         'ALERT_DATE_NICE' => $timeAgo->inWords($alert->created, $language),
         'ALERT_READ' => $alert->read,