diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/area_manager.py | 2 | ||||
| -rw-r--r-- | server/client_manager.py | 4 | ||||
| -rw-r--r-- | server/commands.py | 2 | ||||
| -rw-r--r-- | server/districtclient.py | 2 | ||||
| -rw-r--r-- | server/tsuserver.py | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/server/area_manager.py b/server/area_manager.py index d8e60d0..942ad63 100644 --- a/server/area_manager.py +++ b/server/area_manager.py @@ -124,7 +124,7 @@ class AreaManager: c.send_command(cmd, *args) def send_host_message(self, msg): - self.send_command('CT', self.server.config['hostname'], msg) + self.send_command('CT', self.server.config['hostname'], msg, '1') def set_next_msg_delay(self, msg_length): delay = min(3000, 100 + 60 * msg_length) diff --git a/server/client_manager.py b/server/client_manager.py index 617bb69..e7655bd 100644 --- a/server/client_manager.py +++ b/server/client_manager.py @@ -94,7 +94,7 @@ class ClientManager: self.send_raw_message('{}#%'.format(command)) def send_host_message(self, msg): - self.send_command('CT', self.server.config['hostname'], msg) + self.send_command('CT', self.server.config['hostname'], msg, '1') def send_motd(self): self.send_host_message('=== MOTD ===\r\n{}\r\n============='.format(self.server.config['motd'])) @@ -272,7 +272,7 @@ class ClientManager: info = 'Current online: {}'.format(cnt) + info else: try: - info = 'People in this area: {}\n'.format(len(self.server.area_manager.areas[area_id].clients)) + self.get_area_info(area_id, mods) + info = 'People in this area: {}'.format(len(self.server.area_manager.areas[area_id].clients)) + self.get_area_info(area_id, mods) except AreaError: raise self.send_host_message(info) diff --git a/server/commands.py b/server/commands.py index c84d8b7..a6e2999 100644 --- a/server/commands.py +++ b/server/commands.py @@ -502,7 +502,7 @@ def ooc_cmd_announce(client, arg): if len(arg) == 0: raise ArgumentError("Can't send an empty message.") client.server.send_all_cmd_pred('CT', '{}'.format(client.server.config['hostname']), - '=== Announcement ===\r\n{}\r\n=================='.format(arg)) + '=== Announcement ===\r\n{}\r\n=================='.format(arg), '1') logger.log_server('[{}][{}][ANNOUNCEMENT]{}.'.format(client.area.abbreviation, client.get_char_name(), arg), client) logger.log_mod('[{}][{}][ANNOUNCEMENT]{}.'.format(client.area.abbreviation, client.get_char_name(), arg), client) diff --git a/server/districtclient.py b/server/districtclient.py index adc29ec..c766ba5 100644 --- a/server/districtclient.py +++ b/server/districtclient.py @@ -60,7 +60,7 @@ class DistrictClient: elif cmd == 'NEED': need_msg = '=== Cross Advert ===\r\n{} at {} in {} [{}] needs {}\r\n====================' \ .format(args[1], args[0], args[2], args[3], args[4]) - self.server.send_all_cmd_pred('CT', '{}'.format(self.server.config['hostname']), need_msg, + self.server.send_all_cmd_pred('CT', '{}'.format(self.server.config['hostname']), need_msg, '1', pred=lambda x: not x.muted_adverts) async def write_queue(self): diff --git a/server/tsuserver.py b/server/tsuserver.py index 7ef4f5e..5af8161 100644 --- a/server/tsuserver.py +++ b/server/tsuserver.py @@ -253,8 +253,8 @@ class TsuServer3: area_name = client.area.name area_id = client.area.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) + ['=== Advert ===\r\n{} in {} [{}] needs {}\r\n===============' + .format(char_name, area_name, area_id, msg), '1'], pred=lambda x: not x.muted_adverts) if self.config['use_district']: self.district_client.send_raw_message('NEED#{}#{}#{}#{}'.format(char_name, area_name, area_id, msg)) |