From c1190d63175053ca9b698dd37abafcc8b7d7cb88 Mon Sep 17 00:00:00 2001
From: Terry Geng <gengyanda@gmail.com>
Date: Thu, 12 Mar 2020 19:59:23 +0800
Subject: [PATCH] fix: optimized urlban logic

---
 mumbleBot.py | 14 ++++++++------
 util.py      |  1 +
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/mumbleBot.py b/mumbleBot.py
index 23e1d41..0cb80cb 100644
--- a/mumbleBot.py
+++ b/mumbleBot.py
@@ -235,12 +235,14 @@ class MumbleBot:
                         constants.strings('user_ban'))
                     return
 
-            if parameter:
-                for i in var.db.items("url_ban"):
-                    if util.get_url_from_input(parameter.lower()) == i[0]:
-                        self.mumble.users[text.actor].send_text_message(
-                            constants.strings('url_ban'))
-                        return
+            if not self.is_admin(user) and parameter:
+                input_url = util.get_url_from_input(parameter.lower())
+                if input_url:
+                    for i in var.db.items("url_ban"):
+                        if input_url == i[0]:
+                            self.mumble.users[text.actor].send_text_message(
+                                constants.strings('url_ban'))
+                            return
 
             command_exc = ""
             try:
diff --git a/util.py b/util.py
index af763d6..637e2e6 100644
--- a/util.py
+++ b/util.py
@@ -294,6 +294,7 @@ class Dir(object):
 # Parse the html from the message to get the URL
 
 def get_url_from_input(string):
+    string = string.strip()
     if string.startswith('http'):
         return string
     p = re.compile('href="(.+?)"', re.IGNORECASE)