diff --git a/file/js/be.bastelstu.WCF.Chat.coffee b/file/js/be.bastelstu.WCF.Chat.coffee index 9e1788f..a9796f4 100644 --- a/file/js/be.bastelstu.WCF.Chat.coffee +++ b/file/js/be.bastelstu.WCF.Chat.coffee @@ -65,6 +65,12 @@ window.console ?= fish: null init: (@config, @titleTemplate, @messageTemplate) -> console.log 'Initializing' + + @events = + newMessage: $.Callbacks() + userMenu: $.Callbacks() + submit: $.Callbacks() + @bindEvents() @events.newMessage.add $.proxy @notify, @ @@ -186,11 +192,11 @@ window.console ?= icon = element.find 'img' if element.data('status') is 1 element.data 'status', 0 - icon.attr 'src', icon.attr('src').replace /enabled(Inverse)?.([a-z]{3})$/, 'disabled$1.$2' + icon.attr 'src', icon.attr('src').replace /enabled(.*).svg$/, 'disabled$1.svg' element.attr 'title', element.data 'enableMessage' else element.data 'status', 1 - icon.attr 'src', icon.attr('src').replace /disabled(Inverse)?.([a-z]{3})$/, 'enabled$1.$2' + icon.attr 'src', icon.attr('src').replace /disabled(.*).svg$/, 'enabled$1.svg' element.attr 'title', element.data 'disableMessage' $('#timsChatInput').focus() diff --git a/file/lib/system/chat/command/commands/BanCommand.class.php b/file/lib/system/chat/command/commands/BanCommand.class.php new file mode 100644 index 0000000..b3fae84 --- /dev/null +++ b/file/lib/system/chat/command/commands/BanCommand.class.php @@ -0,0 +1,39 @@ + + * @package be.bastelstu.wcf.chat + * @subpackage system.chat.command.commands + */ +class BanCommand extends MuteCommand { + public function executeAction() { + if ($suspension = suspension\ChatSuspension::getSuspensionByUserRoomAndType($this->user, $this->room, suspension\ChatSuspension::TYPE_BAN)) { + if ($suspension->time > TIME_NOW + $this->time) { + $this->fail = true; + return; + } + + $editor = new suspension\ChatSuspensionEditor($suspension); + $editor->delete(); + } + + $this->suspensionAction = new suspension\ChatSuspensionAction(array(), 'create', array( + 'data' => array( + 'userID' => $this->user->userID, + 'roomID' => ChatUtil::readUserData('roomID'), + 'type' => suspension\ChatSuspension::TYPE_BAN, + 'time' => TIME_NOW + $this->time + ) + )); + $this->suspensionAction->executeAction(); + } +} diff --git a/file/lib/system/chat/command/commands/MuteCommand.class.php b/file/lib/system/chat/command/commands/MuteCommand.class.php new file mode 100644 index 0000000..04fa340 --- /dev/null +++ b/file/lib/system/chat/command/commands/MuteCommand.class.php @@ -0,0 +1,113 @@ + + * @package be.bastelstu.wcf.chat + * @subpackage system.chat.command.commands + */ +class MuteCommand extends \wcf\system\chat\command\AbstractRestrictedCommand { + public $user = null; + public $time = 0; + public $suspensionAction = null; + public $link = ''; + public $fail = false; + public $room = null; + + public function __construct(\wcf\system\chat\command\CommandHandler $commandHandler) { + parent::__construct($commandHandler); + + $parameters = $commandHandler->getParameters(); + if (($comma = strpos($parameters, ',')) !== false) { + $username = substr($parameters, 0, $comma); + $this->time = ChatUtil::timeModifier(substr($parameters, $comma + 1)); + } + else { + throw new \wcf\system\chat\command\NotFoundException(); + } + + $this->user = User::getUserByUsername($username); + if (!$this->user->userID) throw new \wcf\system\chat\command\UserNotFoundException($username); + + $color = ChatUtil::readUserData('color', $this->user); + $profile = \wcf\system\request\LinkHandler::getInstance()->getLink('User', array( + 'object' => $this->user + )); + $this->link = ''; + + $this->executeAction(); + + $this->didInit(); + } + + public function executeAction() { + if ($suspension = suspension\ChatSuspension::getSuspensionByUserRoomAndType($this->user, $this->room, suspension\ChatSuspension::TYPE_MUTE)) { + if ($suspension->time > TIME_NOW + $this->time) { + $this->fail = true; + return; + } + + $editor = new suspension\ChatSuspensionEditor($suspension); + $editor->delete(); + } + + $this->suspensionAction = new suspension\ChatSuspensionAction(array(), 'create', array( + 'data' => array( + 'userID' => $this->user->userID, + 'roomID' => ChatUtil::readUserData('roomID'), + 'type' => suspension\ChatSuspension::TYPE_MUTE, + 'time' => TIME_NOW + $this->time + ) + )); + $this->suspensionAction->executeAction(); + } + + /** + * @see \wcf\system\chat\command\IRestrictedChatCommand::checkPermission() + */ + public function checkPermission() { + parent::checkPermission(); + + $this->room = \wcf\system\request\RequestHandler::getInstance()->getActiveRequest()->getRequestObject()->request->room; + $ph = new \wcf\system\chat\permission\ChatPermissionHandler(); + if (!$ph->getPermission($this->room, 'mod.can'.str_replace(array('wcf\system\chat\command\commands\\', 'Command'), '', get_class($this)))) throw new \wcf\system\exception\PermissionDeniedException(); + } + + /** + * @see wcf\system\chat\command\ICommand::getReceiver() + */ + public function getReceiver() { + if ($this->fail) return WCF::getUser()->userID; + + return parent::getReceiver(); + } + + /** + * @see \wcf\system\chat\command\ICommand::getType() + */ + public function getType() { + if ($this->fail) return \wcf\data\chat\message\ChatMessage::TYPE_INFORMATION; + return \wcf\data\chat\message\ChatMessage::TYPE_MODERATE; + } + + /** + * @see \wcf\system\chat\command\ICommand::getMessage() + */ + public function getMessage() { + if ($this->fail) return WCF::getLanguage()->get('wcf.chat.suspension.exists'); + + return serialize(array( + 'link' => $this->link, + 'until' => TIME_NOW + $this->time, + 'type' => str_replace(array('wcf\system\chat\command\commands\\', 'command'), '', strtolower(get_class($this))) + )); + } +} diff --git a/language/de.xml b/language/de.xml index 183c6c6..6d30ac8 100644 --- a/language/de.xml +++ b/language/de.xml @@ -108,6 +108,7 @@ Hinweis: Setzen Sie diese Einstellung nur, wenn Sie wissen, was sie bewirkt. Die +