From bc07383d139c5bbd32987d19b14112438f945617 Mon Sep 17 00:00:00 2001 From: Et0h Date: Mon, 4 Jul 2016 00:09:36 +0100 Subject: [PATCH] Enable chat by default --- syncplay/messages_de.py | 2 +- syncplay/messages_en.py | 2 +- syncplay/messages_ru.py | 2 +- syncplay/protocols.py | 2 +- syncplay/server.py | 8 ++++---- syncplayServer.py | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/syncplay/messages_de.py b/syncplay/messages_de.py index bd715d8..dc53281 100644 --- a/syncplay/messages_de.py +++ b/syncplay/messages_de.py @@ -379,7 +379,7 @@ de = { "server-salt-argument" : u"zufällige Zeichenkette, die zur Erstellung von Passwörtern verwendet wird", "server-disable-ready-argument" : u"Bereitschaftsfeature deaktivieren", "server-motd-argument": u"Pfad zur Datei, von der die Nachricht des Tages geladen wird", - "server-chat-argument" : "Should chat be enabled?", # TODO: Translate + "server-chat-argument" : "Should chat be disabled?", # TODO: Translate "server-messed-up-motd-unescaped-placeholders": u"Die Nachricht des Tages hat unmaskierte Platzhalter. Alle $-Zeichen sollten verdoppelt werden ($$).", "server-messed-up-motd-too-long": u"Die Nachricht des Tages ist zu lang - Maximal {} Zeichen, aktuell {}.", diff --git a/syncplay/messages_en.py b/syncplay/messages_en.py index 7c2a3f9..23b4043 100644 --- a/syncplay/messages_en.py +++ b/syncplay/messages_en.py @@ -380,7 +380,7 @@ en = { "server-salt-argument" : "random string used to generate managed room passwords", "server-disable-ready-argument" : u"disable readiness feature", "server-motd-argument": "path to file from which motd will be fetched", - "server-chat-argument" : "Should chat be enabled?", + "server-chat-argument" : "Should chat be disabled?", "server-messed-up-motd-unescaped-placeholders": "Message of the Day has unescaped placeholders. All $ signs should be doubled ($$).", "server-messed-up-motd-too-long": u"Message of the Day is too long - maximum of {} chars, {} given.", diff --git a/syncplay/messages_ru.py b/syncplay/messages_ru.py index 1c54910..05d1807 100644 --- a/syncplay/messages_ru.py +++ b/syncplay/messages_ru.py @@ -379,7 +379,7 @@ ru = { "server-salt-argument" : u"генерировать пароли к управляемым комнатам на основании указанной строки (соли)", "server-disable-ready-argument" : u"отключить статусы готов/не готов", "server-motd-argument" : u"путь к файлу, из которого будет извлекаться MOTD-сообщение", - "server-chat-argument" : "Should chat be enabled?", # TODO: Translate + "server-chat-argument" : "Should chat be disabled?", # TODO: Translate "server-messed-up-motd-unescaped-placeholders" : u"MOTD-сообщение содержит неэкранированные спец.символы. Все знаки $ должны быть продублированы ($$).", "server-messed-up-motd-too-long" : u"MOTD-сообщение слишком длинное: максимальная длина - {} символ(ов), текущая длина - {} символ(ов).", diff --git a/syncplay/protocols.py b/syncplay/protocols.py index 1df4f02..e70df7c 100644 --- a/syncplay/protocols.py +++ b/syncplay/protocols.py @@ -355,7 +355,7 @@ class SyncServerProtocol(JSONCommandProtocol): self._logged = True self.sendHello(version) def handleChat(self,chatMessage): - if self._factory.chat: + if not self._factory.disableChat: self._factory.sendChat(self._watcher,chatMessage) def setWatcher(self, watcher): diff --git a/syncplay/server.py b/syncplay/server.py index 90c811a..e3df8e3 100644 --- a/syncplay/server.py +++ b/syncplay/server.py @@ -14,7 +14,7 @@ import argparse from syncplay.utils import RoomPasswordProvider, NotControlledRoom, RandomStringGenerator, meetsMinVersion class SyncFactory(Factory): - def __init__(self, password='', motdFilePath=None, isolateRooms=False, salt=None, disableReady=False,chat =False): + def __init__(self, password='', motdFilePath=None, isolateRooms=False, salt=None, disableReady=False,disableChat=False): self.isolateRooms = isolateRooms print getMessage("welcome-server-notification").format(syncplay.version) if password: @@ -26,7 +26,7 @@ class SyncFactory(Factory): self._salt = salt self._motdFilePath = motdFilePath self.disableReady = disableReady - self.chat=chat + self.disableChat = disableChat if not isolateRooms: self._roomManager = RoomManager() else: @@ -47,7 +47,7 @@ class SyncFactory(Factory): features["isolateRooms"] = self.isolateRooms features["readiness"] = not self.disableReady features["managedRooms"] = True - features["chat"] = self.chat + features["chat"] = not self.disableChat return features def getMotd(self, userIp, username, room, clientVersion): @@ -524,6 +524,6 @@ class ConfigurationGetter(object): self._argparser.add_argument('--password', metavar='password', type=str, nargs='?', help=getMessage("server-password-argument")) self._argparser.add_argument('--isolate-rooms', action='store_true', help=getMessage("server-isolate-room-argument")) self._argparser.add_argument('--disable-ready', action='store_true', help=getMessage("server-disable-ready-argument")) - self._argparser.add_argument('--chat', action='store_true', help=getMessage("server-chat-argument")) + self._argparser.add_argument('--disable-chat', action='store_true', help=getMessage("server-chat-argument")) self._argparser.add_argument('--salt', metavar='salt', type=str, nargs='?', help=getMessage("server-salt-argument")) self._argparser.add_argument('--motd-file', metavar='file', type=str, nargs='?', help=getMessage("server-motd-argument")) diff --git a/syncplayServer.py b/syncplayServer.py index aa13653..347b171 100755 --- a/syncplayServer.py +++ b/syncplayServer.py @@ -19,5 +19,5 @@ from syncplay.server import SyncFactory, ConfigurationGetter if __name__ == '__main__': argsGetter = ConfigurationGetter() args = argsGetter.getConfiguration() - reactor.listenTCP(int(args.port), SyncFactory(args.password, args.motd_file, args.isolate_rooms, args.salt, args.disable_ready,args.chat)) + reactor.listenTCP(int(args.port), SyncFactory(args.password, args.motd_file, args.isolate_rooms, args.salt, args.disable_ready,args.disable_chat)) reactor.run()