Bump version

Co-authored-by: Maximilian Mader <max@bastelstu.be>

.babelrc

@@ -2,11 +2,10 @@
                , { "targets": { "browsers": [ "last 2 chrome versions"
                                             , "last 2 chromeandroid versions"
                                             , "firefox esr"
-                                            , "not firefox 52"
                                             , "last 2 firefox versions"
-                                            , "edge >= 15"
-                                            , "safari >= 11"
-                                            , "ios >= 11"
+                                            , "last 2 edge versions"
+                                            , "safari >= 15"
+                                            , "ios >= 15"
                                             ]
                               }
                  , "debug": true

.git-blame-ignore-revs

@@ -0,0 +1 @@
+3a88e73ee106ef675affb76a6399625bccf446e1

.gitattributes

@@ -0,0 +1,3 @@
+*.php diff=php
+*.css diff=css
+*.scss diff=css

.prettierignore

@@ -0,0 +1 @@
+require.build.js

.prettierrc

@@ -0,0 +1,3 @@
+semi: false
+singleQuote: true
+useTabs: true

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+        "editor.rulers": [
+                {
+                        "column": 120,
+                        "color": "#ff00ff40"
+                }
+        ]
+}

LICENSE

@@ -4,13 +4,13 @@ License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
 Parameters
 
 Licensor:             Tim Düsterhus
-Licensed Work:        Tim’s Chat 4.0
-                      The Licensed Work is (c) 2010-2020 Tim Düsterhus
+Licensed Work:        Tim’s Chat 4.2
+                      The Licensed Work is (c) 2010-2024 Tim Düsterhus
 Additional Use Grant: You may use the Licensed Work when your application
                       uses the Licensed Work for a purpose that does neither
                       directly or indirectly generate revenue.
 
-Change Date:          2024-10-20
+Change Date:          2028-01-13
 
 Change License:       Version 2 or later of the GNU General Public License as
                       published by the Free Software Foundation.

Makefile

@@ -40,4 +40,7 @@ distclean: clean
 	-rm -f be.bastelstu.chat.tar
 	-rm -f be.bastelstu.chat.tar.gz
 
+constants.php: option.xml
+	(echo "<?php" ; xq -r '.data.import.options.option[] | "define(\"" + (.["@name"] | ascii_upcase) + "\", " + .defaultvalue + ");"' < option.xml) > constants.php
+
 .PHONY: distclean clean

acptemplates/__chatVersion.tpl

@@ -1,5 +0,0 @@
-<dl>
-	<dt>{lang}chat.acp.index.system.software.chatVersion{/lang}</dt>
-	<dd>{$__chat->getPackage()->packageVersion}</dd>
-</dl>
-

acptemplates/commandTriggerAdd.tpl

@@ -14,11 +14,7 @@
 	</nav>
 </header>
 
-{include file='formError'}
-
-{if $success|isset}
-	<p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
-{/if}
+{include file='formNotice'}
 
 <form method="post" action="{if $action == 'add'}{link application='chat' controller='CommandTriggerAdd'}{/link}{else}{link application='chat' controller='CommandTriggerEdit' id=$triggerID}{/link}{/if}">
 	<div class="section">
@@ -64,7 +60,7 @@
 
 	<div class="formSubmit">
 		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
-		{@SECURITY_TOKEN_INPUT_TAG}
+		{csrfToken}
 	</div>
 </form>
 

acptemplates/commandTriggerList.tpl

@@ -46,7 +46,7 @@
 					<tr class="jsTriggerRow">
 						<td class="columnIcon">
 							<a href="{link controller='CommandTriggerEdit' object=$trigger application='chat'}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
-							<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$trigger->triggerID}" data-confirm-message-html="{lang __encode=true}chat.acp.command.trigger.delete.sure{/lang}"></span>
+							<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{$trigger->triggerID}" data-confirm-message-html="{lang __encode=true}chat.acp.command.trigger.delete.sure{/lang}"></span>
 
 							{event name='rowButtons'}
 						</td>

acptemplates/roomAdd.tpl

@@ -26,11 +26,7 @@
 	</nav>
 </header>
 
-{include file='formError'}
-
-{if $success|isset}
-	<p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
-{/if}
+{include file='formNotice'}
 
 <form method="post" action="{if $action == 'add'}{link application='chat' controller='RoomAdd'}{/link}{else}{link application='chat' controller='RoomEdit' id=$roomID}{/link}{/if}">
 	<div class="section">
@@ -105,7 +101,7 @@
 
 	<div class="formSubmit">
 		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
-		{@SECURITY_TOKEN_INPUT_TAG}
+		{csrfToken}
 	</div>
 </form>
 

acptemplates/roomList.tpl

@@ -37,14 +37,14 @@
 		<ol id="roomContainer0" class="sortableList" data-object-id="0">
 			{content}
 				{foreach from=$objects item=room}
-					<li class="sortableNode sortableNoNesting" data-object-id="{@$room->roomID}">
+					<li class="sortableNode sortableNoNesting" data-object-id="{$room->roomID}">
 						<span class="sortableNodeLabel">
 							<a href="{link controller='RoomEdit' application='chat' object=$room}{/link}">{$room}</a>
 
 							<span class="statusDisplay sortableButtonContainer">
 								<span class="icon icon16 fa-arrows sortableNodeHandle"></span>
 								<a href="{link controller='RoomEdit' application='chat' object=$room}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
-								<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$room->roomID}" data-confirm-message-html="{lang __encode=true}chat.acp.room.delete.sure{/lang}"></span>
+								<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{$room->roomID}" data-confirm-message-html="{lang __encode=true}chat.acp.room.delete.sure{/lang}"></span>
 								{event name='itemButtons'}
 							</span>
 						</span>

acptemplates/suspensionList.tpl

@@ -99,7 +99,7 @@ require([ 'Bastelstu.be/PromiseWrap/Ajax', 'Bastelstu.be/PromiseWrap/Ui/Confirma
 
 		<div class="formSubmit">
 			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
-			{@SECURITY_TOKEN_INPUT_TAG}
+			{csrfToken}
 		</div>
 	</section>
 </form>

constants.php

@@ -0,0 +1,6 @@
+<?php
+define("CHAT_RELOADTIME", 3);
+define("CHAT_AUTOAWAYTIME", 0);
+define("CHAT_MAX_LENGTH", 500);
+define("CHAT_ARCHIVE_AFTER", 90);
+define("CHAT_LOG_ARCHIVETIME", 7);

files/acp/be.bastelstu.chat_install.php

@@ -1,21 +1,25 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
  * or later of the General Public License.
  */
 
-use \wcf\system\box\BoxHandler;
+use wcf\system\box\BoxHandler;
 
-BoxHandler::getInstance()->createBoxCondition( 'be.bastelstu.chat.roomListDashboard'
-                                             , 'be.bastelstu.chat.box.roomList.condition'
-                                             , 'be.bastelstu.chat.roomFilled'
-                                             , [ 'chatRoomIsFilled' => 1 ]
-                                             );
+BoxHandler::getInstance()->createBoxCondition(
+    'be.bastelstu.chat.roomListDashboard',
+    'be.bastelstu.chat.box.roomList.condition',
+    'be.bastelstu.chat.roomFilled',
+    [
+        'chatRoomIsFilled' => 1,
+    ]
+);

files/acp/be.bastelstu.chat_update.php

@@ -1,35 +1,44 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
  * or later of the General Public License.
  */
 
-use \chat\data\message\MessageAction;
+use chat\data\message\MessageAction;
+use wcf\data\object\type\ObjectTypeCache;
 
-$objectTypeID = \wcf\data\object\type\ObjectTypeCache::getInstance()->getObjectTypeIDByName('be.bastelstu.chat.messageType', 'be.bastelstu.chat.messageType.chatUpdate');
+$objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName(
+    'be.bastelstu.chat.messageType',
+    'be.bastelstu.chat.messageType.chatUpdate'
+);
 
 if ($objectTypeID) {
-	(new MessageAction([ ], 'create', [ 'data' => [ 'roomID'       => null
-						      , 'userID'       => null
-						      , 'username'     => ''
-						      , 'time'         => TIME_NOW
-						      , 'objectTypeID' => $objectTypeID
-						      , 'payload'      => serialize([ ])
-						      ]
-					  ]
-			  )
-	)->executeAction();
+    (new MessageAction(
+        [ ],
+        'create',
+        [
+            'data' => [
+                'roomID' => null,
+                'userID' => null,
+                'username' => '',
+                'time' => TIME_NOW,
+                'objectTypeID' => $objectTypeID,
+                'payload' => \serialize([ ]),
+            ],
+        ]
+    ))->executeAction();
 }
 
-$CHATCore = file_get_contents(__DIR__.'/../lib/system/CHATCore.class.php');
-if (strpos($CHATCore, 'chat.phar.php') === false) {
-	@unlink(__DIR__.'/../chat.phar.php');
+$CHATCore = \file_get_contents(__DIR__ . '/../lib/system/CHATCore.class.php');
+if (\strpos($CHATCore, 'chat.phar.php') === false) {
+    @\unlink(__DIR__ . '/../chat.phar.php');
 }

files/acp/be.bastelstu.chat_update_deleteOrphanedAttachments.php

@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Deletes orphaned attachments.
+ *
+ * @author  Tim Duesterhus
+ * @copyright   2001-2022 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package WoltLabSuite\Core
+ * @see https://github.com/WoltLab/com.woltlab.wcf.conversation/blob/f0d4964a0b8042c440d5a3f759078429dc43c5b8/files/acp/update_com.woltlab.wcf.conversation_5.5_cleanup_orphaned_attachments.php
+ */
+
+use wcf\data\attachment\AttachmentAction;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\system\package\SplitNodeException;
+use wcf\system\WCF;
+
+$objectType = ObjectTypeCache::getInstance()
+    ->getObjectTypeByName('com.woltlab.wcf.attachment.objectType', 'be.bastelstu.chat.message');
+
+$sql = "SELECT  attachmentID
+        FROM    wcf1_attachment
+        WHERE   objectTypeID = ?
+            AND objectID NOT IN (
+                SELECT  messageID
+                FROM    chat1_message
+            )";
+$statement = WCF::getDB()->prepare($sql, 100);
+$statement->execute([$objectType->objectTypeID]);
+$attachmentIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
+
+if (empty($attachmentIDs)) {
+    return;
+}
+
+(new AttachmentAction($attachmentIDs, 'delete'))->executeAction();
+
+// If we reached this location we processed at least one attachment.
+// If this was the final attachment the next iteration will abort this
+// script early, thus not splitting the node.
+throw new SplitNodeException();

files/acp/global.php

@@ -1,18 +1,19 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
  * or later of the General Public License.
  */
 
-define('RELATIVE_CHAT_DIR', '../');
+\define('RELATIVE_CHAT_DIR', '../');
 
-require_once(RELATIVE_CHAT_DIR.'/config.inc.php');
-require_once(RELATIVE_WCF_DIR.'acp/global.php');
+require_once(RELATIVE_CHAT_DIR . '/app.config.inc.php');
+require_once(RELATIVE_WCF_DIR . 'acp/global.php');

files/acp/index.php

@@ -1,16 +1,20 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
  * or later of the General Public License.
  */
 
+use wcf\system\request\RequestHandler;
+
 require('./global.php');
-\wcf\system\request\RequestHandler::getInstance()->handle('chat', true);
+
+RequestHandler::getInstance()->handle('chat', true);

files/global.php

@@ -1,16 +1,17 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
  * or later of the General Public License.
  */
 
-require_once(dirname(__FILE__).'/config.inc.php');
-require_once(RELATIVE_WCF_DIR.'global.php');
+require_once(__DIR__ . '/app.config.inc.php');
+require_once(RELATIVE_WCF_DIR . 'global.php');

files/index.php

@@ -1,16 +1,20 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
  * or later of the General Public License.
  */
 
+use wcf\system\request\RequestHandler;
+
 require('./global.php');
-\wcf\system\request\RequestHandler::getInstance()->handle('chat');
+
+RequestHandler::getInstance()->handle('chat');

files/lib/acp/form/CommandTriggerAddForm.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,146 +15,173 @@
 
 namespace chat\acp\form;
 
-use \chat\data\command\CommandCache;
-use \chat\data\command\CommandTrigger;
-use \chat\data\command\CommandTriggerAction;
-use \chat\data\command\CommandTriggerEditor;
-use \wcf\system\exception\UserInputException;
-use \wcf\system\WCF;
+use chat\data\command\CommandList;
+use chat\data\command\CommandTrigger;
+use chat\data\command\CommandTriggerAction;
+use wcf\form\AbstractForm;
+use wcf\system\exception\UserInputException;
+use wcf\system\WCF;
+use wcf\util\StringUtil;
 
 /**
  * Shows the command trigger add form.
  */
-class CommandTriggerAddForm extends \wcf\form\AbstractForm {
-	/**
-	 * @inheritDoc
-	 */
-	public $activeMenuItem = 'chat.acp.menu.link.command.trigger.add';
+class CommandTriggerAddForm extends AbstractForm
+{
+    /**
+     * @inheritDoc
+     */
+    public $activeMenuItem = 'chat.acp.menu.link.command.trigger.add';
 
-	/**
-	 * @inheritDoc
-	 */
-	public $neededPermissions = [ 'admin.chat.canManageTriggers' ];
+    /**
+     * @inheritDoc
+     */
+    public $neededPermissions = [
+        'admin.chat.canManageTriggers',
+    ];
 
-	/**
-	 * The new trigger for the specified command
-	 * @var string
-	 */
-	public $commandTrigger = '';
+    /**
+     * The new trigger for the specified command
+     * @var string
+     */
+    public $commandTrigger = '';
 
-	/**
-	 * List of currently known commands
-	 * @var array
-	 */
-	public $commands = [ ];
+    /**
+     * List of currently known commands
+     * @var array
+     */
+    public $commands = [ ];
 
-	/**
-	 * The selected command.
-	 *
-	 * @param	Command
-	 */
-	public $command = null;
+    /**
+     * The selected command.
+     *
+     * @param   Command
+     */
+    public $command;
 
-	/**
-	 * The fully qualified name of the command
-	 * @var string
-	 */
-	public $className = '';
+    /**
+     * The fully qualified name of the command
+     * @var string
+     */
+    public $className = '';
 
-	/**
-	 * @inheritDoc
-	 */
-	public function readData() {
-		$commandList = new \chat\data\command\CommandList();
-		$commandList->sqlOrderBy = 'command.className';
-		$commandList->readObjects();
+    /**
+     * @inheritDoc
+     */
+    public function readData()
+    {
+        $commandList = new CommandList();
+        $commandList->sqlOrderBy = 'command.className';
+        $commandList->readObjects();
 
-		$this->commands = $commandList->getObjects();
+        $this->commands = $commandList->getObjects();
 
-		parent::readData();
-	}
+        parent::readData();
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function readFormParameters() {
-		parent::readFormParameters();
+    /**
+     * @inheritDoc
+     */
+    public function readFormParameters()
+    {
+        parent::readFormParameters();
 
-		if (isset($_POST['commandTrigger'])) $this->commandTrigger = \wcf\util\StringUtil::trim($_POST['commandTrigger']);
-		if (isset($_POST['className'])) $this->className = \wcf\util\StringUtil::trim($_POST['className']);
-	}
+        if (isset($_POST['commandTrigger'])) {
+            $this->commandTrigger = StringUtil::trim($_POST['commandTrigger']);
+        }
+        if (isset($_POST['className'])) {
+            $this->className = StringUtil::trim($_POST['className']);
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function validate() {
-		parent::validate();
+    /**
+     * @inheritDoc
+     */
+    public function validate()
+    {
+        parent::validate();
 
-		if (empty($this->commandTrigger)) {
-			throw new UserInputException('commandTrigger', 'empty');
-		}
+        if ($this->commandTrigger === '') {
+            throw new UserInputException('commandTrigger', 'empty');
+        }
 
-		// Triggers must not contain whitespace
-		if (preg_match('~\s~', $this->commandTrigger)) {
-			throw new UserInputException('commandTrigger', 'invalid');
-		}
+        // Triggers must not contain whitespace
+        if (\preg_match('~\s~', $this->commandTrigger)) {
+            throw new UserInputException('commandTrigger', 'invalid');
+        }
 
-		// Check for duplicates
-		$trigger = CommandTrigger::getTriggerByName($this->commandTrigger);
-		if ((!isset($this->trigger) && $trigger->triggerID) || (isset($this->trigger) && $trigger->triggerID != $this->trigger->triggerID)) {
-			throw new UserInputException('commandTrigger', 'duplicate');
-		}
+        // Check for duplicates
+        $trigger = CommandTrigger::getTriggerByName($this->commandTrigger);
+        if (
+            (!isset($this->trigger) && $trigger->triggerID)
+            || (isset($this->trigger) && $trigger->triggerID != $this->trigger->triggerID)
+        ) {
+            throw new UserInputException('commandTrigger', 'duplicate');
+        }
 
-		if (empty($this->className)) {
-			throw new UserInputException('className', 'empty');
-		}
+        if ($this->className === '') {
+            throw new UserInputException('className', 'empty');
+        }
 
-		// Check if the command is registered
-		foreach ($this->commands as $command) {
-			if ($command->className === $this->className) {
-				$this->command = $command;
-				break;
-			}
-		}
+        // Check if the command is registered
+        foreach ($this->commands as $command) {
+            if ($command->className === $this->className) {
+                $this->command = $command;
+                break;
+            }
+        }
 
-		if (!$this->command) {
-			throw new UserInputException('className', 'notFound');
-		}
-	}
+        if (!$this->command) {
+            throw new UserInputException('className', 'notFound');
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function save() {
-		parent::save();
+    /**
+     * @inheritDoc
+     */
+    public function save()
+    {
+        parent::save();
 
-		$fields = [ 'commandTrigger' => $this->commandTrigger
-		          , 'commandID'      => $this->command->commandID
-		          ];
+        $fields = [
+            'commandTrigger' => $this->commandTrigger,
+            'commandID' => $this->command->commandID,
+        ];
 
-		// create room
-		$this->objectAction = new \chat\data\command\CommandTriggerAction([ ], 'create', [ 'data' => array_merge($this->additionalFields, $fields) ]);
-		$this->objectAction->executeAction();
+        // create room
+        $this->objectAction = new CommandTriggerAction(
+            [ ],
+            'create',
+            [
+                'data' => \array_merge(
+                    $this->additionalFields,
+                    $fields
+                ),
+            ]
+        );
+        $this->objectAction->executeAction();
 
-		$this->saved();
+        $this->saved();
 
-		// reset values
-		$this->commandTrigger = $this->className = '';
+        // reset values
+        $this->commandTrigger = $this->className = '';
 
-		// show success message
-		WCF::getTPL()->assign('success', true);
-	}
+        // show success message
+        WCF::getTPL()->assign('success', true);
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function assignVariables() {
-		parent::assignVariables();
+    /**
+     * @inheritDoc
+     */
+    public function assignVariables()
+    {
+        parent::assignVariables();
 
-		WCF::getTPL()->assign([ 'action'            => 'add'
-		                      , 'commandTrigger'    => $this->commandTrigger
-		                      , 'className'         => $this->className
-		                      , 'availableCommands' => $this->commands
-		                      ]);
-	}
+        WCF::getTPL()->assign([
+            'action' => 'add',
+            'commandTrigger' => $this->commandTrigger,
+            'className' => $this->className,
+            'availableCommands' => $this->commands,
+        ]);
+    }
 }

files/lib/acp/form/CommandTriggerEditForm.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,99 +15,119 @@
 
 namespace chat\acp\form;
 
-use \chat\data\command\CommandTrigger;
-use \chat\data\command\CommandTriggerAction;
-use \chat\data\command\CommandTriggerEditor;
-use \wcf\system\exception\IllegalLinkException;
-use \wcf\system\exception\UserInputException;
-use \wcf\system\WCF;
+use chat\data\command\CommandList;
+use chat\data\command\CommandTrigger;
+use chat\data\command\CommandTriggerAction;
+use wcf\form\AbstractForm;
+use wcf\system\exception\IllegalLinkException;
+use wcf\system\WCF;
 
 /**
  * Shows the command trigger edit form.
  */
-class CommandTriggerEditForm extends CommandTriggerAddForm {
-	/**
-	 * @inheritDoc
-	 */
-	public $activeMenuItem = 'chat.acp.menu.link.command.trigger.list';
+class CommandTriggerEditForm extends CommandTriggerAddForm
+{
+    /**
+     * @inheritDoc
+     */
+    public $activeMenuItem = 'chat.acp.menu.link.command.trigger.list';
 
-	/**
-	 * The requested command trigger ID.
-	 *
-	 * @param	int
-	 */
-	public $triggerID = 0;
+    /**
+     * The requested command trigger ID.
+     *
+     * @param   int
+     */
+    public $triggerID = 0;
 
-	/**
-	 * The requested command trigger.
-	 *
-	 * @param	CommandTrigger
-	 */
-	public $trigger = null;
+    /**
+     * The requested command trigger.
+     *
+     * @param   CommandTrigger
+     */
+    public $trigger;
 
-	/**
-	 * @inheritDoc
-	 */
-	public function readParameters() {
-		if (isset($_REQUEST['id'])) $this->triggerID = intval($_REQUEST['id']);
-		$this->trigger = new CommandTrigger($this->triggerID);
+    /**
+     * @inheritDoc
+     */
+    public function readParameters()
+    {
+        if (isset($_REQUEST['id'])) {
+            $this->triggerID = \intval($_REQUEST['id']);
+        }
+        $this->trigger = new CommandTrigger($this->triggerID);
 
-		if (!$this->trigger) {
-			throw new IllegalLinkException();
-		}
+        if (!$this->trigger) {
+            throw new IllegalLinkException();
+        }
 
-		parent::readParameters();
-	}
+        parent::readParameters();
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function readData() {
-		parent::readData();
+    /**
+     * @inheritDoc
+     */
+    public function readData()
+    {
+        parent::readData();
 
-		if (empty($_POST)) {
-			$commandList = new \chat\data\command\CommandList();
-			$commandList->getConditionBuilder()->add('command.commandID = ?', [ $this->trigger->commandID ]);
-			$commandList->readObjects();
-			$commands = $commandList->getObjects();
+        if (empty($_POST)) {
+            $commandList = new CommandList();
+            $commandList->getConditionBuilder()->add('command.commandID = ?', [ $this->trigger->commandID ]);
+            $commandList->readObjects();
+            $commands = $commandList->getObjects();
 
-			if (!count($commands)) {
-				throw new IllegalLinkException();
-			}
+            if (!\count($commands)) {
+                throw new IllegalLinkException();
+            }
 
-			$this->commandTrigger = $this->trigger->commandTrigger;
-			$this->className      = $commands[$this->trigger->commandID]->className;
-		}
-	}
+            $this->commandTrigger = $this->trigger->commandTrigger;
+            $this->className = $commands[$this->trigger->commandID]->className;
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function save() {
-		\wcf\form\AbstractForm::save();
+    /**
+     * @inheritDoc
+     */
+    public function save()
+    {
+        AbstractForm::save();
 
-		$fields = [ 'commandTrigger' => $this->commandTrigger
-		          , 'commandID'      => $this->command->commandID
-		          ];
+        $fields = [
+            'commandTrigger' => $this->commandTrigger,
+            'commandID' => $this->command->commandID,
+        ];
 
-		// update trigger
-		$this->objectAction = new CommandTriggerAction([ $this->trigger ], 'update', [ 'data' => array_merge($this->additionalFields, $fields) ]);
-		$this->objectAction->executeAction();
+        // update trigger
+        $this->objectAction = new CommandTriggerAction(
+            [
+                $this->trigger,
+            ],
+            'update',
+            [
+                'data' => \array_merge(
+                    $this->additionalFields,
+                    $fields
+                ),
+            ]
+        );
+        $this->objectAction->executeAction();
 
-		$this->saved();
+        $this->saved();
 
-		// show success message
-		WCF::getTPL()->assign('success', true);
-	}
+        // show success message
+        WCF::getTPL()->assign('success', true);
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function assignVariables() {
-		parent::assignVariables();
+    /**
+     * @inheritDoc
+     */
+    public function assignVariables()
+    {
+        parent::assignVariables();
 
-		WCF::getTPL()->assign([ 'action'    => 'edit'
-		                      , 'triggerID' => $this->trigger->triggerID
-		                      ]);
-	}
+        WCF::getTPL()->assign([
+            'action' => 'edit',
+            'triggerID' => $this->trigger->triggerID,
+        ]);
+    }
 }

files/lib/acp/form/RoomAddForm.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,202 +15,236 @@
 
 namespace chat\acp\form;
 
-use \chat\data\room\Room;
-use \chat\data\room\RoomAction;
-use \chat\data\room\RoomEditor;
-use \wcf\system\acl\ACLHandler;
-use \wcf\system\exception\UserInputException;
-use \wcf\system\language\I18nHandler;
-use \wcf\system\WCF;
+use chat\data\room\Room;
+use chat\data\room\RoomAction;
+use chat\data\room\RoomEditor;
+use wcf\data\package\PackageCache;
+use wcf\form\AbstractForm;
+use wcf\system\acl\ACLHandler;
+use wcf\system\exception\UserInputException;
+use wcf\system\language\I18nHandler;
+use wcf\system\WCF;
 
 /**
  * Shows the room add form.
  */
-class RoomAddForm extends \wcf\form\AbstractForm {
-	/**
-	 * @inheritDoc
-	 */
-	public $activeMenuItem = 'chat.acp.menu.link.room.add';
+class RoomAddForm extends AbstractForm
+{
+    /**
+     * @inheritDoc
+     */
+    public $activeMenuItem = 'chat.acp.menu.link.room.add';
 
-	/**
-	 * @inheritDoc
-	 */
-	public $neededPermissions = [ 'admin.chat.canManageRoom' ];
+    /**
+     * @inheritDoc
+     */
+    public $neededPermissions = [
+        'admin.chat.canManageRoom',
+    ];
 
-	/**
-	 * Object type ID of the ACL object type for rooms.
-	 * @var int
-	 */
-	public $aclObjectTypeID = 0;
+    /**
+     * Object type ID of the ACL object type for rooms.
+     * @var int
+     */
+    public $aclObjectTypeID = 0;
 
-	/**
-	 * Chat room title.
-	 * @var string
-	 */
-	public $title = '';
+    /**
+     * Chat room title.
+     * @var string
+     */
+    public $title = '';
 
-	/**
-	 * Chat room topic.
-	 * @var string
-	 */
-	public $topic = '';
+    /**
+     * Chat room topic.
+     * @var string
+     */
+    public $topic = '';
 
-	/**
-	 * Whether HTML should be interpreted in the room's topic.
-	 * @var boolean
-	 */
-	public $topicUseHtml = false;
+    /**
+     * Whether HTML should be interpreted in the room's topic.
+     * @var boolean
+     */
+    public $topicUseHtml = false;
 
-	/**
-	 * Chat room user limit.
-	 * @var int
-	 */
-	public $userLimit = 0;
+    /**
+     * Chat room user limit.
+     * @var int
+     */
+    public $userLimit = 0;
 
-	/**
-	 * @inheritDoc
-	 */
-	public function readParameters() {
-		parent::readParameters();
+    /**
+     * @inheritDoc
+     */
+    public function readParameters()
+    {
+        parent::readParameters();
 
-		I18nHandler::getInstance()->register('title');
-		I18nHandler::getInstance()->register('topic');
+        I18nHandler::getInstance()->register('title');
+        I18nHandler::getInstance()->register('topic');
 
-		$this->aclObjectTypeID = ACLHandler::getInstance()->getObjectTypeID('be.bastelstu.chat.room');
-	}
+        $this->aclObjectTypeID = ACLHandler::getInstance()->getObjectTypeID('be.bastelstu.chat.room');
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function readFormParameters() {
-		parent::readFormParameters();
+    /**
+     * @inheritDoc
+     */
+    public function readFormParameters()
+    {
+        parent::readFormParameters();
 
-		// read i18n values
-		I18nHandler::getInstance()->readValues();
+        // read i18n values
+        I18nHandler::getInstance()->readValues();
 
-		// handle i18n plain input
-		if (I18nHandler::getInstance()->isPlainValue('title')) $this->title = I18nHandler::getInstance()->getValue('title');
-		if (I18nHandler::getInstance()->isPlainValue('topic')) $this->topic = I18nHandler::getInstance()->getValue('topic');
-		if (isset($_POST['userLimit'])) $this->userLimit = intval($_POST['userLimit']);
-		if (isset($_POST['topicUseHtml'])) $this->topicUseHtml = true;
-	}
+        // handle i18n plain input
+        if (I18nHandler::getInstance()->isPlainValue('title')) {
+            $this->title = I18nHandler::getInstance()->getValue('title');
+        }
+        if (I18nHandler::getInstance()->isPlainValue('topic')) {
+            $this->topic = I18nHandler::getInstance()->getValue('topic');
+        }
+        if (isset($_POST['userLimit'])) {
+            $this->userLimit = \intval($_POST['userLimit']);
+        }
+        if (isset($_POST['topicUseHtml'])) {
+            $this->topicUseHtml = true;
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function validate() {
-		parent::validate();
+    /**
+     * @inheritDoc
+     */
+    public function validate()
+    {
+        parent::validate();
 
-		// validate title
-		if (!I18nHandler::getInstance()->validateValue('title')) {
-			if (I18nHandler::getInstance()->isPlainValue('title')) {
-				throw new UserInputException('title');
-			}
-			else {
-				throw new UserInputException('title', 'multilingual');
-			}
-		}
+        // validate title
+        if (!I18nHandler::getInstance()->validateValue('title')) {
+            if (I18nHandler::getInstance()->isPlainValue('title')) {
+                throw new UserInputException('title');
+            } else {
+                throw new UserInputException('title', 'multilingual');
+            }
+        }
 
-		// validate topic
-		if (!I18nHandler::getInstance()->validateValue('topic', false, true)) {
-			throw new UserInputException('topic');
-		}
+        // validate topic
+        if (!I18nHandler::getInstance()->validateValue('topic', false, true)) {
+            throw new UserInputException('topic');
+        }
 
-		if (mb_strlen($this->topic) > 10000) {
-			throw new UserInputException('topic', 'tooLong');
-		}
+        if (\mb_strlen($this->topic) > 10000) {
+            throw new UserInputException('topic', 'tooLong');
+        }
 
-		if ($this->userLimit < 0) {
-			throw new UserInputException('userLimit', 'negative');
-		}
-	}
+        if ($this->userLimit < 0) {
+            throw new UserInputException('userLimit', 'negative');
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function save() {
-		parent::save();
+    /**
+     * @inheritDoc
+     */
+    public function save()
+    {
+        parent::save();
 
-		$fields = [ 'title' => $this->title
-		          , 'topic' => $this->topic
-		          , 'topicUseHtml' => (int) $this->topicUseHtml
-		          , 'userLimit' => $this->userLimit
-		          , 'position' => 0 // TODO
-		          ];
+        $fields = [
+            'title' => $this->title,
+            'topic' => $this->topic,
+            'topicUseHtml' => (int)$this->topicUseHtml,
+            'userLimit' => $this->userLimit,
+            'position' => 0, // TODO
+        ];
 
-		// create room
-		$this->objectAction = new \chat\data\room\RoomAction([], 'create', [ 'data' => array_merge($this->additionalFields, $fields) ]);
-		$returnValues = $this->objectAction->executeAction();
+        // create room
+        $this->objectAction = new RoomAction(
+            [ ],
+            'create',
+            [
+                'data' => \array_merge(
+                    $this->additionalFields,
+                    $fields
+                ),
+            ]
+        );
+        $returnValues = $this->objectAction->executeAction();
 
-		// save i18n values
-		$this->saveI18nValue($returnValues['returnValues'], [ 'title', 'topic' ]);
+        // save i18n values
+        $this->saveI18nValue(
+            $returnValues['returnValues'],
+            [
+                'title',
+                'topic',
+            ]
+        );
 
-		// save ACL
-		ACLHandler::getInstance()->save($returnValues['returnValues']->roomID, $this->aclObjectTypeID);
+        // save ACL
+        ACLHandler::getInstance()->save($returnValues['returnValues']->roomID, $this->aclObjectTypeID);
 
-		$this->saved();
+        $this->saved();
 
-		// reset values
-		$this->title = $this->topic = '';
-		$this->userLimit = 0;
-		$this->topicUseHtml = false;
+        // reset values
+        $this->title = $this->topic = '';
+        $this->userLimit = 0;
+        $this->topicUseHtml = false;
 
-		I18nHandler::getInstance()->reset();
-		ACLHandler::getInstance()->disableAssignVariables();
+        I18nHandler::getInstance()->reset();
+        ACLHandler::getInstance()->disableAssignVariables();
 
-		// show success message
-		WCF::getTPL()->assign('success', true);
-	}
+        // show success message
+        WCF::getTPL()->assign('success', true);
+    }
 
-	/**
-	 * Saves i18n values.
-	 *
-	 * @param	Room      $room
-	 * @param	string[]  $columns
-	 */
-	public function saveI18nValue(Room $room, $columns) {
-		$data = [ ];
+    /**
+     * Saves i18n values.
+     *
+     * @param   Room      $room
+     * @param   string[]  $columns
+     */
+    public function saveI18nValue(Room $room, $columns)
+    {
+        $data = [ ];
 
-		foreach ($columns as $columnName) {
-			$languageItem = 'chat.room.room'.$room->roomID.'.'.$columnName;
+        foreach ($columns as $columnName) {
+            $languageItem = 'chat.room.room' . $room->roomID . '.' . $columnName;
 
-			if (I18nHandler::getInstance()->isPlainValue($columnName)) {
-				if ($room->$columnName === $languageItem) {
-					I18nHandler::getInstance()->remove($languageItem);
-				}
-			}
-			else {
-				$packageID = \wcf\data\package\PackageCache::getInstance()->getPackageID('be.bastelstu.chat');
+            if (I18nHandler::getInstance()->isPlainValue($columnName)) {
+                if ($room->{$columnName} === $languageItem) {
+                    I18nHandler::getInstance()->remove($languageItem);
+                }
+            } else {
+                $packageID = PackageCache::getInstance()->getPackageID('be.bastelstu.chat');
 
-				I18nHandler::getInstance()->save( $columnName
-								, $languageItem
-								, 'chat.room'
-								, $packageID
-								);
+                I18nHandler::getInstance()->save(
+                    $columnName,
+                    $languageItem,
+                    'chat.room',
+                    $packageID
+                );
 
-				$data[$columnName] = $languageItem;
-			}
-		}
+                $data[$columnName] = $languageItem;
+            }
+        }
 
-		if (!empty($data)) {
-			(new RoomEditor($room))->update($data);
-		}
-	}
+        if ($data !== []) {
+            (new RoomEditor($room))->update($data);
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function assignVariables() {
-		parent::assignVariables();
+    /**
+     * @inheritDoc
+     */
+    public function assignVariables()
+    {
+        parent::assignVariables();
 
-		ACLHandler::getInstance()->assignVariables($this->aclObjectTypeID);
-		I18nHandler::getInstance()->assignVariables();
+        ACLHandler::getInstance()->assignVariables($this->aclObjectTypeID);
+        I18nHandler::getInstance()->assignVariables();
 
-		WCF::getTPL()->assign([ 'action' => 'add'
-		                      , 'aclObjectTypeID' => $this->aclObjectTypeID
-		                      , 'userLimit' => $this->userLimit
-		                      , 'topicUseHtml' => $this->topicUseHtml
-		                      ]);
-	}
+        WCF::getTPL()->assign([
+            'action' => 'add',
+            'aclObjectTypeID' => $this->aclObjectTypeID,
+            'userLimit' => $this->userLimit,
+            'topicUseHtml' => $this->topicUseHtml,
+        ]);
+    }
 }
-

files/lib/acp/form/RoomEditForm.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,104 +15,144 @@
 
 namespace chat\acp\form;
 
-use \chat\data\room\Room;
-use \chat\data\room\RoomAction;
-use \wcf\system\acl\ACLHandler;
-use \wcf\system\language\I18nHandler;
-use \wcf\system\WCF;
+use chat\data\room\Room;
+use chat\data\room\RoomAction;
+use wcf\data\package\PackageCache;
+use wcf\form\AbstractForm;
+use wcf\system\acl\ACLHandler;
+use wcf\system\exception\IllegalLinkException;
+use wcf\system\language\I18nHandler;
+use wcf\system\WCF;
 
 /**
  * Shows the room edit form.
  */
-class RoomEditForm extends RoomAddForm {
-	/**
-	 * @inheritDoc
-	 */
-	public $activeMenuItem = 'chat.acp.menu.link.room.list';
+class RoomEditForm extends RoomAddForm
+{
+    /**
+     * @inheritDoc
+     */
+    public $activeMenuItem = 'chat.acp.menu.link.room.list';
 
-	/**
-	 * The requested chat room ID.
-	 *
-	 * @param	int
-	 */
-	public $roomID = 0;
+    /**
+     * The requested chat room ID.
+     *
+     * @param   int
+     */
+    public $roomID = 0;
 
-	/**
-	 * The requested chat room.
-	 *
-	 * @param	Room
-	 */
-	public $room = null;
+    /**
+     * The requested chat room.
+     *
+     * @param   Room
+     */
+    public $room;
 
-	/**
-	 * @inheritDoc
-	 */
-	public function readParameters() {
-		if (isset($_REQUEST['id'])) $this->roomID = intval($_REQUEST['id']);
-		$this->room = new Room($this->roomID);
+    /**
+     * @inheritDoc
+     */
+    public function readParameters()
+    {
+        if (isset($_REQUEST['id'])) {
+            $this->roomID = \intval($_REQUEST['id']);
+        }
+        $this->room = new Room($this->roomID);
 
-		if (!$this->room) {
-			throw new IllegalLinkException();
-		}
+        if (!$this->room) {
+            throw new IllegalLinkException();
+        }
 
-		parent::readParameters();
-	}
+        parent::readParameters();
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function readData() {
-		parent::readData();
+    /**
+     * @inheritDoc
+     */
+    public function readData()
+    {
+        parent::readData();
 
-		if (empty($_POST)) {
-			$packageID = \wcf\data\package\PackageCache::getInstance()->getPackageID('be.bastelstu.chat');
-			I18nHandler::getInstance()->setOptions('title', $packageID, $this->room->title, 'chat.room.room\d+.title');
-			I18nHandler::getInstance()->setOptions('topic', $packageID, $this->room->topic, 'chat.room.room\d+.topic');
-			$this->userLimit = $this->room->userLimit;
-			$this->topicUseHtml = $this->room->topicUseHtml;
-		}
-	}
+        if (empty($_POST)) {
+            $packageID = PackageCache::getInstance()->getPackageID('be.bastelstu.chat');
+            I18nHandler::getInstance()->setOptions(
+                'title',
+                $packageID,
+                $this->room->title,
+                'chat.room.room\d+.title'
+            );
+            I18nHandler::getInstance()->setOptions(
+                'topic',
+                $packageID,
+                $this->room->topic,
+                'chat.room.room\d+.topic'
+            );
+            $this->userLimit = $this->room->userLimit;
+            $this->topicUseHtml = $this->room->topicUseHtml;
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function save() {
-		\wcf\form\AbstractForm::save();
+    /**
+     * @inheritDoc
+     */
+    public function save()
+    {
+        AbstractForm::save();
 
-		$fields = [ 'title' => $this->title
-		          , 'topic' => $this->topic
-		          , 'topicUseHtml' => (int) $this->topicUseHtml
-		          , 'userLimit' => $this->userLimit
-		          , 'position' => 0 // TODO
-		          ];
+        $fields = [
+            'title' => $this->title,
+            'topic' => $this->topic,
+            'topicUseHtml' => (int)$this->topicUseHtml,
+            'userLimit' => $this->userLimit,
+            'position' => 0, // TODO
+        ];
 
-		// update room
-		$this->objectAction = new RoomAction([ $this->room ], 'update', [ 'data' => array_merge($this->additionalFields, $fields) ]);
-		$returnValues = $this->objectAction->executeAction();
+        // update room
+        $this->objectAction = new RoomAction(
+            [ $this->room ],
+            'update',
+            [
+                'data' => \array_merge(
+                    $this->additionalFields,
+                    $fields
+                ),
+            ]
+        );
+        $returnValues = $this->objectAction->executeAction();
 
-		// save i18n values
-		$this->saveI18nValue($this->room, [ 'title', 'topic' ]);
+        // save i18n values
+        $this->saveI18nValue(
+            $this->room,
+            [
+                'title',
+                'topic',
+            ]
+        );
 
-		// save ACL
-		ACLHandler::getInstance()->save($this->room->roomID, $this->aclObjectTypeID);
+        // save ACL
+        ACLHandler::getInstance()->save(
+            $this->room->roomID,
+            $this->aclObjectTypeID
+        );
 
-		$this->saved();
+        $this->saved();
 
-		// show success message
-		WCF::getTPL()->assign('success', true);
-	}
+        // show success message
+        WCF::getTPL()->assign('success', true);
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function assignVariables() {
-		parent::assignVariables();
+    /**
+     * @inheritDoc
+     */
+    public function assignVariables()
+    {
+        parent::assignVariables();
 
-		I18nHandler::getInstance()->assignVariables(!empty($_POST));
+        I18nHandler::getInstance()->assignVariables(!empty($_POST));
 
-		WCF::getTPL()->assign([ 'action' => 'edit'
-		                      , 'roomID' => $this->room->roomID
-		                      , 'room'   => $this->room
-		                      ]);
-	}
+        WCF::getTPL()->assign([
+            'action' => 'edit',
+            'roomID' => $this->room->roomID,
+            'room' => $this->room,
+        ]);
+    }
 }

files/lib/acp/page/CommandTriggerListPage.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,42 +15,53 @@
 
 namespace chat\acp\page;
 
+use chat\data\command\CommandTriggerList;
+use wcf\page\SortablePage;
+
 /**
  * Shows the command trigger list.
  */
-class CommandTriggerListPage extends \wcf\page\SortablePage {
-	/**
-	 * @inheritDoc
-	 */
-	public $activeMenuItem = 'chat.acp.menu.link.command.trigger.list';
+final class CommandTriggerListPage extends SortablePage
+{
+    /**
+     * @inheritDoc
+     */
+    public $activeMenuItem = 'chat.acp.menu.link.command.trigger.list';
 
-	/**
-	 * @inheritDoc
-	 */
-	public $neededPermissions = [ 'admin.chat.canManageTriggers' ];
+    /**
+     * @inheritDoc
+     */
+    public $neededPermissions = [
+        'admin.chat.canManageTriggers',
+    ];
 
-	/**
-	 * @inheritDoc
-	 */
-	public $objectListClassName = \chat\data\command\CommandTriggerList::class;
+    /**
+     * @inheritDoc
+     */
+    public $objectListClassName = CommandTriggerList::class;
 
-	/**
-	 * @inheritDoc
-	 */
-	public $validSortFields = [ 'triggerID', 'commandTrigger', 'className' ];
+    /**
+     * @inheritDoc
+     */
+    public $validSortFields = [
+        'triggerID',
+        'commandTrigger',
+        'className',
+    ];
 
-	/**
-	 * @inheritDoc
-	 */
-	public $defaultSortField = 'commandTrigger';
+    /**
+     * @inheritDoc
+     */
+    public $defaultSortField = 'commandTrigger';
 
-	/**
-	 * @inheritDoc
-	 */
-	protected function initObjectList() {
-		parent::initObjectList();
+    /**
+     * @inheritDoc
+     */
+    protected function initObjectList()
+    {
+        parent::initObjectList();
 
-		$this->objectList->sqlSelects = 'command.className';
-		$this->objectList->sqlJoins = 'LEFT JOIN chat'.WCF_N.'_command command ON (command.commandID = command_trigger.commandID)';
-	}
+        $this->objectList->sqlSelects = 'command.className';
+        $this->objectList->sqlJoins = 'LEFT JOIN chat' . WCF_N . '_command command ON (command.commandID = command_trigger.commandID)';
+    }
 }

files/lib/acp/page/RoomListPage.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,32 +15,41 @@
 
 namespace chat\acp\page;
 
+use chat\data\room\RoomList;
+use wcf\page\SortablePage;
+
 /**
  * Shows the room list.
  */
-class RoomListPage extends \wcf\page\SortablePage {
-	/**
-	 * @inheritDoc
-	 */
-	public $activeMenuItem = 'chat.acp.menu.link.room.list';
+final class RoomListPage extends SortablePage
+{
+    /**
+     * @inheritDoc
+     */
+    public $activeMenuItem = 'chat.acp.menu.link.room.list';
 
-	/**
-	 * @inheritDoc
-	 */
-	public $neededPermissions = [ 'admin.chat.canManageRoom' ];
+    /**
+     * @inheritDoc
+     */
+    public $neededPermissions = [
+        'admin.chat.canManageRoom',
+    ];
 
-	/**
-	 * @inheritDoc
-	 */
-	public $objectListClassName = \chat\data\room\RoomList::class;
+    /**
+     * @inheritDoc
+     */
+    public $objectListClassName = RoomList::class;
 
-	/**
-	 * @inheritDoc
-	 */
-	public $validSortFields = [ 'roomID', 'title' ];
+    /**
+     * @inheritDoc
+     */
+    public $validSortFields = [
+        'roomID',
+        'title',
+    ];
 
-	/**
-	 * @inheritDoc
-	 */
-	public $defaultSortField = 'position';
+    /**
+     * @inheritDoc
+     */
+    public $defaultSortField = 'position';
 }

files/lib/acp/page/SuspensionListPage.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,212 +15,236 @@
 
 namespace chat\acp\page;
 
-use \chat\data\room\Room;
-use \chat\data\suspension\Suspension;
-use \wcf\data\user\User;
-use \wcf\system\WCF;
-use \wcf\util\StringUtil;
+use chat\data\room\Room;
+use chat\data\room\RoomList;
+use chat\data\suspension\Suspension;
+use chat\data\suspension\SuspensionList;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\data\user\User;
+use wcf\page\SortablePage;
+use wcf\system\cache\runtime\UserRuntimeCache;
+use wcf\system\WCF;
+use wcf\util\StringUtil;
 
 /**
  * Shows the suspension list.
  */
-class SuspensionListPage extends \wcf\page\SortablePage {
-	/**
-	 * @inheritDoc
-	 */
-	public $activeMenuItem = 'chat.acp.menu.link.suspension.list';
+final class SuspensionListPage extends SortablePage
+{
+    /**
+     * @inheritDoc
+     */
+    public $activeMenuItem = 'chat.acp.menu.link.suspension.list';
 
-	/**
-	 * @inheritDoc
-	 */
-	public $neededPermissions = [ 'admin.chat.canManageSuspensions' ];
+    /**
+     * @inheritDoc
+     */
+    public $neededPermissions = [
+        'admin.chat.canManageSuspensions',
+    ];
 
-	/**
-	 * @inheritDoc
-	 */
-	public $objectListClassName = \chat\data\suspension\SuspensionList::class;
+    /**
+     * @inheritDoc
+     */
+    public $objectListClassName = SuspensionList::class;
 
-	/**
-	 * @inheritDoc
-	 */
-	public $validSortFields = [ 'suspensionID', 'time', 'expires', 'revoked' ];
+    /**
+     * @inheritDoc
+     */
+    public $validSortFields = [
+        'suspensionID',
+        'time',
+        'expires',
+        'revoked',
+    ];
 
-	/**
-	 * @inheritDoc
-	 */
-	public $defaultSortField = 'expiresSort';
+    /**
+     * @inheritDoc
+     */
+    public $defaultSortField = 'expiresSort';
 
-	/**
-	 * @inheritDoc
-	 */
-	public $defaultSortOrder = 'DESC';
+    /**
+     * @inheritDoc
+     */
+    public $defaultSortOrder = 'DESC';
 
-	/**
-	 * userID filter
-	 * @var int
-	 */
-	public $userID = null;
+    /**
+     * userID filter
+     * @var int
+     */
+    public $userID;
 
-	/**
-	 * roomID filter
-	 * @var int
-	 */
-	public $roomID = null;
+    /**
+     * roomID filter
+     * @var int
+     */
+    public $roomID;
 
-	/**
-	 * objectTypeID filter
-	 * @var int
-	 */
-	public $objectTypeID = null;
+    /**
+     * objectTypeID filter
+     * @var int
+     */
+    public $objectTypeID;
 
-	/**
-	 * judgeID filter
-	 * @var int
-	 */
-	public $judgeID = null;
+    /**
+     * judgeID filter
+     * @var int
+     */
+    public $judgeID;
 
-	/**
-	 * Whether to show expired entries
-	 * @var boolean
-	 */
-	public $showExpired = true;
+    /**
+     * Whether to show expired entries
+     * @var boolean
+     */
+    public $showExpired = true;
 
-	/**
-	 * username filter
-	 * @var string
-	 */
-	public $searchUsername = null;
+    /**
+     * username filter
+     * @var string
+     */
+    public $searchUsername;
 
-	/**
-	 * judge's username filter
-	 * @var string
-	 */
-	public $searchJudge = null;
+    /**
+     * judge's username filter
+     * @var string
+     */
+    public $searchJudge;
 
-	/**
-	 * Array of available suspension object types
-	 * @var array
-	 */
-	public $availableObjectTypes = [ ];
+    /**
+     * Array of available suspension object types
+     * @var array
+     */
+    public $availableObjectTypes = [ ];
 
-	/**
-	 * Array of available chat rooms
-	 * @var array
-	 */
-	public $availableRooms = [ ];
+    /**
+     * Array of available chat rooms
+     * @var array
+     */
+    public $availableRooms = [ ];
 
-	/**
-	 * @inheritDoc
-	 */
-	public function readParameters() {
-		parent::readParameters();
+    /**
+     * @inheritDoc
+     */
+    public function readParameters()
+    {
+        parent::readParameters();
 
-		if (isset($_REQUEST['roomID']) && $_REQUEST['roomID'] !== '') $this->roomID = intval($_REQUEST['roomID']);
-		if (isset($_REQUEST['userID']) && $_REQUEST['userID'] !== '') $this->userID = intval($_REQUEST['userID']);
-		if (isset($_REQUEST['judgeID']) && $_REQUEST['judgeID'] !== '') $this->judgeID = intval($_REQUEST['judgeID']);
-		if (isset($_REQUEST['objectTypeID']) && $_REQUEST['objectTypeID'] !== '') $this->objectTypeID = intval($_REQUEST['objectTypeID']);
-		// Checkboxes need special handling
-		if (!empty($_POST) && !isset($_POST['showExpired'])) $this->showExpired = false;
+        if (isset($_REQUEST['roomID']) && $_REQUEST['roomID'] !== '') {
+            $this->roomID = \intval($_REQUEST['roomID']);
+        }
+        if (isset($_REQUEST['userID']) && $_REQUEST['userID'] !== '') {
+            $this->userID = \intval($_REQUEST['userID']);
+        }
+        if (isset($_REQUEST['judgeID']) && $_REQUEST['judgeID'] !== '') {
+            $this->judgeID = \intval($_REQUEST['judgeID']);
+        }
+        if (isset($_REQUEST['objectTypeID']) && $_REQUEST['objectTypeID'] !== '') {
+            $this->objectTypeID = \intval($_REQUEST['objectTypeID']);
+        }
+        // Checkboxes need special handling
+        if (!empty($_POST) && !isset($_POST['showExpired'])) {
+            $this->showExpired = false;
+        }
 
-		if (isset($_POST['searchUsername'])) {
-			$this->searchUsername = StringUtil::trim($_POST['searchUsername']);
+        if (isset($_POST['searchUsername'])) {
+            $this->searchUsername = StringUtil::trim($_POST['searchUsername']);
 
-			if (!empty($this->searchUsername)) {
-				$this->userID = User::getUserByUsername($this->searchUsername)->userID;
-			}
-		}
-		else if ($this->userID !== null) {
-			$this->searchUsername = (new User($this->userID))->username;
-		}
+            if ($this->searchUsername !== '') {
+                $this->userID = User::getUserByUsername($this->searchUsername)->userID;
+            }
+        } elseif ($this->userID !== null) {
+            $this->searchUsername = (new User($this->userID))->username;
+        }
 
-		if (isset($_POST['searchJudge'])) {
-			$this->searchJudge = StringUtil::trim($_POST['searchJudge']);
+        if (isset($_POST['searchJudge'])) {
+            $this->searchJudge = StringUtil::trim($_POST['searchJudge']);
 
-			if (!empty($this->searchJudge)) {
-				$this->judgeID = User::getUserByUsername($this->searchJudge)->userID;
-			}
-		}
-		else if ($this->judgeID !== null) {
-			$this->searchJudge = (new User($this->judgeID))->username;
-		}
-	}
+            if ($this->searchJudge !== '') {
+                $this->judgeID = User::getUserByUsername($this->searchJudge)->userID;
+            }
+        } elseif ($this->judgeID !== null) {
+            $this->searchJudge = (new User($this->judgeID))->username;
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function readData() {
-		$this->availableObjectTypes = \wcf\data\object\type\ObjectTypeCache::getInstance()->getObjectTypes('be.bastelstu.chat.suspension');
+    /**
+     * @inheritDoc
+     */
+    public function readData()
+    {
+        $this->availableObjectTypes = ObjectTypeCache::getInstance()->getObjectTypes('be.bastelstu.chat.suspension');
 
-		$roomList = new \chat\data\room\RoomList();
-		$roomList->sqlOrderBy = "room.position";
-		$roomList->readObjects();
-		$this->availableRooms = $roomList->getObjects();
+        $roomList = new RoomList();
+        $roomList->sqlOrderBy = "room.position";
+        $roomList->readObjects();
+        $this->availableRooms = $roomList->getObjects();
 
-		parent::readData();
+        parent::readData();
 
-		\wcf\system\cache\runtime\UserRuntimeCache::getInstance()->cacheObjectIDs(array_map(function (Suspension $s) {
-			return $s->userID;
-		}, $this->objectList->getObjects()));
-	}
+        UserRuntimeCache::getInstance()->cacheObjectIDs(\array_map(static function (Suspension $s) {
+            return $s->userID;
+        }, $this->objectList->getObjects()));
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	protected function initObjectList() {
-		parent::initObjectList();
+    /**
+     * @inheritDoc
+     */
+    protected function initObjectList()
+    {
+        parent::initObjectList();
 
-		$this->objectList->sqlSelects .= 'COALESCE(suspension.revoked, suspension.expires, 2147483647) AS expiresSort';
+        $this->objectList->sqlSelects .= 'COALESCE(suspension.revoked, suspension.expires, 2147483647) AS expiresSort';
 
-		if (!empty($this->availableRooms)) {
-			$this->objectList->getConditionBuilder()->add('(roomID IN (?) OR roomID IS NULL)', [ array_map(function (Room $room) {
-				return $room->roomID;
-			}, $this->availableRooms) ]);
-		}
-		else {
-			$this->objectList->getConditionBuilder()->add('1 = 0');
-		}
+        if (!empty($this->availableRooms)) {
+            $this->objectList->getConditionBuilder()->add('(roomID IN (?) OR roomID IS NULL)', [ \array_map(static function (Room $room) {
+                return $room->roomID;
+            }, $this->availableRooms) ]);
+        } else {
+            $this->objectList->getConditionBuilder()->add('1 = 0');
+        }
 
-		if ($this->userID !== null) {
-			$this->objectList->getConditionBuilder()->add('userID = ?', [ $this->userID ]);
-		}
+        if ($this->userID !== null) {
+            $this->objectList->getConditionBuilder()->add('userID = ?', [ $this->userID ]);
+        }
 
-		if ($this->roomID !== null) {
-			if ($this->roomID === 0) {
-				$this->objectList->getConditionBuilder()->add('roomID IS NULL');
-			}
-			else {
-				$this->objectList->getConditionBuilder()->add('roomID = ?', [ $this->roomID ]);
-			}
-		}
+        if ($this->roomID !== null) {
+            if ($this->roomID === 0) {
+                $this->objectList->getConditionBuilder()->add('roomID IS NULL');
+            } else {
+                $this->objectList->getConditionBuilder()->add('roomID = ?', [ $this->roomID ]);
+            }
+        }
 
-		if ($this->objectTypeID !== null) {
-			$this->objectList->getConditionBuilder()->add('objectTypeID = ?', [ $this->objectTypeID ]);
-		}
+        if ($this->objectTypeID !== null) {
+            $this->objectList->getConditionBuilder()->add('objectTypeID = ?', [ $this->objectTypeID ]);
+        }
 
-		if ($this->judgeID !== null) {
-			$this->objectList->getConditionBuilder()->add('judgeID = ?', [ $this->judgeID ]);
-		}
+        if ($this->judgeID !== null) {
+            $this->objectList->getConditionBuilder()->add('judgeID = ?', [ $this->judgeID ]);
+        }
 
-		if ($this->showExpired === false) {
-			$this->objectList->getConditionBuilder()->add('expires >= ?', [ TIME_NOW ]);
-		}
-	}
+        if ($this->showExpired === false) {
+            $this->objectList->getConditionBuilder()->add('expires >= ?', [ TIME_NOW ]);
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function assignVariables() {
-		parent::assignVariables();
+    /**
+     * @inheritDoc
+     */
+    public function assignVariables()
+    {
+        parent::assignVariables();
 
-		WCF::getTPL()->assign([ 'userID'               => $this->userID
-		                      , 'roomID'               => $this->roomID
-		                      , 'objectTypeID'         => $this->objectTypeID
-		                      , 'judgeID'              => $this->judgeID
-		                      , 'availableRooms'       => $this->availableRooms
-		                      , 'availableObjectTypes' => $this->availableObjectTypes
-		                      , 'searchUsername'       => $this->searchUsername
-		                      , 'searchJudge'          => $this->searchJudge
-		                      , 'showExpired'          => $this->showExpired
-		                      ]);
-	}
+        WCF::getTPL()->assign([
+            'userID' => $this->userID,
+            'roomID' => $this->roomID,
+            'objectTypeID' => $this->objectTypeID,
+            'judgeID' => $this->judgeID,
+            'availableRooms' => $this->availableRooms,
+            'availableObjectTypes' => $this->availableObjectTypes,
+            'searchUsername' => $this->searchUsername,
+            'searchJudge' => $this->searchJudge,
+            'showExpired' => $this->showExpired,
+        ]);
+    }
 }

files/lib/data/command/Command.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,38 +15,46 @@
 
 namespace chat\data\command;
 
-use \wcf\system\WCF;
+use chat\system\command\ICommand;
+use wcf\data\package\PackageCache;
+use wcf\data\ProcessibleDatabaseObject;
+use wcf\system\WCF;
 
 /**
  * Represents a chat command.
  */
-class Command extends \wcf\data\ProcessibleDatabaseObject {
-	/**
-	 * @inheritDoc
-	 */
-	protected static $processorInterface = \chat\system\command\ICommand::class;
+class Command extends ProcessibleDatabaseObject
+{
+    /**
+     * @inheritDoc
+     */
+    protected static $processorInterface = ICommand::class;
 
-	/**
-	 * Returns whether this command has at least one trigger assigned.
-	 *
-	 * The default PlainCommand implicitely has one.
-	 */
-	public function hasTriggers() {
-		static $chatPackageID = null;
+    /**
+     * Returns whether this command has at least one trigger assigned.
+     *
+     * The default PlainCommand implicitely has one.
+     */
+    public function hasTriggers(): bool
+    {
+        static $chatPackageID = null;
 
-		if ($chatPackageID === null) {
-			$chatPackageID = \wcf\data\package\PackageCache::getInstance()->getPackageID('be.bastelstu.chat');
-		}
+        if ($chatPackageID === null) {
+            $chatPackageID = PackageCache::getInstance()->getPackageID('be.bastelstu.chat');
+        }
 
-		if ($this->packageID === $chatPackageID && $this->identifier === 'plain') {
-			return true;
-		}
+        if ($this->packageID === $chatPackageID && $this->identifier === 'plain') {
+            return true;
+        }
 
-		$sql = "SELECT COUNT(*)
-		        FROM   chat".WCF_N."_command_trigger
-		        WHERE  commandID = ?";
-		$statement = WCF::getDB()->prepareStatement($sql);
-		$statement->execute([ $this->commandID ]);
-		return $statement->fetchSingleColumn() > 0;
-	}
+        $sql = "SELECT  COUNT(*)
+                FROM    chat1_command_trigger
+                WHERE   commandID = ?";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute([
+            $this->commandID,
+        ]);
+
+        return $statement->fetchSingleColumn() > 0;
+    }
 }

files/lib/data/command/CommandCache.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,97 +15,98 @@
 
 namespace chat\data\command;
 
+use chat\system\cache\builder\CommandCacheBuilder;
+use wcf\data\package\Package;
+use wcf\system\SingletonFactory;
+
 /**
  * Manages the command cache.
  */
-class CommandCache extends \wcf\system\SingletonFactory {
-	/**
-	 * list of cached commands
-	 * @var	Command[]
-	 */
-	protected $commands = [ ];
+final class CommandCache extends SingletonFactory
+{
+    /**
+     * list of cached commands
+     * @var Command[]
+     */
+    protected $commands = [ ];
 
-	/**
-	 * list of cached commands by package
-	 * @var Command[][]
-	 */
-	protected $packages = [ ];
+    /**
+     * list of cached commands by package
+     * @var Command[][]
+     */
+    protected $packages = [ ];
 
-	/**
-	 * list of cached triggers
-	 * @var	int[]
-	 */
-	protected $triggers = [ ];
+    /**
+     * list of cached triggers
+     * @var int[]
+     */
+    protected $triggers = [ ];
 
-	/**
-	 * @inheritDoc
-	 */
-	protected function init() {
-		$data = \chat\system\cache\builder\CommandCacheBuilder::getInstance()->getData();
+    /**
+     * @inheritDoc
+     */
+    protected function init()
+    {
+        $data = CommandCacheBuilder::getInstance()->getData();
 
-		$this->commands = $data['commands'];
-		$this->packages = $data['packages'];
-		$this->triggers = $data['triggers'];
-	}
+        $this->commands = $data['commands'];
+        $this->packages = $data['packages'];
+        $this->triggers = $data['triggers'];
+    }
 
-	/**
-	 * Returns a specific command.
-	 *
-	 * @param	integer		$commandID
-	 * @return	Command
-	 */
-	public function getCommand($commandID) {
-		if (isset($this->commands[$commandID])) {
-			return $this->commands[$commandID];
-		}
+    /**
+     * Returns a specific command.
+     */
+    public function getCommand(int $commandID): ?Command
+    {
+        if (isset($this->commands[$commandID])) {
+            return $this->commands[$commandID];
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	/**
-	 * Returns a specific command defined by a trigger.
-	 *
-	 * @param	string		$trigger
-	 * @return	Command
-	 */
-	public function getCommandByTrigger($trigger) {
-		if (isset($this->triggers[$trigger])) {
-			return $this->commands[$this->triggers[$trigger]];
-		}
+    /**
+     * Returns a specific command defined by a trigger.
+     */
+    public function getCommandByTrigger(string $trigger): ?Command
+    {
+        if (isset($this->triggers[$trigger])) {
+            return $this->commands[$this->triggers[$trigger]];
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	/**
-	 * Returns the command defined by the given package and identifier.
-	 *
-	 * @param	\wcf\data\package\Package  $package
-	 * @param	string                     $identifier
-	 * @return	Command
-	 */
-	public function getCommandByPackageAndIdentifier(\wcf\data\package\Package $package, $identifier) {
-		if (isset($this->packages[$package->packageID][$identifier])) {
-			return $this->packages[$package->packageID][$identifier];
-		}
+    /**
+     * Returns the command defined by the given package and identifier.
+     */
+    public function getCommandByPackageAndIdentifier(Package $package, string $identifier): ?Command
+    {
+        if (isset($this->packages[$package->packageID][$identifier])) {
+            return $this->packages[$package->packageID][$identifier];
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	/**
-	 * Returns all commands.
-	 *
-	 * @return	Command[]
-	 */
-	public function getCommands() {
-		return $this->commands;
-	}
+    /**
+     * Returns all commands.
+     *
+     * @return  Command[]
+     */
+    public function getCommands()
+    {
+        return $this->commands;
+    }
 
-	/**
-	 * Returns all triggers.
-	 *
-	 * @return int[]
-	 */
-	public function getTriggers() {
-		return $this->triggers;
-	}
+    /**
+     * Returns all triggers.
+     *
+     * @return int[]
+     */
+    public function getTriggers()
+    {
+        return $this->triggers;
+    }
 }

files/lib/data/command/CommandEditor.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,12 +15,15 @@
 
 namespace chat\data\command;
 
+use wcf\data\DatabaseObjectEditor;
+
 /**
  * Represents a chat command editor.
  */
-class CommandEditor extends \wcf\data\DatabaseObjectEditor {
-	/**
-	 * @inheritDoc
-	 */
-	protected static $baseClass = Command::class;
+class CommandEditor extends DatabaseObjectEditor
+{
+    /**
+     * @inheritDoc
+     */
+    protected static $baseClass = Command::class;
 }

files/lib/data/command/CommandList.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,8 +15,17 @@
 
 namespace chat\data\command;
 
+use wcf\data\DatabaseObjectList;
+
 /**
  * Represents a list of chat commands.
+ *
+ * @method  Command        current()
+ * @method  Command[]      getObjects()
+ * @method  Command|null   getSingleObject()
+ * @method  Command|null   search($objectID)
+ * @property    Command[] $objects
  */
-class CommandList extends \wcf\data\DatabaseObjectList {
+class CommandList extends DatabaseObjectList
+{
 }

files/lib/data/command/CommandTrigger.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,41 +15,48 @@
 
 namespace chat\data\command;
 
-use \wcf\system\WCF;
+use wcf\data\DatabaseObject;
+use wcf\system\request\IRouteController;
+use wcf\system\WCF;
 
 /**
- * Represents a chat command trugger.
+ * Represents a chat command trigger.
  */
-class CommandTrigger extends \wcf\data\DatabaseObject implements \wcf\system\request\IRouteController {
-	/**
-	 * @inheritDoc
-	 */
-	public function getTitle() {
-		return $this->commandTrigger;
-	}
+class CommandTrigger extends DatabaseObject implements IRouteController
+{
+    /**
+     * @inheritDoc
+     */
+    public function getTitle(): string
+    {
+        return $this->commandTrigger;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getObjectID() {
-		return $this->triggerID;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getObjectID()
+    {
+        return $this->triggerID;
+    }
 
-	/**
-	 * Returns the trigger specified by its commandTrigger value
-	 *
-	 * @param  string		$name
-	 * @return CommandTrigger
-	 */
-	public static function getTriggerByName($name) {
-		$sql = "SELECT	*
-			FROM	chat".WCF_N."_command_trigger
-			WHERE	commandTrigger = ?";
-		$statement = WCF::getDB()->prepareStatement($sql);
-		$statement->execute([ $name ]);
-		$row = $statement->fetchArray();
-		if (!$row) $row = [];
+    /**
+     * Returns the trigger specified by its commandTrigger value
+     *
+     * @return CommandTrigger
+     */
+    public static function getTriggerByName(string $name)
+    {
+        $sql = "SELECT  *
+                FROM    chat1_command_trigger
+                WHERE   commandTrigger = ?";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute([ $name ]);
+        $row = $statement->fetchArray();
+        if (!$row) {
+            $row = [];
+        }
 
-		return new self(null, $row);
-	}
+        return new self(null, $row);
+    }
 }

files/lib/data/command/CommandTriggerAction.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,17 +15,24 @@
 
 namespace chat\data\command;
 
+use wcf\data\AbstractDatabaseObjectAction;
+
 /**
  * Executes command trigger-related actions.
  */
-class CommandTriggerAction extends \wcf\data\AbstractDatabaseObjectAction {
-	/**
-	 * @inheritDoc
-	 */
-	protected $permissionsDelete = [ 'admin.chat.canManageTriggers' ];
+class CommandTriggerAction extends AbstractDatabaseObjectAction
+{
+    /**
+     * @inheritDoc
+     */
+    protected $permissionsDelete = [
+        'admin.chat.canManageTriggers',
+    ];
 
-	/**
-	 * @inheritDoc
-	 */
-	protected $permissionsUpdate = [ 'admin.chat.canManageTriggers' ];
+    /**
+     * @inheritDoc
+     */
+    protected $permissionsUpdate = [
+        'admin.chat.canManageTriggers',
+    ];
 }

files/lib/data/command/CommandTriggerEditor.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,19 +15,25 @@
 
 namespace chat\data\command;
 
+use chat\system\cache\builder\CommandCacheBuilder;
+use wcf\data\DatabaseObjectEditor;
+use wcf\data\IEditableCachedObject;
+
 /**
  * Represents a command trigger editor.
  */
-class CommandTriggerEditor extends \wcf\data\DatabaseObjectEditor implements \wcf\data\IEditableCachedObject {
-	/**
-	 * @inheritDoc
-	 */
-	protected static $baseClass = CommandTrigger::class;
+class CommandTriggerEditor extends DatabaseObjectEditor implements IEditableCachedObject
+{
+    /**
+     * @inheritDoc
+     */
+    protected static $baseClass = CommandTrigger::class;
 
-	/**
-	 * @inheritDoc
-	 */
-	public static function resetCache() {
-		\chat\system\cache\builder\CommandCacheBuilder::getInstance()->reset();
-	}
+    /**
+     * @inheritDoc
+     */
+    public static function resetCache()
+    {
+        CommandCacheBuilder::getInstance()->reset();
+    }
 }

files/lib/data/command/CommandTriggerList.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,7 +15,17 @@
 
 namespace chat\data\command;
 
+use wcf\data\DatabaseObjectList;
+
 /**
  * Represents a list command triggers.
+ *
+ * @method  CommandTrigger        current()
+ * @method  CommandTrigger[]      getObjects()
+ * @method  CommandTrigger|null   getSingleObject()
+ * @method  CommandTrigger|null   search($objectID)
+ * @property    CommandTrigger[] $objects
  */
-class CommandTriggerList extends \wcf\data\DatabaseObjectList { }
+class CommandTriggerList extends DatabaseObjectList
+{
+}

files/lib/data/message/Message.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,46 +15,61 @@
 
 namespace chat\data\message;
 
+use chat\data\room\Room;
+use chat\data\room\RoomCache;
+use wcf\data\DatabaseObject;
+use wcf\data\object\type\ObjectType;
+use wcf\data\object\type\ObjectTypeCache;
+
 /**
  * Represents a chat message.
+ *
+ * @property-read   integer $messageID
+ * @property-read   integer $time
+ * @property-read   integer $roomID
+ * @property-read   integer $userID
+ * @property-read   string  $username
+ * @property-read   integer $objectTypeID
+ * @property-read   mixed   $payload
+ * @property-read   integer $hasEmbeddedObjects
+ * @property-read   integer $isDeleted
  */
-class Message extends \wcf\data\DatabaseObject {
-	/**
-	 * @inheritDoc
-	 */
-	protected function handleData($data) {
-		parent::handleData($data);
+class Message extends DatabaseObject
+{
+    /**
+     * @inheritDoc
+     */
+    protected function handleData($data)
+    {
+        parent::handleData($data);
 
-		$this->data['payload'] = @unserialize($this->data['payload']);
-		if (!is_array($this->data['payload'])) {
-			$this->data['payload'] = [ ];
-		}
-	}
+        $this->data['payload'] = @\unserialize($this->data['payload']);
+        if (!\is_array($this->data['payload'])) {
+            $this->data['payload'] = [ ];
+        }
+    }
 
-	/**
-	 * Returns whether this message already is inside the log.
-	 *
-	 * @return	boolean
-	 */
-	public function isInLog() {
-		return $this->time < (TIME_NOW - CHAT_ARCHIVE_AFTER);
-	}
+    /**
+     * Returns whether this message already is inside the log.
+     */
+    public function isInLog(): bool
+    {
+        return $this->time < (TIME_NOW - CHAT_ARCHIVE_AFTER);
+    }
 
-	/**
-	 * Returns the message type object of this message.
-	 *
-	 * @return	\wcf\data\object\type\ObjectType
-	 */
-	public function getMessageType() {
-		return \wcf\data\object\type\ObjectTypeCache::getInstance()->getObjectType($this->objectTypeID);
-	}
+    /**
+     * Returns the message type object of this message.
+     */
+    public function getMessageType(): ObjectType
+    {
+        return ObjectTypeCache::getInstance()->getObjectType($this->objectTypeID);
+    }
 
-	/**
-	 * Returns the chat room that contains this message.
-	 *
-	 * @return	\chat\data\room\Room
-	 */
-	public function getRoom() {
-		return \chat\data\room\RoomCache::getInstance()->getRoom($this->roomID);
-	}
+    /**
+     * Returns the chat room that contains this message.
+     */
+    public function getRoom(): Room
+    {
+        return RoomCache::getInstance()->getRoom($this->roomID);
+    }
 }

files/lib/data/message/MessageAction.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,294 +15,478 @@
 
 namespace chat\data\message;
 
-use \chat\data\command\CommandCache;
-use \chat\data\room\RoomCache;
-use \wcf\data\object\type\ObjectTypeCache;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\exception\UserInputException;
-use \wcf\system\user\activity\point\UserActivityPointHandler;
-use \wcf\system\WCF;
+use chat\data\command\CommandCache;
+use chat\data\room\RoomCache;
+use chat\data\user\User as ChatUser;
+use chat\data\user\UserAction as ChatUserAction;
+use chat\system\message\type\IDeletableMessageType;
+use wcf\data\AbstractDatabaseObjectAction;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\system\attachment\AttachmentHandler;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\exception\UserInputException;
+use wcf\system\html\input\HtmlInputProcessor;
+use wcf\system\message\embedded\object\MessageEmbeddedObjectManager;
+use wcf\system\push\PushHandler;
+use wcf\system\user\activity\point\UserActivityPointHandler;
+use wcf\system\WCF;
 
 /**
  * Executes chat user-related actions.
  */
-class MessageAction extends \wcf\data\AbstractDatabaseObjectAction {
-	/**
-	 * @inheritDoc
-	 */
-	public function create() {
-		$message = parent::create();
+class MessageAction extends AbstractDatabaseObjectAction
+{
+    /**
+     * @inheritDoc
+     */
+    public function create()
+    {
+        $message = parent::create();
+        \assert($message instanceof Message);
 
-		if (isset($this->parameters['updateTimestamp']) && $this->parameters['updateTimestamp']) {
-			$sql = "UPDATE chat".WCF_N."_room_to_user SET lastPush = ? WHERE roomID = ? AND userID = ?";
-			$statement = WCF::getDB()->prepareStatement($sql);
-			$statement->execute([ TIME_NOW, $message->roomID, $message->userID ]);
-		}
-		if (isset($this->parameters['grantPoints']) && $this->parameters['grantPoints']) {
-			UserActivityPointHandler::getInstance()->fireEvent('be.bastelstu.chat.activityPointEvent.message', $message->messageID, $message->userID);
-		}
+        if (isset($this->parameters['updateTimestamp']) && $this->parameters['updateTimestamp']) {
+            $sql = "UPDATE  chat1_room_to_user
+                    SET     lastPush = ?
+                    WHERE   roomID = ?
+                        AND userID = ?";
+            $statement = WCF::getDB()->prepare($sql);
+            $statement->execute([
+                TIME_NOW,
+                $message->roomID,
+                $message->userID,
+            ]);
+        }
+        if (isset($this->parameters['grantPoints']) && $this->parameters['grantPoints']) {
+            UserActivityPointHandler::getInstance()->fireEvent(
+                'be.bastelstu.chat.activityPointEvent.message',
+                $message->messageID,
+                $message->userID
+            );
+        }
 
-		$pushHandler = \wcf\system\push\PushHandler::getInstance();
-		if ($pushHandler->isEnabled() && in_array('target:channels', $pushHandler->getFeatureFlags())) {
-			$fastSelect = $message->getMessageType()->getProcessor()->supportsFastSelect();
-			if ($fastSelect) {
-				$target = [ 'channels' => [ 'be.bastelstu.chat.room-'.$message->roomID ] ];
-			}
-			else {
-				$target = [ 'channels' => [ 'be.bastelstu.chat' ] ];
-			}
-			$pushHandler->sendMessage([ 'message' => 'be.bastelstu.chat.message'
-			                          , 'target' => $target
-			                          ]);
-		}
+        $pushHandler = PushHandler::getInstance();
+        if ($pushHandler->isEnabled() && \in_array('target:channels', $pushHandler->getFeatureFlags())) {
+            $fastSelect = $message->getMessageType()->getProcessor()->supportsFastSelect();
+            if ($fastSelect) {
+                $target = [
+                    'channels' => [
+                        'be.bastelstu.chat.room-' . $message->roomID,
+                    ],
+                ];
+            } else {
+                $target = [
+                    'channels' => [
+                        'be.bastelstu.chat',
+                    ],
+                ];
+            }
+            $pushHandler->sendMessage([
+                'message' => 'be.bastelstu.chat.message',
+                'target' => $target,
+            ]);
+        }
 
-		return $message;
-	}
+        return $message;
+    }
 
-	/**
-	 * Validates parameters and permissions.
-	 */
-	public function validateTrash() {
-		// read objects
-		if (empty($this->objects)) {
-			$this->readObjects();
+    /**
+     * Validates parameters and permissions.
+     */
+    public function validateTrash()
+    {
+        // read objects
+        if (empty($this->objects)) {
+            $this->readObjects();
 
-			if (empty($this->objects)) {
-				throw new UserInputException('objectIDs');
-			}
-		}
+            if (empty($this->objects)) {
+                throw new UserInputException('objectIDs');
+            }
+        }
 
-		foreach ($this->getObjects() as $message) {
-			if ($message->isDeleted) continue;
+        foreach ($this->getObjects() as $message) {
+            if ($message->isDeleted) {
+                continue;
+            }
 
-			$messageType = $message->getMessageType()->getProcessor();
-			if (!($messageType instanceof \chat\system\message\type\IDeletableMessageType) || !$messageType->canDelete($message->getDecoratedObject())) {
-				throw new PermissionDeniedException();
-			}
-		}
-	}
+            $messageType = $message->getMessageType()->getProcessor();
+            if (
+                !($messageType instanceof IDeletableMessageType)
+                || !$messageType->canDelete($message->getDecoratedObject())
+            ) {
+                throw new PermissionDeniedException();
+            }
+        }
+    }
 
-	/**
-	 * Marks this message as deleted and creates a tombstone message.
-	 *
-	 * Note: Contrary to other applications there is no way to undelete a message.
-	 */
-	public function trash() {
-		if (empty($this->objects)) {
-			$this->readObjects();
-		}
+    /**
+     * Marks this message as deleted and creates a tombstone message.
+     *
+     * Note: Contrary to other applications there is no way to undelete a message.
+     */
+    public function trash()
+    {
+        if (empty($this->objects)) {
+            $this->readObjects();
+        }
 
-		$data = [ 'isDeleted' => 1
-		        ];
+        $data = [
+            'isDeleted' => 1,
+        ];
 
-		$objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName('be.bastelstu.chat.messageType', 'be.bastelstu.chat.messageType.tombstone');
-		if (!$objectTypeID) {
-			throw new \LogicException('Missing object type');
-		}
+        $objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName(
+            'be.bastelstu.chat.messageType',
+            'be.bastelstu.chat.messageType.tombstone'
+        );
+        if (!$objectTypeID) {
+            throw new \LogicException('Missing object type');
+        }
 
-		WCF::getDB()->beginTransaction();
-		$objectAction = new static($this->getObjects(), 'update', [ 'data' => $data ]);
-		$objectAction->executeAction();
-		foreach ($this->getObjects() as $message) {
-			if ($message->isDeleted) continue;
+        WCF::getDB()->beginTransaction();
+        $objectAction = new static(
+            $this->getObjects(),
+            'update',
+            [
+                'data' => $data,
+            ]
+        );
+        $objectAction->executeAction();
+        foreach ($this->getObjects() as $message) {
+            if ($message->isDeleted) {
+                continue;
+            }
 
-			(new MessageAction([ ], 'create', [ 'data' => [ 'roomID'       => $message->roomID
-			                                              , 'userID'       => null
-			                                              , 'username'     => ''
-			                                              , 'time'         => TIME_NOW
-			                                              , 'objectTypeID' => $objectTypeID
-			                                              , 'payload'      => serialize([ 'messageID' => $message->messageID ])
-			                                              ]
-			                                  ]
-			                  )
-			)->executeAction();
-		}
-		WCF::getDB()->commitTransaction();
-	}
+            (new self(
+                [ ],
+                'create',
+                [
+                    'data' => [
+                        'roomID' => $message->roomID,
+                        'userID' => null,
+                        'username' => '',
+                        'time' => TIME_NOW,
+                        'objectTypeID' => $objectTypeID,
+                        'payload' => \serialize([
+                            'messageID' => $message->messageID,
+                        ]),
+                    ],
+                ]
+            ))->executeAction();
+        }
+        WCF::getDB()->commitTransaction();
+    }
 
-	/**
-	 * Prunes chat messages older than chat_log_archivetime days.
-	 */
-	public function prune() {
-		// Check whether pruning is disabled.
-		if (!CHAT_LOG_ARCHIVETIME) return;
+    /**
+     * Prunes chat messages older than chat_log_archivetime days.
+     */
+    public function prune()
+    {
+        // Check whether pruning is disabled.
+        if (!CHAT_LOG_ARCHIVETIME) {
+            return;
+        }
 
-		$sql = "SELECT messageID
-		        FROM   chat".WCF_N."_message
-		        WHERE  time < ?";
-		$statement = WCF::getDB()->prepareStatement($sql);
-		$statement->execute([ TIME_NOW - CHAT_LOG_ARCHIVETIME * 86400 ]);
-		$messageIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
+        $sql = "SELECT  messageID
+                FROM    chat1_message
+                WHERE   time < ?";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute([ TIME_NOW - CHAT_LOG_ARCHIVETIME * 86400 ]);
+        $messageIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
 
-		return call_user_func([$this->className, 'deleteAll'], $messageIDs);
-	}
+        return \call_user_func(
+            [$this->className, 'deleteAll'],
+            $messageIDs
+        );
+    }
 
-	/**
-	 * Validates parameters and permissions.
-	 */
-	public function validatePull() {
-		$this->readString('sessionID', true);
-		if ($this->parameters['sessionID']) {
-			$this->parameters['sessionID'] = pack('H*', str_replace('-', '', $this->parameters['sessionID']));
-		}
+    /**
+     * Validates parameters and permissions.
+     */
+    public function validatePull()
+    {
+        $this->readString('sessionID', true);
+        if ($this->parameters['sessionID']) {
+            $this->parameters['sessionID'] = \pack(
+                'H*',
+                \str_replace('-', '', $this->parameters['sessionID'])
+            );
+        }
 
-		$this->readInteger('roomID');
-		$this->readBoolean('inLog', true);
+        $this->readInteger('roomID');
+        $this->readBoolean('inLog', true);
 
-		$room = RoomCache::getInstance()->getRoom($this->parameters['roomID']);
-		if ($room === null) throw new UserInputException('roomID');
-		if (!$room->canSee($user = null, $reason)) throw $reason;
-		$user = new \chat\data\user\User(WCF::getUser());
-		if (!$this->parameters['inLog'] && !$user->isInRoom($room)) throw new PermissionDeniedException();
-		if ($this->parameters['inLog'] && !$room->canSeeLog(null, $reason)) throw $reason;
+        $room = RoomCache::getInstance()->getRoom($this->parameters['roomID']);
+        if ($room === null) {
+            throw new UserInputException('roomID');
+        }
+        if (!$room->canSee($user = null, $reason)) {
+            throw $reason;
+        }
+        $user = new ChatUser(WCF::getUser());
+        if (!$this->parameters['inLog'] && !$user->isInRoom($room)) {
+            throw new PermissionDeniedException();
+        }
+        if ($this->parameters['inLog'] && !$room->canSeeLog(null, $reason)) {
+            throw $reason;
+        }
 
-		$this->readInteger('from', true);
-		$this->readInteger('to', true);
+        $this->readInteger('from', true);
+        $this->readInteger('to', true);
 
-		// One may not pass both 'from' and 'to'
-		if ($this->parameters['from'] && $this->parameters['to']) {
-			throw new UserInputException();
-		}
-	}
+        // One may not pass both 'from' and 'to'
+        if ($this->parameters['from'] && $this->parameters['to']) {
+            throw new UserInputException();
+        }
+    }
 
-	/**
-	 * Pulls messages for the given room.
-	 */
-	public function pull() {
-		$room = RoomCache::getInstance()->getRoom($this->parameters['roomID']);
-		if ($room === null) throw new UserInputException('roomID');
+    /**
+     * Pulls messages for the given room.
+     */
+    public function pull()
+    {
+        $room = RoomCache::getInstance()->getRoom($this->parameters['roomID']);
+        if ($room === null) {
+            throw new UserInputException('roomID');
+        }
 
-		if (($sessionID = $this->parameters['sessionID'])) {
-			if (strlen($sessionID) !== 16) throw new UserInputException('sessionID');
+        if (($sessionID = $this->parameters['sessionID'])) {
+            if (\strlen($sessionID) !== 16) {
+                throw new UserInputException('sessionID');
+            }
 
-			(new \chat\data\user\UserAction([], 'clearDeadSessions'))->executeAction();
+            (new ChatUserAction([], 'clearDeadSessions'))->executeAction();
 
-			WCF::getDB()->beginTransaction();
-			// update timestamp
-			$sql = "UPDATE chat".WCF_N."_room_to_user
-			        SET    lastPull = ?
-			        WHERE      roomID = ?
-			               AND userID = ?";
-			$statement = WCF::getDB()->prepareStatement($sql);
-			$statement->execute([ TIME_NOW
-			                    , $room->roomID
-			                    , WCF::getUser()->userID
-			                    ]);
+            WCF::getDB()->beginTransaction();
+            // update timestamp
+            $sql = "UPDATE  chat1_room_to_user
+                    SET     lastPull = ?
+                    WHERE   roomID = ?
+                        AND userID = ?";
+            $statement = WCF::getDB()->prepare($sql);
+            $statement->execute([ TIME_NOW,
+                $room->roomID,
+                WCF::getUser()->userID,
+            ]);
 
-			$sql = "UPDATE chat".WCF_N."_session
-			        SET    lastRequest = ?
-			        WHERE      roomID = ?
-			               AND userID = ?
-			               AND sessionID = ?";
-			$statement = WCF::getDB()->prepareStatement($sql);
-			$statement->execute([ TIME_NOW
-			                    , $room->roomID
-			                    , WCF::getUser()->userID
-			                    , $sessionID
-			                    ]);
-			WCF::getDB()->commitTransaction();
-		}
+            $sql = "UPDATE  chat1_session
+                    SET     lastRequest = ?
+                    WHERE   roomID = ?
+                        AND userID = ?
+                        AND sessionID = ?";
+            $statement = WCF::getDB()->prepare($sql);
+            $statement->execute([ TIME_NOW,
+                $room->roomID,
+                WCF::getUser()->userID,
+                $sessionID,
+            ]);
+            WCF::getDB()->commitTransaction();
+        }
 
-		// Determine message types supporting fast select
-		$objectTypes = \wcf\data\object\type\ObjectTypeCache::getInstance()->getObjectTypes('be.bastelstu.chat.messageType');
-		$fastSelect = array_map(function ($item) {
-			return $item->objectTypeID;
-		}, array_filter($objectTypes, function ($item) {
-			return $item->getProcessor()->supportsFastSelect();
-		}));
+        // Determine message types supporting fast select
+        $objectTypes = ObjectTypeCache::getInstance()->getObjectTypes('be.bastelstu.chat.messageType');
+        $fastSelect = \array_map(static function ($item) {
+            return $item->objectTypeID;
+        }, \array_filter($objectTypes, static function ($item) {
+            return $item->getProcessor()->supportsFastSelect();
+        }));
 
-		// Build fast select filter
-		$condition = new \wcf\system\database\util\PreparedStatementConditionBuilder();
-		$condition->add('((roomID = ? AND objectTypeID IN (?)) OR objectTypeID NOT IN (?))', [ $room->roomID, $fastSelect, $fastSelect ]);
+        // Build fast select filter
+        $condition = new PreparedStatementConditionBuilder();
+        $condition->add('((roomID = ? AND objectTypeID IN (?)) OR objectTypeID NOT IN (?))', [ $room->roomID, $fastSelect, $fastSelect ]);
 
-		$sortOrder = 'DESC';
-		// Add offset
-		if ($this->parameters['from']) {
-			$condition->add('messageID >= ?', [ $this->parameters['from'] ]);
-			$sortOrder = 'ASC';
-		}
-		if ($this->parameters['to']) {
-			$condition->add('messageID <= ?', [ $this->parameters['to'] ]);
-		}
+        $sortOrder = 'DESC';
+        // Add offset
+        if ($this->parameters['from']) {
+            $condition->add('messageID >= ?', [ $this->parameters['from'] ]);
+            $sortOrder = 'ASC';
+        }
+        if ($this->parameters['to']) {
+            $condition->add('messageID <= ?', [ $this->parameters['to'] ]);
+        }
 
-		$sql = "SELECT   messageID
-		        FROM     chat".WCF_N."_message
-		        ".$condition."
-		        ORDER BY messageID ".$sortOrder;
-		$statement = WCF::getDB()->prepareStatement($sql, 20);
-		$statement->execute($condition->getParameters());
-		$messageIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
+        $sql = "SELECT   messageID
+                FROM     chat1_message
+                " . $condition . "
+                ORDER BY messageID " . $sortOrder;
+        $statement = WCF::getDB()->prepare($sql, 20);
+        $statement->execute($condition->getParameters());
+        $messageIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
 
-		$objectList = new MessageList();
-		$objectList->setObjectIDs($messageIDs);
-		$objectList->readObjects();
-		$objects = $objectList->getObjects();
+        $objectList = new MessageList();
+        $objectList->setObjectIDs($messageIDs);
+        $objectList->readObjects();
+        $objects = $objectList->getObjects();
 
-		$canSeeLog = $room->canSeeLog();
-		$messages = array_map(function (Message $item) use ($room) {
-			return new ViewableMessage($item, $room);
-		}, array_filter($objects, function (Message $message) use ($canSeeLog, $room) {
-			if ($this->parameters['inLog'] || $message->isInLog()) {
-				return $canSeeLog && $message->getMessageType()->getProcessor()->canSeeInLog($message, $room);
-			}
-			else {
-				return $message->getMessageType()->getProcessor()->canSee($message, $room);
-			}
-		}));
+        $canSeeLog = $room->canSeeLog();
+        $messages = \array_map(static function (Message $item) use ($room) {
+            return new ViewableMessage($item, $room);
+        }, \array_filter($objects, function (Message $message) use ($canSeeLog, $room) {
+            if ($this->parameters['inLog'] || $message->isInLog()) {
+                return $canSeeLog && $message->getMessageType()->getProcessor()->canSeeInLog($message, $room);
+            } else {
+                return $message->getMessageType()->getProcessor()->canSee($message, $room);
+            }
+        }));
 
-		$embeddedObjectMessageIDs = array_map(function ($message) {
-			return $message->messageID;
-		}, array_filter($messages, function ($message) {
-			return $message->hasEmbeddedObjects;
-		}));
+        $embeddedObjectMessageIDs = \array_map(static function ($message) {
+            return $message->messageID;
+        }, \array_filter($messages, static function ($message) {
+            return $message->hasEmbeddedObjects;
+        }));
 
-		if (!empty($embeddedObjectMessageIDs)) {
-			// load embedded objects
-			\wcf\system\message\embedded\object\MessageEmbeddedObjectManager::getInstance()->loadObjects('be.bastelstu.chat.message', $embeddedObjectMessageIDs);
-		}
+        if ($embeddedObjectMessageIDs !== []) {
+            // load embedded objects
+            MessageEmbeddedObjectManager::getInstance()->loadObjects('be.bastelstu.chat.message', $embeddedObjectMessageIDs);
+        }
 
-		return [ 'messages' => $messages
-		       , 'from'     => $this->parameters['from'] ?: (!empty($objects) ? reset($objects)->messageID : $this->parameters['to'] + 1)
-		       , 'to'       => $this->parameters['to'] ?: (!empty($objects) ? end($objects)->messageID : $this->parameters['from'] - 1)
-		       ];
-	}
+        return [
+            'messages' => $messages,
+            'from' => $this->parameters['from'] ?: (!empty($objects) ? \reset($objects)->messageID : $this->parameters['to'] + 1),
+            'to' => $this->parameters['to'] ?: (!empty($objects) ? \end($objects)->messageID : $this->parameters['from'] - 1),
+        ];
+    }
 
-	/**
-	 * Validates parameters and permissions.
-	 */
-	public function validatePush() {
-		$this->readInteger('roomID');
+    /**
+     * Validates parameters and permissions.
+     */
+    public function validatePush()
+    {
+        $this->readInteger('roomID');
 
-		$room = RoomCache::getInstance()->getRoom($this->parameters['roomID']);
-		if ($room === null) throw new UserInputException('roomID');
-		if (!$room->canSee($user = null, $reason)) throw $reason;
-		$user = new \chat\data\user\User(WCF::getUser());
-		if (!$user->isInRoom($room)) throw new PermissionDeniedException();
+        $room = RoomCache::getInstance()->getRoom($this->parameters['roomID']);
+        if ($room === null) {
+            throw new UserInputException('roomID');
+        }
+        if (!$room->canSee($user = null, $reason)) {
+            throw $reason;
+        }
+        $user = new ChatUser(WCF::getUser());
+        if (!$user->isInRoom($room)) {
+            throw new PermissionDeniedException();
+        }
 
-		$this->readInteger('commandID');
-		$command = CommandCache::getInstance()->getCommand($this->parameters['commandID']);
-		if ($command === null) throw new UserInputException('commandID');
-		if (!$command->hasTriggers()) {
-			if (!$command->getProcessor()->allowWithoutTrigger()) {
-				throw new UserInputException('commandID');
-			}
-		}
+        $this->readInteger('commandID');
+        $command = CommandCache::getInstance()->getCommand($this->parameters['commandID']);
+        if ($command === null) {
+            throw new UserInputException('commandID');
+        }
+        if (!$command->hasTriggers()) {
+            if (!$command->getProcessor()->allowWithoutTrigger()) {
+                throw new UserInputException('commandID');
+            }
+        }
 
-		$this->readJSON('parameters', true);
-	}
+        $this->readJSON('parameters', true);
+    }
 
-	/**
-	 * Pushes a new message into the given room.
-	 */
-	public function push() {
-		$room = RoomCache::getInstance()->getRoom($this->parameters['roomID']);
-		if ($room === null) throw new UserInputException('roomID');
+    /**
+     * Pushes a new message into the given room.
+     */
+    public function push()
+    {
+        $room = RoomCache::getInstance()->getRoom($this->parameters['roomID']);
+        if ($room === null) {
+            throw new UserInputException('roomID');
+        }
 
-		$command = CommandCache::getInstance()->getCommand($this->parameters['commandID']);
-		if ($command === null) throw new UserInputException('commandID');
+        $command = CommandCache::getInstance()->getCommand($this->parameters['commandID']);
+        if ($command === null) {
+            throw new UserInputException('commandID');
+        }
 
-		$processor = $command->getProcessor();
-		$processor->validate($this->parameters['parameters'], $room);
-		$processor->execute($this->parameters['parameters'], $room);
-	}
+        $processor = $command->getProcessor();
+        $processor->validate($this->parameters['parameters'], $room);
+        $processor->execute($this->parameters['parameters'], $room);
+    }
+
+    /**
+     * Validates parameters and permissions.
+     */
+    public function validatePushAttachment()
+    {
+        $this->readInteger('roomID');
+
+        $room = RoomCache::getInstance()->getRoom($this->parameters['roomID']);
+        if ($room === null) {
+            throw new UserInputException('roomID');
+        }
+        if (!$room->canSee($user = null, $reason)) {
+            throw $reason;
+        }
+        $user = new ChatUser(WCF::getUser());
+        if (!$user->isInRoom($room)) {
+            throw new PermissionDeniedException();
+        }
+
+        if (!$room->canWritePublicly(null, $reason)) {
+            throw $reason;
+        }
+
+        $this->readString('tmpHash');
+    }
+
+    /**
+     * Pushes a new attachment into the given room.
+     */
+    public function pushAttachment()
+    {
+        $objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName(
+            'be.bastelstu.chat.messageType',
+            'be.bastelstu.chat.messageType.attachment'
+        );
+        if (!$objectTypeID) {
+            throw new \LogicException('Missing object type');
+        }
+
+        $room = RoomCache::getInstance()->getRoom($this->parameters['roomID']);
+        if ($room === null) {
+            throw new UserInputException('roomID');
+        }
+
+        $attachmentHandler = new AttachmentHandler(
+            'be.bastelstu.chat.message',
+            0,
+            $this->parameters['tmpHash'],
+            $room->roomID
+        );
+        $attachments = $attachmentHandler->getAttachmentList();
+        $attachmentIDs = [];
+        foreach ($attachments as $attachment) {
+            $attachmentIDs[] = $attachment->attachmentID;
+        }
+
+        $processor = new HtmlInputProcessor();
+        $processor->process(\implode(' ', \array_map(static function ($attachmentID) {
+            return '[attach=' . $attachmentID . ',none,true][/attach]';
+        }, $attachmentIDs)), 'be.bastelstu.chat.message', 0);
+
+        WCF::getDB()->beginTransaction();
+        /** @var Message $message */
+        $message = (new self(
+            [ ],
+            'create',
+            [
+                'data' => [
+                    'roomID' => $room->roomID,
+                    'userID' => WCF::getUser()->userID,
+                    'username' => WCF::getUser()->username,
+                    'time' => TIME_NOW,
+                    'objectTypeID' => $objectTypeID,
+                    'payload' => \serialize([
+                        'attachmentIDs' => $attachmentIDs,
+                        'message' => $processor->getHtml(),
+                    ]),
+                ],
+            ]
+        ))->executeAction()['returnValues'];
+
+        $attachmentHandler->updateObjectID($message->messageID);
+        $processor->setObjectID($message->messageID);
+        if (MessageEmbeddedObjectManager::getInstance()->registerObjects($processor)) {
+            (new MessageEditor($message))->update([
+                'hasEmbeddedObjects' => 1,
+            ]);
+        }
+        WCF::getDB()->commitTransaction();
+    }
 }

files/lib/data/message/MessageEditor.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,12 +15,34 @@
 
 namespace chat\data\message;
 
+use wcf\data\DatabaseObjectEditor;
+use wcf\system\attachment\AttachmentHandler;
+use wcf\system\WCF;
+
 /**
  * Represents a chat message editor.
  */
-class MessageEditor extends \wcf\data\DatabaseObjectEditor {
-	/**
-	 * @inheritDoc
-	 */
-	protected static $baseClass = Message::class;
+class MessageEditor extends DatabaseObjectEditor
+{
+    /**
+     * @inheritDoc
+     */
+    protected static $baseClass = Message::class;
+
+    /**
+     * @inheritDoc
+     */
+    public static function deleteAll(array $messageIDs = [])
+    {
+        WCF::getDB()->beginTransaction();
+
+        $result = parent::deleteAll($messageIDs);
+        if ($messageIDs !== []) {
+            AttachmentHandler::removeAttachments('be.bastelstu.chat.message', $messageIDs);
+        }
+
+        WCF::getDB()->commitTransaction();
+
+        return $result;
+    }
 }

files/lib/data/message/MessageList.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,8 +15,17 @@
 
 namespace chat\data\message;
 
+use wcf\data\DatabaseObjectList;
+
 /**
  * Represents a list of chat messages.
+ *
+ * @method  Message        current()
+ * @method  Message[]      getObjects()
+ * @method  Message|null   getSingleObject()
+ * @method  Message|null   search($objectID)
+ * @property    Message[] $objects
  */
-class MessageList extends \wcf\data\DatabaseObjectList {
+class MessageList extends DatabaseObjectList
+{
 }

files/lib/data/message/ViewableMessage.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,50 +15,59 @@
 
 namespace chat\data\message;
 
-use \wcf\system\request\LinkHandler;
-use \wcf\system\WCF;
+use chat\data\room\Room;
+use chat\page\LogPage;
+use wcf\data\DatabaseObjectDecorator;
+use wcf\system\request\LinkHandler;
+use wcf\system\WCF;
 
 /**
  * Represents a chat message.
  */
-class ViewableMessage extends \wcf\data\DatabaseObjectDecorator implements \JsonSerializable {
-	protected static $baseClass = Message::class;
+class ViewableMessage extends DatabaseObjectDecorator implements \JsonSerializable
+{
+    protected static $baseClass = Message::class;
 
-	protected $room = null;
+    protected $room;
 
-	public function __construct(Message $message, \chat\data\room\Room $room) {
-		parent::__construct($message);
+    public function __construct(Message $message, Room $room)
+    {
+        parent::__construct($message);
 
-		$this->room = $room;
-	}
+        $this->room = $room;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function jsonSerialize() {
-		$link = LinkHandler::getInstance()->getLink('Log', [ 'application' => 'chat'
-		                                                   , 'messageid'   => $this->messageID
-		                                                   , 'object'      => $this->room
-		                                                   ]);
+    /**
+     * @inheritDoc
+     */
+    public function jsonSerialize(): array
+    {
+        $link = LinkHandler::getInstance()->getControllerLink(
+            LogPage::class,
+            [
+                'messageid' => $this->messageID,
+                'object' => $this->room,
+            ]
+        );
 
-		if ($this->isDeleted) {
-			$payload = false;
-			$objectType = 'be.bastelstu.chat.messageType.tombstone';
-		}
-		else {
-			$payload = $this->getMessageType()->getProcessor()->getPayload($this->getDecoratedObject());
-			$objectType = $this->getMessageType()->objectType;
-		}
+        if ($this->isDeleted) {
+            $payload = false;
+            $objectType = 'be.bastelstu.chat.messageType.tombstone';
+        } else {
+            $payload = $this->getMessageType()->getProcessor()->getPayload($this->getDecoratedObject());
+            $objectType = $this->getMessageType()->objectType;
+        }
 
-		return [ 'messageID'  => $this->messageID
-		       , 'userID'     => $this->userID
-		       , 'username'   => $this->username
-		       , 'time'       => $this->time
-		       , 'payload'    => $payload
-		       , 'objectType' => $objectType
-		       , 'link'       => $link
-		       , 'isIgnored'  => WCF::getUserProfileHandler()->isIgnoredUser($this->userID)
-		       , 'isDeleted'  => (bool) $this->isDeleted
-		       ];
-	}
+        return [
+            'messageID' => $this->messageID,
+            'userID' => $this->userID,
+            'username' => $this->username,
+            'time' => $this->time,
+            'payload' => $payload,
+            'objectType' => $objectType,
+            'link' => $link,
+            'isIgnored' => WCF::getUserProfileHandler()->isIgnoredUser($this->userID),
+            'isDeleted' => (bool)$this->isDeleted,
+        ];
+    }
 }

files/lib/data/room/Room.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,249 +15,291 @@
 
 namespace chat\data\room;
 
-use \chat\system\cache\runtime\UserRuntimeCache;
-use \chat\system\permission\PermissionHandler;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\request\LinkHandler;
-use \wcf\system\WCF;
-use \wcf\util\StringUtil;
+use chat\page\RoomPage;
+use chat\system\cache\runtime\UserRuntimeCache as ChatUserRuntimeCache;
+use chat\system\permission\PermissionHandler;
+use wcf\data\DatabaseObject;
+use wcf\data\ITitledLinkObject;
+use wcf\data\user\UserProfile;
+use wcf\system\event\EventHandler;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\request\IRouteController;
+use wcf\system\request\LinkHandler;
+use wcf\system\WCF;
+use wcf\util\StringUtil;
 
 /**
  * Represents a chat room.
+ *
+ * @property-read   integer $roomID
+ * @property-read   string  $title
+ * @property-read   string  $topic
+ * @property-read   integer $position
+ * @property-read   integer $userLimit
+ * @property-read   integer $isTemporary
+ * @property-read   integer $ownerID
+ * @property-read   integer $topicUseHtml
  */
-final class Room extends \wcf\data\DatabaseObject implements \wcf\system\request\IRouteController
-                                                           , \wcf\data\ITitledLinkObject
-                                                           , \JsonSerializable {
-	/**
-	 * User to Room mapping.
-	 *
-	 * @param	int[]
-	 */
-	private static $userToRoom = null;
+final class Room extends DatabaseObject implements
+    IRouteController,
+    ITitledLinkObject,
+    \JsonSerializable
+{
+    /**
+     * @var ?(integer[])
+     */
+    private static $userToRoom;
 
-	/**
-	 * @see	Room::getTitle()
-	 */
-	public function __toString() {
-		return $this->getTitle();
-	}
+    /**
+     * @see Room::getTitle()
+     */
+    public function __toString(): string
+    {
+        return $this->getTitle();
+    }
 
-	/**
-	 * Returns whether the given user can see at least
-	 * one chat room. If no user is given the current user
-	 * should be assumed
-	 *
-	 * @param	\wcf\data\user\UserProfile	$user
-	 * @return	boolean
-	 */
-	public static function canSeeAny(\wcf\data\user\UserProfile $user = null) {
-		$rooms = RoomCache::getInstance()->getRooms();
-		foreach ($rooms as $room) {
-			if ($room->canSee($user)) return true;
-		}
+    /**
+     * Returns whether the given user can see at least
+     * one chat room. If no user is given the current user
+     * should be assumed
+     */
+    public static function canSeeAny(?UserProfile $user = null): bool
+    {
+        $rooms = RoomCache::getInstance()->getRooms();
+        foreach ($rooms as $room) {
+            if ($room->canSee($user)) {
+                return true;
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * Returns whether the given user can see this room.
-	 * If no user is given the current user should be assumed.
-	 *
-	 * @param	\wcf\data\user\UserProfile	$user
-	 * @return	boolean
-	 */
-	public function canSee(\wcf\data\user\UserProfile $user = null, \Exception &$reason = null) {
-		static $cache = [ ];
-		if ($user === null) $user = new \wcf\data\user\UserProfile(WCF::getUser());
+    /**
+     * Returns whether the given user can see this room.
+     * If no user is given the current user should be assumed.
+     */
+    public function canSee(?UserProfile $user = null, ?\Exception &$reason = null): bool
+    {
+        static $cache = [ ];
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		if (!isset($cache[$this->roomID])) $cache[$this->roomID] = [];
-		if (array_key_exists($user->userID, $cache[$this->roomID])) {
-			return ($reason = $cache[$this->roomID][$user->userID]) === null;
-		}
+        if (!isset($cache[$this->roomID])) {
+            $cache[$this->roomID] = [];
+        }
+        if (\array_key_exists($user->userID, $cache[$this->roomID])) {
+            return ($reason = $cache[$this->roomID][$user->userID]) === null;
+        }
 
-		if (!$user->userID) {
-			$reason = new PermissionDeniedException();
-			return ($cache[$this->roomID][$user->userID] = $reason) === null;
-		}
+        if (!$user->userID) {
+            $reason = new PermissionDeniedException();
 
-		$result = null;
-		if (!PermissionHandler::get($user)->getPermission($this, 'user.canSee')) {
-			$result = new PermissionDeniedException();
-		}
+            return ($cache[$this->roomID][$user->userID] = $reason) === null;
+        }
 
-		$parameters = [ 'user'   => $user
-		              , 'result' => $result
-		              ];
-		\wcf\system\event\EventHandler::getInstance()->fireAction($this, 'canSee', $parameters);
-		$reason = $parameters['result'];
+        $result = null;
+        if (!PermissionHandler::get($user)->getPermission($this, 'user.canSee')) {
+            $result = new PermissionDeniedException();
+        }
 
-		if (!($reason === null || $reason instanceof \Exception || $reason instanceof \Throwable)) {
-			throw new \DomainException('Result of canSee must be a \Throwable or null.');
-		}
+        $parameters = [
+            'user' => $user,
+            'result' => $result,
+        ];
+        EventHandler::getInstance()->fireAction($this, 'canSee', $parameters);
+        $reason = $parameters['result'];
 
-		return ($cache[$this->roomID][$user->userID] = $reason) === null;
-	}
+        if (!($reason === null || $reason instanceof \Throwable)) {
+            throw new \DomainException('Result of canSee must be a \Throwable or null.');
+        }
 
-	/**
-	 * Returns whether the given user can see the log of this room.
-	 * If no user is given the current user should be assumed.
-	 *
-	 * @param	\wcf\data\user\UserProfile	$user
-	 * @return	boolean
-	 */
-	public function canSeeLog(\wcf\data\user\UserProfile $user = null, \Exception &$reason = null) {
-		static $cache = [ ];
-		if ($user === null) $user = new \wcf\data\user\UserProfile(WCF::getUser());
+        return ($cache[$this->roomID][$user->userID] = $reason) === null;
+    }
 
-		if (!isset($cache[$this->roomID])) $cache[$this->roomID] = [];
-		if (array_key_exists($user->userID, $cache[$this->roomID])) {
-			return ($reason = $cache[$this->roomID][$user->userID]) === null;
-		}
+    /**
+     * Returns whether the given user can see the log of this room.
+     * If no user is given the current user should be assumed.
+     */
+    public function canSeeLog(?UserProfile $user = null, ?\Exception &$reason = null): bool
+    {
+        static $cache = [ ];
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$result = null;
-		if (!PermissionHandler::get($user)->getPermission($this, 'user.canSeeLog')) {
-			$result = new PermissionDeniedException();
-		}
+        if (!isset($cache[$this->roomID])) {
+            $cache[$this->roomID] = [];
+        }
+        if (\array_key_exists($user->userID, $cache[$this->roomID])) {
+            return ($reason = $cache[$this->roomID][$user->userID]) === null;
+        }
 
-		$parameters = [ 'user'   => $user
-		              , 'result' => $result
-		              ];
-		\wcf\system\event\EventHandler::getInstance()->fireAction($this, 'canSeeLog', $parameters);
-		$reason = $parameters['result'];
+        $result = null;
+        if (!PermissionHandler::get($user)->getPermission($this, 'user.canSeeLog')) {
+            $result = new PermissionDeniedException();
+        }
 
-		if (!($reason === null || $reason instanceof \Exception || $reason instanceof \Throwable)) {
-			throw new \DomainException('Result of canSeeLog must be a \Throwable or null.');
-		}
+        $parameters = [
+            'user' => $user,
+            'result' => $result,
+        ];
+        EventHandler::getInstance()->fireAction($this, 'canSeeLog', $parameters);
+        $reason = $parameters['result'];
 
-		return ($cache[$this->roomID][$user->userID] = $reason) === null;
-	}
+        if (!($reason === null || $reason instanceof \Throwable)) {
+            throw new \DomainException('Result of canSeeLog must be a \Throwable or null.');
+        }
 
-	/**
-	 * Returns whether the given user can join this room.
-	 * If no user is given the current user should be assumed.
-	 *
-	 * @param	\wcf\data\user\UserProfile	$user
-	 * @return	boolean
-	 */
-	public function canJoin(\wcf\data\user\UserProfile $user = null, \Exception &$reason = null) {
-		static $cache = [ ];
-		if ($user === null) $user = new \wcf\data\user\UserProfile(WCF::getUser());
+        return ($cache[$this->roomID][$user->userID] = $reason) === null;
+    }
 
-		if (!isset($cache[$this->roomID])) $cache[$this->roomID] = [];
-		if (array_key_exists($user->userID, $cache[$this->roomID])) {
-			return ($reason = $cache[$this->roomID][$user->userID]) === null;
-		}
+    /**
+     * Returns whether the given user can join this room.
+     * If no user is given the current user should be assumed.
+     */
+    public function canJoin(?UserProfile $user = null, ?\Exception &$reason = null): bool
+    {
+        static $cache = [ ];
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$parameters = [ 'user' => $user
-		              , 'result' => null
-		              ];
-		\wcf\system\event\EventHandler::getInstance()->fireAction($this, 'canJoin', $parameters);
-		$reason = $parameters['result'];
+        if (!isset($cache[$this->roomID])) {
+            $cache[$this->roomID] = [];
+        }
+        if (\array_key_exists($user->userID, $cache[$this->roomID])) {
+            return ($reason = $cache[$this->roomID][$user->userID]) === null;
+        }
 
-		if (!($reason === null || $reason instanceof \Exception || $reason instanceof \Throwable)) {
-			throw new \DomainException('Result of canJoin must be a \Throwable or null.');
-		}
+        $parameters = [
+            'user' => $user,
+            'result' => null,
+        ];
+        EventHandler::getInstance()->fireAction($this, 'canJoin', $parameters);
+        $reason = $parameters['result'];
 
-		return ($cache[$this->roomID][$user->userID] = $reason) === null;
-	}
+        if (!($reason === null || $reason instanceof \Throwable)) {
+            throw new \DomainException('Result of canJoin must be a \Throwable or null.');
+        }
 
-	/**
-	 * Returns whether the given user can write public messages in this room.
-	 * If no user is given the current user should be assumed.
-	 *
-	 * @param	\wcf\data\user\UserProfile	$user
-	 * @return	boolean
-	 */
-	public function canWritePublicly(\wcf\data\user\UserProfile $user = null, \Exception &$reason = null) {
-		static $cache = [ ];
-		if ($user === null) $user = new \wcf\data\user\UserProfile(WCF::getUser());
+        return ($cache[$this->roomID][$user->userID] = $reason) === null;
+    }
 
-		if (!isset($cache[$this->roomID])) $cache[$this->roomID] = [];
-		if (array_key_exists($user->userID, $cache[$this->roomID])) {
-			return ($reason = $cache[$this->roomID][$user->userID]) === null;
-		}
+    /**
+     * Returns whether the given user can write public messages in this room.
+     * If no user is given the current user should be assumed.
+     */
+    public function canWritePublicly(?UserProfile $user = null, ?\Exception &$reason = null): bool
+    {
+        static $cache = [ ];
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$result = null;
-		if (!PermissionHandler::get($user)->getPermission($this, 'user.canWrite')) {
-			$result = new PermissionDeniedException();
-		}
+        if (!isset($cache[$this->roomID])) {
+            $cache[$this->roomID] = [];
+        }
+        if (\array_key_exists($user->userID, $cache[$this->roomID])) {
+            return ($reason = $cache[$this->roomID][$user->userID]) === null;
+        }
 
-		$parameters = [ 'user'   => $user
-		              , 'result' => $result
-		              ];
-		\wcf\system\event\EventHandler::getInstance()->fireAction($this, 'canWritePublicly', $parameters);
-		$reason = $parameters['result'];
+        $result = null;
+        if (!PermissionHandler::get($user)->getPermission($this, 'user.canWrite')) {
+            $result = new PermissionDeniedException();
+        }
 
-		if (!($reason === null || $reason instanceof \Exception || $reason instanceof \Throwable)) {
-			throw new \DomainException('Result of canWritePublicly must be a \Throwable or null.');
-		}
+        $parameters = [
+            'user' => $user,
+            'result' => $result,
+        ];
+        EventHandler::getInstance()->fireAction($this, 'canWritePublicly', $parameters);
+        $reason = $parameters['result'];
 
-		return ($cache[$this->roomID][$user->userID] = $reason) === null;
-	}
+        if (!($reason === null || $reason instanceof \Throwable)) {
+            throw new \DomainException('Result of canWritePublicly must be a \Throwable or null.');
+        }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getTitle() {
-		return WCF::getLanguage()->get($this->title);
-	}
+        return ($cache[$this->roomID][$user->userID] = $reason) === null;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getTopic() {
-		$topic = StringUtil::trim(WCF::getLanguage()->get($this->topic));
+    /**
+     * @inheritDoc
+     */
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get($this->title);
+    }
 
-		if (!$this->topicUseHtml) {
-			$topic = StringUtil::encodeHTML($topic);
-		}
+    /**
+     * @inheritDoc
+     */
+    public function getTopic(): string
+    {
+        $topic = StringUtil::trim(WCF::getLanguage()->get($this->topic));
 
-		return $topic;
-	}
+        if (!$this->topicUseHtml) {
+            $topic = StringUtil::encodeHTML($topic);
+        }
 
-	/**
-	 * Returns an array of users in this room.
-	 */
-	public function getUsers() {
-		if (self::$userToRoom === null) {
-			$sql = "SELECT     r2u.userID, r2u.roomID
-			        FROM       chat".WCF_N."_room_to_user r2u
-			        INNER JOIN wcf".WCF_N."_user u
-			                ON r2u.userID = u.userID
-			        WHERE      r2u.active = ?
-			        ORDER BY   u.username ASC";
-			$statement = WCF::getDB()->prepareStatement($sql);
-			$statement->execute([ 1 ]);
-			self::$userToRoom = $statement->fetchMap('roomID', 'userID', false);
+        return $topic;
+    }
 
-			if (!empty(self::$userToRoom)) {
-				UserRuntimeCache::getInstance()->cacheObjectIDs(array_merge(...self::$userToRoom));
-			}
-		}
+    /**
+     * Returns an array of users in this room.
+     *
+     * @return \chat\data\user\User[]
+     */
+    public function getUsers()
+    {
+        if (self::$userToRoom === null) {
+            $sql = "SELECT      r2u.userID,
+                                r2u.roomID
+                    FROM        chat1_room_to_user r2u
+                    INNER JOIN  wcf1_user u
+                            ON  r2u.userID = u.userID
+                    WHERE       r2u.active = ?
+                    ORDER BY    u.username ASC";
+            $statement = WCF::getDB()->prepare($sql);
+            $statement->execute([ 1 ]);
+            self::$userToRoom = $statement->fetchMap('roomID', 'userID', false);
 
-		if (!isset(self::$userToRoom[$this->roomID])) return [ ];
+            if (!empty(self::$userToRoom)) {
+                ChatUserRuntimeCache::getInstance()->cacheObjectIDs(\array_merge(...self::$userToRoom));
+            }
+        }
 
-		return UserRuntimeCache::getInstance()->getObjects(self::$userToRoom[$this->roomID]);
-	}
+        if (!isset(self::$userToRoom[$this->roomID])) {
+            return [ ];
+        }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getLink() {
-		return LinkHandler::getInstance()->getLink('Room', [ 'application'   => 'chat'
-		                                                   , 'object'        => $this
-		                                                   , 'forceFrontend' => true
-		                                                   ]
-		                                          );
-	}
+        return ChatUserRuntimeCache::getInstance()->getObjects(self::$userToRoom[$this->roomID]);
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function jsonSerialize() {
-		return [ 'title' => $this->getTitle()
-		       , 'topic' => $this->getTopic()
-		       , 'link'  => $this->getLink()
-		       ];
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getLink(): string
+    {
+        return LinkHandler::getInstance()->getControllerLink(
+            RoomPage::class,
+            [
+                'object' => $this,
+                'forceFrontend' => true,
+            ]
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function jsonSerialize(): array
+    {
+        return [
+            'title' => $this->getTitle(),
+            'topic' => $this->getTopic(),
+            'link' => $this->getLink(),
+        ];
+    }
 }

files/lib/data/room/RoomAction.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,363 +15,478 @@
 
 namespace chat\data\room;
 
-use \chat\data\user\User as ChatUser;
-use \chat\data\message\MessageAction;
-use \wcf\data\object\type\ObjectTypeCache;
-use \wcf\system\cache\runtime\UserProfileRuntimeCache;
-use \wcf\system\database\util\PreparedStatementConditionBuilder;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\exception\UserInputException;
-use \wcf\system\user\activity\point\UserActivityPointHandler;
-use \wcf\system\WCF;
+use chat\data\command\CommandCache;
+use chat\data\message\MessageAction;
+use chat\data\user\User as ChatUser;
+use chat\data\user\UserAction as ChatUserAction;
+use chat\system\box\RoomListBoxController;
+use wcf\data\AbstractDatabaseObjectAction;
+use wcf\data\box\Box;
+use wcf\data\ISortableAction;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\data\package\PackageCache;
+use wcf\data\user\UserProfile;
+use wcf\system\cache\runtime\UserProfileRuntimeCache;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\event\EventHandler;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\exception\UserInputException;
+use wcf\system\push\PushHandler;
+use wcf\system\user\activity\point\UserActivityPointHandler;
+use wcf\system\WCF;
 
 /**
  * Executes chat room-related actions.
  */
-class RoomAction extends \wcf\data\AbstractDatabaseObjectAction implements \wcf\data\ISortableAction {
-	/**
-	 * @inheritDoc
-	 */
-	protected $permissionsDelete = [ 'admin.chat.canManageRoom' ];
+class RoomAction extends AbstractDatabaseObjectAction implements ISortableAction
+{
+    /**
+     * @inheritDoc
+     */
+    protected $permissionsDelete = [
+        'admin.chat.canManageRoom',
+    ];
 
-	/**
-	 * @inheritDoc
-	 */
-	protected $permissionsUpdate = [ 'admin.chat.canManageRoom' ];
+    /**
+     * @inheritDoc
+     */
+    protected $permissionsUpdate = [
+        'admin.chat.canManageRoom',
+    ];
 
-	/**
-	 * Validates parameters and permissions.
-	 */
-	public function validateJoin() {
-		unset($this->parameters['user']);
+    /**
+     * Validates parameters and permissions.
+     */
+    public function validateJoin()
+    {
+        unset($this->parameters['user']);
 
-		$this->readString('sessionID');
-		$this->parameters['sessionID'] = pack('H*', str_replace('-', '', $this->parameters['sessionID']));
+        $this->readString('sessionID');
+        $this->parameters['sessionID'] = \pack(
+            'H*',
+            \str_replace('-', '', $this->parameters['sessionID'])
+        );
 
-		$this->readInteger('roomID');
+        $this->readInteger('roomID');
 
-		$room = RoomCache::getInstance()->getRoom($this->parameters['roomID']);
-		if ($room === null) throw new UserInputException('roomID');
-		if (!$room->canSee($user = null, $reason)) throw $reason;
-		if (!$room->canJoin($user = null, $reason)) throw $reason;
-	}
+        $room = RoomCache::getInstance()->getRoom($this->parameters['roomID']);
+        if ($room === null) {
+            throw new UserInputException('roomID');
+        }
+        if (!$room->canSee($user = null, $reason)) {
+            throw $reason;
+        }
+        if (!$room->canJoin($user = null, $reason)) {
+            throw $reason;
+        }
+    }
 
-	/**
-	 * Makes the given user join the current chat room.
-	 */
-	public function join() {
-		$objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName('be.bastelstu.chat.messageType', 'be.bastelstu.chat.messageType.join');
-		if (!$objectTypeID) throw new \LogicException('Missing object type');
-		// User cannot be set during an AJAX request, but may be set by Tim’s Chat itself.
-		if (!isset($this->parameters['user'])) $this->parameters['user'] = WCF::getUser();
-		$user = new ChatUser($this->parameters['user']);
+    /**
+     * Makes the given user join the current chat room.
+     */
+    public function join()
+    {
+        $objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName(
+            'be.bastelstu.chat.messageType',
+            'be.bastelstu.chat.messageType.join'
+        );
+        if (!$objectTypeID) {
+            throw new \LogicException('Missing object type');
+        }
+        // User cannot be set during an AJAX request, but may be set by Tim’s Chat itself.
+        if (!isset($this->parameters['user'])) {
+            $this->parameters['user'] = WCF::getUser();
+        }
+        $user = new ChatUser($this->parameters['user']);
 
-		// Check parameters
-		$room = RoomCache::getInstance()->getRoom($this->parameters['roomID']);
-		if ($room === null) throw new UserInputException('roomID');
-		$sessionID = $this->parameters['sessionID'];
-		if (strlen($sessionID) !== 16) throw new UserInputException('sessionID');
+        // Check parameters
+        $room = RoomCache::getInstance()->getRoom($this->parameters['roomID']);
+        if ($room === null) {
+            throw new UserInputException('roomID');
+        }
+        $sessionID = $this->parameters['sessionID'];
+        if (\strlen($sessionID) !== 16) {
+            throw new UserInputException('sessionID');
+        }
 
-		try {
-			// Create room_to_user mapping.
-			$sql = "INSERT INTO chat".WCF_N."_room_to_user (active, roomID, userID) VALUES (?, ?, ?)";
-			$statement = WCF::getDB()->prepareStatement($sql);
-			$statement->execute([ 0, $room->roomID, $user->userID ]);
-		}
-		catch (\wcf\system\database\exception\DatabaseException $e) {
-			// Ignore if there already is a mapping.
-			if ((string) $e->getCode() !== '23000') throw $e;
-		}
+        try {
+            // Create room_to_user mapping.
+            $sql = "INSERT INTO chat1_room_to_user
+                                (active, roomID, userID)
+                    VALUES      (?, ?, ?)";
+            $statement = WCF::getDB()->prepare($sql);
+            $statement->execute([ 0, $room->roomID, $user->userID ]);
+        } catch (\wcf\system\database\exception\DatabaseException $e) {
+            // Ignore if there already is a mapping.
+            if ((string)$e->getCode() !== '23000') {
+                throw $e;
+            }
+        }
 
-		try {
-			$sql = "INSERT INTO chat".WCF_N."_session (roomID, userID, sessionID, lastRequest) VALUES (?, ?, ?, ?)";
-			$statement = WCF::getDB()->prepareStatement($sql);
-			$statement->execute([ $room->roomID, $user->userID, $sessionID, TIME_NOW ]);
-		}
-		catch (\wcf\system\database\exception\DatabaseException $e) {
-			if ((string) $e->getCode() !== '23000') throw $e;
+        try {
+            $sql = "INSERT INTO chat1_session
+                                (roomID, userID, sessionID, lastRequest)
+                    VALUES      (?, ?, ?, ?)";
+            $statement = WCF::getDB()->prepare($sql);
+            $statement->execute([
+                $room->roomID,
+                $user->userID,
+                $sessionID,
+                TIME_NOW,
+            ]);
+        } catch (\wcf\system\database\exception\DatabaseException $e) {
+            if ((string)$e->getCode() !== '23000') {
+                throw $e;
+            }
 
-			throw new UserInputException('sessionID');
-		}
+            throw new UserInputException('sessionID');
+        }
 
-		$markAsBack = function () use ($user, $room) {
-			$userProfile = new \wcf\data\user\UserProfile($user->getDecoratedObject());
-			$package = \wcf\data\package\PackageCache::getInstance()->getPackageByIdentifier('be.bastelstu.chat');
-			$command = \chat\data\command\CommandCache::getInstance()->getCommandByPackageAndIdentifier($package, 'back');
-			$processor = $command->getProcessor();
-			$processor->execute([ ], $room, $userProfile);
-		};
+        $markAsBack = static function () use ($user, $room) {
+            $userProfile = new UserProfile($user->getDecoratedObject());
+            $package = PackageCache::getInstance()->getPackageByIdentifier('be.bastelstu.chat');
+            $command = CommandCache::getInstance()->getCommandByPackageAndIdentifier($package, 'back');
+            $processor = $command->getProcessor();
+            $processor->execute([ ], $room, $userProfile);
+        };
 
-		if ($user->chatAway !== null) {
-			$markAsBack();
-		}
+        if ($user->chatAway !== null) {
+            $markAsBack();
+        }
 
-		// Attempt to mark the user as active in the room.
-		$sql = "UPDATE chat".WCF_N."_room_to_user SET active = ? WHERE roomID = ? AND userID = ?";
-		$statement = WCF::getDB()->prepareStatement($sql);
-		$statement->execute([ 1, $room->roomID, $user->userID ]);
-		if ($statement->getAffectedRows() === 0) {
-			// The User already is inside the room: Nothing to do here.
-			return;
-		}
+        // Attempt to mark the user as active in the room.
+        $sql = "UPDATE  chat1_room_to_user
+                SET     active = ?
+                WHERE   roomID = ?
+                    AND userID = ?";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute([ 1, $room->roomID, $user->userID ]);
+        if ($statement->getAffectedRows() === 0) {
+            // The User already is inside the room: Nothing to do here.
+            return;
+        }
 
-		// Update lastPull. This must not be merged into the above query, because of the 'getAffectedRows' check.
-		$sql = "UPDATE chat".WCF_N."_room_to_user SET lastPull = ? WHERE roomID = ? AND userID = ?";
-		$statement = WCF::getDB()->prepareStatement($sql);
-		$statement->execute([ TIME_NOW, $room->roomID, $user->userID ]);
+        // Update lastPull. This must not be merged into the above query, because of the 'getAffectedRows' check.
+        $sql = "UPDATE  chat1_room_to_user
+                SET     lastPull = ?
+                WHERE   roomID = ?
+                    AND userID = ?";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute([ TIME_NOW, $room->roomID, $user->userID ]);
 
-		(new MessageAction([ ], 'create', [ 'data' => [ 'roomID'       => $room->roomID
-		                                              , 'userID'       => $user->userID
-		                                              , 'username'     => $user->username
-		                                              , 'time'         => TIME_NOW
-		                                              , 'objectTypeID' => $objectTypeID
-		                                              , 'payload'      => serialize([ ])
-		                                              ]
-		                                  ]
-		                  )
-		)->executeAction();
+        (new MessageAction(
+            [ ],
+            'create',
+            [
+                'data' => [
+                    'roomID' => $room->roomID,
+                    'userID' => $user->userID,
+                    'username' => $user->username,
+                    'time' => TIME_NOW,
+                    'objectTypeID' => $objectTypeID,
+                    'payload' => \serialize([ ]),
+                ],
+            ]
+        ))->executeAction();
 
-		UserActivityPointHandler::getInstance()->fireEvent('be.bastelstu.chat.activityPointEvent.join', 0, $user->userID);
-		$pushHandler = \wcf\system\push\PushHandler::getInstance();
-		$pushHandler->sendMessage([ 'message' => 'be.bastelstu.chat.join'
-		                          , 'target' => 'registered'
-		                          ]);
-	}
+        UserActivityPointHandler::getInstance()->fireEvent(
+            'be.bastelstu.chat.activityPointEvent.join',
+            0,
+            $user->userID
+        );
+        $pushHandler = PushHandler::getInstance();
+        $pushHandler->sendMessage([
+            'message' => 'be.bastelstu.chat.join',
+            'target' => 'registered',
+        ]);
+    }
 
-	/**
-	 * Validates parameters and permissions.
-	 */
-	public function validateLeave() {
-		unset($this->parameters['user']);
+    /**
+     * Validates parameters and permissions.
+     */
+    public function validateLeave()
+    {
+        unset($this->parameters['user']);
 
-		$this->readString('sessionID');
-		$this->parameters['sessionID'] = pack('H*', str_replace('-', '', $this->parameters['sessionID']));
+        $this->readString('sessionID');
+        $this->parameters['sessionID'] = \pack(
+            'H*',
+            \str_replace('-', '', $this->parameters['sessionID'])
+        );
 
-		$this->readInteger('roomID');
-		$room = RoomCache::getInstance()->getRoom($this->parameters['roomID']);
-		if ($room === null) throw new UserInputException('roomID');
-		// Do not check permissions: If the user is not inside the room nothing happens, if he is it
-		//                           may lead to a faster eviction of the user.
-	}
+        $this->readInteger('roomID');
+        $room = RoomCache::getInstance()->getRoom($this->parameters['roomID']);
+        if ($room === null) {
+            throw new UserInputException('roomID');
+        }
+        // Do not check permissions: If the user is not inside the room nothing happens, if he is it
+        //                           may lead to a faster eviction of the user.
+    }
 
-	/**
-	 * Makes the given user leave the current chat room.
-	 */
-	public function leave() {
-		$objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName('be.bastelstu.chat.messageType', 'be.bastelstu.chat.messageType.leave');
-		if ($objectTypeID) {
-			// User cannot be set during an AJAX request, but may be set by Tim’s Chat itself.
-			if (!isset($this->parameters['user'])) $this->parameters['user'] = WCF::getUser();
-			$user = new ChatUser($this->parameters['user']);
+    /**
+     * Makes the given user leave the current chat room.
+     */
+    public function leave()
+    {
+        $objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName(
+            'be.bastelstu.chat.messageType',
+            'be.bastelstu.chat.messageType.leave'
+        );
+        if ($objectTypeID) {
+            // User cannot be set during an AJAX request, but may be set by Tim’s Chat itself.
+            if (!isset($this->parameters['user'])) {
+                $this->parameters['user'] = WCF::getUser();
+            }
+            $user = new ChatUser($this->parameters['user']);
 
-			$room = RoomCache::getInstance()->getRoom($this->parameters['roomID']);
-			if ($room === null) throw new UserInputException('roomID');
+            $room = RoomCache::getInstance()->getRoom($this->parameters['roomID']);
+            if ($room === null) {
+                throw new UserInputException('roomID');
+            }
 
-			$sessionID = null;
-			if (isset($this->parameters['sessionID'])) {
-				$sessionID = $this->parameters['sessionID'];
-				if (strlen($sessionID) !== 16) throw new UserInputException('sessionID');
-			}
+            $sessionID = null;
+            if (isset($this->parameters['sessionID'])) {
+                $sessionID = $this->parameters['sessionID'];
+                if (\strlen($sessionID) !== 16) {
+                    throw new UserInputException('sessionID');
+                }
+            }
 
-			// Delete session.
-			$condition = new \wcf\system\database\util\PreparedStatementConditionBuilder();
-			$condition->add('roomID = ?', [ $room->roomID ]);
-			$condition->add('userID = ?', [ $user->userID ]);
-			if ($sessionID !== null) {
-				$condition->add('sessionID = ?', [ $sessionID ]);
-			}
-			$sql = "DELETE FROM chat".WCF_N."_session
-			       ".$condition;
-			$statement = WCF::getDB()->prepareStatement($sql);
-			$statement->execute($condition->getParameters());
-			if ($statement->getAffectedRows() === 0) {
-				throw new UserInputException('sessionID');
-			}
+            // Delete session.
+            $condition = new PreparedStatementConditionBuilder();
+            $condition->add('roomID = ?', [ $room->roomID ]);
+            $condition->add('userID = ?', [ $user->userID ]);
+            if ($sessionID !== null) {
+                $condition->add('sessionID = ?', [ $sessionID ]);
+            }
+            $sql = "DELETE FROM chat1_session
+                   {$condition}";
+            $statement = WCF::getDB()->prepare($sql);
+            $statement->execute($condition->getParameters());
+            if ($statement->getAffectedRows() === 0) {
+                throw new UserInputException('sessionID');
+            }
 
-			try {
-				$commited = false;
-				WCF::getDB()->beginTransaction();
+            try {
+                $commited = false;
+                WCF::getDB()->beginTransaction();
 
-				// Check whether we deleted the last session.
-				$sql = "SELECT COUNT(*)
-				        FROM   chat".WCF_N."_session
-				        WHERE      roomID = ?
-				               AND userID = ?";
-				$statement = WCF::getDB()->prepareStatement($sql);
-				$statement->execute([ $room->roomID, $user->userID ]);
+                // Check whether we deleted the last session.
+                $sql = "SELECT  COUNT(*)
+                        FROM    chat1_session
+                        WHERE   roomID = ?
+                            AND userID = ?";
+                $statement = WCF::getDB()->prepare($sql);
+                $statement->execute([ $room->roomID, $user->userID ]);
 
-				// We did not: Nothing to do here.
-				if ($statement->fetchColumn()) return;
+                // We did not: Nothing to do here.
+                if ($statement->fetchColumn()) {
+                    return;
+                }
 
-				// Mark the user as inactive.
-				$sql = "UPDATE chat".WCF_N."_room_to_user SET active = ? WHERE roomID = ? AND userID = ?";
-				$statement = WCF::getDB()->prepareStatement($sql);
-				$statement->execute([ 0, $room->roomID, $user->userID ]);
-				if ($statement->getAffectedRows() === 0) throw new \LogicException('Unreachable');
+                // Mark the user as inactive.
+                $sql = "UPDATE  chat1_room_to_user
+                        SET     active = ?
+                        WHERE   roomID = ?
+                            AND userID = ?";
+                $statement = WCF::getDB()->prepare($sql);
+                $statement->execute([ 0, $room->roomID, $user->userID ]);
+                \assert($statement->getAffectedRows() > 0);
 
-				WCF::getDB()->commitTransaction();
-				$commited = true;
-			}
-			finally {
-				if (!$commited) WCF::getDB()->rollBackTransaction();
-			}
+                WCF::getDB()->commitTransaction();
+                $commited = true;
+            } finally {
+                if (!$commited) {
+                    WCF::getDB()->rollBackTransaction();
+                }
+            }
 
-			(new MessageAction([ ], 'create', [ 'data' => [ 'roomID'       => $room->roomID
-			                                              , 'userID'       => $user->userID
-			                                              , 'username'     => $user->username
-			                                              , 'time'         => TIME_NOW
-			                                              , 'objectTypeID' => $objectTypeID
-			                                              , 'payload'      => serialize([ ])
-			                                              ]
-			                                  ]
-			                  )
-			)->executeAction();
+            (new MessageAction(
+                [ ],
+                'create',
+                [
+                    'data' => [
+                        'roomID' => $room->roomID,
+                        'userID' => $user->userID,
+                        'username' => $user->username,
+                        'time' => TIME_NOW,
+                        'objectTypeID' => $objectTypeID,
+                        'payload' => \serialize([ ]),
+                    ],
+                ]
+            ))->executeAction();
 
-			$pushHandler = \wcf\system\push\PushHandler::getInstance();
-			$pushHandler->sendMessage([ 'message' => 'be.bastelstu.chat.leave'
-			                          , 'target' => 'registered'
-			                          ]);
-		}
-		else {
-			throw new \LogicException('Missing object type');
-		}
-	}
+            $pushHandler = PushHandler::getInstance();
+            $pushHandler->sendMessage([
+                'message' => 'be.bastelstu.chat.leave',
+                'target' => 'registered',
+            ]);
+        } else {
+            throw new \LogicException('Missing object type');
+        }
+    }
 
-	/**
-	 * Validates parameters and permissions.
-	 */
-	public function validateGetUsers() {
-		if (empty($this->getObjects())) {
-			$this->readObjects();
-		}
-		if (count($this->getObjects()) !== 1) {
-			throw new UserInputException('objectIDs');
-		}
+    /**
+     * Validates parameters and permissions.
+     */
+    public function validateGetUsers()
+    {
+        if (empty($this->getObjects())) {
+            $this->readObjects();
+        }
+        if (\count($this->getObjects()) !== 1) {
+            throw new UserInputException('objectIDs');
+        }
 
-		$room = $this->getObjects()[0];
+        $room = $this->getObjects()[0];
 
-		$user = new ChatUser(WCF::getUser());
-		if (!$user->isInRoom($room->getDecoratedObject())) throw new PermissionDeniedException();
-	}
+        $user = new ChatUser(WCF::getUser());
+        if (!$user->isInRoom($room->getDecoratedObject())) {
+            throw new PermissionDeniedException();
+        }
+    }
 
-	/**
-	 * Returns the userIDs of the users in this room.
-	 */
-	public function getUsers() {
-		if (empty($this->getObjects())) {
-			$this->readObjects();
-		}
-		if (count($this->getObjects()) !== 1) {
-			throw new UserInputException('objectIDs');
-		}
+    /**
+     * Returns the userIDs of the users in this room.
+     */
+    public function getUsers()
+    {
+        if (empty($this->getObjects())) {
+            $this->readObjects();
+        }
+        if (\count($this->getObjects()) !== 1) {
+            throw new UserInputException('objectIDs');
+        }
 
-		$room = $this->getObjects()[0];
+        $room = $this->getObjects()[0];
 
-		$users = (new \chat\data\user\UserAction([ ], 'getUsersByID', [
-			'userIDs' => array_keys($room->getUsers())
-		]))->executeAction()['returnValues'];
+        $users = (new ChatUserAction(
+            [ ],
+            'getUsersByID',
+            [
+                'userIDs' => \array_keys($room->getUsers()),
+            ]
+        ))->executeAction()['returnValues'];
 
-		$users = array_map(function (array $user) use ($room) {
-			$userProfile = UserProfileRuntimeCache::getInstance()->getObject($user['userID']);
-			if (!isset($user['permissions'])) $user['permissions'] = [];
-			$user['permissions']['canWritePublicly'] = $room->canWritePublicly($userProfile);
+        $users = \array_map(static function (array $user) use ($room) {
+            $userProfile = UserProfileRuntimeCache::getInstance()->getObject($user['userID']);
+            if (!isset($user['permissions'])) {
+                $user['permissions'] = [];
+            }
+            $user['permissions']['canWritePublicly'] = $room->canWritePublicly($userProfile);
 
-			return $user;
-		}, $users);
-		
-		\wcf\system\event\EventHandler::getInstance()->fireAction($this, 'getUsers', $users);
+            return $user;
+        }, $users);
 
-		return $users;
-	}
+        EventHandler::getInstance()->fireAction($this, 'getUsers', $users);
 
-	/**
-	 * @inheritDoc
-	 */
-	public function validateUpdatePosition() {
-		// validate permissions
-		if (is_array($this->permissionsUpdate) && !empty($this->permissionsUpdate)) {
-			WCF::getSession()->checkPermissions($this->permissionsUpdate);
-		}
-		else {
-			throw new PermissionDeniedException();
-		}
+        return $users;
+    }
 
-		$this->readIntegerArray('structure', false, 'data');
+    /**
+     * @inheritDoc
+     */
+    public function validateUpdatePosition()
+    {
+        // validate permissions
+        if (\is_array($this->permissionsUpdate) && !empty($this->permissionsUpdate)) {
+            WCF::getSession()->checkPermissions($this->permissionsUpdate);
+        } else {
+            throw new PermissionDeniedException();
+        }
 
-		$roomList = new RoomList();
-		$roomList->readObjects();
+        $this->readIntegerArray('structure', false, 'data');
 
-		foreach ($this->parameters['data']['structure'][0] as $roomID) {
-			$room = $roomList->search($roomID);
-			if ($room === null) throw new UserInputException('structure');
-		}
-	}
+        $roomList = new RoomList();
+        $roomList->readObjects();
 
-	/**
-	 * @inheritDoc
-	 */
-	public function updatePosition() {
-		$roomList = new RoomList();
-		$roomList->readObjects();
+        foreach ($this->parameters['data']['structure'][0] as $roomID) {
+            $room = $roomList->search($roomID);
+            if ($room === null) {
+                throw new UserInputException('structure');
+            }
+        }
+    }
 
-		$i = 0;
-		WCF::getDB()->beginTransaction();
-		foreach ($this->parameters['data']['structure'][0] as $roomID) {
-			$room = $roomList->search($roomID);
-			if ($room === null) continue;
+    /**
+     * @inheritDoc
+     */
+    public function updatePosition()
+    {
+        $roomList = new RoomList();
+        $roomList->readObjects();
 
-			$editor = new RoomEditor($room);
-			$editor->update([ 'position' => $i++ ]);
-		}
-		WCF::getDB()->commitTransaction();
-	}
+        $i = 0;
+        WCF::getDB()->beginTransaction();
+        foreach ($this->parameters['data']['structure'][0] as $roomID) {
+            $room = $roomList->search($roomID);
+            if ($room === null) {
+                continue;
+            }
 
-	/**
-	 * Validates permissions.
-	 */
-	public function validateGetBoxRoomList() {
-		if (!\chat\data\room\Room::canSeeAny()) throw new \wcf\system\exception\PermissionDeniedException();
+            $editor = new RoomEditor($room);
+            $editor->update([
+                'position' => $i++,
+            ]);
+        }
+        WCF::getDB()->commitTransaction();
+    }
 
-		$this->readBoolean('isSidebar', true);
-		$this->readBoolean('skipEmptyRooms', true);
-		$this->readInteger('activeRoomID', true);
+    /**
+     * Validates permissions.
+     */
+    public function validateGetBoxRoomList()
+    {
+        if (!Room::canSeeAny()) {
+            throw new PermissionDeniedException();
+        }
 
-		unset($this->parameters['boxController']);
-		$this->readInteger('boxID', true);
-		if ($this->parameters['boxID']) {
-			$box = new \wcf\data\box\Box($this->parameters['boxID']);
-			if ($box->boxID) {
-				$this->parameters['boxController'] = $box->getController();
-				if ($this->parameters['boxController'] instanceof \chat\system\box\RoomListBoxController) {
-					// all checks passed, end validation; otherwise throw the exception below
-					return;
-				}
-			}
+        $this->readBoolean('isSidebar', true);
+        $this->readBoolean('skipEmptyRooms', true);
+        $this->readInteger('activeRoomID', true);
 
-			throw new UserInputException('boxID');
-		}
-	}
+        unset($this->parameters['boxController']);
+        $this->readInteger('boxID', true);
+        if ($this->parameters['boxID']) {
+            $box = new Box($this->parameters['boxID']);
+            if ($box->boxID) {
+                $this->parameters['boxController'] = $box->getController();
+                if ($this->parameters['boxController'] instanceof RoomListBoxController) {
+                    // all checks passed, end validation; otherwise throw the exception below
+                    return;
+                }
+            }
 
-	/**
-	 * Returns dashboard roomlist.
-	 */
-	public function getBoxRoomList() {
-		if (isset($this->parameters['boxController'])) {
-			$this->parameters['boxController']->setActiveRoomID($this->parameters['activeRoomID']);
+            throw new UserInputException('boxID');
+        }
+    }
 
-			return [ 'template' => $this->parameters['boxController']->getContent() ];
-		}
+    /**
+     * Returns dashboard roomlist.
+     */
+    public function getBoxRoomList()
+    {
+        if (isset($this->parameters['boxController'])) {
+            $this->parameters['boxController']->setActiveRoomID($this->parameters['activeRoomID']);
 
-		// Fetch all rooms, the templates have filtering in place
-		$rooms = RoomCache::getInstance()->getRooms();
+            return [
+                'template' => $this->parameters['boxController']->getContent(),
+            ];
+        }
 
-		$template = 'boxRoomList'.($this->parameters['isSidebar'] ? 'Sidebar' : '');
+        // Fetch all rooms, the templates have filtering in place
+        $rooms = RoomCache::getInstance()->getRooms();
 
-		\wcf\system\WCF::getTPL()->assign([ 'boxRoomList'    => $rooms
-		                                  , 'skipEmptyRooms' => $this->parameters['skipEmptyRooms']
-		                                  , 'activeRoomID'   => $this->parameters['activeRoomID']
-		                                  ]);
+        $template = 'boxRoomList' . ($this->parameters['isSidebar'] ? 'Sidebar' : '');
 
-		return [ 'template' => \wcf\system\WCF::getTPL()->fetch($template, 'chat') ];
-	}
+        WCF::getTPL()->assign([
+            'boxRoomList' => $rooms,
+            'skipEmptyRooms' => $this->parameters['skipEmptyRooms'],
+            'activeRoomID' => $this->parameters['activeRoomID'],
+        ]);
+
+        return [
+            'template' => WCF::getTPL()->fetch($template, 'chat'),
+        ];
+    }
 }

files/lib/data/room/RoomCache.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,53 +15,55 @@
 
 namespace chat\data\room;
 
-use \wcf\system\WCF;
+use chat\system\cache\builder\RoomCacheBuilder;
+use wcf\system\SingletonFactory;
 
 /**
  * Manages the room cache.
  */
-class RoomCache extends \wcf\system\SingletonFactory {
-	/**
-	 * List of cached rooms.
-	 *
-	 * @var	Room[]
-	 */
-	protected $rooms = [ ];
+final class RoomCache extends SingletonFactory
+{
+    /**
+     * List of cached rooms.
+     *
+     * @var Room[]
+     */
+    protected $rooms = [ ];
 
-	/**
-	 * Cached user counts for the rooms.
-	 *
-	 * @var	int[]
-	 */
-	protected $userCount = [ ];
+    /**
+     * Cached user counts for the rooms.
+     *
+     * @var int[]
+     */
+    protected $userCount = [ ];
 
-	/**
-	 * @inheritDoc
-	 */
-	protected function init() {
-		$this->rooms = \chat\system\cache\builder\RoomCacheBuilder::getInstance()->getData();
-	}
+    /**
+     * @inheritDoc
+     */
+    protected function init()
+    {
+        $this->rooms = RoomCacheBuilder::getInstance()->getData();
+    }
 
-	/**
-	 * Returns a specific room.
-	 *
-	 * @param	integer		$roomID
-	 * @return	Room
-	 */
-	public function getRoom($roomID) {
-		if (isset($this->rooms[$roomID])) {
-			return $this->rooms[$roomID];
-		}
+    /**
+     * Returns a specific room.
+     */
+    public function getRoom(int $roomID): ?Room
+    {
+        if (isset($this->rooms[$roomID])) {
+            return $this->rooms[$roomID];
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	/**
-	 * Returns all rooms.
-	 *
-	 * @return	Room[]
-	 */
-	public function getRooms() {
-		return $this->rooms;
-	}
+    /**
+     * Returns all rooms.
+     *
+     * @return  Room[]
+     */
+    public function getRooms()
+    {
+        return $this->rooms;
+    }
 }

files/lib/data/room/RoomEditor.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,20 +15,27 @@
 
 namespace chat\data\room;
 
+use chat\system\cache\builder\RoomCacheBuilder;
+use chat\system\permission\PermissionHandler;
+use wcf\data\DatabaseObjectEditor;
+use wcf\data\IEditableCachedObject;
+
 /**
  * Represents a chat room editor.
  */
-class RoomEditor extends \wcf\data\DatabaseObjectEditor implements \wcf\data\IEditableCachedObject {
-	/**
-	 * @inheritDoc
-	 */
-	protected static $baseClass = Room::class;
+class RoomEditor extends DatabaseObjectEditor implements IEditableCachedObject
+{
+    /**
+     * @inheritDoc
+     */
+    protected static $baseClass = Room::class;
 
-	/**
-	 * @inheritDoc
-	 */
-	public static function resetCache() {
-		\chat\system\cache\builder\RoomCacheBuilder::getInstance()->reset();
-		\chat\system\permission\PermissionHandler::resetCache();
-	}
+    /**
+     * @inheritDoc
+     */
+    public static function resetCache()
+    {
+        RoomCacheBuilder::getInstance()->reset();
+        PermissionHandler::resetCache();
+    }
 }

files/lib/data/room/RoomList.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,12 +15,21 @@
 
 namespace chat\data\room;
 
+use wcf\data\DatabaseObjectList;
+
 /**
  * Represents a list of chat rooms.
+ *
+ * @method  Room        current()
+ * @method  Room[]      getObjects()
+ * @method  Room|null   getSingleObject()
+ * @method  Room|null   search($objectID)
+ * @property    Room[] $objects
  */
-class RoomList extends \wcf\data\DatabaseObjectList {
-	/**
-	 * @inheritDoc
-	 */
-	public $sqlOrderBy = 'position';
+class RoomList extends DatabaseObjectList
+{
+    /**
+     * @inheritDoc
+     */
+    public $sqlOrderBy = 'position';
 }

files/lib/data/suspension/Suspension.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,98 +15,105 @@
 
 namespace chat\data\suspension;
 
-use \chat\data\room\Room;
-use \wcf\data\user\User;
-use \wcf\system\WCF;
+use chat\data\room\Room;
+use chat\data\room\RoomCache;
+use wcf\data\DatabaseObject;
+use wcf\data\object\type\ObjectType;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\data\user\User;
+use wcf\system\cache\runtime\UserRuntimeCache;
 
 /**
  * Represents a chat suspension.
  */
-class Suspension extends \wcf\data\DatabaseObject implements \JsonSerializable {
-	/**
-	 * Returns the active suspensions for the given (objectTypeID, Room, User)
-	 * triple.
-	 *
-	 * @param  int                                $objectTypeID
-	 * @param  \wcf\data\user\User                $user
-	 * @param  \chat\data\room\Room               $room
-	 * @return \chat\data\suspension\Suspension[]
-	 */
-	public static function getActiveSuspensionsByTriple($objectTypeID, User $user, Room $room) {
-		$suspensionList = new SuspensionList();
+class Suspension extends DatabaseObject implements \JsonSerializable
+{
+    /**
+     * Returns the active suspensions for the given (objectTypeID, Room, User)
+     * triple.
+     *
+     * @return \chat\data\suspension\Suspension[]
+     */
+    public static function getActiveSuspensionsByTriple(int $objectTypeID, User $user, Room $room)
+    {
+        $suspensionList = new SuspensionList();
 
-		$suspensionList->getConditionBuilder()->add('(expires IS NULL OR expires > ?)', [ TIME_NOW ]);
-		$suspensionList->getConditionBuilder()->add('revoked IS NULL');
-		$suspensionList->getConditionBuilder()->add('userID = ?', [ $user->userID ]);
-		$suspensionList->getConditionBuilder()->add('objectTypeID = ?', [ $objectTypeID ]);
-		$suspensionList->getConditionBuilder()->add('(roomID IS NULL OR roomID = ?)', [ $room->roomID ]);
+        $suspensionList->getConditionBuilder()->add('(expires IS NULL OR expires > ?)', [ TIME_NOW ]);
+        $suspensionList->getConditionBuilder()->add('revoked IS NULL');
+        $suspensionList->getConditionBuilder()->add('userID = ?', [ $user->userID ]);
+        $suspensionList->getConditionBuilder()->add('objectTypeID = ?', [ $objectTypeID ]);
+        $suspensionList->getConditionBuilder()->add('(roomID IS NULL OR roomID = ?)', [ $room->roomID ]);
 
-		$suspensionList->readObjects();
+        $suspensionList->readObjects();
 
-		return array_filter($suspensionList->getObjects(), function (Suspension $suspension) {
-			return $suspension->isActive();
-		});
-	}
+        return \array_filter($suspensionList->getObjects(), static function (self $suspension) {
+            return $suspension->isActive();
+        });
+    }
 
-	/**
-	 * Returns the suspension object type of this message.
-	 *
-	 * @return	\wcf\data\object\type\ObjectType
-	 */
-	public function getSuspensionType() {
-		return \wcf\data\object\type\ObjectTypeCache::getInstance()->getObjectType($this->objectTypeID);
-	}
+    /**
+     * Returns the suspension object type of this message.
+     */
+    public function getSuspensionType(): ObjectType
+    {
+        return ObjectTypeCache::getInstance()->getObjectType($this->objectTypeID);
+    }
 
-	/**
-	 * Returns whether this suspension still is in effect.
-	 *
-	 * @return boolean
-	 */
-	public function isActive() {
-		if ($this->revoked !== null) return false;
-		if (!$this->getSuspensionType()->getProcessor()->hasEffect($this)) return false;
+    /**
+     * Returns whether this suspension still is in effect.
+     */
+    public function isActive(): bool
+    {
+        if ($this->revoked !== null) {
+            return false;
+        }
+        if (!$this->getSuspensionType()->getProcessor()->hasEffect($this)) {
+            return false;
+        }
 
-		if ($this->expires === null) return true;
+        if ($this->expires === null) {
+            return true;
+        }
 
-		return $this->expires > TIME_NOW;
-	}
+        return $this->expires > TIME_NOW;
+    }
 
-	/**
-	 * Returns the chat room this suspension is in effect.
-	 * Returns null if this is a global suspension.
-	 *
-	 * @return \chat\data\room\Room
-	 */
-	public function getRoom() {
-		if ($this->roomID === null) {
-			return null;
-		}
+    /**
+     * Returns the chat room this suspension is in effect.
+     * Returns null if this is a global suspension.
+     */
+    public function getRoom(): ?Room
+    {
+        if ($this->roomID === null) {
+            return null;
+        }
 
-		return \chat\data\room\RoomCache::getInstance()->getRoom($this->roomID);
-	}
+        return RoomCache::getInstance()->getRoom($this->roomID);
+    }
 
-	/**
-	 * Returns the user that is affected by this suspension.
-	 *
-	 * @return \wcf\data\user\User
-	 */
-	public function getUser() {
-		return \wcf\system\cache\runtime\UserRuntimeCache::getInstance()->getObject($this->userID);
-	}
+    /**
+     * Returns the user that is affected by this suspension.
+     */
+    public function getUser(): User
+    {
+        return UserRuntimeCache::getInstance()->getObject($this->userID);
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	 public function jsonSerialize() {
-		return [ 'userID'     => $this->userID
-		       , 'username'   => $this->getUser()->username
-		       , 'roomID'     => $this->roomID
-		       , 'time'       => $this->time
-		       , 'expires'    => $this->expires
-		       , 'reason'     => $this->reason
-		       , 'objectType' => $this->getSuspensionType()->objectType
-		       , 'judgeID'    => $this->judgeID
-		       , 'judge'      => $this->judge
-		       ];
-	}
+    /**
+     * @inheritDoc
+     */
+    public function jsonSerialize(): array
+    {
+        return [
+            'userID' => $this->userID,
+            'username' => $this->getUser()->username,
+            'roomID' => $this->roomID,
+            'time' => $this->time,
+            'expires' => $this->expires,
+            'reason' => $this->reason,
+            'objectType' => $this->getSuspensionType()->objectType,
+            'judgeID' => $this->judgeID,
+            'judge' => $this->judge,
+        ];
+    }
 }

files/lib/data/suspension/SuspensionAction.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,55 +15,75 @@
 
 namespace chat\data\suspension;
 
-use \wcf\system\WCF;
+use wcf\data\AbstractDatabaseObjectAction;
+use wcf\system\exception\UserInputException;
+use wcf\system\WCF;
 
 /**
  * Executes suspension-related actions.
  */
-class SuspensionAction extends \wcf\data\AbstractDatabaseObjectAction {
-	/**
-	 * @inheritDoc
-	 */
-	protected $requireACP = [ 'revoke' ];
+class SuspensionAction extends AbstractDatabaseObjectAction
+{
+    /**
+     * @inheritDoc
+     */
+    protected $requireACP = [
+        'revoke',
+    ];
 
-	/**
-	 * Validates parameters and permissions.
-	 */
-	public function validateRevoke() {
-		if (empty($this->objects)) {
-			$this->readObjects();
+    /**
+     * Validates parameters and permissions.
+     */
+    public function validateRevoke()
+    {
+        if (empty($this->objects)) {
+            $this->readObjects();
 
-			if (empty($this->objects)) {
-				throw new UserInputException('objectIDs');
-			}
-		}
+            if (empty($this->objects)) {
+                throw new UserInputException('objectIDs');
+            }
+        }
 
-		unset($this->parameters['revoker']);
+        unset($this->parameters['revoker']);
 
-		WCF::getSession()->checkPermissions([ 'admin.chat.canManageSuspensions' ]);
+        WCF::getSession()->checkPermissions([
+            'admin.chat.canManageSuspensions',
+        ]);
 
-		foreach ($this->getObjects() as $object) {
-			if (!$object->isActive()) throw new UserInputException('objectIDs', 'nonActive');
-		}
-	}
+        foreach ($this->getObjects() as $object) {
+            if (!$object->isActive()) {
+                throw new UserInputException('objectIDs', 'nonActive');
+            }
+        }
+    }
 
-	/**
-	 * Revokes the suspensions
-	 */
-	public function revoke() {
-		if (empty($this->objects)) {
-			$this->readObjects();
-		}
+    /**
+     * Revokes the suspensions
+     */
+    public function revoke()
+    {
+        if (empty($this->objects)) {
+            $this->readObjects();
+        }
 
-		// User cannot be set during an AJAX request, but may be set by Tim’s Chat itself.
-		if (!isset($this->parameters['revoker'])) $this->parameters['revoker'] = WCF::getUser();
+        // User cannot be set during an AJAX request, but may be set by Tim’s Chat itself.
+        if (!isset($this->parameters['revoker'])) {
+            $this->parameters['revoker'] = WCF::getUser();
+        }
 
-		$data = [ 'revoked'   => TIME_NOW
-		        , 'revokerID' => $this->parameters['revoker']->userID
-		        , 'revoker'   => $this->parameters['revoker']->username
-		        ];
+        $data = [
+            'revoked' => TIME_NOW,
+            'revokerID' => $this->parameters['revoker']->userID,
+            'revoker' => $this->parameters['revoker']->username,
+        ];
 
-		$objectAction = new static($this->getObjects(), 'update', [ 'data' => $data ]);
-		$objectAction->executeAction();
-	}
+        $objectAction = new static(
+            $this->getObjects(),
+            'update',
+            [
+                'data' => $data,
+            ]
+        );
+        $objectAction->executeAction();
+    }
 }

files/lib/data/suspension/SuspensionEditor.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,12 +15,15 @@
 
 namespace chat\data\suspension;
 
+use wcf\data\DatabaseObjectEditor;
+
 /**
  * Represents a chat suspension editor.
  */
-class SuspensionEditor extends \wcf\data\DatabaseObjectEditor {
-	/**
-	 * @inheritDoc
-	 */
-	protected static $baseClass = Suspension::class;
+class SuspensionEditor extends DatabaseObjectEditor
+{
+    /**
+     * @inheritDoc
+     */
+    protected static $baseClass = Suspension::class;
 }

files/lib/data/suspension/SuspensionList.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,9 +15,17 @@
 
 namespace chat\data\suspension;
 
+use wcf\data\DatabaseObjectList;
+
 /**
  * Represents a list of chat suspensions.
+ *
+ * @method  Suspension        current()
+ * @method  Suspension[]      getObjects()
+ * @method  Suspension|null   getSingleObject()
+ * @method  Suspension|null   search($objectID)
+ * @property    Suspension[] $objects
  */
-class SuspensionList extends \wcf\data\DatabaseObjectList {
-
+class SuspensionList extends DatabaseObjectList
+{
 }

files/lib/data/user/User.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,93 +15,107 @@
 
 namespace chat\data\user;
 
-use \wcf\system\WCF;
+use chat\data\room\Room;
+use chat\data\room\RoomCache;
+use wcf\data\DatabaseObjectDecorator;
+use wcf\system\WCF;
 
 /**
  * Decorates the User object to make it useful in context of Tim’s Chat.
  */
-class User extends \wcf\data\DatabaseObjectDecorator implements \JsonSerializable {
-	/**
-	 * @inheritDoc
-	 */
-	protected static $baseClass = \wcf\data\user\User::class;
+class User extends DatabaseObjectDecorator implements \JsonSerializable
+{
+    /**
+     * @inheritDoc
+     */
+    protected static $baseClass = \wcf\data\user\User::class;
 
-	/**
-	 * array of room_to_user rows
-	 *
-	 * @var	int[][]
-	 */
-	protected $roomToUser = null;
+    /**
+     * array of room_to_user rows
+     *
+     * @var int[][]
+     */
+    protected $roomToUser;
 
-	/**
-	 * Returns an array of the room_to_user arrays for this user.
-	 *
-	 * @return	mixed[]
-	 */
-	public function getRoomAssociations($skipCache = false) {
-		if ($this->roomToUser === null || $skipCache) {
-			$sql = "SELECT *
-			        FROM   chat".WCF_N."_room_to_user
-			        WHERE  userID = ?";
-			$statement = WCF::getDB()->prepareStatement($sql);
-			$statement->execute([ $this->userID ]);
-			$this->roomToUser = [ ];
-			while (($row = $statement->fetchArray())) {
-				$this->roomToUser[$row['roomID']] = $row;
-			}
-		}
+    /**
+     * Returns an array of the room_to_user arrays for this user.
+     *
+     * @return  mixed[]
+     */
+    public function getRoomAssociations($skipCache = false)
+    {
+        if ($this->roomToUser === null || $skipCache) {
+            $sql = "SELECT  *
+                    FROM    chat1_room_to_user
+                    WHERE   userID = ?";
+            $statement = WCF::getDB()->prepare($sql);
+            $statement->execute([ $this->userID ]);
+            $this->roomToUser = [ ];
+            while (($row = $statement->fetchArray())) {
+                $this->roomToUser[$row['roomID']] = $row;
+            }
+        }
 
-		return $this->roomToUser;
-	}
+        return $this->roomToUser;
+    }
 
-	/**
-	 * Returns an array of Rooms this user is part of.
-	 *
-	 * @return	\chat\data\room\Room[]
-	 */
-	public function getRooms($skipCache = false) {
-		return array_map(function ($assoc) {
-			return \chat\data\room\RoomCache::getInstance()->getRoom($assoc['roomID']);
-		}, array_filter($this->getRoomAssociations($skipCache), function ($assoc) {
-			return $assoc['active'] === 1;
-		}));
-	}
+    /**
+     * Returns an array of Rooms this user is part of.
+     *
+     * @return  \chat\data\room\Room[]
+     */
+    public function getRooms($skipCache = false)
+    {
+        return \array_map(static function ($assoc) {
+            return RoomCache::getInstance()->getRoom($assoc['roomID']);
+        }, \array_filter($this->getRoomAssociations($skipCache), static function ($assoc) {
+            return $assoc['active'] === 1;
+        }));
+    }
 
-	/**
-	 * Returns whether the user is in the given room.
-	 *
-	 * @param	\chat\data\room\Room $room
-	 * @return	boolean
-	 */
-	public function isInRoom(\chat\data\room\Room $room, $skipCache = false) {
-		$assoc = $this->getRoomAssociations($skipCache);
+    /**
+     * Returns whether the user is in the given room.
+     */
+    public function isInRoom(Room $room, $skipCache = false): bool
+    {
+        $assoc = $this->getRoomAssociations($skipCache);
 
-		if (!isset($assoc[$room->roomID])) return false;
-		return $assoc[$room->roomID]['active'] === 1;
-	}
+        if (!isset($assoc[$room->roomID])) {
+            return false;
+        }
 
-	/**
-	 * Returns (userID, roomID, sessionID) triples where the client died.
-	 *
-	 * @return	mixed[][]
-	 */
-	public static function getDeadSessions() {
-		$sql = "SELECT userID, roomID, sessionID
-		        FROM   chat".WCF_N."_session
-		        WHERE  lastRequest < ?";
-		$statement = WCF::getDB()->prepareStatement($sql);
-		$statement->execute([ TIME_NOW - 60 * 3 ]);
+        return $assoc[$room->roomID]['active'] === 1;
+    }
 
-		return $statement->fetchAll(\PDO::FETCH_ASSOC);
-	}
+    /**
+     * Returns (userID, roomID, sessionID) triples where the client died.
+     *
+     * @return  mixed[][]
+     */
+    public static function getDeadSessions()
+    {
+        $sql = "SELECT  userID,
+                        roomID,
+                        sessionID
+                FROM    chat1_session
+                WHERE   lastRequest < ?";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute([
+            TIME_NOW - 60 * 3,
+        ]);
 
-	/**
-	 * @inheritDoc
-	 */
-	public function jsonSerialize() {
-		return [ 'userID'   => $this->userID
-		       , 'username' => $this->username
-		       , 'link'     => $this->getLink()
-		       ];
-	}
+        return $statement->fetchAll(\PDO::FETCH_ASSOC);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function jsonSerialize(): array
+    {
+        return [
+            'userID' => $this->userID,
+            'username' => $this->username,
+            'link' => $this->getLink(),
+        ];
+    }
 }

files/lib/data/user/UserAction.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,105 +15,126 @@
 
 namespace chat\data\user;
 
-use \chat\data\room\RoomCache;
-use \wcf\system\cache\runtime\UserProfileRuntimeCache;
-use \wcf\system\cache\runtime\UserRuntimeCache;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\exception\UserInputException;
-use \wcf\system\WCF;
+use chat\data\room\Room;
+use chat\data\room\RoomAction;
+use wcf\data\AbstractDatabaseObjectAction;
+use wcf\system\cache\runtime\UserProfileRuntimeCache;
+use wcf\system\cache\runtime\UserRuntimeCache;
+use wcf\system\event\EventHandler;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\exception\UserInputException;
 
 /**
  * Executes chat user-related actions.
  */
-class UserAction extends \wcf\data\AbstractDatabaseObjectAction {
-	/**
-	 * @inheritDoc
-	 */
-	protected $className = User::class;
+class UserAction extends AbstractDatabaseObjectAction
+{
+    /**
+     * @inheritDoc
+     */
+    protected $className = User::class;
 
-	/**
-	 * Validates parameters and permissions.
-	 */
-	public function validateGetUsersByID() {
-		if (!\chat\data\room\Room::canSeeAny()) throw new PermissionDeniedException();
+    /**
+     * Validates parameters and permissions.
+     */
+    public function validateGetUsersByID()
+    {
+        if (!Room::canSeeAny()) {
+            throw new PermissionDeniedException();
+        }
 
-		$this->readIntegerArray('userIDs');
-	}
+        $this->readIntegerArray('userIDs');
+    }
 
-	/**
-	 * Returns information about the users identified by the given userIDs.
-	 */
-	public function getUsersByID() {
-		$userList = UserProfileRuntimeCache::getInstance()->getObjects($this->parameters['userIDs']);
+    /**
+     * Returns information about the users identified by the given userIDs.
+     */
+    public function getUsersByID()
+    {
+        $userList = UserProfileRuntimeCache::getInstance()->getObjects($this->parameters['userIDs']);
 
-		return array_map(function ($user) {
-			if (!$user) return null;
+        return \array_map(function ($user) {
+            if (!$user) {
+                return null;
+            }
 
-			$payload = [ 'image16'           => $user->getAvatar()->getImageTag(16)
-			           , 'image24'           => $user->getAvatar()->getImageTag(24)
-			           , 'image32'           => $user->getAvatar()->getImageTag(32)
-			           , 'image48'           => $user->getAvatar()->getImageTag(48)
-			           , 'imageUrl'          => $user->getAvatar()->getURL()
-			           , 'link'              => $user->getLink()
-			           , 'anchor'            => $user->getAnchorTag()
-			           , 'userID'            => $user->userID
-			           , 'username'          => $user->username
-			           , 'userTitle'         => $user->getUserTitle()
-			           , 'userRankClass'     => $user->getRank() ? $user->getRank()->cssClassName : null
-			           , 'formattedUsername' => $user->getFormattedUsername()
-			           , 'away'              => $user->chatAway
-			           , 'color1'            => $user->chatColor1
-			           , 'color2'            => $user->chatColor2
-			           ];
+            $payload = [
+                'image16' => $user->getAvatar()->getImageTag(16),
+                'image24' => $user->getAvatar()->getImageTag(24),
+                'image32' => $user->getAvatar()->getImageTag(32),
+                'image48' => $user->getAvatar()->getImageTag(48),
+                'imageUrl' => $user->getAvatar()->getURL(),
+                'link' => $user->getLink(),
+                'anchor' => $user->getAnchorTag(),
+                'userID' => $user->userID,
+                'username' => $user->username,
+                'userTitle' => $user->getUserTitle(),
+                'userRankClass' => $user->getRank() ? $user->getRank()->cssClassName : null,
+                'formattedUsername' => $user->getFormattedUsername(),
+                'away' => $user->chatAway,
+                'color1' => $user->chatColor1,
+                'color2' => $user->chatColor2,
+            ];
 
-			\wcf\system\event\EventHandler::getInstance()->fireAction($this, 'getUsersByID', $payload);
+            EventHandler::getInstance()->fireAction($this, 'getUsersByID', $payload);
 
-			return $payload;
-		}, $userList);
-	}
+            return $payload;
+        }, $userList);
+    }
 
-	/**
-	 * Clears dead clients.
-	 */
-	public function clearDeadSessions() {
-		$sessions = User::getDeadSessions();
-		if (empty($sessions)) return;
-		$userIDs = array_map(function ($item) {
-			return $item['userID'];
-		}, $sessions);
-		$users = UserRuntimeCache::getInstance()->getObjects($userIDs);
-		foreach ($sessions as $session) {
-			$parameters = [ 'user' => $users[$session['userID']]
-			              , 'roomID' => $session['roomID']
-			              , 'sessionID' => $session['sessionID']
-			              ];
-			try {
-				(new \chat\data\room\RoomAction([ ], 'leave', $parameters))->executeAction();
-			}
-			catch (UserInputException $e) {
-				// Probably some other request has been faster to remove this session, ignore
-			}
-		}
-	}
+    /**
+     * Clears dead clients.
+     */
+    public function clearDeadSessions()
+    {
+        $sessions = User::getDeadSessions();
+        if ($sessions === []) {
+            return;
+        }
+        $userIDs = \array_map(static function ($item) {
+            return $item['userID'];
+        }, $sessions);
+        $users = UserRuntimeCache::getInstance()->getObjects($userIDs);
+        foreach ($sessions as $session) {
+            $parameters = [
+                'user' => $users[$session['userID']],
+                'roomID' => $session['roomID'],
+                'sessionID' => $session['sessionID'],
+            ];
 
-	/**
-	 * @inheritDoc
-	 */
-	public function create() {
-		throw new \BadMethodCallException();
-	}
+            try {
+                (new RoomAction(
+                    [ ],
+                    'leave',
+                    $parameters
+                ))->executeAction();
+            } catch (UserInputException $e) {
+                // Probably some other request has been faster to remove this session, ignore
+            }
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function update() {
-		throw new \BadMethodCallException();
-	}
+    /**
+     * @inheritDoc
+     */
+    public function create()
+    {
+        throw new \BadMethodCallException();
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function delete() {
-		throw new \BadMethodCallException();
-	}
+    /**
+     * @inheritDoc
+     */
+    public function update()
+    {
+        throw new \BadMethodCallException();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function delete()
+    {
+        throw new \BadMethodCallException();
+    }
 }

files/lib/data/user/UserList.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -17,9 +18,10 @@ namespace chat\data\user;
 /**
  * Represents a list of chat users.
  */
-class UserList extends \wcf\data\user\UserList {
-	/**
-	 * @inheritDoc
-	 */
-	public $decoratorClassName = User::class;
+class UserList extends \wcf\data\user\UserList
+{
+    /**
+     * @inheritDoc
+     */
+    public $decoratorClassName = User::class;
 }

files/lib/page/LogPage.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,157 +15,187 @@
 
 namespace chat\page;
 
-use \chat\data\message\MessageList;
-use \wcf\system\exception\IllegalLinkException;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\page\PageLocationManager;
-use \wcf\system\WCF;
+use chat\data\message\Message;
+use chat\data\message\MessageList;
+use chat\data\room\RoomCache;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\page\AbstractPage;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\exception\IllegalLinkException;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\page\PageLocationManager;
+use wcf\system\request\LinkHandler;
+use wcf\system\WCF;
+use wcf\util\HeaderUtil;
 
 /**
  * Shows the log of a specific chat room.
  */
-class LogPage extends \wcf\page\AbstractPage {
-	use TConfiguredPage;
+final class LogPage extends AbstractPage
+{
+    use TConfiguredPage;
 
-	/**
-	 * @inheritDoc
-	 */
-	public $loginRequired = true;
+    /**
+     * @inheritDoc
+     */
+    public $loginRequired = true;
 
-	/**
-	 * The requested chat room ID.
-	 * @var int
-	 */
-	public $roomID = 0;
+    /**
+     * The requested chat room ID.
+     * @var int
+     */
+    public $roomID = 0;
 
-	/**
-	 * The requested chat room.
-	 * @var \chat\data\room\Room
-	 */
-	public $room = null;
+    /**
+     * The requested chat room.
+     * @var \chat\data\room\Room
+     */
+    public $room;
 
-	/**
-	 * The requested message ID.
-	 * @var int
-	 */
-	public $messageID = 0;
-	
-	/**
-	 * The requested message.
-	 * @var \chat\data\message\Message
-	 */
-	public $message = null;
+    /**
+     * The requested message ID.
+     * @var int
+     */
+    public $messageID = 0;
 
-	/**
-	 * The requested time.
-	 * @var int
-	 */
-	public $datetime = 0;
+    /**
+     * The requested message.
+     * @var \chat\data\message\Message
+     */
+    public $message;
 
-	/**
-	 * @inheritDoc
-	 */
-	public function readParameters() {
-		parent::readParameters();
+    /**
+     * The requested time.
+     * @var int
+     */
+    public $datetime = 0;
 
-		if (isset($_GET['id'])) $this->roomID = intval($_GET['id']);
-		$this->room = \chat\data\room\RoomCache::getInstance()->getRoom($this->roomID);
+    /**
+     * @inheritDoc
+     */
+    public function readParameters()
+    {
+        parent::readParameters();
 
-		if ($this->room === null) throw new IllegalLinkException();
-		if (!$this->room->canSee($user = null, $reason)) throw $reason;
-		if (!$this->room->canSeeLog($user = null, $reason)) throw $reason;
+        if (isset($_GET['id'])) {
+            $this->roomID = \intval($_GET['id']);
+        }
+        $this->room = RoomCache::getInstance()->getRoom($this->roomID);
 
-		if (isset($_GET['messageid'])) $this->messageID = intval($_GET['messageid']);
-		if ($this->messageID) {
-			$this->message = new \chat\data\message\Message($this->messageID);
-			if (!$this->message->getMessageType()->getProcessor()->canSeeInLog($this->message, $this->room)) {
-				throw new PermissionDeniedException();
-			}
-		}
+        if ($this->room === null) {
+            throw new IllegalLinkException();
+        }
+        if (!$this->room->canSee($user = null, $reason)) {
+            throw $reason;
+        }
+        if (!$this->room->canSeeLog($user = null, $reason)) {
+            throw $reason;
+        }
 
-		if (isset($_REQUEST['datetime'])) $this->datetime = strtotime($_REQUEST['datetime']);
-	}
+        if (isset($_GET['messageid'])) {
+            $this->messageID = \intval($_GET['messageid']);
+        }
+        if ($this->messageID) {
+            $this->message = new Message($this->messageID);
+            if (!$this->message->getMessageType()->getProcessor()->canSeeInLog($this->message, $this->room)) {
+                throw new PermissionDeniedException();
+            }
+        }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function readData() {
-		parent::readData();
+        if (isset($_REQUEST['datetime'])) {
+            $this->datetime = \strtotime($_REQUEST['datetime']);
+        }
+    }
 
-		if ($this->datetime) {
-			// Determine message types supporting fast select
-			$objectTypes = \wcf\data\object\type\ObjectTypeCache::getInstance()->getObjectTypes('be.bastelstu.chat.messageType');
-			$fastSelect = array_map(function ($item) {
-				return $item->objectTypeID;
-			}, array_filter($objectTypes, function ($item) {
-				// TODO: Consider a method couldAppearInLog(): bool
-				return $item->getProcessor()->supportsFastSelect();
-			}));
+    /**
+     * @inheritDoc
+     */
+    public function readData()
+    {
+        parent::readData();
 
-			$minimum = 0;
-			$loops = 0;
-			do {
-				// Build fast select filter
-				$condition = new \wcf\system\database\util\PreparedStatementConditionBuilder();
-				$condition->add('((roomID = ? AND objectTypeID IN (?)) OR objectTypeID NOT IN (?))', [ $this->room->roomID, $fastSelect, $fastSelect ]);
-				$condition->add('time >= ?', [ $this->datetime ]);
-				if ($minimum) {
-					$condition->add('messageID > ?', [ $minimum ]);
-				}
+        if ($this->datetime) {
+            // Determine message types supporting fast select
+            $objectTypes = ObjectTypeCache::getInstance()->getObjectTypes('be.bastelstu.chat.messageType');
+            $fastSelect = \array_map(static function ($item) {
+                return $item->objectTypeID;
+            }, \array_filter($objectTypes, static function ($item) {
+                // TODO: Consider a method couldAppearInLog(): bool
+                return $item->getProcessor()->supportsFastSelect();
+            }));
 
-				$sql = "SELECT   messageID
-					FROM     chat".WCF_N."_message
-					".$condition."
-					ORDER BY messageID ASC";
-				$statement = WCF::getDB()->prepareStatement($sql, 20);
-				$statement->execute($condition->getParameters());
-				$messageIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
+            $minimum = 0;
+            $loops = 0;
+            do {
+                // Build fast select filter
+                $condition = new PreparedStatementConditionBuilder();
+                $condition->add('((roomID = ? AND objectTypeID IN (?)) OR objectTypeID NOT IN (?))', [ $this->room->roomID, $fastSelect, $fastSelect ]);
+                $condition->add('time >= ?', [ $this->datetime ]);
+                if ($minimum) {
+                    $condition->add('messageID > ?', [ $minimum ]);
+                }
 
-				$objectList = new MessageList();
-				$objectList->setObjectIDs($messageIDs);
-				$objectList->readObjects();
-				$objects = $objectList->getObjects();
-				if (empty($objects)) {
-					// TODO: UserInputException?
-					throw new IllegalLinkException();
-				}
+                $sql = "SELECT  messageID
+                        FROM    chat1_message
+                        {$condition}
+                        ORDER BY messageID ASC";
+                $statement = WCF::getDB()->prepare($sql, 20);
+                $statement->execute($condition->getParameters());
+                $messageIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
 
-				foreach ($objects as $message) {
-					if ($message->getMessageType()->getProcessor()->canSeeInLog($message, $this->room)) {
-						$parameters = [ 'application' => 'chat'
-						              , 'messageid'   => $message->messageID
-						              , 'object'      => $this->room
-						              ];
-						\wcf\util\HeaderUtil::redirect(\wcf\system\request\LinkHandler::getInstance()->getLink('Log', $parameters));
-						exit;
-					}
-					$minimum = $message->messageID;
-				}
-			}
-			while (++$loops <= 3);
+                $objectList = new MessageList();
+                $objectList->setObjectIDs($messageIDs);
+                $objectList->readObjects();
+                $objects = $objectList->getObjects();
+                if (empty($objects)) {
+                    // TODO: UserInputException?
+                    throw new IllegalLinkException();
+                }
 
-			// Do a best guess redirect to an ID that is as near as possible
-			$parameters = [ 'application' => 'chat'
-			              , 'messageid'   => $minimum
-			              , 'object'      => $this->room
-			              ];
-			\wcf\util\HeaderUtil::redirect(\wcf\system\request\LinkHandler::getInstance()->getLink('Log', $parameters));
-			exit;
-		}
-	}
+                foreach ($objects as $message) {
+                    if ($message->getMessageType()->getProcessor()->canSeeInLog($message, $this->room)) {
+                        $parameters = [
+                            'messageid' => $message->messageID,
+                            'object' => $this->room,
+                        ];
+                        HeaderUtil::redirect(LinkHandler::getInstance()->getControllerLink(self::class, $parameters));
 
-	/**
-	 * @inheritDoc
-	 */
-	public function assignVariables() {
-		parent::assignVariables();
+                        exit;
+                    }
+                    $minimum = $message->messageID;
+                }
+            } while (++$loops <= 3);
 
-		PageLocationManager::getInstance()->addParentLocation('be.bastelstu.chat.Room', $this->room->roomID, $this->room);
-		WCF::getTPL()->assign([ 'room'      => $this->room
-		                      , 'roomList'  => \chat\data\room\RoomCache::getInstance()->getRooms()
-		                      , 'messageID' => $this->messageID
-		                      , 'message'   => $this->message
-		                      , 'config'    => $this->getConfig()
-		                      ]);
-	}
+            // Do a best guess redirect to an ID that is as near as possible
+            $parameters = [
+                'application' => 'chat',
+                'messageid' => $minimum,
+                'object' => $this->room,
+            ];
+            HeaderUtil::redirect(LinkHandler::getInstance()->getControllerLink(self::class, $parameters));
+
+            exit;
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function assignVariables()
+    {
+        parent::assignVariables();
+
+        PageLocationManager::getInstance()->addParentLocation(
+            'be.bastelstu.chat.Room',
+            $this->room->roomID,
+            $this->room
+        );
+        WCF::getTPL()->assign([
+            'room' => $this->room,
+            'roomList' => RoomCache::getInstance()->getRooms(),
+            'messageID' => $this->messageID,
+            'message' => $this->message,
+            'config' => $this->getConfig(),
+        ]);
+    }
 }

files/lib/page/RoomListPage.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,48 +15,60 @@
 
 namespace chat\page;
 
-use \wcf\system\WCF;
+use chat\data\room\Room;
+use chat\data\room\RoomCache;
+use wcf\page\AbstractPage;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\WCF;
 
 /**
  * Shows the list of available chat rooms.
  */
-class RoomListPage extends \wcf\page\AbstractPage {
-	/**
-	 * @inheritDoc
-	 */
-	public $loginRequired = true;
+final class RoomListPage extends AbstractPage
+{
+    /**
+     * @inheritDoc
+     */
+    public $loginRequired = true;
 
-	/**
-	 * List of rooms.
-	 *
-	 * @var	\chat\data\room\Room[]
-	 */
-	public $rooms = [ ];
+    /**
+     * List of rooms.
+     *
+     * @var \chat\data\room\Room[]
+     */
+    public $rooms = [ ];
 
-	/**
-	 * @inheritDoc
-	 */
-	public function checkPermissions() {
-		parent::checkPermissions();
+    /**
+     * @inheritDoc
+     */
+    public function checkPermissions()
+    {
+        parent::checkPermissions();
 
-		if (!\chat\data\room\Room::canSeeAny()) throw new \wcf\system\exception\PermissionDeniedException();
-	}
+        if (!Room::canSeeAny()) {
+            throw new PermissionDeniedException();
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function readData() {
-		parent::readData();
+    /**
+     * @inheritDoc
+     */
+    public function readData()
+    {
+        parent::readData();
 
-		$this->rooms = \chat\data\room\RoomCache::getInstance()->getRooms();
-	}
+        $this->rooms = RoomCache::getInstance()->getRooms();
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function assignVariables() {
-		parent::assignVariables();
+    /**
+     * @inheritDoc
+     */
+    public function assignVariables()
+    {
+        parent::assignVariables();
 
-		WCF::getTPL()->assign([ 'rooms' => $this->rooms ]);
-	}
+        WCF::getTPL()->assign([
+            'rooms' => $this->rooms,
+        ]);
+    }
 }

files/lib/page/RoomPage.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,96 +15,131 @@
 
 namespace chat\page;
 
-use \wcf\system\exception\IllegalLinkException;
-use \wcf\system\exception\NamedUserException;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\WCF;
+use chat\data\room\RoomCache;
+use wcf\data\package\PackageCache;
+use wcf\page\AbstractPage;
+use wcf\system\attachment\AttachmentHandler;
+use wcf\system\exception\IllegalLinkException;
+use wcf\system\exception\NamedUserException;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\push\PushHandler;
+use wcf\system\WCF;
 
 /**
  * Shows a specific chat room.
  */
-class RoomPage extends \wcf\page\AbstractPage {
-	use TConfiguredPage;
+final class RoomPage extends AbstractPage
+{
+    use TConfiguredPage;
 
-	/**
-	 * @inheritDoc
-	 */
-	public $loginRequired = true;
+    /**
+     * Almost dummy attachment handler (used in language variable)
+     *
+     * @var \wcf\system\attachment\AttachmentHandler
+     */
+    public $attachmentHandler;
 
-	/**
-	 * The requested chat room ID.
-	 *
-	 * @param	int
-	 */
-	public $roomID = 0;
+    /**
+     * @inheritDoc
+     */
+    public $loginRequired = true;
 
-	/**
-	 * The requested chat room.
-	 *
-	 * @param	\chat\data\room\Room
-	 */
-	public $room = null;
+    /**
+     * The requested chat room ID.
+     *
+     * @var   int
+     */
+    public $roomID = 0;
 
-	/**
-	 * @inheritDoc
-	 */
-	public function readParameters() {
-		parent::readParameters();
+    /**
+     * The requested chat room.
+     *
+     * @var   \chat\data\room\Room
+     */
+    public $room;
 
-		if (isset($_GET['id'])) $this->roomID = intval($_GET['id']);
-		$this->room = \chat\data\room\RoomCache::getInstance()->getRoom($this->roomID);
+    /**
+     * @inheritDoc
+     */
+    public function readParameters()
+    {
+        parent::readParameters();
 
-		if ($this->room === null) throw new IllegalLinkException();
-		if (!$this->room->canSee($user = null, $reason)) throw $reason;
-		if (!$this->room->canJoin($user = null, $reason)) throw $reason;
+        if (isset($_GET['id'])) {
+            $this->roomID = \intval($_GET['id']);
+        }
+        $this->room = RoomCache::getInstance()->getRoom($this->roomID);
 
-		$this->canonicalURL = $this->room->getLink();
-	}
+        if ($this->room === null) {
+            throw new IllegalLinkException();
+        }
+        if (!$this->room->canSee($user = null, $reason)) {
+            throw $reason;
+        }
+        if (!$this->room->canJoin($user = null, $reason)) {
+            throw $reason;
+        }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function checkPermissions() {
-		parent::checkPermissions();
-		
-		$package = \wcf\data\package\PackageCache::getInstance()->getPackageByIdentifier('be.bastelstu.chat');
-		if (stripos($package->packageVersion, 'Alpha') !== false) {
-			$sql = "SELECT COUNT(*) FROM wcf".WCF_N."_user";
-			$statement = WCF::getDB()->prepareStatement($sql);
-			$statement->execute();
-			$userCount = $statement->fetchSingleColumn();
-			if ((($userCount > 5 && !OFFLINE) || ($userCount > 30 && OFFLINE)) && sha1(WCF_UUID) !== '643a6b3af2a6ea3d393c4d8371e75d7d1b66e0d0') {
-				throw new PermissionDeniedException("Do not use alpha versions of Tims Chat in production communities!");
-			}
-		}
-	}
+        $this->canonicalURL = $this->room->getLink();
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function readData() {
-		$sql = "SELECT 1";
-		$statement = WCF::getDB()->prepareStatement($sql);
-		$statement->execute();
-		if ($statement->fetchSingleColumn() !== 1) {
-			throw new NamedUserException('PHP must be configured to use the MySQLnd driver, instead of libmysqlclient.');
-		}
+    /**
+     * @inheritDoc
+     */
+    public function checkPermissions()
+    {
+        parent::checkPermissions();
 
-		parent::readData();
+        $package = PackageCache::getInstance()->getPackageByIdentifier('be.bastelstu.chat');
+        if (\stripos($package->packageVersion, 'Alpha') !== false) {
+            $sql = "SELECT COUNT(*) FROM wcf1_user";
+            $statement = WCF::getDB()->prepare($sql);
+            $statement->execute();
+            $userCount = $statement->fetchSingleColumn();
+            if ((($userCount > 5 && !OFFLINE) || ($userCount > 30 && OFFLINE)) && \sha1(WCF_UUID) !== '643a6b3af2a6ea3d393c4d8371e75d7d1b66e0d0') {
+                throw new PermissionDeniedException("Do not use alpha versions of Tims Chat in production communities!");
+            }
+        }
+    }
 
-		$pushHandler = \wcf\system\push\PushHandler::getInstance();
-		$pushHandler->joinChannel('be.bastelstu.chat');
-		$pushHandler->joinChannel('be.bastelstu.chat.room-'.$this->room->roomID);
-	}
+    /**
+     * @inheritDoc
+     */
+    public function readData()
+    {
+        $sql = "SELECT 1";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute();
+        if ($statement->fetchSingleColumn() !== 1) {
+            throw new NamedUserException('PHP must be configured to use the MySQLnd driver, instead of libmysqlclient.');
+        }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function assignVariables() {
-		parent::assignVariables();
+        parent::readData();
 
-		WCF::getTPL()->assign([ 'room' => $this->room
-		                      , 'config' => $this->getConfig()
-		                      ]);
-	}
+        // This attachment handler gets only used for the language variable `wcf.attachment.upload.limits`!
+        $this->attachmentHandler = new AttachmentHandler(
+            'be.bastelstu.chat.message',
+            0,
+            'DEADC0DE00000000DEADC0DE00000000DEADC0DE',
+            $this->room->roomID
+        );
+
+        $pushHandler = PushHandler::getInstance();
+        $pushHandler->joinChannel('be.bastelstu.chat');
+        $pushHandler->joinChannel('be.bastelstu.chat.room-' . $this->room->roomID);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function assignVariables()
+    {
+        parent::assignVariables();
+
+        WCF::getTPL()->assign([
+            'room' => $this->room,
+            'config' => $this->getConfig(),
+            'attachmentHandler' => $this->attachmentHandler,
+        ]);
+    }
 }

files/lib/page/TConfiguredPage.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,47 +15,55 @@
 
 namespace chat\page;
 
-use \chat\data\command\Command;
-use \chat\data\command\CommandCache;
-use \wcf\data\object\type\ObjectTypeCache;
-use \wcf\data\package\PackageCache;
+use chat\data\command\Command;
+use chat\data\command\CommandCache;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\data\package\PackageCache;
+use wcf\system\event\EventHandler;
+use wcf\util\JSON;
 
 /**
  * Provides a getConfig() method, returning the JSON configuration
  * for the chat's JavaSCript.
  */
-trait TConfiguredPage {
-	/**
-	 * Returns the configuration for the chat's JavaScript.
-	 */
-	public function getConfig() {
-		$triggers = CommandCache::getInstance()->getTriggers();
+trait TConfiguredPage
+{
+    /**
+     * Returns the configuration for the chat's JavaScript.
+     */
+    public function getConfig()
+    {
+        $triggers = CommandCache::getInstance()->getTriggers();
 
-		$commands = array_map(function (Command $item) {
-			$package = PackageCache::getInstance()->getPackage($item->packageID)->package;
-			return [ 'package'     => $package
-			       , 'identifier'  => $item->identifier
-			       , 'commandID'   => $item->commandID
-			       , 'module'      => $item->getProcessor()->getJavaScriptModuleName()
-			       , 'isAvailable' => $item->getProcessor()->isAvailable($this->room) && ($item->hasTriggers() || $item->getProcessor()->allowWithoutTrigger())
-			       ];
-		}, CommandCache::getInstance()->getCommands());
+        $commands = \array_map(function (Command $item) {
+            $package = PackageCache::getInstance()->getPackage($item->packageID)->package;
 
-		$messageTypes = array_map(function ($item) {
-			return [ 'module'     => $item->getProcessor()->getJavaScriptModuleName()
-			       ];
-		}, ObjectTypeCache::getInstance()->getObjectTypes('be.bastelstu.chat.messageType'));
+            return [
+                'package' => $package,
+                'identifier' => $item->identifier,
+                'commandID' => $item->commandID,
+                'module' => $item->getProcessor()->getJavaScriptModuleName(),
+                'isAvailable' => $item->getProcessor()->isAvailable($this->room) && ($item->hasTriggers() || $item->getProcessor()->allowWithoutTrigger()),
+            ];
+        }, CommandCache::getInstance()->getCommands());
 
-		$config = [ 'clientVersion' => 1
-		          , 'reloadTime'    => (int) CHAT_RELOADTIME
-		          , 'autoAwayTime'  => (int) CHAT_AUTOAWAYTIME
-		          , 'commands'      => $commands
-		          , 'triggers'      => $triggers
-		          , 'messageTypes'  => $messageTypes
-		          ];
+        $messageTypes = \array_map(static function ($item) {
+            return [
+                'module' => $item->getProcessor()->getJavaScriptModuleName(),
+            ];
+        }, ObjectTypeCache::getInstance()->getObjectTypes('be.bastelstu.chat.messageType'));
 
-		\wcf\system\event\EventHandler::getInstance()->fireAction($this, 'config', $config);
-		
-		return \wcf\util\JSON::encode($config);
-	}
+        $config = [
+            'clientVersion' => 1,
+            'reloadTime' => (int)CHAT_RELOADTIME,
+            'autoAwayTime' => (int)CHAT_AUTOAWAYTIME,
+            'commands' => $commands,
+            'triggers' => $triggers,
+            'messageTypes' => $messageTypes,
+        ];
+
+        EventHandler::getInstance()->fireAction($this, 'config', $config);
+
+        return JSON::encode($config);
+    }
 }

files/lib/system/CHATCore.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,25 +15,33 @@
 
 namespace chat\system;
 
-class CHATCore extends \wcf\system\application\AbstractApplication {
-	/**
-	 * @inheritDoc
-	 */
-	protected $primaryController = \chat\page\RoomListPage::class;
+use chat\page\RoomListPage;
+use wcf\system\application\AbstractApplication;
+use wcf\system\request\route\StaticRequestRoute;
+use wcf\system\request\RouteHandler;
 
-	/**
-	 * @inheritDoc
-	 */
-	public function __run() {
-		$route = new \wcf\system\request\route\StaticRequestRoute();
-		$route->setStaticController('chat', 'Log');
-		$route->setBuildSchema('/{controller}/{id}-{title}/{messageid}');
-		$route->setPattern('~^/?(?P<controller>[^/]+)/(?P<id>\d+)(?:-(?P<title>[^/]+))?/(?P<messageid>\d+)~x');
-		$route->setRequiredComponents([ 'id' => '~^\d+$~'
-		                              , 'messageid' => '~^\d+$~'
-		                              ]);
-		$route->setMatchController(true);
+final class CHATCore extends AbstractApplication
+{
+    /**
+     * @inheritDoc
+     */
+    protected $primaryController = RoomListPage::class;
 
-		\wcf\system\request\RouteHandler::getInstance()->addRoute($route);
-	}
+    /**
+     * @inheritDoc
+     */
+    public function __run()
+    {
+        $route = new StaticRequestRoute();
+        $route->setStaticController('chat', 'Log');
+        $route->setBuildSchema('/{controller}/{id}-{title}/{messageid}');
+        $route->setPattern('~^/?(?P<controller>[^/]+)/(?P<id>\d+)(?:-(?P<title>[^/]+))?/(?P<messageid>\d+)~x');
+        $route->setRequiredComponents([
+            'id' => '~^\d+$~',
+            'messageid' => '~^\d+$~',
+        ]);
+        $route->setMatchController(true);
+
+        RouteHandler::getInstance()->addRoute($route);
+    }
 }

files/lib/system/attachment/MessageAttachmentObjectType.class.php

@@ -0,0 +1,124 @@
+<?php
+
+/*
+ * Copyright (c) 2010-2024 Tim Düsterhus.
+ *
+ * Use of this software is governed by the Business Source License
+ * included in the LICENSE file.
+ *
+ * Change Date: 2028-01-13
+ *
+ * On the date above, in accordance with the Business Source
+ * License, use of this software will be governed by version 2
+ * or later of the General Public License.
+ */
+
+namespace chat\system\attachment;
+
+use chat\data\message\Message;
+use chat\data\message\MessageList;
+use chat\data\room\RoomCache;
+use wcf\system\attachment\AbstractAttachmentObjectType;
+use wcf\system\WCF;
+use wcf\util\ArrayUtil;
+
+/**
+ * Attachment object type implementation for messages.
+ */
+final class MessageAttachmentObjectType extends AbstractAttachmentObjectType
+{
+    /**
+     * @inheritDoc
+     */
+    public function canDownload($objectID): bool
+    {
+        if ($objectID) {
+            $message = new Message($objectID);
+
+            if (!$message->messageID) {
+                return false;
+            }
+
+            \assert($message->getMessageType()->objectType === 'be.bastelstu.chat.messageType.attachment');
+            $room = $message->getRoom();
+
+            return $room->canSee();
+        }
+
+        return false;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function canUpload($objectID, $parentObjectID = 0): bool
+    {
+        if ($objectID) {
+            return false;
+        }
+
+        if (!WCF::getSession()->getPermission('user.chat.canAttach')) {
+            return false;
+        }
+
+        $room = null;
+        if ($parentObjectID) {
+            $room = RoomCache::getInstance()->getRoom($parentObjectID);
+        }
+
+        if ($room !== null) {
+            return $room->canSee();
+        }
+
+        return false;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function canDelete($objectID): bool
+    {
+        return false;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getMaxCount(): int
+    {
+        return 1;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getMaxSize(): int
+    {
+        return (int)WCF::getSession()->getPermission('user.chat.attachment.maxSize');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAllowedExtensions()
+    {
+        return ArrayUtil::trim(\explode(
+            "\n",
+            WCF::getSession()->getPermission('user.chat.attachment.allowedExtensions')
+        ));
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function cacheObjects(array $objectIDs)
+    {
+        $messageList = new MessageList();
+        $messageList->setObjectIDs($objectIDs);
+        $messageList->readObjects();
+
+        foreach ($messageList->getObjects() as $objectID => $object) {
+            $this->cachedObjects[$objectID] = $object;
+        }
+    }
+}

files/lib/system/box/RoomListBoxController.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,107 +15,129 @@
 
 namespace chat\system\box;
 
-use \wcf\system\request\RequestHandler;
-use \wcf\system\WCF;
+use chat\data\room\Room;
+use chat\data\room\RoomList;
+use chat\page\RoomListPage;
+use chat\page\RoomPage;
+use wcf\system\box\AbstractDatabaseObjectListBoxController;
+use wcf\system\request\LinkHandler;
+use wcf\system\request\RequestHandler;
+use wcf\system\WCF;
 
 /**
  * Dynamic box controller implementation for a list of rooms.
  */
-class RoomListBoxController extends \wcf\system\box\AbstractDatabaseObjectListBoxController {
-	/**
-	 * @inheritDoc
-	 */
-	protected static $supportedPositions = [ 'contentBottom', 'contentTop', 'sidebarLeft', 'sidebarRight' ];
+final class RoomListBoxController extends AbstractDatabaseObjectListBoxController
+{
+    /**
+     * @inheritDoc
+     */
+    protected static $supportedPositions = [
+        'contentBottom',
+        'contentTop',
+        'sidebarLeft',
+        'sidebarRight',
+    ];
 
-	/**
-	 * @inheritDoc
-	 */
-	protected $conditionDefinition = 'be.bastelstu.chat.box.roomList.condition';
+    /**
+     * @inheritDoc
+     */
+    protected $conditionDefinition = 'be.bastelstu.chat.box.roomList.condition';
 
-	/**
-	 * @var int
-	 */
-	protected $activeRoomID = null;
+    /**
+     * @var int
+     */
+    protected $activeRoomID;
 
-	/**
-	 * @inheritDoc
-	 */
-	public function __construct() {
-		parent::__construct();
+    /**
+     * @inheritDoc
+     */
+    public function __construct()
+    {
+        parent::__construct();
 
-		$activeRequest = RequestHandler::getInstance()->getActiveRequest();
-		if ($activeRequest && $activeRequest->getRequestObject() instanceof \chat\page\RoomPage) {
-			$this->activeRoomID = $activeRequest->getRequestObject()->room->roomID;
-		}
-	}
+        $activeRequest = RequestHandler::getInstance()->getActiveRequest();
+        if ($activeRequest && $activeRequest->getRequestObject() instanceof RoomPage) {
+            $this->activeRoomID = $activeRequest->getRequestObject()->room->roomID;
+        }
+    }
 
-	/**
-	 * Sets the active room ID.
-	 */
-	public function setActiveRoomID($activeRoomID) {
-		$this->activeRoomID = $activeRoomID;
-	}
+    /**
+     * Sets the active room ID.
+     */
+    public function setActiveRoomID($activeRoomID)
+    {
+        $this->activeRoomID = $activeRoomID;
+    }
 
-	/**
-	 * Returns the active room ID.
-	 *
-	 * @return	int
-	 */
-	public function getActiveRoomID() {
-		return $this->activeRoomID;
-	}
+    /**
+     * Returns the active room ID.
+     *
+     * @return  int
+     */
+    public function getActiveRoomID()
+    {
+        return $this->activeRoomID;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function hasLink() {
-		return true;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function hasLink()
+    {
+        return true;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getLink() {
-		return \wcf\system\request\LinkHandler::getInstance()->getLink('RoomList', [ 'application' => 'chat' ]);
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getLink(): string
+    {
+        return LinkHandler::getInstance()->getControllerLink(RoomListPage::class);
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	protected function getObjectList() {
-		return new \chat\data\room\RoomList();
-	}
+    /**
+     * @inheritDoc
+     */
+    protected function getObjectList()
+    {
+        return new RoomList();
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	protected function getTemplate() {
-		$templateName = 'boxRoomList';
-		if ($this->box->position === 'sidebarLeft' || $this->box->position === 'sidebarRight') {
-			$templateName = 'boxRoomListSidebar';
-		}
+    /**
+     * @inheritDoc
+     */
+    protected function getTemplate()
+    {
+        $templateName = 'boxRoomList';
+        if ($this->box->position === 'sidebarLeft' || $this->box->position === 'sidebarRight') {
+            $templateName = 'boxRoomListSidebar';
+        }
 
-		return WCF::getTPL()->fetch($templateName, 'chat', [ 'boxRoomList'  => $this->objectList
-		                                                   , 'boxID'        => $this->getBox()->boxID
-		                                                   , 'activeRoomID' => $this->activeRoomID ?: 0
-		                                                   ], true);
-	}
+        return WCF::getTPL()->fetch($templateName, 'chat', [
+            'boxRoomList' => $this->objectList,
+            'boxID' => $this->getBox()->boxID,
+            'activeRoomID' => $this->activeRoomID ?: 0,
+        ], true);
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function hasContent() {
-		if ($this->box->position === 'sidebarLeft' || $this->box->position === 'sidebarRight') {
-			parent::hasContent();
+    /**
+     * @inheritDoc
+     */
+    public function hasContent()
+    {
+        if ($this->box->position === 'sidebarLeft' || $this->box->position === 'sidebarRight') {
+            parent::hasContent();
 
-			foreach ($this->objectList as $room) {
-				if ($room->canSee()) return true;
-			}
+            foreach ($this->objectList as $room) {
+                if ($room->canSee()) {
+                    return true;
+                }
+            }
 
-			return false;
-		}
-		else {
-			return \chat\data\room\Room::canSeeAny();
-		}
-	}
+            return false;
+        } else {
+            return Room::canSeeAny();
+        }
+    }
 }

files/lib/system/cache/builder/CommandCacheBuilder.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,39 +15,46 @@
 
 namespace chat\system\cache\builder;
 
-use \wcf\system\WCF;
+use chat\data\command\CommandList;
+use wcf\system\cache\builder\AbstractCacheBuilder;
+use wcf\system\WCF;
 
 /**
  * Caches all chat commands.
  */
-class CommandCacheBuilder extends \wcf\system\cache\builder\AbstractCacheBuilder {
-	/**
-	 * @see	\wcf\system\cache\AbstractCacheBuilder::rebuild()
-	 */
-	public function rebuild(array $parameters) {
-		$data = [ 'commands' => [ ]
-		        , 'triggers' => [ ]
-		        , 'packages' => [ ]
-		        ];
+final class CommandCacheBuilder extends AbstractCacheBuilder
+{
+    /**
+     * @inheritDoc
+     */
+    public function rebuild(array $parameters)
+    {
+        $data = [
+            'commands' => [ ],
+            'triggers' => [ ],
+            'packages' => [ ],
+        ];
 
-		$commandList = new \chat\data\command\CommandList();
-		$commandList->sqlOrderBy = 'command.commandID';
-		$commandList->readObjects();
+        $commandList = new CommandList();
+        $commandList->sqlOrderBy = 'command.commandID';
+        $commandList->readObjects();
 
-		$data['commands'] = $commandList->getObjects();
+        $data['commands'] = $commandList->getObjects();
 
-		foreach ($data['commands'] as $command) {
-			if (!isset($data['packages'][$command->packageID])) $data['packages'][$command->packageID] = [ ];
-			$data['packages'][$command->packageID][$command->identifier] = $command;
-		}
+        foreach ($data['commands'] as $command) {
+            if (!isset($data['packages'][$command->packageID])) {
+                $data['packages'][$command->packageID] = [ ];
+            }
+            $data['packages'][$command->packageID][$command->identifier] = $command;
+        }
 
-		$sql = "SELECT *
-		        FROM   chat".WCF_N."_command_trigger";
-		$statement = WCF::getDB()->prepareStatement($sql);
-		$statement->execute();
+        $sql = "SELECT  *
+                FROM    chat1_command_trigger";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute();
 
-		$data['triggers'] = $statement->fetchMap('commandTrigger', 'commandID');
+        $data['triggers'] = $statement->fetchMap('commandTrigger', 'commandID');
 
-		return $data;
-	}
+        return $data;
+    }
 }

files/lib/system/cache/builder/PermissionCacheBuilder.class.php

@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Copyright (C) 2010-2017  Tim Düsterhus
- * Copyright (C) 2010-2017  Woltlab GmbH
+ * Copyright (C) 2010-2024  Tim Düsterhus
+ * Copyright (C) 2010-2024  Woltlab GmbH
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,42 +21,45 @@
 
 namespace chat\system\cache\builder;
 
-use \wcf\system\acl\ACLHandler;
-use \wcf\system\WCF;
+use wcf\system\acl\ACLHandler;
+use wcf\system\cache\builder\AbstractCacheBuilder;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\WCF;
 
 /**
  * Caches the chat permissions for a combination of user groups.
  */
-class PermissionCacheBuilder extends \wcf\system\cache\builder\AbstractCacheBuilder {
-	/**
-	 * @inheritDoc
-	 */
-	public function rebuild(array $parameters) {
-		$data = [ ];
+final class PermissionCacheBuilder extends AbstractCacheBuilder
+{
+    /**
+     * @inheritDoc
+     */
+    public function rebuild(array $parameters)
+    {
+        $data = [ ];
 
-		if (!empty($parameters)) {
-			$conditionBuilder = new \wcf\system\database\util\PreparedStatementConditionBuilder();
-			$conditionBuilder->add('acl_option.objectTypeID = ?', [ ACLHandler::getInstance()->getObjectTypeID('be.bastelstu.chat.room') ]);
-			$conditionBuilder->add('option_to_group.groupID IN (?)', [ $parameters ]);
-			$sql = "SELECT     option_to_group.objectID AS roomID,
-				           option_to_group.optionValue,
-				           acl_option.optionName AS permission
-				FROM       wcf".WCF_N."_acl_option acl_option
-				INNER JOIN wcf".WCF_N."_acl_option_to_group option_to_group
-				        ON option_to_group.optionID = acl_option.optionID
-				".$conditionBuilder;
-			$statement = WCF::getDB()->prepareStatement($sql);
-			$statement->execute($conditionBuilder->getParameters());
-			while (($row = $statement->fetchArray())) {
-				if (!isset($data[$row['roomID']][$row['permission']])) {
-					$data[$row['roomID']][$row['permission']] = $row['optionValue'];
-				}
-				else {
-					$data[$row['roomID']][$row['permission']] = $row['optionValue'] || $data[$row['roomID']][$row['permission']];
-				}
-			}
-		}
+        if (!empty($parameters)) {
+            $conditionBuilder = new PreparedStatementConditionBuilder();
+            $conditionBuilder->add('acl_option.objectTypeID = ?', [ ACLHandler::getInstance()->getObjectTypeID('be.bastelstu.chat.room') ]);
+            $conditionBuilder->add('option_to_group.groupID IN (?)', [ $parameters ]);
+            $sql = "SELECT      option_to_group.objectID AS roomID,
+                                option_to_group.optionValue,
+                                acl_option.optionName AS permission
+                    FROM        wcf1_acl_option acl_option
+                    INNER JOIN  wcf1_acl_option_to_group option_to_group
+                            ON  option_to_group.optionID = acl_option.optionID
+                    {$conditionBuilder}";
+            $statement = WCF::getDB()->prepare($sql);
+            $statement->execute($conditionBuilder->getParameters());
+            while (($row = $statement->fetchArray())) {
+                if (!isset($data[$row['roomID']][$row['permission']])) {
+                    $data[$row['roomID']][$row['permission']] = $row['optionValue'];
+                } else {
+                    $data[$row['roomID']][$row['permission']] = $row['optionValue'] || $data[$row['roomID']][$row['permission']];
+                }
+            }
+        }
 
-		return $data;
-	}
+        return $data;
+    }
 }

files/lib/system/cache/builder/RoomCacheBuilder.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,18 +15,23 @@
 
 namespace chat\system\cache\builder;
 
+use chat\data\room\RoomList;
+use wcf\system\cache\builder\AbstractCacheBuilder;
+
 /**
  * Caches all chat rooms.
  */
-class RoomCacheBuilder extends \wcf\system\cache\builder\AbstractCacheBuilder {
-	/**
-	 * @inheritDoc
-	 */
-	public function rebuild(array $parameters) {
-		$roomList = new \chat\data\room\RoomList();
-		$roomList->sqlOrderBy = "room.position";
-		$roomList->readObjects();
+final class RoomCacheBuilder extends AbstractCacheBuilder
+{
+    /**
+     * @inheritDoc
+     */
+    public function rebuild(array $parameters)
+    {
+        $roomList = new RoomList();
+        $roomList->sqlOrderBy = "room.position";
+        $roomList->readObjects();
 
-		return $roomList->getObjects();
-	}
+        return $roomList->getObjects();
+    }
 }

files/lib/system/cache/runtime/UserRuntimeCache.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,12 +15,16 @@
 
 namespace chat\system\cache\runtime;
 
+use chat\data\user\UserList as ChatUserList;
+use wcf\system\cache\runtime\AbstractRuntimeCache;
+
 /**
  * Runtime cache implementation for chat users.
  */
-class UserRuntimeCache extends \wcf\system\cache\runtime\AbstractRuntimeCache {
-	/**
-	 * @inheritDoc
-	 */
-	protected $listClassName = \chat\data\user\UserList::class;
+class UserRuntimeCache extends AbstractRuntimeCache
+{
+    /**
+     * @inheritDoc
+     */
+    protected $listClassName = ChatUserList::class;
 }

files/lib/system/command/AbstractCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,64 +15,76 @@
 
 namespace chat\system\command;
 
-use \chat\data\room\Room;
-use \wcf\data\object\type\ObjectTypeCache;
-use \wcf\data\user\UserProfile;
-use \wcf\system\exception\UserInputException;
+use chat\data\command\Command;
+use chat\data\room\Room;
+use wcf\data\DatabaseObjectDecorator;
+use wcf\data\IDatabaseObjectProcessor;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\data\user\UserProfile;
+use wcf\system\exception\UserInputException;
 
 /**
  * Default implemention for command processors.
  */
-abstract class AbstractCommand extends \wcf\data\DatabaseObjectDecorator implements ICommand
-                                                                                  , \wcf\data\IDatabaseObjectProcessor {
-	/**
-	 * @inheritDoc
-	 */
-	protected static $baseClass = \chat\data\command\Command::class;
+abstract class AbstractCommand extends DatabaseObjectDecorator implements
+    ICommand,
+    IDatabaseObjectProcessor
+{
+    /**
+     * @inheritDoc
+     */
+    protected static $baseClass = Command::class;
 
-	/**
-	 * @inheritDoc
-	 */
-	public function isAvailable(Room $room, UserProfile $user = null) {
-		return true;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function isAvailable(Room $room, ?UserProfile $user = null)
+    {
+        return true;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function allowWithoutTrigger() {
-		return false;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function allowWithoutTrigger()
+    {
+        return false;
+    }
 
-	/**
-	 * Returns the object type ID for the given message type.
-	 *
-	 * @param  string
-	 * @return int
-	 */
-	public function getMessageObjectTypeID($objectType) {
-		$objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName('be.bastelstu.chat.messageType', $objectType);
+    /**
+     * Returns the object type ID for the given message type.
+     *
+     * @param  string
+     * @return int
+     */
+    public function getMessageObjectTypeID($objectType)
+    {
+        $objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName(
+            'be.bastelstu.chat.messageType',
+            $objectType
+        );
 
-		if (!$objectType) {
-			throw new \LogicException('Missing object type');
-		}
+        if (!$objectType) {
+            throw new \LogicException('Missing object type');
+        }
 
-		return $objectTypeID;
-	}
+        return $objectTypeID;
+    }
 
-	/**
-	 * Ensures that the given parameter exists in the parameter array and
-	 * throws otherwise.
-	 *
-	 * @param  array  $parameters
-	 * @param  string $key
-	 * @return mixed  The value.
-	 */
-	public function assertParameter($parameters, $key) {
-		if (array_key_exists($key, $parameters)) {
-			return $parameters[$key];
-		}
+    /**
+     * Ensures that the given parameter exists in the parameter array and
+     * throws otherwise.
+     *
+     * @param  array  $parameters
+     * @param  string $key
+     * @return mixed  The value.
+     */
+    public function assertParameter($parameters, $key)
+    {
+        if (\array_key_exists($key, $parameters)) {
+            return $parameters[$key];
+        }
 
-		throw new UserInputException('message');
-	}
+        throw new UserInputException('message');
+    }
 }

files/lib/system/command/AbstractInputProcessedCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,71 +15,114 @@
 
 namespace chat\system\command;
 
-use \wcf\system\exception\UserInputException;
-use \wcf\system\bbcode\BBCodeHandler;
-use \wcf\system\message\censorship\Censorship;
-use \wcf\system\WCF;
+use wcf\data\DatabaseObject;
+use wcf\system\bbcode\BBCodeHandler;
+use wcf\system\exception\UserInputException;
+use wcf\system\html\input\HtmlInputProcessor;
+use wcf\system\message\censorship\Censorship;
+use wcf\system\WCF;
 
 /**
  * Represents a command that processes the input using HtmlInputProcessor.
  */
-abstract class AbstractInputProcessedCommand extends AbstractCommand {
-	/**
-	 * HtmlInputProcessor to use.
-	 * @var	\wcf\system\html\input\HtmlInputProcessor
-	 */
-	protected $processor = null;
+abstract class AbstractInputProcessedCommand extends AbstractCommand
+{
+    /**
+     * HtmlInputProcessor to use.
+     * @var \wcf\system\html\input\HtmlInputProcessor
+     */
+    protected $processor;
 
-	/**
-	 * The text processed last.
-	 * @var	string
-	 */
-	private $text = null;
+    /**
+     * The text processed last.
+     * @var string
+     */
+    private $text;
 
-	public function __construct(\wcf\data\DatabaseObject $object) {
-		parent::__construct($object);
+    public function __construct(DatabaseObject $object)
+    {
+        parent::__construct($object);
 
-		$this->processor = new \wcf\system\html\input\HtmlInputProcessor();
-		$this->setDisallowedBBCodes();
-	}
+        $this->processor = new HtmlInputProcessor();
+        $this->setDisallowedBBCodes();
+    }
 
-	private function setDisallowedBBCodes() {
-		BBCodeHandler::getInstance()->setDisallowedBBCodes(explode(',', WCF::getSession()->getPermission('user.chat.disallowedBBCodes')));
-	}
+    private function setDisallowedBBCodes()
+    {
+        BBCodeHandler::getInstance()->setDisallowedBBCodes(\explode(
+            ',',
+            WCF::getSession()->getPermission('user.chat.disallowedBBCodes')
+        ));
+    }
 
-	public function setText($text) {
-		if ($this->text === $text) return;
+    public function setText($text)
+    {
+        if ($this->text === $text) {
+            return;
+        }
 
-		$this->text = $text;
-		$this->setDisallowedBBCodes();
-		$this->processor->process($text, 'be.bastelstu.chat.message', 0);
-	}
+        $this->text = $text;
+        $this->setDisallowedBBCodes();
+        $this->processor->process(
+            $text,
+            'be.bastelstu.chat.message',
+            0
+        );
+    }
 
-	public function validateText() {
-		if ($this->processor->appearsToBeEmpty()) {
-			throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('wcf.global.form.error.empty'));
-		}
+    public function validateText()
+    {
+        if ($this->processor->appearsToBeEmpty()) {
+            throw new UserInputException(
+                'message',
+                WCF::getLanguage()->getDynamicVariable('wcf.global.form.error.empty')
+            );
+        }
 
-		$message = $this->processor->getTextContent();
+        $message = $this->processor->getTextContent();
 
-		// validate message length
-		if (mb_strlen($message) > CHAT_MAX_LENGTH) {
-			throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('wcf.message.error.tooLong', [ 'maxTextLength' => CHAT_MAX_LENGTH ]));
-		}
+        // validate message length
+        if (\mb_strlen($message) > CHAT_MAX_LENGTH) {
+            throw new UserInputException(
+                'message',
+                WCF::getLanguage()->getDynamicVariable(
+                    'wcf.message.error.tooLong',
+                    [
+                        'maxTextLength' => CHAT_MAX_LENGTH,
+                    ]
+                )
+            );
+        }
 
-		// search for disallowed bbcodes
-		$this->setDisallowedBBCodes();
-		$disallowedBBCodes = $this->processor->validate();
-		if (!empty($disallowedBBCodes)) {
-			throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('wcf.message.error.disallowedBBCodes', [ 'disallowedBBCodes' => $disallowedBBCodes ]));
-		}
+        // search for disallowed bbcodes
+        $this->setDisallowedBBCodes();
+        $disallowedBBCodes = $this->processor->validate();
+        if (!empty($disallowedBBCodes)) {
+            throw new UserInputException(
+                'message',
+                WCF::getLanguage()->getDynamicVariable(
+                    'wcf.message.error.disallowedBBCodes',
+                    [
+                        'disallowedBBCodes' => $disallowedBBCodes,
+                    ]
+                )
+            );
+        }
 
-		// search for censored words
-		if (ENABLE_CENSORSHIP) {
-			$result = Censorship::getInstance()->test($message);
-			if ($result) {
-				throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('wcf.message.error.censoredWordsFound', [ 'censoredWords' => $result ]));
-			}
-		}
-	}
+        // search for censored words
+        if (ENABLE_CENSORSHIP) {
+            $result = Censorship::getInstance()->test($message);
+            if ($result) {
+                throw new UserInputException(
+                    'message',
+                    WCF::getLanguage()->getDynamicVariable(
+                        'wcf.message.error.censoredWordsFound',
+                        [
+                            'censoredWords' => $result,
+                        ]
+                    )
+                );
+            }
+        }
+    }
 }

files/lib/system/command/AbstractSuspensionCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,157 +15,192 @@
 
 namespace chat\system\command;
 
-use \chat\data\message\MessageAction;
-use \chat\data\room\Room;
-use \chat\data\suspension\Suspension;
-use \chat\data\suspension\SuspensionAction;
-use \wcf\data\object\type\ObjectTypeCache;
-use \wcf\data\user\UserProfile;
-use \wcf\system\exception\UserInputException;
-use \wcf\system\WCF;
+use chat\data\message\MessageAction;
+use chat\data\room\Room;
+use chat\data\suspension\Suspension;
+use chat\data\suspension\SuspensionAction;
+use chat\data\user\User as ChatUser;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\data\user\UserProfile;
+use wcf\system\exception\UserInputException;
+use wcf\system\WCF;
 
 /**
  * Represents a command that creates suspensions
  */
-abstract class AbstractSuspensionCommand extends AbstractCommand {
-	use TNeedsUser;
+abstract class AbstractSuspensionCommand extends AbstractCommand
+{
+    use TNeedsUser;
 
-	/**
-	 * Returns the name of the object type for this suspension.
-	 *
-	 * @return string
-	 */
-	abstract public function getObjectTypeName();
+    /**
+     * Returns the name of the object type for this suspension.
+     *
+     * @return string
+     */
+    abstract public function getObjectTypeName();
 
-	/**
-	 * Checks the permissions to execute this command.
-	 * Throws if necessary.
-	 *
-	 * @see \chat\system\command\ICommand::validate()
-	 */
-	abstract protected function checkPermissions($parameters, Room $room, UserProfile $user);
+    /**
+     * Checks the permissions to execute this command.
+     * Throws if necessary.
+     *
+     * @see \chat\system\command\ICommand::validate()
+     */
+    abstract protected function checkPermissions($parameters, Room $room, UserProfile $user);
 
-	/**
-	 * @inheritDoc
-	 */
-	public function validate($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function validate($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$this->assertParameter($parameters, 'username');
-		$this->assertParameter($parameters, 'globally');
-		$this->assertParameter($parameters, 'duration');
-		$this->assertParameter($parameters, 'reason');
+        $this->assertParameter($parameters, 'username');
+        $this->assertParameter($parameters, 'globally');
+        $this->assertParameter($parameters, 'duration');
+        $this->assertParameter($parameters, 'reason');
 
-		$this->assertUser($parameters['username']);
-		if ($parameters['duration'] !== null && $parameters['duration'] < TIME_NOW) {
-			throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('chat.error.datePast'));
-		}
-		if (!empty($parameters['reason']) && mb_strlen($parameters['reason']) > 100) {
-			throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('wcf.message.error.tooLong', [ 'maxTextLength' => 250 ]));
-		}
-		$this->checkPermissions($parameters, $room, $user);
+        $this->assertUser($parameters['username']);
+        if ($parameters['duration'] !== null && $parameters['duration'] < TIME_NOW) {
+            throw new UserInputException(
+                'message',
+                WCF::getLanguage()->getDynamicVariable('chat.error.datePast')
+            );
+        }
+        if (!empty($parameters['reason']) && \mb_strlen($parameters['reason']) > 100) {
+            throw new UserInputException(
+                'message',
+                WCF::getLanguage()->getDynamicVariable(
+                    'wcf.message.error.tooLong',
+                    [
+                        'maxTextLength' => 250,
+                    ]
+                )
+            );
+        }
+        $this->checkPermissions($parameters, $room, $user);
 
-		$test = new Suspension(null, $this->getSuspensionData($parameters, $room, $user));
-		if (!$test->isActive()) {
-			throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('chat.error.suspension.noEffect'));
-		}
-	}
+        $test = new Suspension(null, $this->getSuspensionData($parameters, $room, $user));
+        if (!$test->isActive()) {
+            throw new UserInputException(
+                'message',
+                WCF::getLanguage()->getDynamicVariable('chat.error.suspension.noEffect')
+            );
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function execute($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function execute($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$data = $this->getSuspensionData($parameters, $room, $user);
-		$test = new Suspension(null, $data);
-		if (!$test->isActive()) {
-			return;
-		}
+        $data = $this->getSuspensionData($parameters, $room, $user);
+        $test = new Suspension(null, $data);
+        if (!$test->isActive()) {
+            return;
+        }
 
-		WCF::getDB()->beginTransaction();
-		$suspension = (new SuspensionAction([ ], 'create', [ 'data' => $data ]))->executeAction()['returnValues'];
+        WCF::getDB()->beginTransaction();
+        $suspension = (new SuspensionAction(
+            [ ],
+            'create',
+            [
+                'data' => $data,
+            ]
+        ))->executeAction()['returnValues'];
 
-		$this->afterCreate($suspension, $parameters, $room, $user);
-		WCF::getDB()->commitTransaction();
-	}
+        $this->afterCreate($suspension, $parameters, $room, $user);
+        WCF::getDB()->commitTransaction();
+    }
 
-	/**
-	 * Creates chat messages informing about the suspension.
-	 *
-	 * @param \chat\data\suspension\Suspension $suspension
-	 * @param  mixed[]                         $parameters
-	 * @param  \chat\data\room\Room            $room
-	 * @param  \wcf\data\user\UserProfile      $user
-	 */
-	protected function afterCreate(Suspension $suspension, $parameters, Room $room, UserProfile $user) {
-		$objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.suspend');
-		$target = $suspension->getUser();
+    /**
+     * Creates chat messages informing about the suspension.
+     *
+     * @param  mixed[]                         $parameters
+     */
+    protected function afterCreate(Suspension $suspension, $parameters, Room $room, UserProfile $user)
+    {
+        $objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.suspend');
+        $target = $suspension->getUser();
 
-		if ($suspension->getRoom() === null) {
-			$roomIDs = array_map(function (Room $room) use ($user) {
-				return $room->roomID;
-			}, (new \chat\data\user\User($target))->getRooms());
-			$roomIDs[] = $room->roomID;
-		}
-		else {
-			$roomIDs = [ $suspension->getRoom()->roomID ];
-		}
+        if ($suspension->getRoom() === null) {
+            $roomIDs = \array_map(static function (Room $room) {
+                return $room->roomID;
+            }, (new ChatUser($target))->getRooms());
+            $roomIDs[] = $room->roomID;
+        } else {
+            $roomIDs = [ $suspension->getRoom()->roomID ];
+        }
 
-		(new MessageAction([ ], 'create', [ 'data' => [ 'roomID'       => $room->roomID
-		                                              , 'userID'       => $user->userID
-		                                              , 'username'     => $user->username
-		                                              , 'time'         => TIME_NOW
-		                                              , 'objectTypeID' => $objectTypeID
-		                                              , 'payload'      => serialize([ 'suspension' => $suspension
-		                                                                            , 'roomIDs'    => $roomIDs
-		                                                                            , 'globally'   => $this->isGlobally($parameters)
-		                                                                            , 'target'     => [ 'userID'   => $target->userID
-		                                                                                              , 'username' => $target->username
-		                                                                                              ]
-		                                                                            ])
-		                                              ]
-		                                  , 'updateTimestamp' => true
-		                                  ]
-		                  )
-		)->executeAction();
-	}
+        (new MessageAction(
+            [ ],
+            'create',
+            [
+                'data' => [
+                    'roomID' => $room->roomID,
+                    'userID' => $user->userID,
+                    'username' => $user->username,
+                    'time' => TIME_NOW,
+                    'objectTypeID' => $objectTypeID,
+                    'payload' => \serialize([
+                        'suspension' => $suspension,
+                        'roomIDs' => $roomIDs,
+                        'globally' => $this->isGlobally($parameters),
+                        'target' => [
+                            'userID' => $target->userID,
+                            'username' => $target->username,
+                        ],
+                    ]),
+                ],
+                'updateTimestamp' => true,
+            ]
+        ))->executeAction();
+    }
 
-	/**
-	 * Returns the database fields.
-	 *
-	 * @param  mixed[]                    $parameters
-	 * @param  \chat\data\room\Room       $room
-	 * @param  \wcf\data\user\UserProfile $user
-	 * @return mixed[]
-	 */
-	protected function getSuspensionData($parameters, Room $room, UserProfile $user = null) {
-		$target = $this->getUser($parameters['username']);
-		$globally = $this->isGlobally($parameters);
-		$expires = $parameters['duration'];
-		$reason = $parameters['reason'] ?: '';
+    /**
+     * Returns the database fields.
+     *
+     * @param  mixed[]                    $parameters
+     * @return mixed[]
+     */
+    protected function getSuspensionData($parameters, Room $room, ?UserProfile $user = null)
+    {
+        $target = $this->getUser($parameters['username']);
+        $globally = $this->isGlobally($parameters);
+        $expires = $parameters['duration'];
+        $reason = $parameters['reason'] ?: '';
 
-		$roomID  = $globally ? null : $room->roomID;
-		$objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName('be.bastelstu.chat.suspension', $this->getObjectTypeName());
+        $roomID = $globally ? null : $room->roomID;
+        $objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName(
+            'be.bastelstu.chat.suspension',
+            $this->getObjectTypeName()
+        );
 
-		return [ 'time' => TIME_NOW
-		       , 'expires' => $expires
-		       , 'roomID' => $roomID
-		       , 'userID' => $target->userID
-		       , 'objectTypeID' => $objectTypeID
-		       , 'reason' => $reason
-		       , 'judgeID' => $user->userID
-		       , 'judge' => $user->username
-		       ];
-	}
+        return [
+            'time' => TIME_NOW,
+            'expires' => $expires,
+            'roomID' => $roomID,
+            'userID' => $target->userID,
+            'objectTypeID' => $objectTypeID,
+            'reason' => $reason,
+            'judgeID' => $user->userID,
+            'judge' => $user->username,
+        ];
+    }
 
-	/**
-	 * Returns whether a global suspension was requested.
-	 *
-	 * @param  mixed[] $parameters
-	 * @return boolean
-	 */
-	protected function isGlobally($parameters) {
-		return $parameters['globally'] === true;
-	}
+    /**
+     * Returns whether a global suspension was requested.
+     *
+     * @param  mixed[] $parameters
+     * @return boolean
+     */
+    protected function isGlobally($parameters)
+    {
+        return $parameters['globally'] === true;
+    }
 }

files/lib/system/command/AbstractUnsuspensionCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,149 +15,172 @@
 
 namespace chat\system\command;
 
-use \chat\data\message\MessageAction;
-use \chat\data\room\Room;
-use \chat\data\suspension\Suspension;
-use \chat\data\suspension\SuspensionAction;
-use \chat\data\suspension\SuspensionList;
-use \wcf\data\object\type\ObjectTypeCache;
-use \wcf\data\user\UserProfile;
-use \wcf\system\exception\UserInputException;
-use \wcf\system\WCF;
+use chat\data\message\MessageAction;
+use chat\data\room\Room;
+use chat\data\suspension\Suspension;
+use chat\data\suspension\SuspensionAction;
+use chat\data\suspension\SuspensionList;
+use chat\data\user\User as ChatUser;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\data\user\UserProfile;
+use wcf\system\exception\UserInputException;
+use wcf\system\WCF;
 
 /**
  * Represents a command that revokes suspensions
  */
-abstract class AbstractUnsuspensionCommand extends AbstractCommand {
-	use TNeedsUser;
+abstract class AbstractUnsuspensionCommand extends AbstractCommand
+{
+    use TNeedsUser;
 
-	/**
-	 * Returns the name of the object type for this suspension.
-	 *
-	 * @return string
-	 */
-	abstract public function getObjectTypeName();
+    /**
+     * Returns the name of the object type for this suspension.
+     *
+     * @return string
+     */
+    abstract public function getObjectTypeName();
 
-	/**
-	 * Checks the permissions to execute this command.
-	 * Throws if necessary.
-	 *
-	 * @see \chat\system\command\ICommand::validate()
-	 */
-	abstract protected function checkPermissions($parameters, Room $room, UserProfile $user);
+    /**
+     * Checks the permissions to execute this command.
+     * Throws if necessary.
+     *
+     * @see \chat\system\command\ICommand::validate()
+     */
+    abstract protected function checkPermissions($parameters, Room $room, UserProfile $user);
 
-	/**
-	 * @inheritDoc
-	 */
-	public function validate($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function validate($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$this->assertParameter($parameters, 'username');
-		$this->assertParameter($parameters, 'globally');
+        $this->assertParameter($parameters, 'username');
+        $this->assertParameter($parameters, 'globally');
 
-		$this->assertUser($parameters['username']);
+        $this->assertUser($parameters['username']);
 
-		$suspensions = $this->getSuspensionData($parameters, $room, $user);
-		if (empty($suspensions)) {
-			throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('chat.error.suspension.remove.empty'));
-		}
-	}
+        $suspensions = $this->getSuspensionData($parameters, $room, $user);
+        if (empty($suspensions)) {
+            throw new UserInputException(
+                'message',
+                WCF::getLanguage()->getDynamicVariable('chat.error.suspension.remove.empty')
+            );
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function execute($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function execute($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$suspensions = $this->getSuspensionData($parameters, $room, $user);
+        $suspensions = $this->getSuspensionData($parameters, $room, $user);
 
-		WCF::getDB()->beginTransaction();
-		(new SuspensionAction($suspensions, 'revoke', [ ]))->executeAction();
-		$this->afterCreate($suspensions, $parameters, $room, $user);
-		WCF::getDB()->commitTransaction();
-	}
+        WCF::getDB()->beginTransaction();
+        (new SuspensionAction(
+            $suspensions,
+            'revoke',
+            [ ]
+        ))->executeAction();
+        $this->afterCreate($suspensions, $parameters, $room, $user);
+        WCF::getDB()->commitTransaction();
+    }
 
-	/**
-	 * Creates chat messages informing about the removed suspensions.
-	 *
-	 * @param \chat\data\suspension\Suspension[] $suspension
-	 * @param  mixed[]                           $parameters
-	 * @param  \chat\data\room\Room              $room
-	 * @param  \wcf\data\user\UserProfile        $user
-	 */
-	protected function afterCreate($suspensions, $parameters, Room $room, UserProfile $user) {
-		$objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.unsuspend');
-		$target = $this->getUser($parameters['username']);
-		if ($this->isGlobally($parameters)) {
-			$roomIDs = array_map(function (Room $room) use ($user) {
-				return $room->roomID;
-			}, (new \chat\data\user\User($target))->getRooms());
-			$roomIDs[] = $room->roomID;
-		}
-		else {
-			$roomIDs = [ $room->roomID ];
-		}
+    /**
+     * Creates chat messages informing about the removed suspensions.
+     *
+     * @param \chat\data\suspension\Suspension[] $suspension
+     * @param  mixed[]                           $parameters
+     */
+    protected function afterCreate($suspensions, $parameters, Room $room, UserProfile $user)
+    {
+        $objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.unsuspend');
+        $target = $this->getUser($parameters['username']);
+        if ($this->isGlobally($parameters)) {
+            $roomIDs = \array_map(static function (Room $room) {
+                return $room->roomID;
+            }, (new ChatUser($target))->getRooms());
+            $roomIDs[] = $room->roomID;
+        } else {
+            $roomIDs = [
+                $room->roomID,
+            ];
+        }
 
-		(new MessageAction([ ], 'create', [ 'data' => [ 'roomID'       => $room->roomID
-		                                              , 'userID'       => $user->userID
-		                                              , 'username'     => $user->username
-		                                              , 'time'         => TIME_NOW
-		                                              , 'objectTypeID' => $objectTypeID
-		                                              , 'payload'      => serialize([ 'objectType' => $this->getObjectTypeName()
-		                                                                            , 'roomIDs'    => $roomIDs
-		                                                                            , 'globally'   => $this->isGlobally($parameters)
-		                                                                            , 'target'     => [ 'userID'   => $target->userID
-		                                                                                              , 'username' => $target->username
-		                                                                                              ]
-		                                                                            ])
-		                                              ]
-		                                  , 'updateTimestamp' => true
-		                                  ]
-		                  )
-		)->executeAction();
-	}
+        (new MessageAction(
+            [ ],
+            'create',
+            [
+                'data' => [
+                    'roomID' => $room->roomID,
+                    'userID' => $user->userID,
+                    'username' => $user->username,
+                    'time' => TIME_NOW,
+                    'objectTypeID' => $objectTypeID,
+                    'payload' => \serialize([
+                        'objectType' => $this->getObjectTypeName(),
+                        'roomIDs' => $roomIDs,
+                        'globally' => $this->isGlobally($parameters),
+                        'target' => [
+                            'userID' => $target->userID,
+                            'username' => $target->username,
+                        ],
+                    ]),
+                ],
+                'updateTimestamp' => true,
+            ]
+        ))->executeAction();
+    }
 
-	/**
-	 * Returns the active suspensions.
-	 *
-	 * @param  mixed[]                    $parameters
-	 * @param  \chat\data\room\Room       $room
-	 * @param  \wcf\data\user\UserProfile $user
-	 * @return mixed[]
-	 */
-	protected function getSuspensionData($parameters, Room $room, UserProfile $user = null) {
-		$target = $this->getUser($parameters['username']);
+    /**
+     * Returns the active suspensions.
+     *
+     * @param  mixed[]                    $parameters
+     * @return mixed[]
+     */
+    protected function getSuspensionData($parameters, Room $room, ?UserProfile $user = null)
+    {
+        $target = $this->getUser($parameters['username']);
 
-		$roomID  = $this->isGlobally($parameters) ? null : $room->roomID;
-		$objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName('be.bastelstu.chat.suspension', $this->getObjectTypeName());
+        $roomID = $this->isGlobally($parameters) ? null : $room->roomID;
+        $objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName(
+            'be.bastelstu.chat.suspension',
+            $this->getObjectTypeName()
+        );
 
-		$suspensionList = new SuspensionList();
+        $suspensionList = new SuspensionList();
 
-		$suspensionList->getConditionBuilder()->add('(expires IS NULL OR expires > ?)', [ TIME_NOW ]);
-		$suspensionList->getConditionBuilder()->add('revoked IS NULL');
-		$suspensionList->getConditionBuilder()->add('userID = ?', [ $target->userID ]);
-		$suspensionList->getConditionBuilder()->add('objectTypeID = ?', [ $objectTypeID ]);
-		if ($roomID === null) {
-			$suspensionList->getConditionBuilder()->add('roomID IS NULL');
-		}
-		else {
-			$suspensionList->getConditionBuilder()->add('roomID = ?', [ $room->roomID ]);
-		}
+        $suspensionList->getConditionBuilder()->add('(expires IS NULL OR expires > ?)', [ TIME_NOW ]);
+        $suspensionList->getConditionBuilder()->add('revoked IS NULL');
+        $suspensionList->getConditionBuilder()->add('userID = ?', [ $target->userID ]);
+        $suspensionList->getConditionBuilder()->add('objectTypeID = ?', [ $objectTypeID ]);
+        if ($roomID === null) {
+            $suspensionList->getConditionBuilder()->add('roomID IS NULL');
+        } else {
+            $suspensionList->getConditionBuilder()->add('roomID = ?', [ $room->roomID ]);
+        }
 
-		$suspensionList->readObjects();
+        $suspensionList->readObjects();
 
-		return array_filter($suspensionList->getObjects(), function (Suspension $suspension) {
-			return $suspension->isActive();
-		});
-	}
+        return \array_filter($suspensionList->getObjects(), static function (Suspension $suspension) {
+            return $suspension->isActive();
+        });
+    }
 
-	/**
-	 * Returns whether a global suspension removal was requested.
-	 *
-	 * @param  mixed[] $parameters
-	 * @return boolean
-	 */
-	protected function isGlobally($parameters) {
-		return $parameters['globally'] === true;
-	}
+    /**
+     * Returns whether a global suspension removal was requested.
+     *
+     * @param  mixed[] $parameters
+     * @return boolean
+     */
+    protected function isGlobally($parameters)
+    {
+        return $parameters['globally'] === true;
+    }
 }

files/lib/system/command/AwayCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,74 +15,99 @@
 
 namespace chat\system\command;
 
-use \chat\data\message\MessageAction;
-use \chat\data\room\Room;
-use \wcf\data\user\UserProfile;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\exception\UserInputException;
-use \wcf\system\message\censorship\Censorship;
-use \wcf\system\WCF;
+use chat\data\message\MessageAction;
+use chat\data\room\Room;
+use chat\data\user\User as ChatUser;
+use wcf\data\user\UserEditor;
+use wcf\data\user\UserProfile;
+use wcf\system\exception\UserInputException;
+use wcf\system\message\censorship\Censorship;
+use wcf\system\WCF;
 
 /**
  * The away command marks the user as being away.
  */
-class AwayCommand extends AbstractCommand implements ICommand {
-	/**
-	 * @inheritDoc
-	 */
-	public function getJavaScriptModuleName() {
-		return 'Bastelstu.be/Chat/Command/Away';
-	}
+final class AwayCommand extends AbstractCommand implements ICommand
+{
+    /**
+     * @inheritDoc
+     */
+    public function getJavaScriptModuleName()
+    {
+        return 'Bastelstu.be/Chat/Command/Away';
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function validate($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function validate($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$reason = $this->assertParameter($parameters, 'reason');
+        $reason = $this->assertParameter($parameters, 'reason');
 
-		// search for censored words
-		if (ENABLE_CENSORSHIP) {
-			$result = Censorship::getInstance()->test($reason);
-			if ($result) {
-				throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('wcf.message.error.censoredWordsFound', [ 'censoredWords' => $result ]));
-			}
-		}
-	}
+        // search for censored words
+        if (ENABLE_CENSORSHIP) {
+            $result = Censorship::getInstance()->test($reason);
+            if ($result) {
+                throw new UserInputException(
+                    'message',
+                    WCF::getLanguage()->getDynamicVariable(
+                        'wcf.message.error.censoredWordsFound',
+                        [
+                            'censoredWords' => $result,
+                        ]
+                    )
+                );
+            }
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function execute($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function execute($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$reason = $this->assertParameter($parameters, 'reason');
+        $reason = $this->assertParameter($parameters, 'reason');
 
-		$objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.away');
-		$rooms = array_map(function (Room $room) use ($user) {
-			return [ 'roomID'   => $room->roomID
-			       , 'isSilent' => !$room->canWritePublicly($user)
-			       ];
-		}, (new \chat\data\user\User($user->getDecoratedObject()))->getRooms());
+        $objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.away');
+        $rooms = \array_map(static function (Room $room) use ($user) {
+            return [
+                'roomID' => $room->roomID,
+                'isSilent' => !$room->canWritePublicly($user),
+            ];
+        }, (new ChatUser($user->getDecoratedObject()))->getRooms());
 
-		WCF::getDB()->beginTransaction();
-		$editor = new \wcf\data\user\UserEditor($user->getDecoratedObject());
-		$editor->update([ 'chatAway' => $reason ]);
+        WCF::getDB()->beginTransaction();
+        $editor = new UserEditor($user->getDecoratedObject());
+        $editor->update([
+            'chatAway' => $reason,
+        ]);
 
-		(new MessageAction([ ], 'create', [ 'data' => [ 'roomID'       => $room->roomID
-		                                              , 'userID'       => $user->userID
-		                                              , 'username'     => $user->username
-		                                              , 'time'         => TIME_NOW
-		                                              , 'objectTypeID' => $objectTypeID
-		                                              , 'payload'      => serialize([ 'message' => $reason
-		                                                                            , 'rooms'   => array_values($rooms)
-		                                                                            ])
-		                                              ]
-		                                  , 'updateTimestamp' => true
-		                                  ]
-		                  )
-		)->executeAction();
-		WCF::getDB()->commitTransaction();
-	}
+        (new MessageAction(
+            [ ],
+            'create',
+            [
+                'data' => [
+                    'roomID' => $room->roomID,
+                    'userID' => $user->userID,
+                    'username' => $user->username,
+                    'time' => TIME_NOW,
+                    'objectTypeID' => $objectTypeID,
+                    'payload' => \serialize([
+                        'message' => $reason,
+                        'rooms' => \array_values($rooms),
+                    ]),
+                ],
+                'updateTimestamp' => true,
+            ]
+        ))->executeAction();
+        WCF::getDB()->commitTransaction();
+    }
 }

files/lib/system/command/BackCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,67 +15,89 @@
 
 namespace chat\system\command;
 
-use \chat\data\message\MessageAction;
-use \chat\data\room\Room;
-use \wcf\data\user\UserProfile;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\WCF;
+use chat\data\message\MessageAction;
+use chat\data\room\Room;
+use chat\data\user\User as ChatUser;
+use wcf\data\user\UserEditor;
+use wcf\data\user\UserProfile;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\WCF;
 
 /**
  * The back command marks the user as being back.
  */
-class BackCommand extends AbstractCommand implements ICommand {
-	/**
-	 * @inheritDoc
-	 */
-	public function allowWithoutTrigger() {
-		return true;
-	}
+final class BackCommand extends AbstractCommand implements ICommand
+{
+    /**
+     * @inheritDoc
+     */
+    public function allowWithoutTrigger()
+    {
+        return true;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getJavaScriptModuleName() {
-		return 'Bastelstu.be/Chat/Command/Back';
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getJavaScriptModuleName()
+    {
+        return 'Bastelstu.be/Chat/Command/Back';
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function validate($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function validate($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		if ($user->chatAway === null) throw new PermissionDeniedException();
-	}
+        if ($user->chatAway === null) {
+            throw new PermissionDeniedException();
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function execute($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function execute($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.back');
-		$rooms = array_map(function (Room $room) use ($user) {
-			return [ 'roomID'   => $room->roomID
-			       , 'isSilent' => !$room->canWritePublicly($user)
-			       ];
-		}, (new \chat\data\user\User($user->getDecoratedObject()))->getRooms());
+        $objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.back');
+        $rooms = \array_map(static function (Room $room) use ($user) {
+            return [
+                'roomID' => $room->roomID,
+                'isSilent' => !$room->canWritePublicly($user),
+            ];
+        }, (new ChatUser($user->getDecoratedObject()))->getRooms());
 
-		WCF::getDB()->beginTransaction();
-		$editor = new \wcf\data\user\UserEditor($user->getDecoratedObject());
-		$editor->update([ 'chatAway' => null ]);
+        WCF::getDB()->beginTransaction();
+        $editor = new UserEditor($user->getDecoratedObject());
+        $editor->update([
+            'chatAway' => null,
+        ]);
 
-		(new MessageAction([ ], 'create', [ 'data' => [ 'roomID'       => $room->roomID
-		                                              , 'userID'       => $user->userID
-		                                              , 'username'     => $user->username
-		                                              , 'time'         => TIME_NOW
-		                                              , 'objectTypeID' => $objectTypeID
-		                                              , 'payload'      => serialize([ 'rooms'   => array_values($rooms) ])
-		                                              ]
-		                                  , 'updateTimestamp' => true
-		                                  ]
-		                  )
-		)->executeAction();
-		WCF::getDB()->commitTransaction();
-	}
+        (new MessageAction(
+            [ ],
+            'create',
+            [
+                'data' => [
+                    'roomID' => $room->roomID,
+                    'userID' => $user->userID,
+                    'username' => $user->username,
+                    'time' => TIME_NOW,
+                    'objectTypeID' => $objectTypeID,
+                    'payload' => \serialize([
+                        'rooms' => \array_values($rooms),
+                    ]),
+                ],
+                'updateTimestamp' => true,
+            ]
+        ))->executeAction();
+        WCF::getDB()->commitTransaction();
+    }
 }

files/lib/system/command/BanCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,81 +15,98 @@
 
 namespace chat\system\command;
 
-use \chat\data\room\Room;
-use \chat\data\suspension\Suspension;
-use \chat\data\suspension\SuspensionAction;
-use \chat\system\permission\PermissionHandler;
-use \wcf\data\object\type\ObjectTypeCache;
-use \wcf\data\user\UserProfile;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\WCF;
+use chat\data\room\Room;
+use chat\data\room\RoomAction;
+use chat\data\suspension\Suspension;
+use chat\data\user\User as ChatUser;
+use chat\system\permission\PermissionHandler;
+use wcf\data\user\UserProfile;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\exception\UserInputException;
+use wcf\system\WCF;
 
 /**
  * The ban command creates a new be.bastelstu.chat.suspension.ban suspension.
  */
-class BanCommand extends AbstractSuspensionCommand implements ICommand {
-	/**
-	 * @inheritDoc
-	 */
-	public function getJavaScriptModuleName() {
-		return 'Bastelstu.be/Chat/Command/Ban';
-	}
+final class BanCommand extends AbstractSuspensionCommand implements ICommand
+{
+    /**
+     * @inheritDoc
+     */
+    public function getJavaScriptModuleName()
+    {
+        return 'Bastelstu.be/Chat/Command/Ban';
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function isAvailable(Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(WCF::getUser());
-		return $user->getPermission('mod.chat.canBan') || PermissionHandler::get($user)->getPermission($room, 'mod.canBan');
-	}
+    /**
+     * @inheritDoc
+     */
+    public function isAvailable(Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getObjectTypeName() {
-		return 'be.bastelstu.chat.suspension.ban';
-	}
+        return $user->getPermission('mod.chat.canBan') || PermissionHandler::get($user)->getPermission($room, 'mod.canBan');
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	protected function checkPermissions($parameters, Room $room, UserProfile $user) {
-		$permission = $user->getPermission('mod.chat.canBan');
+    /**
+     * @inheritDoc
+     */
+    public function getObjectTypeName()
+    {
+        return 'be.bastelstu.chat.suspension.ban';
+    }
 
-		if (!$this->isGlobally($parameters)) {
-			$permission = $permission || PermissionHandler::get($user)->getPermission($room, 'mod.canBan');
-		}
+    /**
+     * @inheritDoc
+     */
+    protected function checkPermissions($parameters, Room $room, UserProfile $user)
+    {
+        $permission = $user->getPermission('mod.chat.canBan');
 
-		if (!$permission) throw new PermissionDeniedException();
-	}
+        if (!$this->isGlobally($parameters)) {
+            $permission = $permission || PermissionHandler::get($user)->getPermission($room, 'mod.canBan');
+        }
 
-	/**
-	 * @inheritDoc
-	 */
-	protected function afterCreate(Suspension $suspension, $parameters, Room $room, UserProfile $user) {
-		parent::afterCreate($suspension, $parameters, $room, $user);
+        if (!$permission) {
+            throw new PermissionDeniedException();
+        }
+    }
 
-		$user = new \chat\data\user\User($suspension->getUser());
-		$rooms = [ ];
-		if ($suspension->getRoom() === null) {
-			$rooms = $user->getRooms();
-		}
-		else {
-			if ($user->isInRoom($suspension->getRoom())) {
-				$rooms = [ $suspension->getRoom() ];
-			}
-		}
+    /**
+     * @inheritDoc
+     */
+    protected function afterCreate(Suspension $suspension, $parameters, Room $room, UserProfile $user)
+    {
+        parent::afterCreate($suspension, $parameters, $room, $user);
 
-		foreach ($rooms as $room) {
-			$parameters = [ 'user'   => $suspension->getUser()
-			              , 'roomID' => $room->roomID
-			              ];
-			try {
-				(new \chat\data\room\RoomAction([ ], 'leave', $parameters))->executeAction();
-			}
-			catch (UserInputException $e) {
-				// User already left
-			}
-		}
-	}
+        $user = new ChatUser($suspension->getUser());
+        $rooms = [ ];
+        if ($suspension->getRoom() === null) {
+            $rooms = $user->getRooms();
+        } else {
+            if ($user->isInRoom($suspension->getRoom())) {
+                $rooms = [
+                    $suspension->getRoom(),
+                ];
+            }
+        }
+
+        foreach ($rooms as $room) {
+            $parameters = [
+                'user' => $suspension->getUser(),
+                'roomID' => $room->roomID,
+            ];
+            try {
+                (new RoomAction(
+                    [ ],
+                    'leave',
+                    $parameters
+                ))->executeAction();
+            } catch (UserInputException $e) {
+                // User already left
+            }
+        }
+    }
 }

files/lib/system/command/BroadcastCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,72 +15,94 @@
 
 namespace chat\system\command;
 
-use \chat\data\message\MessageAction;
-use \chat\data\message\MessageEditor;
-use \chat\data\room\Room;
-use \wcf\data\user\UserProfile;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\WCF;
+use chat\data\message\MessageAction;
+use chat\data\message\MessageEditor;
+use chat\data\room\Room;
+use wcf\data\user\UserProfile;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\message\embedded\object\MessageEmbeddedObjectManager;
+use wcf\system\WCF;
 
 /**
  * BroadcastCommand sends a broadcast into all channels.
  */
-class BroadcastCommand extends AbstractInputProcessedCommand implements ICommand {
-	/**
-	 * @inheritDoc
-	 */
-	public function getJavaScriptModuleName() {
-		return 'Bastelstu.be/Chat/Command/Broadcast';
-	}
+final class BroadcastCommand extends AbstractInputProcessedCommand implements ICommand
+{
+    /**
+     * @inheritDoc
+     */
+    public function getJavaScriptModuleName()
+    {
+        return 'Bastelstu.be/Chat/Command/Broadcast';
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function isAvailable(Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(WCF::getUser());
-		return $user->getPermission('mod.chat.canBroadcast');
-	}
+    /**
+     * @inheritDoc
+     */
+    public function isAvailable(Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function validate($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+        return $user->getPermission('mod.chat.canBroadcast');
+    }
 
-		if (!$user->getPermission('mod.chat.canBroadcast')) throw new PermissionDeniedException();
+    /**
+     * @inheritDoc
+     */
+    public function validate($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$this->setText($this->assertParameter($parameters, 'text'));
-		$this->validateText();
-	}
+        if (!$user->getPermission('mod.chat.canBroadcast')) {
+            throw new PermissionDeniedException();
+        }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function execute($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+        $this->setText($this->assertParameter($parameters, 'text'));
+        $this->validateText();
+    }
 
-		$objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.broadcast');
-		$this->setText($this->assertParameter($parameters, 'text'));
+    /**
+     * @inheritDoc
+     */
+    public function execute($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		WCF::getDB()->beginTransaction();
-		$message = (new MessageAction([ ], 'create', [ 'data' => [ 'roomID'       => $room->roomID
-		                                                         , 'userID'       => $user->userID
-		                                                         , 'username'     => $user->username
-		                                                         , 'time'         => TIME_NOW
-		                                                         , 'objectTypeID' => $objectTypeID
-		                                                         , 'payload'      => serialize([ 'message' => $this->processor->getHtml() ])
-		                                                         ]
-		                                             , 'updateTimestamp' => true
-		                                             ]
-		                             )
-		           )->executeAction()['returnValues'];
+        $objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.broadcast');
+        $this->setText($this->assertParameter($parameters, 'text'));
 
-		$this->processor->setObjectID($message->messageID);
-		if (\wcf\system\message\embedded\object\MessageEmbeddedObjectManager::getInstance()->registerObjects($this->processor)) {
-			(new MessageEditor($message))->update([
-				'hasEmbeddedObjects' => 1
-			]);
-		}
-		WCF::getDB()->commitTransaction();
-	}
+        WCF::getDB()->beginTransaction();
+        $message = (new MessageAction(
+            [ ],
+            'create',
+            [
+                'data' => [
+                    'roomID' => $room->roomID,
+                    'userID' => $user->userID,
+                    'username' => $user->username,
+                    'time' => TIME_NOW,
+                    'objectTypeID' => $objectTypeID,
+                    'payload' => \serialize([
+                        'message' => $this->processor->getHtml(),
+                    ]),
+                ],
+                'updateTimestamp' => true,
+            ]
+        )
+                   )->executeAction()['returnValues'];
+
+        $this->processor->setObjectID($message->messageID);
+        if (MessageEmbeddedObjectManager::getInstance()->registerObjects($this->processor)) {
+            (new MessageEditor($message))->update([
+                'hasEmbeddedObjects' => 1,
+            ]);
+        }
+        WCF::getDB()->commitTransaction();
+    }
 }

files/lib/system/command/ColorCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,272 +15,312 @@
 
 namespace chat\system\command;
 
-use \chat\data\message\MessageAction;
-use \chat\data\room\Room;
-use \wcf\data\user\UserProfile;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\exception\UserInputException;
-use \wcf\system\WCF;
-use \wcf\util\StringUtil;
+use chat\data\message\MessageAction;
+use chat\data\room\Room;
+use wcf\data\DatabaseObject;
+use wcf\data\user\UserEditor;
+use wcf\data\user\UserProfile;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\exception\UserInputException;
+use wcf\system\Regex;
+use wcf\system\WCF;
+use wcf\util\StringUtil;
 
 /**
  * The color command allows a user to set a color for their username
  */
-class ColorCommand extends AbstractCommand implements ICommand {
-	/**
-	 * Regular expression matching RGB values in hexadecimal notation
-	 * @var \wcf\system\Regex
-	 */
-	protected $colorRegex = null;
+final class ColorCommand extends AbstractCommand implements ICommand
+{
+    /**
+     * Regular expression matching RGB values in hexadecimal notation
+     * @var \wcf\system\Regex
+     */
+    protected $colorRegex;
 
-	public function __construct(\wcf\data\DatabaseObject $object) {
-		parent::__construct($object);
+    public function __construct(DatabaseObject $object)
+    {
+        parent::__construct($object);
 
-		$this->colorRegex = new \wcf\system\Regex('^#?([a-f0-9]{6})$', \wcf\system\Regex::CASE_INSENSITIVE);
-	}
+        $this->colorRegex = new Regex('^#?([a-f0-9]{6})$', Regex::CASE_INSENSITIVE);
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getJavaScriptModuleName() {
-		return 'Bastelstu.be/Chat/Command/Color';
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getJavaScriptModuleName()
+    {
+        return 'Bastelstu.be/Chat/Command/Color';
+    }
 
-	/**
-	 * Map CSS color names to hexcodes.
-	 * See: https://www.w3.org/TR/css3-color/#svg-color
-	 *
-	 * @var	int[]
-	 */
-	public static $colors = [
-		'aliceblue'		=> 0xF0F8FF,
-		'antiquewhite'		=> 0xFAEBD7,
-		'aqua'			=> 0x00FFFF,
-		'aquamarine'		=> 0x7FFFD4,
-		'azure'			=> 0xF0FFFF,
-		'beige'			=> 0xF5F5DC,
-		'bisque'		=> 0xFFE4C4,
-		'black'			=> 0x000000,
-		'blanchedalmond'	=> 0xFFEBCD,
-		'blue'			=> 0x0000FF,
-		'bluescreenblue'	=> 0x0000AA,
-		'blueviolet'		=> 0x8A2BE2,
-		'brown'			=> 0xA52A2A,
-		'burlywood'		=> 0xDEB887,
-		'cadetblue'		=> 0x5F9EA0,
-		'chartreuse'		=> 0x7FFF00,
-		'chocolate'		=> 0xD2691E,
-		'coral'			=> 0xFF7F50,
-		'cornflowerblue'	=> 0x6495ED,
-		'cornsilk'		=> 0xFFF8DC,
-		'crimson'		=> 0xDC143C,
-		'cyan'			=> 0x00FFFF,
-		'darkblue'		=> 0x00008B,
-		'darkcyan'		=> 0x008B8B,
-		'darkgoldenrod'		=> 0xB8860B,
-		'darkgray'		=> 0xA9A9A9,
-		'darkgrey'		=> 0xA9A9A9,
-		'darkgreen'		=> 0x006400,
-		'darkkhaki'		=> 0xBDB76B,
-		'darkmagenta'		=> 0x8B008B,
-		'darkolivegreen'	=> 0x556B2F,
-		'darkorange'		=> 0xFF8C00,
-		'darkorchid'		=> 0x9932CC,
-		'darkred'		=> 0x8B0000,
-		'darksalmon'		=> 0xE9967A,
-		'darkseagreen'		=> 0x8FBC8F,
-		'darkslateblue'		=> 0x483D8B,
-		'darkslategray'		=> 0x2F4F4F,
-		'darkslategrey'		=> 0x2F4F4F,
-		'darkturquoise'		=> 0x00CED1,
-		'darkviolet'		=> 0x9400D3,
-		'deeppink'		=> 0xFF1493,
-		'deepskyblue'		=> 0x00BFFF,
-		'dimgray'		=> 0x696969,
-		'dimgrey'		=> 0x696969,
-		'dodgerblue'		=> 0x1E90FF,
-		'firebrick'		=> 0xB22222,
-		'floralwhite'		=> 0xFFFAF0,
-		'forestgreen'		=> 0x228B22,
-		'fuchsia'		=> 0xFF00FF,
-		'gainsboro'		=> 0xDCDCDC,
-		'ghostwhite'		=> 0xF8F8FF,
-		'gold'			=> 0xFFD700,
-		'goldenrod'		=> 0xDAA520,
-		'gray'			=> 0x808080,
-		'grey'			=> 0x808080,
-		'green'			=> 0x008000,
-		'greenyellow'		=> 0xADFF2F,
-		'honeydew'		=> 0xF0FFF0,
-		'hotpink'		=> 0xFF69B4,
-		'indianred'		=> 0xCD5C5C,
-		'indigo'		=> 0x4B0082,
-		'ivory'			=> 0xFFFFF0,
-		'khaki'			=> 0xF0E68C,
-		'lavender'		=> 0xE6E6FA,
-		'lavenderblush'		=> 0xFFF0F5,
-		'lawngreen'		=> 0x7CFC00,
-		'lemonchiffon'		=> 0xFFFACD,
-		'lightblue'		=> 0xADD8E6,
-		'lightcoral'		=> 0xF08080,
-		'lightcyan'		=> 0xE0FFFF,
-		'lightgoldenrodyellow'	=> 0xFAFAD2,
-		'lightgray'		=> 0xD3D3D3,
-		'lightgrey'		=> 0xD3D3D3,
-		'lightgreen'		=> 0x90EE90,
-		'lightpink'		=> 0xFFB6C1,
-		'lightsalmon'		=> 0xFFA07A,
-		'lightseagreen'		=> 0x20B2AA,
-		'lightskyblue'		=> 0x87CEFA,
-		'lightslategray'	=> 0x778899,
-		'lightslategrey'	=> 0x778899,
-		'lightsteelblue'	=> 0xB0C4DE,
-		'lightyellow'		=> 0xFFFFE0,
-		'lime'			=> 0x00FF00,
-		'limegreen'		=> 0x32CD32,
-		'linen'			=> 0xFAF0E6,
-		'magenta'		=> 0xFF00FF,
-		'maroon'		=> 0x800000,
-		'mediumaquamarine'	=> 0x66CDAA,
-		'mediumblue'		=> 0x0000CD,
-		'mediumorchid'		=> 0xBA55D3,
-		'mediumpurple'		=> 0x9370D8,
-		'mediumseagreen'	=> 0x3CB371,
-		'mediumslateblue'	=> 0x7B68EE,
-		'mediumspringgreen'	=> 0x00FA9A,
-		'mediumturquoise'	=> 0x48D1CC,
-		'mediumvioletred'	=> 0xC71585,
-		'midnightblue'		=> 0x191970,
-		'mintcream'		=> 0xF5FFFA,
-		'mistyrose'		=> 0xFFE4E1,
-		'moccasin'		=> 0xFFE4B5,
-		'navajowhite'		=> 0xFFDEAD,
-		'navy'			=> 0x000080,
-		'oldlace'		=> 0xFDF5E6,
-		'olive'			=> 0x808000,
-		'olivedrab'		=> 0x6B8E23,
-		'orange'		=> 0xFFA500,
-		'orangered'		=> 0xFF4500,
-		'orchid'		=> 0xDA70D6,
-		'oxford'		=> 0xF02D,  // looks like green
-		'palegoldenrod'		=> 0xEEE8AA,
-		'palegreen'		=> 0x98FB98,
-		'paleturquoise'		=> 0xAFEEEE,
-		'palevioletred'		=> 0xD87093,
-		'papayawhip'		=> 0xFFEFD5,
-		'peachpuff'		=> 0xFFDAB9,
-		'peru'			=> 0xCD853F,
-		'pink'			=> 0xFFC0CB,
-		'plum'			=> 0xDDA0DD,
-		'powderblue'		=> 0xB0E0E6,
-		'purple'		=> 0x800080,
-		'red'			=> 0xFF0000,
-		'rosybrown'		=> 0xBC8F8F,
-		'royalblue'		=> 0x4169E1,
-		'saddlebrown'		=> 0x8B4513,
-		'sadwin'		=> 0x2067B2,
-		'salmon'		=> 0xFA8072,
-		'sandybrown'		=> 0xF4A460,
-		'seagreen'		=> 0x2E8B57,
-		'seashell'		=> 0xFFF5EE,
-		'sienna'		=> 0xA0522D,
-		'silver'		=> 0xC0C0C0,
-		'skyblue'		=> 0x87CEEB,
-		'slateblue'		=> 0x6A5ACD,
-		'slategray'		=> 0x708090,
-		'slategrey'		=> 0x708090,
-		'snow'			=> 0xFFFAFA,
-		'springgreen'		=> 0x00FF7F,
-		'steelblue'		=> 0x4682B4,
-		'tan'			=> 0xD2B48C,
-		'teal'			=> 0x008080,
-		'thistle'		=> 0xD8BFD8,
-		'tomato'		=> 0xFF6347,
-		'turquoise'		=> 0x40E0D0,
-		'violet'		=> 0xEE82EE,
-		'wheat'			=> 0xF5DEB3,
-		'white'			=> 0xFFFFFF,
-		'whitesmoke'		=> 0xF5F5F5,
-		'yellow'		=> 0xFFFF00,
-		'yellowgreen'		=> 0x9ACD32
-	];
+    /**
+     * Map CSS color names to hexcodes.
+     * See: https://www.w3.org/TR/css3-color/#svg-color
+     *
+     * @var int[]
+     */
+    public static $colors = [
+        'aliceblue' => 0xF0F8FF,
+        'antiquewhite' => 0xFAEBD7,
+        'aqua' => 0x00FFFF,
+        'aquamarine' => 0x7FFFD4,
+        'azure' => 0xF0FFFF,
+        'beige' => 0xF5F5DC,
+        'bisque' => 0xFFE4C4,
+        'black' => 0x000000,
+        'blanchedalmond' => 0xFFEBCD,
+        'blue' => 0x0000FF,
+        'bluescreenblue' => 0x0000AA,
+        'blueviolet' => 0x8A2BE2,
+        'brown' => 0xA52A2A,
+        'burlywood' => 0xDEB887,
+        'cadetblue' => 0x5F9EA0,
+        'chartreuse' => 0x7FFF00,
+        'chocolate' => 0xD2691E,
+        'coral' => 0xFF7F50,
+        'cornflowerblue' => 0x6495ED,
+        'cornsilk' => 0xFFF8DC,
+        'crimson' => 0xDC143C,
+        'cyan' => 0x00FFFF,
+        'darkblue' => 0x00008B,
+        'darkcyan' => 0x008B8B,
+        'darkgoldenrod' => 0xB8860B,
+        'darkgray' => 0xA9A9A9,
+        'darkgrey' => 0xA9A9A9,
+        'darkgreen' => 0x006400,
+        'darkkhaki' => 0xBDB76B,
+        'darkmagenta' => 0x8B008B,
+        'darkolivegreen' => 0x556B2F,
+        'darkorange' => 0xFF8C00,
+        'darkorchid' => 0x9932CC,
+        'darkred' => 0x8B0000,
+        'darksalmon' => 0xE9967A,
+        'darkseagreen' => 0x8FBC8F,
+        'darkslateblue' => 0x483D8B,
+        'darkslategray' => 0x2F4F4F,
+        'darkslategrey' => 0x2F4F4F,
+        'darkturquoise' => 0x00CED1,
+        'darkviolet' => 0x9400D3,
+        'deeppink' => 0xFF1493,
+        'deepskyblue' => 0x00BFFF,
+        'dimgray' => 0x696969,
+        'dimgrey' => 0x696969,
+        'dodgerblue' => 0x1E90FF,
+        'firebrick' => 0xB22222,
+        'floralwhite' => 0xFFFAF0,
+        'forestgreen' => 0x228B22,
+        'fuchsia' => 0xFF00FF,
+        'gainsboro' => 0xDCDCDC,
+        'ghostwhite' => 0xF8F8FF,
+        'gold' => 0xFFD700,
+        'goldenrod' => 0xDAA520,
+        'gray' => 0x808080,
+        'grey' => 0x808080,
+        'green' => 0x008000,
+        'greenyellow' => 0xADFF2F,
+        'honeydew' => 0xF0FFF0,
+        'hotpink' => 0xFF69B4,
+        'indianred' => 0xCD5C5C,
+        'indigo' => 0x4B0082,
+        'ivory' => 0xFFFFF0,
+        'khaki' => 0xF0E68C,
+        'lavender' => 0xE6E6FA,
+        'lavenderblush' => 0xFFF0F5,
+        'lawngreen' => 0x7CFC00,
+        'lemonchiffon' => 0xFFFACD,
+        'lightblue' => 0xADD8E6,
+        'lightcoral' => 0xF08080,
+        'lightcyan' => 0xE0FFFF,
+        'lightgoldenrodyellow' => 0xFAFAD2,
+        'lightgray' => 0xD3D3D3,
+        'lightgrey' => 0xD3D3D3,
+        'lightgreen' => 0x90EE90,
+        'lightpink' => 0xFFB6C1,
+        'lightsalmon' => 0xFFA07A,
+        'lightseagreen' => 0x20B2AA,
+        'lightskyblue' => 0x87CEFA,
+        'lightslategray' => 0x778899,
+        'lightslategrey' => 0x778899,
+        'lightsteelblue' => 0xB0C4DE,
+        'lightyellow' => 0xFFFFE0,
+        'lime' => 0x00FF00,
+        'limegreen' => 0x32CD32,
+        'linen' => 0xFAF0E6,
+        'magenta' => 0xFF00FF,
+        'maroon' => 0x800000,
+        'mediumaquamarine' => 0x66CDAA,
+        'mediumblue' => 0x0000CD,
+        'mediumorchid' => 0xBA55D3,
+        'mediumpurple' => 0x9370D8,
+        'mediumseagreen' => 0x3CB371,
+        'mediumslateblue' => 0x7B68EE,
+        'mediumspringgreen' => 0x00FA9A,
+        'mediumturquoise' => 0x48D1CC,
+        'mediumvioletred' => 0xC71585,
+        'midnightblue' => 0x191970,
+        'mintcream' => 0xF5FFFA,
+        'mistyrose' => 0xFFE4E1,
+        'moccasin' => 0xFFE4B5,
+        'navajowhite' => 0xFFDEAD,
+        'navy' => 0x000080,
+        'oldlace' => 0xFDF5E6,
+        'olive' => 0x808000,
+        'olivedrab' => 0x6B8E23,
+        'orange' => 0xFFA500,
+        'orangered' => 0xFF4500,
+        'orchid' => 0xDA70D6,
+        'oxford' => 0xF02D,  // looks like green
+        'palegoldenrod' => 0xEEE8AA,
+        'palegreen' => 0x98FB98,
+        'paleturquoise' => 0xAFEEEE,
+        'palevioletred' => 0xD87093,
+        'papayawhip' => 0xFFEFD5,
+        'peachpuff' => 0xFFDAB9,
+        'peru' => 0xCD853F,
+        'pink' => 0xFFC0CB,
+        'plum' => 0xDDA0DD,
+        'powderblue' => 0xB0E0E6,
+        'purple' => 0x800080,
+        'red' => 0xFF0000,
+        'rosybrown' => 0xBC8F8F,
+        'royalblue' => 0x4169E1,
+        'saddlebrown' => 0x8B4513,
+        'sadwin' => 0x2067B2,
+        'salmon' => 0xFA8072,
+        'sandybrown' => 0xF4A460,
+        'seagreen' => 0x2E8B57,
+        'seashell' => 0xFFF5EE,
+        'sienna' => 0xA0522D,
+        'silver' => 0xC0C0C0,
+        'skyblue' => 0x87CEEB,
+        'slateblue' => 0x6A5ACD,
+        'slategray' => 0x708090,
+        'slategrey' => 0x708090,
+        'snow' => 0xFFFAFA,
+        'springgreen' => 0x00FF7F,
+        'steelblue' => 0x4682B4,
+        'tan' => 0xD2B48C,
+        'teal' => 0x008080,
+        'thistle' => 0xD8BFD8,
+        'tomato' => 0xFF6347,
+        'turquoise' => 0x40E0D0,
+        'violet' => 0xEE82EE,
+        'wheat' => 0xF5DEB3,
+        'white' => 0xFFFFFF,
+        'whitesmoke' => 0xF5F5F5,
+        'yellow' => 0xFFFF00,
+        'yellowgreen' => 0x9ACD32,
+    ];
 
-	/**
-	 * @inheritDoc
-	 */
-	public function validate($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function validate($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		if (!$user->getPermission('user.chat.canSetColor')) throw new PermissionDeniedException();
+        if (!$user->getPermission('user.chat.canSetColor')) {
+            throw new PermissionDeniedException();
+        }
 
-		foreach ($parameters as $parameter) {
-			$value = StringUtil::trim($this->assertParameter($parameter, 'value'));
-			$valid = true;
+        foreach ($parameters as $parameter) {
+            $value = StringUtil::trim($this->assertParameter($parameter, 'value'));
+            $valid = true;
 
-			switch ($this->assertParameter($parameter, 'type')) {
-				case 'hex':
-					if (!$this->colorRegex->match($value)) {
-						throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('chat.error.invalidColor', [ 'color' => $value ]));
-					}
-					break;
-				case 'word':
-					if (!isset(self::$colors[$value])) {
-						throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('chat.error.invalidColor', [ 'color' => $value ]));
-					}
-					break;
+            switch ($this->assertParameter($parameter, 'type')) {
+                case 'hex':
+                    if (!$this->colorRegex->match($value)) {
+                        throw new UserInputException(
+                            'message',
+                            WCF::getLanguage()->getDynamicVariable(
+                                'chat.error.invalidColor',
+                                [
+                                    'color' => $value,
+                                ]
+                            )
+                        );
+                    }
+                    break;
+                case 'word':
+                    if (!isset(self::$colors[$value])) {
+                        throw new UserInputException(
+                            'message',
+                            WCF::getLanguage()->getDynamicVariable(
+                                'chat.error.invalidColor',
+                                [
+                                    'color' => $value,
+                                ]
+                            )
+                        );
+                    }
+                    break;
 
-				default:
-					throw new UserInputException('message');
-			}
-		}
-	}
+                default:
+                    throw new UserInputException('message');
+            }
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function execute($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function execute($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.color');
-		$colors = [ ];
+        $objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.color');
+        $colors = [ ];
 
-		if (!isset($parameters[1])) $parameters[1] = $parameters[0];
+        if (!isset($parameters[1])) {
+            $parameters[1] = $parameters[0];
+        }
 
-		foreach ($parameters as $key => $parameter) {
-			$value = StringUtil::trim($this->assertParameter($parameter, 'value'));
+        foreach ($parameters as $key => $parameter) {
+            $value = StringUtil::trim($this->assertParameter($parameter, 'value'));
 
-			switch ($this->assertParameter($parameter, 'type')) {
-				case 'hex':
-					$colors[$key] = hexdec($value);
-					break;
-				case 'word':
-					if (!isset(self::$colors[$value])) throw new UserInputException('message');
-					$colors[$key] = self::$colors[$value];
-					break;
-				default:
-					throw new UserInputException('message');
-			}
-		}
+            switch ($this->assertParameter($parameter, 'type')) {
+                case 'hex':
+                    $colors[$key] = \hexdec($value);
+                    break;
+                case 'word':
+                    if (!isset(self::$colors[$value])) {
+                        throw new UserInputException('message');
+                    }
+                    $colors[$key] = self::$colors[$value];
+                    break;
+                default:
+                    throw new UserInputException('message');
+            }
+        }
 
-		WCF::getDB()->beginTransaction();
-		$editor = new \wcf\data\user\UserEditor($user->getDecoratedObject());
-		$editor->update([ 'chatColor1' => $colors[0]
-		                , 'chatColor2' => $colors[1]
-		                ]);
+        WCF::getDB()->beginTransaction();
+        $editor = new UserEditor($user->getDecoratedObject());
+        $editor->update([
+            'chatColor1' => $colors[0],
+            'chatColor2' => $colors[1],
+        ]);
 
-		(new MessageAction([ ], 'create', [ 'data' => [ 'roomID'       => $room->roomID
-		                                              , 'userID'       => $user->userID
-		                                              , 'username'     => $user->username
-		                                              , 'time'         => TIME_NOW
-		                                              , 'objectTypeID' => $objectTypeID
-		                                              , 'payload'      => serialize([ 'color1' => $colors[0]
-		                                                                            , 'color2' => $colors[1]
-		                                                                            ])
-		                                              ]
-		                                  , 'updateTimestamp' => true
-		                                  ]
-		                  )
-		)->executeAction();
-		WCF::getDB()->commitTransaction();
-	}
+        (new MessageAction(
+            [ ],
+            'create',
+            [
+                'data' => [
+                    'roomID' => $room->roomID,
+                    'userID' => $user->userID,
+                    'username' => $user->username,
+                    'time' => TIME_NOW,
+                    'objectTypeID' => $objectTypeID,
+                    'payload' => \serialize([
+                        'color1' => $colors[0],
+                        'color2' => $colors[1],
+                    ]),
+                ],
+                'updateTimestamp' => true,
+            ]
+        ))->executeAction();
+        WCF::getDB()->commitTransaction();
+    }
 }

files/lib/system/command/ICommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,63 +15,64 @@
 
 namespace chat\system\command;
 
-use \chat\data\room\Room;
-use \wcf\data\user\UserProfile;
+use chat\data\room\Room;
+use wcf\data\user\UserProfile;
 
 /**
  * Interface for Command processors.
  */
-interface ICommand {
-	/**
-	 * Returns whether the command can be used even when
-	 * no trigger is configured for it.
-	 *
-	 * @return boolean
-	 */
-	public function allowWithoutTrigger();
+interface ICommand
+{
+    /**
+     * Returns whether the command can be used even when
+     * no trigger is configured for it.
+     *
+     * @return boolean
+     */
+    public function allowWithoutTrigger();
 
-	/**
-	 * Returns the name of the JavaScript module.
-	 *
-	 * @return string
-	 */
-	public function getJavaScriptModuleName();
+    /**
+     * Returns the name of the JavaScript module.
+     *
+     * @return string
+     */
+    public function getJavaScriptModuleName();
 
-	/**
-	 * Returns whether this command theoretically is available
-	 * in the given room, for the given user.
-	 * If no user is given the active user should be assumed.
-	 *
-	 * The return value sets a flag for the JavaScript to
-	 * consume. You still need to validate() this as well!
-	 *
-	 * @param	Room              $room
-	 * @param	UserProfile       $user
-	 * @return	boolean
-	 */
-	public function isAvailable(Room $room, UserProfile $user = null);
+    /**
+     * Returns whether this command theoretically is available
+     * in the given room, for the given user.
+     * If no user is given the active user should be assumed.
+     *
+     * The return value sets a flag for the JavaScript to
+     * consume. You still need to validate() this as well!
+     *
+     * @param   Room              $room
+     * @param   UserProfile       $user
+     * @return  boolean
+     */
+    public function isAvailable(Room $room, ?UserProfile $user = null);
 
-	/**
-	 * Validates the execution of the command with the given parameters
-	 * in the given room for the given user.
-	 * If no user is given the active user should be assumed.
-	 * This method must throw if the command may not be executed in this form.
-	 *
-	 * @param	mixed             $parameters
-	 * @param	Room              $room
-	 * @param	UserProfile       $user
-	 */
-	public function validate($parameters, Room $room, UserProfile $user = null);
+    /**
+     * Validates the execution of the command with the given parameters
+     * in the given room for the given user.
+     * If no user is given the active user should be assumed.
+     * This method must throw if the command may not be executed in this form.
+     *
+     * @param   mixed             $parameters
+     * @param   Room              $room
+     * @param   UserProfile       $user
+     */
+    public function validate($parameters, Room $room, ?UserProfile $user = null);
 
-	/**
-	 * Executes the command with the given parameters in the given room in
-	 * the context of the given user.
-	 * If no user is given the active user should be assumed.
-	 * This method must throw if the command may not be executed in this form.
-	 *
-	 * @param	mixed             $parameters
-	 * @param	Room              $room
-	 * @param	UserProfile       $user
-	 */
-	public function execute($parameters, Room $room, UserProfile $user = null);
+    /**
+     * Executes the command with the given parameters in the given room in
+     * the context of the given user.
+     * If no user is given the active user should be assumed.
+     * This method must throw if the command may not be executed in this form.
+     *
+     * @param   mixed             $parameters
+     * @param   Room              $room
+     * @param   UserProfile       $user
+     */
+    public function execute($parameters, Room $room, ?UserProfile $user = null);
 }

files/lib/system/command/InfoCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,75 +15,91 @@
 
 namespace chat\system\command;
 
-use \chat\data\message\MessageAction;
-use \chat\data\room\Room;
-use \chat\data\room\RoomCache;
-use \wcf\data\user\User;
-use \wcf\data\user\UserProfile;
+use chat\data\message\MessageAction;
+use chat\data\room\Room;
+use chat\data\room\RoomCache;
+use chat\data\user\User as ChatUser;
+use wcf\data\user\User;
+use wcf\data\user\UserProfile;
+use wcf\system\event\EventHandler;
+use wcf\system\WCF;
 
 /**
  * The info command shows information about a single user.
  */
-class InfoCommand extends AbstractCommand implements ICommand {
-	use TNeedsUser;
+final class InfoCommand extends AbstractCommand implements ICommand
+{
+    use TNeedsUser;
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getJavaScriptModuleName() {
-		return 'Bastelstu.be/Chat/Command/Info';
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getJavaScriptModuleName()
+    {
+        return 'Bastelstu.be/Chat/Command/Info';
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function validate($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function validate($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$this->assertUser($this->assertParameter($parameters, 'username'));
-	}
+        $this->assertUser($this->assertParameter($parameters, 'username'));
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function execute($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function execute($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.info');
-		$target = new \chat\data\user\User($this->getUser($this->assertParameter($parameters, 'username')));
-		$rooms = array_values(array_map(function ($assoc) {
-			$room = RoomCache::getInstance()->getRoom($assoc['roomID']);
+        $objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.info');
+        $target = new ChatUser($this->getUser($this->assertParameter($parameters, 'username')));
+        $rooms = \array_values(\array_map(static function ($assoc) {
+            $room = RoomCache::getInstance()->getRoom($assoc['roomID']);
 
-			return [ 'title'    => (string) $room
-			       , 'roomID'   => $assoc['roomID']
-			       , 'lastPush' => $assoc['lastPush']
-			       , 'lastPull' => $assoc['lastPull']
-			       , 'active'   => $assoc['active']
-			       , 'link'     => $room->getLink()
-			       ];
-		}, array_filter($target->getRoomAssociations(), function ($assoc) {
-			return RoomCache::getInstance()->getRoom($assoc['roomID'])->canSee();
-		})));
+            return [
+                'title' => (string)$room,
+                'roomID' => $assoc['roomID'],
+                'lastPush' => $assoc['lastPush'],
+                'lastPull' => $assoc['lastPull'],
+                'active' => $assoc['active'],
+                'link' => $room->getLink(),
+            ];
+        }, \array_filter($target->getRoomAssociations(), static function ($assoc) {
+            return RoomCache::getInstance()->getRoom($assoc['roomID'])->canSee();
+        })));
 
-		$payload = [ 'data' => [ 'rooms'  => $rooms
-		                       , 'away'   => $target->chatAway
-		                       , 'user'   => $target
-		                       ]
-		           , 'caller' => $user
-		           ];
+        $payload = [
+            'data' => [
+                'rooms' => $rooms,
+                'away' => $target->chatAway,
+                'user' => $target,
+            ], 'caller' => $user,
+        ];
 
-		\wcf\system\event\EventHandler::getInstance()->fireAction($this, 'execute', $payload);
+        EventHandler::getInstance()->fireAction($this, 'execute', $payload);
 
-		(new MessageAction([ ], 'create', [ 'data' => [ 'roomID'       => $room->roomID
-		                                              , 'userID'       => $user->userID
-		                                              , 'username'     => $user->username
-		                                              , 'time'         => TIME_NOW
-		                                              , 'objectTypeID' => $objectTypeID
-		                                              , 'payload'      => serialize($payload['data'])
-		                                              ]
-		                                  , 'updateTimestamp' => true
-		                                  ]
-		                  )
-		)->executeAction();
-	}
+        (new MessageAction(
+            [ ],
+            'create',
+            [
+                'data' => [
+                    'roomID' => $room->roomID,
+                    'userID' => $user->userID,
+                    'username' => $user->username,
+                    'time' => TIME_NOW,
+                    'objectTypeID' => $objectTypeID,
+                    'payload' => \serialize($payload['data']),
+                ], 'updateTimestamp' => true,
+            ]
+        ))->executeAction();
+    }
 }

files/lib/system/command/MeCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,71 +15,106 @@
 
 namespace chat\system\command;
 
-use \chat\data\message\MessageAction;
-use \chat\data\room\Room;
-use \wcf\data\user\UserProfile;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\exception\UserInputException;
-use \wcf\system\message\censorship\Censorship;
-use \wcf\system\WCF;
+use chat\data\message\MessageAction;
+use chat\data\room\Room;
+use wcf\data\user\UserProfile;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\exception\UserInputException;
+use wcf\system\message\censorship\Censorship;
+use wcf\system\WCF;
 
 /**
  * MeCommand represents an action message.
  */
-class MeCommand extends AbstractCommand implements ICommand {
-	/**
-	 * @inheritDoc
-	 */
-	public function getJavaScriptModuleName() {
-		return 'Bastelstu.be/Chat/Command/Me';
-	}
+final class MeCommand extends AbstractCommand implements ICommand
+{
+    /**
+     * @inheritDoc
+     */
+    public function getJavaScriptModuleName()
+    {
+        return 'Bastelstu.be/Chat/Command/Me';
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function validate($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function validate($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		if (!$room->canWritePublicly($user)) throw new PermissionDeniedException();
+        if (!$room->canWritePublicly($user)) {
+            throw new PermissionDeniedException();
+        }
 
-		$text = $this->assertParameter($parameters, 'text');
+        $text = $this->assertParameter($parameters, 'text');
 
-		if (mb_strlen($text) === 0) {
-			throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('wcf.global.form.error.empty'));
-		}
+        if (\mb_strlen($text) === 0) {
+            throw new UserInputException(
+                'message',
+                WCF::getLanguage()->getDynamicVariable('wcf.global.form.error.empty')
+            );
+        }
 
-		// validate message length
-		if (mb_strlen($text) > CHAT_MAX_LENGTH) {
-			throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('wcf.message.error.tooLong', [ 'maxTextLength' => CHAT_MAX_LENGTH ]));
-		}
+        // validate message length
+        if (\mb_strlen($text) > CHAT_MAX_LENGTH) {
+            throw new UserInputException(
+                'message',
+                WCF::getLanguage()->getDynamicVariable(
+                    'wcf.message.error.tooLong',
+                    [
+                        'maxTextLength' => CHAT_MAX_LENGTH,
+                    ]
+                )
+            );
+        }
 
-		// search for censored words
-		if (ENABLE_CENSORSHIP) {
-			$result = Censorship::getInstance()->test($text);
-			if ($result) {
-				throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('wcf.message.error.censoredWordsFound', [ 'censoredWords' => $result ]));
-			}
-		}
-	}
+        // search for censored words
+        if (ENABLE_CENSORSHIP) {
+            $result = Censorship::getInstance()->test($text);
+            if ($result) {
+                throw new UserInputException(
+                    'message',
+                    WCF::getLanguage()->getDynamicVariable(
+                        'wcf.message.error.censoredWordsFound',
+                        [
+                            'censoredWords' => $result,
+                        ]
+                    )
+                );
+            }
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function execute($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function execute($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.me');
-		(new MessageAction([ ], 'create', [ 'data' => [ 'roomID'       => $room->roomID
-		                                              , 'userID'       => $user->userID
-		                                              , 'username'     => $user->username
-		                                              , 'time'         => TIME_NOW
-		                                              , 'objectTypeID' => $objectTypeID
-		                                              , 'payload'      => serialize([ 'message' => $this->assertParameter($parameters, 'text') ])
-		                                              ]
-		                                  , 'updateTimestamp' => true
-		                                  , 'grantPoints' => true
-		                                  ]
-		                  )
-		)->executeAction();
-	}
+        $objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.me');
+        (new MessageAction(
+            [ ],
+            'create',
+            [
+                'data' => [
+                    'roomID' => $room->roomID,
+                    'userID' => $user->userID,
+                    'username' => $user->username,
+                    'time' => TIME_NOW,
+                    'objectTypeID' => $objectTypeID,
+                    'payload' => \serialize([
+                        'message' => $this->assertParameter($parameters, 'text'),
+                    ]),
+                ],
+                'updateTimestamp' => true,
+                'grantPoints' => true,
+            ]
+        ))->executeAction();
+    }
 }

files/lib/system/command/MuteCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,50 +15,58 @@
 
 namespace chat\system\command;
 
-use \chat\data\room\Room;
-use \chat\data\suspension\SuspensionAction;
-use \chat\system\permission\PermissionHandler;
-use \wcf\data\object\type\ObjectTypeCache;
-use \wcf\data\user\UserProfile;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\WCF;
+use chat\data\room\Room;
+use chat\system\permission\PermissionHandler;
+use wcf\data\user\UserProfile;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\WCF;
 
 /**
  * The mute command creates a new be.bastelstu.chat.suspension.mute suspension.
  */
-class MuteCommand extends AbstractSuspensionCommand implements ICommand {
-	/**
-	 * @inheritDoc
-	 */
-	public function getJavaScriptModuleName() {
-		return 'Bastelstu.be/Chat/Command/Mute';
-	}
+final class MuteCommand extends AbstractSuspensionCommand implements ICommand
+{
+    /**
+     * @inheritDoc
+     */
+    public function getJavaScriptModuleName()
+    {
+        return 'Bastelstu.be/Chat/Command/Mute';
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function isAvailable(Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(WCF::getUser());
-		return $user->getPermission('mod.chat.canMute') || PermissionHandler::get($user)->getPermission($room, 'mod.canMute');
-	}
+    /**
+     * @inheritDoc
+     */
+    public function isAvailable(Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getObjectTypeName() {
-		return 'be.bastelstu.chat.suspension.mute';
-	}
+        return $user->getPermission('mod.chat.canMute') || PermissionHandler::get($user)->getPermission($room, 'mod.canMute');
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	protected function checkPermissions($parameters, Room $room, UserProfile $user) {
-		$permission = $user->getPermission('mod.chat.canMute');
+    /**
+     * @inheritDoc
+     */
+    public function getObjectTypeName()
+    {
+        return 'be.bastelstu.chat.suspension.mute';
+    }
 
-		if (!$this->isGlobally($parameters)) {
-			$permission = $permission || PermissionHandler::get($user)->getPermission($room, 'mod.canMute');
-		}
+    /**
+     * @inheritDoc
+     */
+    protected function checkPermissions($parameters, Room $room, UserProfile $user)
+    {
+        $permission = $user->getPermission('mod.chat.canMute');
 
-		if (!$permission) throw new PermissionDeniedException();
-	}
+        if (!$this->isGlobally($parameters)) {
+            $permission = $permission || PermissionHandler::get($user)->getPermission($room, 'mod.canMute');
+        }
+
+        if (!$permission) {
+            throw new PermissionDeniedException();
+        }
+    }
 }

files/lib/system/command/PlainCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,68 +15,90 @@
 
 namespace chat\system\command;
 
-use \chat\data\message\MessageAction;
-use \chat\data\message\MessageEditor;
-use \chat\data\room\Room;
-use \wcf\data\user\UserProfile;
-use \wcf\system\exception\PermissionDeniedException;
+use chat\data\message\MessageAction;
+use chat\data\message\MessageEditor;
+use chat\data\room\Room;
+use wcf\data\user\UserProfile;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\message\embedded\object\MessageEmbeddedObjectManager;
+use wcf\system\WCF;
 
 /**
  * The plain command creates a normal chat message
  */
-class PlainCommand extends AbstractInputProcessedCommand implements ICommand {
-	/**
-	 * @inheritDoc
-	 */
-	public function allowWithoutTrigger() {
-		return true;
-	}
+final class PlainCommand extends AbstractInputProcessedCommand implements ICommand
+{
+    /**
+     * @inheritDoc
+     */
+    public function allowWithoutTrigger()
+    {
+        return true;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getJavaScriptModuleName() {
-		return 'Bastelstu.be/Chat/Command/Plain';
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getJavaScriptModuleName()
+    {
+        return 'Bastelstu.be/Chat/Command/Plain';
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function validate($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function validate($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		if (!$room->canWritePublicly($user)) throw new PermissionDeniedException();
+        if (!$room->canWritePublicly($user)) {
+            throw new PermissionDeniedException();
+        }
 
-		$this->setText($this->assertParameter($parameters, 'text'));
-		$this->validateText();
-	}
+        $this->setText($this->assertParameter($parameters, 'text'));
+        $this->validateText();
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function execute($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function execute($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.plain');
-		$this->setText($this->assertParameter($parameters, 'text'));
-		$message = (new MessageAction([ ], 'create', [ 'data' => [ 'roomID'       => $room->roomID
-		                                                         , 'userID'       => $user->userID
-		                                                         , 'username'     => $user->username
-		                                                         , 'time'         => TIME_NOW
-		                                                         , 'objectTypeID' => $objectTypeID
-		                                                         , 'payload'      => serialize([ 'message' => $this->processor->getHtml() ])
-		                                                         ]
-		                                             , 'updateTimestamp' => true
-		                                             , 'grantPoints' => true
-		                                             ]
-		                             )
-		           )->executeAction()['returnValues'];
+        $objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.plain');
+        $this->setText($this->assertParameter($parameters, 'text'));
 
-		$this->processor->setObjectID($message->messageID);
-		if (\wcf\system\message\embedded\object\MessageEmbeddedObjectManager::getInstance()->registerObjects($this->processor)) {
-			(new MessageEditor($message))->update([
-				'hasEmbeddedObjects' => 1
-			]);
-		}
-	}
+        WCF::getDB()->beginTransaction();
+        $message = (new MessageAction(
+            [ ],
+            'create',
+            [
+                'data' => [
+                    'roomID' => $room->roomID,
+                    'userID' => $user->userID,
+                    'username' => $user->username,
+                    'time' => TIME_NOW,
+                    'objectTypeID' => $objectTypeID,
+                    'payload' => \serialize([
+                        'message' => $this->processor->getHtml(),
+                    ]),
+                ],
+                'updateTimestamp' => true,
+                'grantPoints' => true,
+            ]
+        ))->executeAction()['returnValues'];
+
+        $this->processor->setObjectID($message->messageID);
+        if (MessageEmbeddedObjectManager::getInstance()->registerObjects($this->processor)) {
+            (new MessageEditor($message))->update([
+                'hasEmbeddedObjects' => 1,
+            ]);
+        }
+        WCF::getDB()->commitTransaction();
+    }
 }

files/lib/system/command/TNeedsUser.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,40 +15,47 @@
 
 namespace chat\system\command;
 
-use \wcf\data\user\User;
-use \wcf\system\exception\UserInputException;
-use \wcf\system\WCF;
+use wcf\data\user\User;
+use wcf\system\exception\UserInputException;
+use wcf\system\WCF;
 
 /**
  * Adds helpful functions for commands that operate on a user.
  */
-trait TNeedsUser {
-	/**
-	 * Returns the user with the given username.
-	 *
-	 * @param   string  $username
-	 * @return  \wcf\data\user\User
-	 */
-	protected function getUser($username) {
-		static $cache = [ ];
-		if (!isset($cache[$username])) {
-			$cache[$username] = User::getUserByUsername($username);
-		}
+trait TNeedsUser
+{
+    /**
+     * Returns the user with the given username.
+     */
+    protected function getUser(string $username): User
+    {
+        static $cache = [ ];
+        if (!isset($cache[$username])) {
+            $cache[$username] = User::getUserByUsername($username);
+        }
 
-		return $cache[$username];
-	}
+        return $cache[$username];
+    }
 
-	/**
-	 * Checks whether the given username is valid and throws otherwise.
-	 *
-	 * @param   string  $username
-	 * @return  \wcf\data\user\User
-	 */
-	protected function assertUser($username) {
-		$user = $this->getUser($username);
+    /**
+     * Checks whether the given username is valid and throws otherwise.
+     */
+    protected function assertUser(string $username): User
+    {
+        $user = $this->getUser($username);
 
-		if (!$user->userID) throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('chat.error.userNotFound', [ 'username' => $username ]));
+        if (!$user->userID) {
+            throw new UserInputException(
+                'message',
+                WCF::getLanguage()->getDynamicVariable(
+                    'chat.error.userNotFound',
+                    [
+                        'username' => $username,
+                    ]
+                )
+            );
+        }
 
-		return $user;
-	}
+        return $user;
+    }
 }

files/lib/system/command/TeamCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,73 +15,92 @@
 
 namespace chat\system\command;
 
-use \chat\data\message\MessageAction;
-use \chat\data\message\MessageEditor;
-use \chat\data\room\Room;
-use \wcf\data\user\UserProfile;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\exception\UserInputException;
-use \wcf\system\WCF;
+use chat\data\message\MessageAction;
+use chat\data\message\MessageEditor;
+use chat\data\room\Room;
+use wcf\data\user\UserProfile;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\message\embedded\object\MessageEmbeddedObjectManager;
+use wcf\system\WCF;
 
 /**
  * TeamCommand sends a broadcast to all team members.
  */
-class TeamCommand extends AbstractInputProcessedCommand implements ICommand {
-	/**
-	 * @inheritDoc
-	 */
-	public function getJavaScriptModuleName() {
-		return 'Bastelstu.be/Chat/Command/Team';
-	}
+final class TeamCommand extends AbstractInputProcessedCommand implements ICommand
+{
+    /**
+     * @inheritDoc
+     */
+    public function getJavaScriptModuleName()
+    {
+        return 'Bastelstu.be/Chat/Command/Team';
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function isAvailable(Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(WCF::getUser());
-		return $user->getPermission('mod.chat.canTeam');
-	}
+    /**
+     * @inheritDoc
+     */
+    public function isAvailable(Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function validate($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+        return $user->getPermission('mod.chat.canTeam');
+    }
 
-		if (!$user->getPermission('mod.chat.canTeam')) throw new PermissionDeniedException();
+    /**
+     * @inheritDoc
+     */
+    public function validate($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$this->setText($this->assertParameter($parameters, 'text'));
-		$this->validateText();
-	}
+        if (!$user->getPermission('mod.chat.canTeam')) {
+            throw new PermissionDeniedException();
+        }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function execute($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+        $this->setText($this->assertParameter($parameters, 'text'));
+        $this->validateText();
+    }
 
-		$objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.team');
-		$this->setText($this->assertParameter($parameters, 'text'));
+    /**
+     * @inheritDoc
+     */
+    public function execute($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		WCF::getDB()->beginTransaction();
-		$message = (new MessageAction([ ], 'create', [ 'data' => [ 'roomID'       => $room->roomID
-		                                                         , 'userID'       => $user->userID
-		                                                         , 'username'     => $user->username
-		                                                         , 'time'         => TIME_NOW
-		                                                         , 'objectTypeID' => $objectTypeID
-		                                                         , 'payload'      => serialize([ 'message' => $this->processor->getHtml() ])
-		                                                         ]
-		                                             , 'updateTimestamp' => true
-		                                             ]
-		                             )
-		           )->executeAction()['returnValues'];
+        $objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.team');
+        $this->setText($this->assertParameter($parameters, 'text'));
 
-		$this->processor->setObjectID($message->messageID);
-		if (\wcf\system\message\embedded\object\MessageEmbeddedObjectManager::getInstance()->registerObjects($this->processor)) {
-			(new MessageEditor($message))->update([
-				'hasEmbeddedObjects' => 1
-			]);
-		}
-		WCF::getDB()->commitTransaction();
-	}
+        WCF::getDB()->beginTransaction();
+        $message = (new MessageAction(
+            [ ],
+            'create',
+            [
+                'data' => [
+                    'roomID' => $room->roomID,
+                    'userID' => $user->userID,
+                    'username' => $user->username,
+                    'time' => TIME_NOW,
+                    'objectTypeID' => $objectTypeID,
+                    'payload' => \serialize([
+                        'message' => $this->processor->getHtml(),
+                    ]),
+                ], 'updateTimestamp' => true,
+            ]
+        ))->executeAction()['returnValues'];
+
+        $this->processor->setObjectID($message->messageID);
+        if (MessageEmbeddedObjectManager::getInstance()->registerObjects($this->processor)) {
+            (new MessageEditor($message))->update([
+                'hasEmbeddedObjects' => 1,
+            ]);
+        }
+        WCF::getDB()->commitTransaction();
+    }
 }

files/lib/system/command/TemproomCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,123 +15,187 @@
 
 namespace chat\system\command;
 
-use \chat\data\message\MessageAction;
-use \chat\data\room\Room;
-use \wcf\data\user\UserProfile;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\exception\UserInputException;
-use \wcf\system\WCF;
+use chat\data\message\MessageAction;
+use chat\data\room\Room;
+use chat\data\room\RoomAction;
+use wcf\data\user\UserProfile;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\exception\UserInputException;
+use wcf\system\WCF;
 
 /**
  * The temproom command allows a user to manage temporary rooms.
  */
-class TemproomCommand extends AbstractCommand implements ICommand {
-	use TNeedsUser;
+final class TemproomCommand extends AbstractCommand implements ICommand
+{
+    use TNeedsUser;
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getJavaScriptModuleName() {
-		return 'Bastelstu.be/Chat/Command/Temproom';
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getJavaScriptModuleName()
+    {
+        return 'Bastelstu.be/Chat/Command/Temproom';
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function validate($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function validate($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		switch ($this->assertParameter($parameters, 'type')) {
-			case 'create':
-				if (!$user->getPermission('user.chat.canTemproom')) throw new PermissionDeniedException();
-			break;
-			case 'invite':
-				if (!$room->isTemporary) throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('chat.error.notInTemproom'));
-				if ($room->ownerID !== $user->userID) throw new PermissionDeniedException();
+        switch ($this->assertParameter($parameters, 'type')) {
+            case 'create':
+                if (!$user->getPermission('user.chat.canTemproom')) {
+                    throw new PermissionDeniedException();
+                }
+                break;
+            case 'invite':
+                if (!$room->isTemporary) {
+                    throw new UserInputException(
+                        'message',
+                        WCF::getLanguage()->getDynamicVariable('chat.error.notInTemproom')
+                    );
+                }
+                if ($room->ownerID !== $user->userID) {
+                    throw new PermissionDeniedException();
+                }
 
-				$recipient = new UserProfile($this->assertUser($this->assertParameter($parameters, 'username')));
-				if ($recipient->isIgnoredUser($user->userID)) throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('chat.error.userIgnoresYou', [ 'user' => $recipient ]));
-			break;
-			case 'delete':
-				if (!$room->isTemporary) throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('chat.error.notInTemproom'));
-				if ($room->ownerID !== $user->userID) throw new PermissionDeniedException();
-			break;
-			default:
-				throw new UserInputException('message');
-		}
-	}
+                $recipient = new UserProfile($this->assertUser($this->assertParameter($parameters, 'username')));
+                if ($recipient->isIgnoredUser($user->userID)) {
+                    throw new UserInputException(
+                        'message',
+                        WCF::getLanguage()->getDynamicVariable(
+                            'chat.error.userIgnoresYou',
+                            [
+                                'user' => $recipient,
+                            ]
+                        )
+                    );
+                }
+                break;
+            case 'delete':
+                if (!$room->isTemporary) {
+                    throw new UserInputException(
+                        'message',
+                        WCF::getLanguage()->getDynamicVariable(
+                            'chat.error.notInTemproom'
+                        )
+                    );
+                }
+                if ($room->ownerID !== $user->userID) {
+                    throw new PermissionDeniedException();
+                }
+                break;
+            default:
+                throw new UserInputException('message');
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function execute($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function execute($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		switch ($this->assertParameter($parameters, 'type')) {
-			case 'create':
-				$fields = [ 'title' => WCF::getLanguage()->getDynamicVariable('chat.room.temporary.blueprint', [ 'user' => $user ])
-				          , 'topic' => ''
-				          , 'position' => 999
-				          , 'isTemporary' => true
-				          , 'ownerID' => $user->userID
-				          ];
+        switch ($this->assertParameter($parameters, 'type')) {
+            case 'create':
+                $fields = [
+                    'title' => WCF::getLanguage()->getDynamicVariable(
+                        'chat.room.temporary.blueprint',
+                        [
+                            'user' => $user,
+                        ]
+                    ),
+                    'topic' => '',
+                    'position' => 999,
+                    'isTemporary' => true,
+                    'ownerID' => $user->userID,
+                ];
 
-				WCF::getDB()->beginTransaction();
-				// create room
-				$tempRoom = (new \chat\data\room\RoomAction([], 'create', [ 'data' => $fields ]))->executeAction()['returnValues'];
-				$objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.temproomCreated');
-				(new MessageAction([ ], 'create', [ 'data' => [ 'roomID'       => $room->roomID
-				                                              , 'userID'       => $user->userID
-				                                              , 'username'     => $user->username
-				                                              , 'time'         => TIME_NOW
-				                                              , 'objectTypeID' => $objectTypeID
-				                                              , 'payload'      => serialize([ 'room' => $tempRoom ])
-				                                              ]
-				                                  , 'updateTimestamp' => true
-				                                  ]
-				                  )
-				)->executeAction();
-				WCF::getDB()->commitTransaction();
-				return;
-			case 'invite':
-				$recipient = $this->getUser($this->assertParameter($parameters, 'username'));
-				WCF::getDB()->beginTransaction();
-				try {
-					$sql = "INSERT INTO chat".WCF_N."_room_temporary_invite
-					               (userID, roomID)
-					        VALUES (?, ?)";
-					$statement = WCF::getDB()->prepareStatement($sql);
-					$statement->execute([ $recipient->userID, $room->roomID ]);
-				}
-				catch (\wcf\system\database\DatabaseException $e) {
-					WCF::getDB()->rollBackTransaction();
-					// Duplicate key errors don't cause harm.
-					if ((string) $e->getCode() !== '23000') throw $e;
-					return;
-				}
+                WCF::getDB()->beginTransaction();
+                // create room
+                $tempRoom = (new RoomAction([], 'create', [
+                    'data' => $fields,
+                ]))->executeAction()['returnValues'];
+                $objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.temproomCreated');
+                (new MessageAction(
+                    [ ],
+                    'create',
+                    [
+                        'data' => [
+                            'roomID' => $room->roomID,
+                            'userID' => $user->userID,
+                            'username' => $user->username,
+                            'time' => TIME_NOW,
+                            'objectTypeID' => $objectTypeID,
+                            'payload' => \serialize([
+                                'room' => $tempRoom,
+                            ]),
+                        ], 'updateTimestamp' => true,
+                    ]
+                ))->executeAction();
+                WCF::getDB()->commitTransaction();
 
-				$objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.temproomInvited');
-				(new MessageAction([ ], 'create', [ 'data' => [ 'roomID'       => $room->roomID
-				                                              , 'userID'       => $user->userID
-				                                              , 'username'     => $user->username
-				                                              , 'time'         => TIME_NOW
-				                                              , 'objectTypeID' => $objectTypeID
-				                                              , 'payload'      => serialize([ 'recipient'     => $recipient->userID
-				                                                                            , 'recipientName' => $recipient->username
-				                                                                            ])
-				                                              ]
-				                                  , 'updateTimestamp' => true
-				                                  ]
-				                  )
-				)->executeAction();
-				WCF::getDB()->commitTransaction();
+                return;
+            case 'invite':
+                $recipient = $this->getUser($this->assertParameter($parameters, 'username'));
+                WCF::getDB()->beginTransaction();
+                try {
+                    $sql = "INSERT INTO chat1_room_temporary_invite
+                                        (userID, roomID)
+                            VALUES      (?, ?)";
+                    $statement = WCF::getDB()->prepare($sql);
+                    $statement->execute([ $recipient->userID, $room->roomID ]);
+                } catch (\wcf\system\database\DatabaseException $e) {
+                    WCF::getDB()->rollBackTransaction();
+                    // Duplicate key errors don't cause harm.
+                    if ((string)$e->getCode() !== '23000') {
+                        throw $e;
+                    }
 
-				return;
-			case 'delete':
-				(new \chat\data\room\RoomAction([ $room ], 'delete'))->executeAction();
-				return;
-			default:
-				throw new UserInputException('message');
-		}
-	}
+                    return;
+                }
+
+                $objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.temproomInvited');
+                (new MessageAction(
+                    [ ],
+                    'create',
+                    [
+                        'data' => [
+                            'roomID' => $room->roomID,
+                            'userID' => $user->userID,
+                            'username' => $user->username,
+                            'time' => TIME_NOW,
+                            'objectTypeID' => $objectTypeID,
+                            'payload' => \serialize([
+                                'recipient' => $recipient->userID,
+                                'recipientName' => $recipient->username,
+                            ]),
+                        ],
+                        'updateTimestamp' => true,
+                    ]
+                ))->executeAction();
+                WCF::getDB()->commitTransaction();
+
+                return;
+            case 'delete':
+                (new RoomAction(
+                    [
+                        $room,
+                    ],
+                    'delete'
+                ))->executeAction();
+
+                return;
+            default:
+                throw new UserInputException('message');
+        }
+    }
 }

files/lib/system/command/UnbanCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,51 +15,59 @@
 
 namespace chat\system\command;
 
-use \chat\data\room\Room;
-use \chat\data\suspension\Suspension;
-use \chat\data\suspension\SuspensionAction;
-use \chat\system\permission\PermissionHandler;
-use \wcf\data\object\type\ObjectTypeCache;
-use \wcf\data\user\UserProfile;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\WCF;
+use chat\data\room\Room;
+use chat\data\suspension\Suspension;
+use chat\system\permission\PermissionHandler;
+use wcf\data\user\UserProfile;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\WCF;
 
 /**
  * The unban command revokes a new be.bastelstu.chat.suspension.ban suspension.
  */
-class UnbanCommand extends AbstractUnsuspensionCommand implements ICommand {
-	/**
-	 * @inheritDoc
-	 */
-	public function getJavaScriptModuleName() {
-		return 'Bastelstu.be/Chat/Command/Unban';
-	}
+final class UnbanCommand extends AbstractUnsuspensionCommand implements ICommand
+{
+    /**
+     * @inheritDoc
+     */
+    public function getJavaScriptModuleName()
+    {
+        return 'Bastelstu.be/Chat/Command/Unban';
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function isAvailable(Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(WCF::getUser());
-		return $user->getPermission('mod.chat.canBan') || PermissionHandler::get($user)->getPermission($room, 'mod.canBan');
-	}
+    /**
+     * @inheritDoc
+     */
+    public function isAvailable(Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getObjectTypeName() {
-		return 'be.bastelstu.chat.suspension.ban';
-	}
+        return $user->getPermission('mod.chat.canBan') || PermissionHandler::get($user)->getPermission($room, 'mod.canBan');
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	protected function checkPermissions($parameters, Room $room, UserProfile $user) {
-		$permission = $user->getPermission('mod.chat.canBan');
+    /**
+     * @inheritDoc
+     */
+    public function getObjectTypeName()
+    {
+        return 'be.bastelstu.chat.suspension.ban';
+    }
 
-		if (!$this->isGlobally($parameters)) {
-			$permission = $permission || PermissionHandler::get($user)->getPermission($room, 'mod.canBan');
-		}
+    /**
+     * @inheritDoc
+     */
+    protected function checkPermissions($parameters, Room $room, UserProfile $user)
+    {
+        $permission = $user->getPermission('mod.chat.canBan');
 
-		if (!$permission) throw new PermissionDeniedException();
-	}
+        if (!$this->isGlobally($parameters)) {
+            $permission = $permission || PermissionHandler::get($user)->getPermission($room, 'mod.canBan');
+        }
+
+        if (!$permission) {
+            throw new PermissionDeniedException();
+        }
+    }
 }

files/lib/system/command/UnmuteCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,50 +15,58 @@
 
 namespace chat\system\command;
 
-use \chat\data\room\Room;
-use \chat\data\suspension\SuspensionAction;
-use \chat\system\permission\PermissionHandler;
-use \wcf\data\object\type\ObjectTypeCache;
-use \wcf\data\user\UserProfile;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\WCF;
+use chat\data\room\Room;
+use chat\system\permission\PermissionHandler;
+use wcf\data\user\UserProfile;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\WCF;
 
 /**
  * The unmute command revokes a new be.bastelstu.chat.suspension.mute suspension.
  */
-class UnmuteCommand extends AbstractUnsuspensionCommand implements ICommand {
-	/**
-	 * @inheritDoc
-	 */
-	public function getJavaScriptModuleName() {
-		return 'Bastelstu.be/Chat/Command/Unmute';
-	}
+final class UnmuteCommand extends AbstractUnsuspensionCommand implements ICommand
+{
+    /**
+     * @inheritDoc
+     */
+    public function getJavaScriptModuleName()
+    {
+        return 'Bastelstu.be/Chat/Command/Unmute';
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function isAvailable(Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(WCF::getUser());
-		return $user->getPermission('mod.chat.canMute') || PermissionHandler::get($user)->getPermission($room, 'mod.canMute');
-	}
+    /**
+     * @inheritDoc
+     */
+    public function isAvailable(Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getObjectTypeName() {
-		return 'be.bastelstu.chat.suspension.mute';
-	}
+        return $user->getPermission('mod.chat.canMute') || PermissionHandler::get($user)->getPermission($room, 'mod.canMute');
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	protected function checkPermissions($parameters, Room $room, UserProfile $user) {
-		$permission = $user->getPermission('mod.chat.canMute');
+    /**
+     * @inheritDoc
+     */
+    public function getObjectTypeName()
+    {
+        return 'be.bastelstu.chat.suspension.mute';
+    }
 
-		if (!$this->isGlobally($parameters)) {
-			$permission = $permission || PermissionHandler::get($user)->getPermission($room, 'mod.canMute');
-		}
+    /**
+     * @inheritDoc
+     */
+    protected function checkPermissions($parameters, Room $room, UserProfile $user)
+    {
+        $permission = $user->getPermission('mod.chat.canMute');
 
-		if (!$permission) throw new PermissionDeniedException();
-	}
+        if (!$this->isGlobally($parameters)) {
+            $permission = $permission || PermissionHandler::get($user)->getPermission($room, 'mod.canMute');
+        }
+
+        if (!$permission) {
+            throw new PermissionDeniedException();
+        }
+    }
 }

files/lib/system/command/WhereCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,61 +15,75 @@
 
 namespace chat\system\command;
 
-use \chat\data\message\MessageAction;
-use \chat\data\room\Room;
-use \wcf\data\user\User;
-use \wcf\data\user\UserProfile;
+use chat\data\message\MessageAction;
+use chat\data\room\Room;
+use chat\data\room\RoomList;
+use chat\data\user\User as ChatUser;
+use wcf\data\user\UserProfile;
+use wcf\system\WCF;
 
 /**
  * The where command shows the distribution of users among
  * the different chat rooms.
  */
-class WhereCommand extends AbstractCommand implements ICommand {
-	/**
-	 * @inheritDoc
-	 */
-	public function getJavaScriptModuleName() {
-		return 'Bastelstu.be/Chat/Command/Where';
-	}
+final class WhereCommand extends AbstractCommand implements ICommand
+{
+    /**
+     * @inheritDoc
+     */
+    public function getJavaScriptModuleName()
+    {
+        return 'Bastelstu.be/Chat/Command/Where';
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function validate($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
-	}
+    /**
+     * @inheritDoc
+     */
+    public function validate($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function execute($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function execute($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.where');
-		$roomList = new \chat\data\room\RoomList();
-		$roomList->readObjects();
-		$rooms = array_map(function (Room $room) {
-			$users = array_map(function (\chat\data\user\User $user) {
-				return $user->jsonSerialize();
-			}, $room->getUsers());
+        $objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.where');
+        $roomList = new RoomList();
+        $roomList->readObjects();
+        $rooms = \array_map(static function (Room $room) {
+            $users = \array_map(static function (ChatUser $user) {
+                return $user->jsonSerialize();
+            }, $room->getUsers());
 
-			return [ 'roomID' => $room->roomID
-			       , 'users' => array_values($users)
-			       ];
-		}, array_filter($roomList->getObjects(), function (Room $room) {
-			return $room->canSee();
-		}));
+            return [
+                'roomID' => $room->roomID,
+                'users' => \array_values($users),
+            ];
+        }, \array_filter($roomList->getObjects(), static function (Room $room) {
+            return $room->canSee();
+        }));
 
-		(new MessageAction([ ], 'create', [ 'data' => [ 'roomID'       => $room->roomID
-		                                              , 'userID'       => $user->userID
-		                                              , 'username'     => $user->username
-		                                              , 'time'         => TIME_NOW
-		                                              , 'objectTypeID' => $objectTypeID
-		                                              , 'payload'      => serialize($rooms)
-		                                              ]
-		                                  , 'updateTimestamp' => true
-		                                  ]
-		                  )
-		)->executeAction();
-	}
+        (new MessageAction(
+            [ ],
+            'create',
+            [
+                'data' => [
+                    'roomID' => $room->roomID,
+                    'userID' => $user->userID,
+                    'username' => $user->username,
+                    'time' => TIME_NOW,
+                    'objectTypeID' => $objectTypeID,
+                    'payload' => \serialize($rooms),
+                ], 'updateTimestamp' => true,
+            ]
+        ))->executeAction();
+    }
 }

files/lib/system/command/WhisperCommand.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,70 +15,96 @@
 
 namespace chat\system\command;
 
-use \chat\data\message\MessageAction;
-use \chat\data\message\MessageEditor;
-use \chat\data\room\Room;
-use \wcf\data\user\User;
-use \wcf\data\user\UserProfile;
-use \wcf\system\exception\UserInputException;
-use \wcf\system\WCF;
+use chat\data\message\MessageAction;
+use chat\data\message\MessageEditor;
+use chat\data\room\Room;
+use wcf\data\user\UserProfile;
+use wcf\system\exception\UserInputException;
+use wcf\system\message\embedded\object\MessageEmbeddedObjectManager;
+use wcf\system\WCF;
 
 /**
  * The whisper command creates a private message
  * between two chat users.
  */
-class WhisperCommand extends AbstractInputProcessedCommand implements ICommand {
-	use TNeedsUser;
+final class WhisperCommand extends AbstractInputProcessedCommand implements ICommand
+{
+    use TNeedsUser;
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getJavaScriptModuleName() {
-		return 'Bastelstu.be/Chat/Command/Whisper';
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getJavaScriptModuleName()
+    {
+        return 'Bastelstu.be/Chat/Command/Whisper';
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function validate($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function validate($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$recipient = new UserProfile($this->assertUser($this->assertParameter($parameters, 'username')));
-		if ($recipient->isIgnoredUser($user->userID)) throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('chat.error.userIgnoresYou', [ 'user' => $recipient ]));
+        $recipient = new UserProfile($this->assertUser($this->assertParameter($parameters, 'username')));
+        if ($recipient->isIgnoredUser($user->userID)) {
+            throw new UserInputException(
+                'message',
+                WCF::getLanguage()->getDynamicVariable(
+                    'chat.error.userIgnoresYou',
+                    [
+                        'user' => $recipient,
+                    ]
+                )
+            );
+        }
 
-		$this->setText($this->assertParameter($parameters, 'text'));
-		$this->validateText();
-	}
+        $this->setText($this->assertParameter($parameters, 'text'));
+        $this->validateText();
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function execute($parameters, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function execute($parameters, Room $room, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.whisper');
-		$recipient = $this->assertUser($this->assertParameter($parameters, 'username'));
-		$this->setText($this->assertParameter($parameters, 'text'));
-		$message = (new MessageAction([ ], 'create', [ 'data' => [ 'roomID'       => $room->roomID
-		                                                         , 'userID'       => $user->userID
-		                                                         , 'username'     => $user->username
-		                                                         , 'time'         => TIME_NOW
-		                                                         , 'objectTypeID' => $objectTypeID
-		                                                         , 'payload'      => serialize([ 'message'       => $this->processor->getHtml()
-		                                                                                       , 'recipient'     => $recipient->userID
-		                                                                                       , 'recipientName' => $recipient->username
-		                                                                                       ])
-		                                                         ]
-		                                             , 'updateTimestamp' => true
-		                                             ]
-		                             )
-		           )->executeAction()['returnValues'];
+        $objectTypeID = $this->getMessageObjectTypeID('be.bastelstu.chat.messageType.whisper');
+        $recipient = $this->assertUser($this->assertParameter($parameters, 'username'));
+        $this->setText($this->assertParameter($parameters, 'text'));
 
-		$this->processor->setObjectID($message->messageID);
-		if (\wcf\system\message\embedded\object\MessageEmbeddedObjectManager::getInstance()->registerObjects($this->processor)) {
-			(new MessageEditor($message))->update([
-				'hasEmbeddedObjects' => 1
-			]);
-		}
-	}
+        WCF::getDB()->beginTransaction();
+        $message = (new MessageAction(
+            [ ],
+            'create',
+            [
+                'data' => [
+                    'roomID' => $room->roomID,
+                    'userID' => $user->userID,
+                    'username' => $user->username,
+                    'time' => TIME_NOW,
+                    'objectTypeID' => $objectTypeID,
+                    'payload' => \serialize([
+                        'message' => $this->processor->getHtml(),
+                        'recipient' => $recipient->userID,
+                        'recipientName' => $recipient->username,
+                    ]),
+                ],
+                'updateTimestamp' => true,
+            ]
+        ))->executeAction()['returnValues'];
+
+        $this->processor->setObjectID($message->messageID);
+        if (MessageEmbeddedObjectManager::getInstance()->registerObjects($this->processor)) {
+            (new MessageEditor($message))->update([
+                'hasEmbeddedObjects' => 1,
+            ]);
+        }
+        WCF::getDB()->commitTransaction();
+    }
 }

files/lib/system/condition/room/RoomFilledCondition.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,33 +15,45 @@
 
 namespace chat\system\condition\room;
 
-use \chat\data\room\RoomList;
-use \wcf\data\DatabaseObject;
-use \wcf\data\DatabaseObjectList;
-use \wcf\system\exception\SystemException;
+use chat\data\room\RoomList;
+use wcf\data\DatabaseObjectList;
+use wcf\system\condition\AbstractCheckboxCondition;
+use wcf\system\condition\IObjectListCondition;
+use wcf\system\exception\ParentClassException;
 
 /**
  * Condition implementation for rooms to only include non-empty rooms in lists.
  */
-class RoomFilledCondition extends \wcf\system\condition\AbstractCheckboxCondition implements \wcf\system\condition\IObjectListCondition {
-	/**
-	 * @inheritDoc
-	 */
-	protected $fieldName = 'chatRoomIsFilled';
+final class RoomFilledCondition extends AbstractCheckboxCondition implements IObjectListCondition
+{
+    /**
+     * @inheritDoc
+     */
+    protected $fieldName = 'chatRoomIsFilled';
 
-	/**
-	 * @inheritDoc
-	 */
-	protected $label = 'chat.room.condition.isFilled';
+    /**
+     * @inheritDoc
+     */
+    protected $label = 'chat.room.condition.isFilled';
 
-	/**
-	 * @inheritDoc
-	 */
-	public function addObjectListCondition(DatabaseObjectList $objectList, array $conditionData) {
-		if (!($objectList instanceof RoomList)) {
-			throw new \wcf\system\exception\ParentClassException(get_class($objectList), RoomList::class);
-		}
+    /**
+     * @inheritDoc
+     */
+    public function addObjectListCondition(DatabaseObjectList $objectList, array $conditionData)
+    {
+        if (!($objectList instanceof RoomList)) {
+            throw new ParentClassException(\get_class($objectList), RoomList::class);
+        }
 
-		$objectList->getConditionBuilder()->add("EXISTS (SELECT 1 FROM chat".WCF_N."_room_to_user r2u WHERE r2u.roomID = room.roomID AND active = ?)", [ 1 ]);
-	}
+        $objectList->getConditionBuilder()->add(
+            "
+            EXISTS (
+                SELECT  1
+                FROM    chat" . WCF_N . "_room_to_user r2u
+                WHERE   r2u.roomID = room.roomID
+                    AND active = ?
+            )",
+            [ 1 ]
+        );
+    }
 }

files/lib/system/event/listener/HourlyCleanUpCronjobExecuteChatCleanUpListener.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,27 +15,35 @@
 
 namespace chat\system\event\listener;
 
-use \wcf\system\WCF;
+use chat\data\message\MessageAction;
+use chat\data\user\UserAction as ChatUserAction;
+use wcf\system\event\listener\IParameterizedEventListener;
+use wcf\system\WCF;
 
 /**
  * Vaporizes unneeded data.
  */
-class HourlyCleanUpCronjobExecuteChatCleanUpListener implements \wcf\system\event\listener\IParameterizedEventListener {
-	/**
-	 * @see	\wcf\system\event\listener\IParameterizedEventListener::execute()
-	 */
-	public function execute($eventObj, $className, $eventName, array &$parameters) {
-		(new \chat\data\message\MessageAction([ ], 'prune'))->executeAction();
-		(new \chat\data\user\UserAction([], 'clearDeadSessions'))->executeAction();
+final class HourlyCleanUpCronjobExecuteChatCleanUpListener implements IParameterizedEventListener
+{
+    /**
+     * @inheritDoc
+     */
+    public function execute($eventObj, $className, $eventName, array &$parameters)
+    {
+        (new MessageAction([ ], 'prune'))->executeAction();
+        (new ChatUserAction([ ], 'clearDeadSessions'))->executeAction();
 
-		$sql = "UPDATE chat".WCF_N."_room_to_user
-		        SET    active = ?
-		        WHERE      (roomID, userID) NOT IN (SELECT roomID, userID FROM chat".WCF_N."_session)
-		               AND active = ?";
-		$statement = WCF::getDB()->prepareStatement($sql);
-		$statement->execute([ 0, 1 ]);
-		if ($statement->getAffectedRows()) {
-			\wcf\functions\exception\logThrowable(new \Exception('Unreachable'));
-		}
-	}
+        $sql = "UPDATE  chat1_room_to_user
+                SET     active = ?
+                WHERE   (roomID, userID) NOT IN (
+                            SELECT  roomID, userID
+                            FROM    chat1_session
+                        )
+                    AND active = ?";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute([ 0, 1 ]);
+        if ($statement->getAffectedRows()) {
+            \wcf\functions\exception\logThrowable(new \Exception('Unreachable'));
+        }
+    }
 }

files/lib/system/event/listener/HourlyCleanUpCronjobExecuteTemproomListener.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,30 +15,38 @@
 
 namespace chat\system\event\listener;
 
-use \wcf\system\WCF;
+use chat\data\room\RoomAction;
+use chat\data\room\RoomList;
+use wcf\system\event\listener\IParameterizedEventListener;
+use wcf\system\WCF;
 
 /**
  * Removes empty temporary rooms.
  */
-class HourlyCleanUpCronjobExecuteTemproomListener implements \wcf\system\event\listener\IParameterizedEventListener {
-	/**
-	 * @see	\wcf\system\event\listener\IParameterizedEventListener::execute()
-	 */
-	public function execute($eventObj, $className, $eventName, array &$parameters) {
-		$roomList = new \chat\data\room\RoomList();
-		$roomList->getConditionBuilder()->add('isTemporary = ?', [ 1 ]);
-		$roomList->readObjects();
+final class HourlyCleanUpCronjobExecuteTemproomListener implements IParameterizedEventListener
+{
+    /**
+     * @inheritDoc
+     */
+    public function execute($eventObj, $className, $eventName, array &$parameters)
+    {
+        $roomList = new RoomList();
+        $roomList->getConditionBuilder()->add('isTemporary = ?', [ 1 ]);
+        $roomList->readObjects();
 
-		$toDelete = [ ];
-		WCF::getDB()->beginTransaction();
-		foreach ($roomList as $room) {
-			if (count($room->getUsers()) === 0) {
-				$toDelete[] = $room;
-			}
-		}
-		if (!empty($toDelete)) {
-			(new \chat\data\room\RoomAction($toDelete, 'delete'))->executeAction();
-		}
-		WCF::getDB()->commitTransaction();
-	}
+        $toDelete = [ ];
+        WCF::getDB()->beginTransaction();
+        foreach ($roomList as $room) {
+            if (\count($room->getUsers()) === 0) {
+                $toDelete[] = $room;
+            }
+        }
+        if ($toDelete !== []) {
+            (new RoomAction(
+                $toDelete,
+                'delete'
+            ))->executeAction();
+        }
+        WCF::getDB()->commitTransaction();
+    }
 }

files/lib/system/event/listener/InfoCommandSuspensionsListener.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,48 +15,52 @@
 
 namespace chat\system\event\listener;
 
-use \chat\data\suspension\Suspension;
-use \wcf\data\object\type\ObjectTypeCache;
-use \wcf\system\WCF;
+use chat\data\room\RoomCache;
+use chat\data\suspension\Suspension;
+use chat\data\suspension\SuspensionList;
+use wcf\system\event\listener\IParameterizedEventListener;
 
 /**
  * Fetches information about the users suspensions
  */
-class InfoCommandSuspensionsListener implements \wcf\system\event\listener\IParameterizedEventListener {
-	/**
-	 * @see	\wcf\system\event\listener\IParameterizedEventListener::execute()
-	 */
-	public function execute($eventObj, $className, $eventName, array &$parameters) {
-		if (!$parameters['caller']->getPermission('admin.chat.canManageSuspensions')) {
-			return;
-		}
+final class InfoCommandSuspensionsListener implements IParameterizedEventListener
+{
+    /**
+     * @inheritDoc
+     */
+    public function execute($eventObj, $className, $eventName, array &$parameters)
+    {
+        if (!$parameters['caller']->getPermission('admin.chat.canManageSuspensions')) {
+            return;
+        }
 
-		$target = $parameters['data']['user'];
+        $target = $parameters['data']['user'];
 
-		$parameters['data']['suspensions'] = [ ];
+        $parameters['data']['suspensions'] = [ ];
 
-		$suspensionList = new \chat\data\suspension\SuspensionList();
-		$suspensionList->getConditionBuilder()->add('(expires IS NULL OR expires > ?)', [ TIME_NOW ]);
-		$suspensionList->getConditionBuilder()->add('revoked IS NULL');
-		$suspensionList->getConditionBuilder()->add('userID = ?', [ $target->userID ]);
-		$suspensionList->sqlOrderBy = 'expires ASC, time ASC';
-		$suspensionList->readObjects();
+        $suspensionList = new SuspensionList();
+        $suspensionList->getConditionBuilder()->add('(expires IS NULL OR expires > ?)', [ TIME_NOW ]);
+        $suspensionList->getConditionBuilder()->add('revoked IS NULL');
+        $suspensionList->getConditionBuilder()->add('userID = ?', [ $target->userID ]);
+        $suspensionList->sqlOrderBy = 'expires ASC, time ASC';
+        $suspensionList->readObjects();
 
-		$suspensions = array_filter($suspensionList->getObjects(), function (Suspension $suspension) {
-			return $suspension->isActive();
-		});
+        $suspensions = \array_filter($suspensionList->getObjects(), static function (Suspension $suspension) {
+            return $suspension->isActive();
+        });
 
-		$parameters['data']['suspensions'] = array_values(array_map(function ($suspension) {
-			$room = \chat\data\room\RoomCache::getInstance()->getRoom($suspension->roomID);
+        $parameters['data']['suspensions'] = \array_values(\array_map(static function ($suspension) {
+            $room = RoomCache::getInstance()->getRoom($suspension->roomID);
 
-			$suspension = $suspension->jsonSerialize();
-			if ($room) {
-				$suspension['room'] = [ 'title' => $room->getTitle()
-				                      , 'link' => $room->getLink()
-				                      ];
-			}
+            $suspension = $suspension->jsonSerialize();
+            if ($room) {
+                $suspension['room'] = [
+                    'title' => $room->getTitle(),
+                    'link' => $room->getLink(),
+                ];
+            }
 
-			return $suspension;
-		}, $suspensions));
-	}
+            return $suspension;
+        }, $suspensions));
+    }
 }

files/lib/system/event/listener/RoomActionGetUsersModeratorListener.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,31 +15,37 @@
 
 namespace chat\system\event\listener;
 
-use \chat\data\command\CommandCache;
-use \wcf\system\cache\runtime\UserProfileRuntimeCache;
+use chat\data\command\CommandCache;
+use wcf\data\package\PackageCache;
+use wcf\system\cache\runtime\UserProfileRuntimeCache;
+use wcf\system\event\listener\IParameterizedEventListener;
 
 /**
- * Adds moderator permissiosn to the user object.
+ * Adds moderator permissions to the user object.
  */
-class RoomActionGetUsersModeratorListener implements \wcf\system\event\listener\IParameterizedEventListener {
-	/**
-	 * @see	\wcf\system\event\listener\IParameterizedEventListener::execute()
-	 */
-	public function execute($eventObj, $className, $eventName, array &$users) {
-		$room = $eventObj->getObjects()[0]->getDecoratedObject();
+final class RoomActionGetUsersModeratorListener implements IParameterizedEventListener
+{
+    /**
+     * @inheritDoc
+     */
+    public function execute($eventObj, $className, $eventName, array &$users)
+    {
+        $room = $eventObj->getObjects()[0]->getDecoratedObject();
 
-		$package = \wcf\data\package\PackageCache::getInstance()->getPackageByIdentifier('be.bastelstu.chat');
-		$muteCommand = CommandCache::getInstance()->getCommandByPackageAndIdentifier($package, 'mute')->getProcessor();
-		$banCommand = CommandCache::getInstance()->getCommandByPackageAndIdentifier($package, 'ban')->getProcessor();
+        $package = PackageCache::getInstance()->getPackageByIdentifier('be.bastelstu.chat');
+        $muteCommand = CommandCache::getInstance()->getCommandByPackageAndIdentifier($package, 'mute')->getProcessor();
+        $banCommand = CommandCache::getInstance()->getCommandByPackageAndIdentifier($package, 'ban')->getProcessor();
 
-		$users = array_map(function (array $user) use ($room, $muteCommand, $banCommand) {
-			$userProfile = UserProfileRuntimeCache::getInstance()->getObject($user['userID']);
-			if (!isset($user['permissions'])) $user['permissions'] = [];
+        $users = \array_map(static function (array $user) use ($room, $muteCommand, $banCommand) {
+            $userProfile = UserProfileRuntimeCache::getInstance()->getObject($user['userID']);
+            if (!isset($user['permissions'])) {
+                $user['permissions'] = [];
+            }
 
-			$user['permissions']['canMute'] = $muteCommand->isAvailable($room, $userProfile);
-			$user['permissions']['canBan'] = $banCommand->isAvailable($room, $userProfile);
+            $user['permissions']['canMute'] = $muteCommand->isAvailable($room, $userProfile);
+            $user['permissions']['canBan'] = $banCommand->isAvailable($room, $userProfile);
 
-			return $user;
-		}, $users);
-	}
+            return $user;
+        }, $users);
+    }
 }

files/lib/system/event/listener/RoomCanJoinBanListener.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,25 +15,37 @@
 
 namespace chat\system\event\listener;
 
-use \chat\data\suspension\Suspension;
-use \wcf\data\object\type\ObjectTypeCache;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\WCF;
+use chat\data\suspension\Suspension;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\system\event\listener\IParameterizedEventListener;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\WCF;
 
 /**
  * Denies access to banned users.
  */
-class RoomCanJoinBanListener implements \wcf\system\event\listener\IParameterizedEventListener {
-	/**
-	 * @see	\wcf\system\event\listener\IParameterizedEventListener::execute()
-	 */
-	public function execute($eventObj, $className, $eventName, array &$parameters) {
-		$objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName('be.bastelstu.chat.suspension', 'be.bastelstu.chat.suspension.ban');
-		if (!$objectTypeID) throw new \LogicException('Unreachable');
+final class RoomCanJoinBanListener implements IParameterizedEventListener
+{
+    /**
+     * @inheritDoc
+     */
+    public function execute($eventObj, $className, $eventName, array &$parameters)
+    {
+        $objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName(
+            'be.bastelstu.chat.suspension',
+            'be.bastelstu.chat.suspension.ban'
+        );
+        \assert($objectTypeID !== null);
 
-		$suspensions = Suspension::getActiveSuspensionsByTriple($objectTypeID, $parameters['user']->getDecoratedObject(), $eventObj);
-		if (!empty($suspensions)) {
-			$parameters['result'] = new PermissionDeniedException(WCF::getLanguage()->getDynamicVariable('chat.suspension.info.be.bastelstu.chat.suspension.ban'));
-		}
-	}
+        $suspensions = Suspension::getActiveSuspensionsByTriple(
+            $objectTypeID,
+            $parameters['user']->getDecoratedObject(),
+            $eventObj
+        );
+        if ($suspensions !== []) {
+            $parameters['result'] = new PermissionDeniedException(
+                WCF::getLanguage()->getDynamicVariable('chat.suspension.info.be.bastelstu.chat.suspension.ban')
+            );
+        }
+    }
 }

files/lib/system/event/listener/RoomCanJoinUserLimitListener.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,29 +15,43 @@
 
 namespace chat\system\event\listener;
 
-use \chat\system\permission\PermissionHandler;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\WCF;
+use chat\data\user\User as ChatUser;
+use chat\system\permission\PermissionHandler;
+use wcf\system\event\listener\IParameterizedEventListener;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\WCF;
 
 /**
  * Denies access when room is full.
  */
-class RoomCanJoinUserLimitListener implements \wcf\system\event\listener\IParameterizedEventListener {
-	/**
-	 * @see	\wcf\system\event\listener\IParameterizedEventListener::execute()
-	 */
-	public function execute($eventObj, $className, $eventName, array &$parameters) {
-		if ($eventObj->userLimit === 0) return;
+final class RoomCanJoinUserLimitListener implements IParameterizedEventListener
+{
+    /**
+     * @inheritDoc
+     */
+    public function execute($eventObj, $className, $eventName, array &$parameters)
+    {
+        if ($eventObj->userLimit === 0) {
+            return;
+        }
 
-		$users = $eventObj->getUsers();
-		if (count($users) < $eventObj->userLimit) return;
+        $users = $eventObj->getUsers();
+        if (\count($users) < $eventObj->userLimit) {
+            return;
+        }
 
-		$user = new \chat\data\user\User($parameters['user']->getDecoratedObject());
-		if ($user->isInRoom($eventObj)) return;
+        $user = new ChatUser($parameters['user']->getDecoratedObject());
+        if ($user->isInRoom($eventObj)) {
+            return;
+        }
 
-		$canIgnoreLimit = PermissionHandler::get($parameters['user'])->getPermission($eventObj, 'mod.canIgnoreUserLimit');
-		if ($canIgnoreLimit) return;
+        $canIgnoreLimit = PermissionHandler::get($parameters['user'])->getPermission($eventObj, 'mod.canIgnoreUserLimit');
+        if ($canIgnoreLimit) {
+            return;
+        }
 
-		$parameters['result'] = new PermissionDeniedException(WCF::getLanguage()->get('chat.error.roomFull'));
-	}
+        $parameters['result'] = new PermissionDeniedException(
+            WCF::getLanguage()->get('chat.error.roomFull')
+        );
+    }
 }

files/lib/system/event/listener/RoomCanSeeTemproomListener.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,31 +15,43 @@
 
 namespace chat\system\event\listener;
 
-use \chat\system\permission\PermissionHandler;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\WCF;
+use chat\data\user\User as ChatUser;
+use wcf\system\event\listener\IParameterizedEventListener;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\WCF;
 
 /**
  * Denies access to temporary rooms, unless invited.
  */
-class RoomCanSeeTemproomListener implements \wcf\system\event\listener\IParameterizedEventListener {
-	/**
-	 * @see	\wcf\system\event\listener\IParameterizedEventListener::execute()
-	 */
-	public function execute($eventObj, $className, $eventName, array &$parameters) {
-		if (!$eventObj->isTemporary) return;
+final class RoomCanSeeTemproomListener implements IParameterizedEventListener
+{
+    /**
+     * @inheritDoc
+     */
+    public function execute($eventObj, $className, $eventName, array &$parameters)
+    {
+        if (!$eventObj->isTemporary) {
+            return;
+        }
 
-		$user = new \chat\data\user\User($parameters['user']->getDecoratedObject());
-		if ($eventObj->ownerID === $user->userID) return;
+        $user = new ChatUser($parameters['user']->getDecoratedObject());
+        if ($eventObj->ownerID === $user->userID) {
+            return;
+        }
 
-		$sql = "SELECT COUNT(*)
-		        FROM   chat".WCF_N."_room_temporary_invite
-		        WHERE      userID = ?
-		               AND roomID = ?";
-		$statement = WCF::getDB()->prepareStatement($sql);
-		$statement->execute([ $user->userID, $eventObj->roomID ]);
-		if ($statement->fetchSingleColumn() > 0) return;
+        $sql = "SELECT  COUNT(*)
+                FROM    chat1_room_temporary_invite
+                WHERE   userID = ?
+                    AND roomID = ?";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute([
+            $user->userID,
+            $eventObj->roomID,
+        ]);
+        if ($statement->fetchSingleColumn() > 0) {
+            return;
+        }
 
-		$parameters['result'] = new PermissionDeniedException();
-	}
+        $parameters['result'] = new PermissionDeniedException();
+    }
 }

files/lib/system/event/listener/RoomCanWritePubliclyMuteListener.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,25 +15,37 @@
 
 namespace chat\system\event\listener;
 
-use \chat\data\suspension\Suspension;
-use \wcf\data\object\type\ObjectTypeCache;
-use \wcf\system\exception\PermissionDeniedException;
-use \wcf\system\WCF;
+use chat\data\suspension\Suspension;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\system\event\listener\IParameterizedEventListener;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\WCF;
 
 /**
  * Denies access to muted users.
  */
-class RoomCanWritePubliclyMuteListener implements \wcf\system\event\listener\IParameterizedEventListener {
-	/**
-	 * @see	\wcf\system\event\listener\IParameterizedEventListener::execute()
-	 */
-	public function execute($eventObj, $className, $eventName, array &$parameters) {
-		$objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName('be.bastelstu.chat.suspension', 'be.bastelstu.chat.suspension.mute');
-		if (!$objectTypeID) throw new \LogicException('Unreachable');
+final class RoomCanWritePubliclyMuteListener implements IParameterizedEventListener
+{
+    /**
+     * @inheritDoc
+     */
+    public function execute($eventObj, $className, $eventName, array &$parameters)
+    {
+        $objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName(
+            'be.bastelstu.chat.suspension',
+            'be.bastelstu.chat.suspension.mute'
+        );
+        \assert($objectTypeID !== null);
 
-		$suspensions = Suspension::getActiveSuspensionsByTriple($objectTypeID, $parameters['user']->getDecoratedObject(), $eventObj);
-		if (!empty($suspensions)) {
-			$parameters['result'] = new PermissionDeniedException(WCF::getLanguage()->getDynamicVariable('chat.suspension.info.be.bastelstu.chat.suspension.mute'));
-		}
-	}
+        $suspensions = Suspension::getActiveSuspensionsByTriple(
+            $objectTypeID,
+            $parameters['user']->getDecoratedObject(),
+            $eventObj
+        );
+        if ($suspensions !== []) {
+            $parameters['result'] = new PermissionDeniedException(
+                WCF::getLanguage()->getDynamicVariable('chat.suspension.info.be.bastelstu.chat.suspension.mute')
+            );
+        }
+    }
 }

files/lib/system/event/listener/RoomEditFormTemproomListener.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,16 +15,21 @@
 
 namespace chat\system\event\listener;
 
+use wcf\system\event\listener\IParameterizedEventListener;
+use wcf\system\exception\PermissionDeniedException;
+
 /**
  * Disallow editing of temprooms in ACP.
  */
-class RoomEditFormTemproomListener implements \wcf\system\event\listener\IParameterizedEventListener {
-	/**
-	 * @see	\wcf\system\event\listener\IParameterizedEventListener::execute()
-	 */
-	public function execute($eventObj, $className, $eventName, array &$parameters) {
-		if ($eventObj->room->isTemporary) {
-			throw new \wcf\system\exception\PermissionDeniedException();
-		}
-	}
+final class RoomEditFormTemproomListener implements IParameterizedEventListener
+{
+    /**
+     * @inheritDoc
+     */
+    public function execute($eventObj, $className, $eventName, array &$parameters)
+    {
+        if ($eventObj->room->isTemporary) {
+            throw new PermissionDeniedException();
+        }
+    }
 }

files/lib/system/event/listener/RoomListPageTemproomListener.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,14 +15,18 @@
 
 namespace chat\system\event\listener;
 
+use wcf\system\event\listener\IParameterizedEventListener;
+
 /**
  * Hides temprooms in ACP.
  */
-class RoomListPageTemproomListener implements \wcf\system\event\listener\IParameterizedEventListener {
-	/**
-	 * @see	\wcf\system\event\listener\IParameterizedEventListener::execute()
-	 */
-	public function execute($eventObj, $className, $eventName, array &$parameters) {
-		$eventObj->objectList->getConditionBuilder()->add('isTemporary = ?', [ 0 ]);
-	}
+final class RoomListPageTemproomListener implements IParameterizedEventListener
+{
+    /**
+     * @inheritDoc
+     */
+    public function execute($eventObj, $className, $eventName, array &$parameters)
+    {
+        $eventObj->objectList->getConditionBuilder()->add('isTemporary = ?', [ 0 ]);
+    }
 }

files/lib/system/event/listener/SuspensionListPageTemproomListener.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 3
@@ -14,18 +15,21 @@
 
 namespace chat\system\event\listener;
 
-use \chat\data\room\Room;
+use chat\data\room\Room;
+use wcf\system\event\listener\IParameterizedEventListener;
 
 /**
  * Hides temprooms in ACP.
  */
-class SuspensionListPageTemproomListener implements \wcf\system\event\listener\IParameterizedEventListener {
-	/**
-	 * @see	\wcf\system\event\listener\IParameterizedEventListener::execute()
-	 */
-	public function execute($eventObj, $className, $eventName, array &$parameters) {
-		$eventObj->availableRooms = array_filter($eventObj->availableRooms, function (Room $room) {
-			return !$room->isTemporary;
-		});
-	}
+final class SuspensionListPageTemproomListener implements IParameterizedEventListener
+{
+    /**
+     * @inheritDoc
+     */
+    public function execute($eventObj, $className, $eventName, array &$parameters)
+    {
+        $eventObj->availableRooms = \array_filter($eventObj->availableRooms, static function (Room $room) {
+            return !$room->isTemporary;
+        });
+    }
 }

files/lib/system/message/type/AttachmentMessageType.class.php

@@ -0,0 +1,103 @@
+<?php
+
+/*
+ * Copyright (c) 2010-2024 Tim Düsterhus.
+ *
+ * Use of this software is governed by the Business Source License
+ * included in the LICENSE file.
+ *
+ * Change Date: 2028-01-13
+ *
+ * On the date above, in accordance with the Business Source
+ * License, use of this software will be governed by version 2
+ * or later of the General Public License.
+ */
+
+namespace chat\system\message\type;
+
+use chat\data\message\Message;
+use wcf\data\user\UserProfile;
+use wcf\system\event\EventHandler;
+use wcf\system\html\output\HtmlOutputProcessor;
+use wcf\system\WCF;
+
+/**
+ * AttachmentMessageType represents a message with an attached file.
+ */
+final class AttachmentMessageType implements IMessageType, IDeletableMessageType
+{
+    use TCanSeeInSameRoom;
+
+    /**
+     * HtmlOutputProcessor to use.
+     * @var \wcf\system\html\output\HtmlOutputProcessor
+     */
+    protected $processor;
+
+    public function __construct()
+    {
+        $this->processor = new HtmlOutputProcessor();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getJavaScriptModuleName(): string
+    {
+        return 'Bastelstu.be/Chat/MessageType/Plain';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function canDelete(Message $message, ?UserProfile $user = null): bool
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
+
+        return !!$user->getPermission('mod.chat.canDelete');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getPayload(Message $message, ?UserProfile $user = null)
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
+
+        $payload = $message->payload;
+        $payload['formattedMessage'] = null;
+        $payload['plaintextMessage'] = null;
+
+        $parameters = [
+            'message' => $message,
+            'user' => $user,
+            'payload' => $payload,
+        ];
+        EventHandler::getInstance()->fireAction($this, 'getPayload', $parameters);
+
+        if ($parameters['payload']['formattedMessage'] === null) {
+            $this->processor->setOutputType('text/html');
+            $this->processor->process(
+                $parameters['payload']['message'],
+                'be.bastelstu.chat.message',
+                $message->messageID
+            );
+            $parameters['payload']['formattedMessage'] = $this->processor->getHtml();
+        }
+        if ($parameters['payload']['plaintextMessage'] === null) {
+            $this->processor->setOutputType('text/plain');
+            $this->processor->process(
+                $parameters['payload']['message'],
+                'be.bastelstu.chat.message',
+                $message->messageID
+            );
+            $parameters['payload']['plaintextMessage'] = $this->processor->getHtml();
+        }
+
+        return $parameters['payload'];
+    }
+}

files/lib/system/message/type/AwayMessageType.class.php

@@ -1,11 +1,12 @@
 <?php
+
 /*
- * Copyright (c) 2010-2018 Tim Düsterhus.
+ * Copyright (c) 2010-2024 Tim Düsterhus.
  *
  * Use of this software is governed by the Business Source License
  * included in the LICENSE file.
  *
- * Change Date: 2024-10-20
+ * Change Date: 2028-01-13
  *
  * On the date above, in accordance with the Business Source
  * License, use of this software will be governed by version 2
@@ -14,67 +15,80 @@
 
 namespace chat\system\message\type;
 
-use \chat\data\message\Message;
-use \chat\data\room\Room;
-use \wcf\data\user\UserProfile;
+use chat\data\message\Message;
+use chat\data\room\Room;
+use wcf\data\user\UserProfile;
+use wcf\system\event\EventHandler;
+use wcf\system\WCF;
 
 /**
  * AwayMessageType represents a notice that a user now is away from chat.
  */
-class AwayMessageType implements IMessageType {
-	use TDefaultPayload;
+final class AwayMessageType implements IMessageType
+{
+    use TDefaultPayload;
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getJavaScriptModuleName() {
-		return 'Bastelstu.be/Chat/MessageType/Away';
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getJavaScriptModuleName(): string
+    {
+        return 'Bastelstu.be/Chat/MessageType/Away';
+    }
 
-	/**
-	 * @see	\chat\system\message\type\IMessageType::canSee()
-	 */
-	 public function canSee(Message $message, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function canSee(Message $message, Room $room, ?UserProfile $user = null): bool
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$roomIDs = array_map(function ($item) {
-			return $item['roomID'];
-		}, $message->payload['rooms']);
+        $roomIDs = \array_map(static function ($item) {
+            return $item['roomID'];
+        }, $message->payload['rooms']);
 
-		$parameters = [ 'message' => $message
-		              , 'room'    => $room
-		              , 'user'    => $user
-		              , 'canSee'  => in_array($room->roomID, $roomIDs, true)
-		              ];
-		\wcf\system\event\EventHandler::getInstance()->fireAction($this, 'canSee', $parameters);
+        $parameters = [
+            'message' => $message,
+            'room' => $room,
+            'user' => $user,
+            'canSee' => \in_array($room->roomID, $roomIDs, true),
+        ];
+        EventHandler::getInstance()->fireAction($this, 'canSee', $parameters);
 
-		return $parameters['canSee'];
-	}
+        return $parameters['canSee'];
+    }
 
-	/**
-	 * @see	\chat\system\message\type\IMessageType::canSeeInLog()
-	 */
-	public function canSeeInLog(Message $message, Room $room, UserProfile $user = null) {
-		if ($user === null) $user = new UserProfile(\wcf\system\WCF::getUser());
+    /**
+     * @inheritDoc
+     */
+    public function canSeeInLog(Message $message, Room $room, ?UserProfile $user = null): bool
+    {
+        if ($user === null) {
+            $user = new UserProfile(WCF::getUser());
+        }
 
-		$roomIDs = array_map(function ($item) {
-			return $item['roomID'];
-		}, $message->payload['rooms']);
+        $roomIDs = \array_map(static function ($item) {
+            return $item['roomID'];
+        }, $message->payload['rooms']);
 
-		$parameters = [ 'message' => $message
-		              , 'room'    => $room
-		              , 'user'    => $user
-		              , 'canSee'  => in_array($room->roomID, $roomIDs, true)
-		              ];
-		\wcf\system\event\EventHandler::getInstance()->fireAction($this, 'canSeeInLog', $parameters);
+        $parameters = [
+            'message' => $message,
+            'room' => $room,
+            'user' => $user,
+            'canSee' => \in_array($room->roomID, $roomIDs, true),
+        ];
+        EventHandler::getInstance()->fireAction($this, 'canSeeInLog', $parameters);
 
-		return $parameters['canSee'];
-	}
+        return $parameters['canSee'];
+    }
 
-	/**
-	 * @see»\chat\system\message\type\IMessageType::supportsFastSelect()
-	 */
-	 public function supportsFastSelect() {
-		return false;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function supportsFastSelect(): bool
+    {
+        return false;
+    }
 }