diff --git a/server/aoprotocol.py b/server/aoprotocol.py index 877b617..9bddb0a 100644 --- a/server/aoprotocol.py +++ b/server/aoprotocol.py @@ -603,15 +603,13 @@ class AOProtocol(asyncio.Protocol): current_time = strftime("%H:%M", localtime()) if len(args) < 1: - self.server.send_all_cmd_pred('ZZ', '[{}] {} ({}) in {} ({}) without reason (not using the Case Café client?)' - .format(current_time, self.client.get_char_name(), self.client.get_ip(), self.client.area.name, - self.client.area.id), pred=lambda c: c.is_mod) + self.server.send_all_cmd_pred('ZZ', '[{}] {} ({}) in {} without reason (not using the Case Café client?)' + .format(current_time, self.client.get_char_name(), self.client.get_ip(), self.client.area.name), pred=lambda c: c.is_mod) self.client.set_mod_call_delay() logger.log_server('[{}][{}]{} called a moderator.'.format(self.client.get_ip(), self.client.area.id, self.client.get_char_name())) else: - self.server.send_all_cmd_pred('ZZ', '[{}] {} ({}) in {} ({}) with reason: {}' - .format(current_time, self.client.get_char_name(), self.client.get_ip(), self.client.area.name, - self.client.area.id, args[0][:100]), pred=lambda c: c.is_mod) + self.server.send_all_cmd_pred('ZZ', '[{}] {} ({}) in {} with reason: {}' + .format(current_time, self.client.get_char_name(), self.client.get_ip(), self.client.area.name, args[0][:100]), pred=lambda c: c.is_mod) self.client.set_mod_call_delay() logger.log_server('[{}][{}]{} called a moderator: {}.'.format(self.client.get_ip(), self.client.area.id, self.client.get_char_name(), args[0])) diff --git a/server/area_manager.py b/server/area_manager.py index 374c529..36ade64 100644 --- a/server/area_manager.py +++ b/server/area_manager.py @@ -187,6 +187,18 @@ class AreaManager: """ for client in self.clients: client.send_command('LE', *self.get_evidence_list(client)) + + def get_abbreviation(self): + if self.name.lower().startswith("courtroom"): + return "CR" + self.name.split()[-1] + elif self.name.lower().startswith("area"): + return "A" + self.name.split()[-1] + elif len(self.name.split()) > 1: + return "".join(item[0].upper() for item in self.name.split()) + elif len(self.name) > 3: + return self.name[:3].upper() + else: + return self.name.upper() def __init__(self, server): diff --git a/server/client_manager.py b/server/client_manager.py index 6857269..0030173 100644 --- a/server/client_manager.py +++ b/server/client_manager.py @@ -203,7 +203,7 @@ class ClientManager: for client in [x for x in area.clients if x.is_cm]: owner = 'MASTER: {}'.format(client.get_char_name()) break - msg += '\r\nArea {}: {} (users: {}) [{}][{}]{}'.format(i, area.name, len(area.clients), area.status, owner, lock[area.is_locked]) + msg += '\r\nArea {}: {} (users: {}) [{}][{}]{}'.format(area.get_abbreviation(), area.name, len(area.clients), area.status, owner, lock[area.is_locked]) if self.area == area: msg += ' [*]' self.send_host_message(msg) @@ -214,7 +214,7 @@ class ClientManager: area = self.server.area_manager.get_area_by_id(area_id) except AreaError: raise - info += '= Area {}: {} =='.format(area.id, area.name) + info += '=== {} ==='.format(area.name) sorted_clients = [] for client in area.clients: if (not mods) or client.is_mod: diff --git a/server/commands.py b/server/commands.py index 14ae147..f58dbea 100644 --- a/server/commands.py +++ b/server/commands.py @@ -593,7 +593,7 @@ def ooc_cmd_invite(client, arg): c = client.server.client_manager.get_targets(client, TargetType.ID, int(arg), False)[0] client.area.invite_list[c.ipid] = None client.send_host_message('{} is invited to your area.'.format(c.get_char_name())) - c.send_host_message('You were invited and given access to area {}.'.format(client.area.id)) + c.send_host_message('You were invited and given access to {}.'.format(client.area.name)) except: raise ClientError('You must specify a target. Use /invite ') diff --git a/server/tsuserver.py b/server/tsuserver.py index 14ad60b..9438a35 100644 --- a/server/tsuserver.py +++ b/server/tsuserver.py @@ -232,7 +232,7 @@ class TsuServer3: def broadcast_global(self, client, msg, as_mod=False): char_name = client.get_char_name() - ooc_name = '{}[{}][{}]'.format('G', client.area.id, char_name) + ooc_name = '{}[{}][{}]'.format('G', client.area.get_abbreviation(), char_name) if as_mod: ooc_name += '[M]' self.send_all_cmd_pred('CT', ooc_name, msg, pred=lambda x: not x.muted_global) @@ -243,7 +243,7 @@ class TsuServer3: def broadcast_need(self, client, msg): char_name = client.get_char_name() area_name = client.area.name - area_id = client.area.id + area_id = client.area.get_abbreviation() self.send_all_cmd_pred('CT', '{}'.format(self.config['hostname']), '=== Advert ===\r\n{} in {} [{}] needs {}\r\n===============' .format(char_name, area_name, area_id, msg), pred=lambda x: not x.muted_adverts)