filter whitespace from wp responses

diff --git a/distbot/bot/bot.py b/distbot/bot/bot.py
index 51590abd1993bd700212ca5d011e6f550b4fb4e2..e337e1360ed6e1f1df827d105a41bfd8599f93da 100644 (file)
--- a/distbot/bot/bot.py
+++ b/distbot/bot/bot.py
@@ -128,7 +128,7 @@ class Bot(slixmpp.ClientXMPP):
                 key.insert(0, "nick")
             offset = msg["body"].find(nick) + len(nick) + 1
         routing_key = '.'.join(key).encode("UTF-8")[:255]
-
+        logging.debug(f"Routing key for message {msg['body']} -> {routing_key}")
         return offset, routing_key
 
     def message(self, msg):
@@ -177,7 +177,7 @@ class Bot(slixmpp.ClientXMPP):
                 })
             )
 
-    def echo(self, body, recipient=None):
+    def echo(self, body: str, recipient: str = None):
         logger.debug("echo: %s", body)
         if not recipient:
             rooms = self.rooms

diff --git a/distbot/plugins/lookup.py b/distbot/plugins/lookup.py
index 0baa538e36eeba7f4c5d6ccc65e4fc5fd78b3533..547b76275113a55ec98726a096217ecc9d0751f6 100644 (file)
--- a/distbot/plugins/lookup.py
+++ b/distbot/plugins/lookup.py
@@ -4,6 +4,7 @@ Plugins related to looking things up
 """
 
 import logging
+import re
 import traceback
 import unicodedata
 
@@ -11,7 +12,6 @@ import requests
 
 from distbot.bot.worker import Worker
 from distbot.common.action import Action
-from distbot.common.config import conf_get
 from distbot.common.message import get_nick_from_message, get_words
 
 
@@ -145,9 +145,8 @@ class Wikipedia(Worker):
             return Action(msg='{}: something failed: {}'.format(sender, e))
 
         if short:
-            return Action(msg=sender + ': %s (<%s>)' % (
-                short if short.strip() else '(nix)', link
-            ))
+            text = re.sub(r"(\\n|\s)+", " ", short) if short.strip() else '(nix)'
+            return Action(msg=sender + ': %s (<%s>)' % (text, link))
         elif 'missing' in page:
             return Action(msg='Article "%s" not found' % page.get('title', query))
         else: