Browse Source

Quelques bugfix

master
hadware 8 years ago
parent
commit
ee829e6dbe
  1. 1
      tools/base.py
  2. 6
      tools/coco/client.py
  3. 4
      tools/coco/tools.py

1
tools/base.py

@ -31,6 +31,7 @@ class CoboBot:
self.cococlient = cococlient self.cococlient = cococlient
async def _send_message(self, message): async def _send_message(self, message):
logging.debug("Sending message to server")
if isinstance(message, dict): if isinstance(message, dict):
await self.socket.send(json.dumps(message)) await self.socket.send(json.dumps(message))
elif isinstance(message, bytes): elif isinstance(message, bytes):

6
tools/coco/client.py

@ -72,6 +72,7 @@ class CocoClient:
return out return out
def connect(self, nick: str, age: int, is_female: bool, zip_code: str): def connect(self, nick: str, age: int, is_female: bool, zip_code: str):
self.interlocutors = set()
self.nick = nick self.nick = nick
self.histories = defaultdict(list) self.histories = defaultdict(list)
self.current_interlocutor = None self.current_interlocutor = None
@ -103,6 +104,9 @@ class CocoClient:
return [BotMessage("Il faut sélectionner une conversation d'abord pd")] return [BotMessage("Il faut sélectionner une conversation d'abord pd")]
def switch_conv(self, nick: str=None) -> Union[List[BotMessage], BotMessage]: def switch_conv(self, nick: str=None) -> Union[List[BotMessage], BotMessage]:
if not self.interlocutors:
return BotMessage("Pas de conversations en cours")
new_interlocutor = None new_interlocutor = None
if nick is not None: if nick is not None:
for usr in self.interlocutors: for usr in self.interlocutors:
@ -110,7 +114,7 @@ class CocoClient:
new_interlocutor = usr new_interlocutor = usr
break break
else: else:
new_interlocutor = random.choice(self.interlocutors) new_interlocutor = random.choice(list(self.interlocutors))
if new_interlocutor is None: if new_interlocutor is None:
return BotMessage("Impossible de trouver l'utilisateur") return BotMessage("Impossible de trouver l'utilisateur")

4
tools/coco/tools.py

@ -70,7 +70,7 @@ smilies = [":)", ":(", ";)", ":d", ":-o", ":s", ":$", "*-)", "-)", "^o)", ":p",
"nw$", "ba$", "ao$", "db$", "si$", "oo$", "co$", "bi$", "cc$", "ye$", "mo$", "aa$", "ci$", "uu$", "ff$", "nw$", "ba$", "ao$", "db$", "si$", "oo$", "co$", "bi$", "cc$", "ye$", "mo$", "aa$", "ci$", "uu$", "ff$",
"zz$", "gt$", "ah$", "mm$", "?$", "xx$"] "zz$", "gt$", "ah$", "mm$", "?$", "xx$"]
special_chars = bidict.bidict({" ": "~", "!": "!", "$": "*7", "%": "*g", "'": "*8", "(": "(", ")": ")", "*": "*s", "=": "*h", special_chars = bidict.bidict({" ": "_", "$": "*7", "%": "*g", "'": "*8", "(": "(", ")": ")", "*": "*s", "=": "*h",
"?": "=", "@": "*m", "^": "*l", "_": "*0", "": "*d", "à": "*a", "â": "*k", "ç": "*c", "è": "*e", "?": "=", "@": "*m", "^": "*l", "_": "*0", "": "*d", "à": "*a", "â": "*k", "ç": "*c", "è": "*e",
"é": "*r", "ê": "*b", "î": "*i", "ï": "*j", "ô": "*o", "ù": "*f", "û": "*u"}) "é": "*r", "ê": "*b", "î": "*i", "ï": "*j", "ô": "*o", "ù": "*f", "û": "*u"})
@ -82,7 +82,7 @@ def encode_msg(msg : str):
for char, replacement in special_chars.items(): for char, replacement in special_chars.items():
msg = msg.replace(char, replacement) msg = msg.replace(char, replacement)
msg = ''.join([c for c in msg if ord(c) < 128])
return msg return msg

Loading…
Cancel
Save