beu/TrackManiaControl
1
0
Fork 0
Code Issues 11 Pull Requests Releases Wiki Activity

Fix Chat::formatMessage issues after tests

Browse Source
This commit is contained in:
Alexander Nell 2020-06-22 04:53:31 +02:00
parent 9abadac932
commit 566f77801f
4 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/Maps/MapQueue.php
View File

@ -119,7 +119,7 @@ class MapQueue implements CallbackListener, CommandListener, UsageInformationAbl
return;
}
$messagePrefix = $this->maniaControl->getSettingManager()->initSetting($this, self::SETTING_MESSAGE_FORMAT);
$messagePrefix = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_MESSAGE_FORMAT);
if ($admin && empty($this->queuedMaps)) {
$this->maniaControl->getChat()->sendError($messagePrefix . 'There are no maps in the jukebox!', $admin);
return;
@ -131,8 +131,7 @@ class MapQueue implements CallbackListener, CommandListener, UsageInformationAbl
if ($admin) {
$title = $admin->getAuthLevelName();
$message = $this->maniaControl->getChat()->formatMessage(
$messagePrefix . '%s %s cleared the Map-Queue!',
$title,
"{$messagePrefix}{$title} %s cleared the Map-Queue!",
$admin
);
$this->maniaControl->getChat()->sendInformation($message);

52
core/Players/PlayerActions.php
View File

@ -211,9 +211,9 @@ class PlayerActions implements EchoListener, CommunicationListener, UsageInforma
if ($teamName) {
if ($calledByAdmin) {
$title = $admin->getAuthLevelName();
$message = $this->maniaControl->getChat()->formatMessage(
'%s %s forced %s into the %s-Team!',
$admin->getAuthLevelName(),
"{$title} %s forced %s into the %s-Team!",
$admin,
$target,
$teamName
@ -284,9 +284,9 @@ class PlayerActions implements EchoListener, CommunicationListener, UsageInforma
// Announce force
if ($displayAnnouncement) {
if ($calledByAdmin) {
$title = $admin->getAuthLevelName();
$message = $this->maniaControl->getChat()->formatMessage(
'%s %s forced %s to Play!',
$admin->getAuthLevelName(),
"{$title} %s forced %s to Play!",
$admin,
$target
);
@ -341,9 +341,9 @@ class PlayerActions implements EchoListener, CommunicationListener, UsageInforma
}
if ($calledByAdmin) {
$title = $admin->getAuthLevelName();
$message = $this->maniaControl->getChat()->formatMessage(
'%s %s forced %s to Spectator!',
$admin->getAuthLevelName(),
"{$title} %s forced %s to Spectator!",
$admin,
$target
);
@ -397,16 +397,16 @@ class PlayerActions implements EchoListener, CommunicationListener, UsageInforma
} catch (NotInListException $e) {
$message = $this->maniaControl->getChat()->formatMessage(
'%s is not muted!',
$player
$targetLogin
);
$this->maniaControl->getChat()->sendError($message, $adminLogin);
return false;
}
if ($calledByAdmin) {
$title = $admin->getAuthLevelName();
$message = $this->maniaControl->getChat()->formatMessage(
'%s %s un-muted %s!',
$admin->getAuthLevelName(),
"{$title} %s un-muted %s!",
$admin,
$target
);
@ -451,16 +451,19 @@ class PlayerActions implements EchoListener, CommunicationListener, UsageInforma
} catch (AlreadyInListException $e) {
$message = $this->maniaControl->getChat()->formatMessage(
'%s is already muted!',
$player
$targetLogin
);
$this->maniaControl->getChat()->sendError($message, $adminLogin);
return false;
} catch (UnknownPlayerException $e) {
$this->maniaControl->getChat()->sendException($e, $adminLogin);
return false;
}
if ($calledByAdmin) {
$title = $admin->getAuthLevelName();
$message = $this->maniaControl->getChat()->formatMessage(
'%s %s muted %s!',
$admin->getAuthLevelName(),
"{$title} %s muted %s!",
$admin,
$target
);
@ -559,9 +562,9 @@ class PlayerActions implements EchoListener, CommunicationListener, UsageInforma
$this->maniaControl->getManialinkManager()->displayWidget($maniaLink, $target);
if ($calledByAdmin) {
$title = $admin->getAuthLevelName();
$message = $this->maniaControl->getChat()->formatMessage(
'%s %s warned %s!',
$admin->getAuthLevelName(),
"{$title} %s warned %s!",
$admin,
$target
);
@ -623,9 +626,9 @@ class PlayerActions implements EchoListener, CommunicationListener, UsageInforma
}
if ($calledByAdmin) {
$title = $admin->getAuthLevelName();
$message = $this->maniaControl->getChat()->formatMessage(
'%s %s kicked %s!',
$admin->getAuthLevelName(),
"{$title} %s kicked %s!",
$admin,
$target
);
@ -676,9 +679,9 @@ class PlayerActions implements EchoListener, CommunicationListener, UsageInforma
return;
}
$title = $admin->getAuthLevelName();
$message = $this->maniaControl->getChat()->formatMessage(
'%s %s banned %s!',
$admin->getAuthLevelName(),
"{$title} %s banned %s!",
$admin,
$target
);
@ -718,9 +721,9 @@ class PlayerActions implements EchoListener, CommunicationListener, UsageInforma
return;
}
$title = $admin->getAuthLevelName();
$message = $this->maniaControl->getChat()->formatMessage(
'%s %s unbanned %s!',
$admin->getAuthLevelName(),
"{$title} %s unbanned %s!",
$admin,
$target
);
@ -745,7 +748,6 @@ class PlayerActions implements EchoListener, CommunicationListener, UsageInforma
* Grants the Player an Authorization Level
*
* @api
* @deprecated
* @param string $adminLogin
* @param string $targetLogin
* @param int $authLevel
@ -774,9 +776,9 @@ class PlayerActions implements EchoListener, CommunicationListener, UsageInforma
return;
}
$title = $admin->getAuthLevelName();
$message = $this->maniaControl->getChat()->formatMessage(
"%s %s added %s as {$authLevelName}!",
$admin->getAuthLevelName(),
"{$title} %s added %s as {$authLevelName}!",
$admin,
$target
);
@ -814,9 +816,9 @@ class PlayerActions implements EchoListener, CommunicationListener, UsageInforma
return;
}
$title = $admin->getAuthLevelName();
$message = $this->maniaControl->getChat()->formatMessage(
"%s %s revoked the Rights of %s!",
$admin->getAuthLevelName(),
"{$title} %s revoked the Rights of %s!",
$admin,
$target
);

7
core/Players/PlayerManager.php
View File

@ -503,20 +503,21 @@ class PlayerManager implements CallbackListener, TimerListener, CommunicationLis
$color = $this->maniaControl->getColorManager()->getColorByPlayer($player);
}
$authName = $player->getAuthLeveName();
$authName = $player->getAuthLevelName();
$nation = $player->getCountry();
if (!$player->isSpectator && $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_JOIN_LEAVE_MESSAGES) && !$player->isFakePlayer()) {
$message = $this->maniaControl->getChat()->formatMessage(
"{$color}{$authName} %s Nation: %s joined!",
$player,
$player->getCountry()
$nation
);
$this->maniaControl->getChat()->sendChat($message);
} else if ($player->isSpectator && $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_JOIN_LEAVE_MESSAGES_SPECTATOR)) {
$message = $this->maniaControl->getChat()->formatMessage(
"{$color}{$authName} %s Nation: %s joined as Spectator!",
$player,
$player->getCountry()
$nation
);
$this->maniaControl->getChat()->sendChat($message);
}