Revert "Merge pull request #822 from j-f1/patch-1"

This reverts commit 57518ac, reversing
changes made to 8e8e5f7.

chatcommands.py

@@ -293,7 +293,7 @@ def command_blacklist_help(*args, **kwargs):
 
 
 # noinspection PyIncorrectDocstring,PyUnusedLocal
-def command_blacklist_website(message_parts, ev_user_name, ev_room, ev_user_id, wrap2, message_id, *args, **kwargs):
+def command_blacklist_website(message_parts, ev_user_name, ev_room, ev_user_id, wrap2, *args, **kwargs):
     """
     Adds a string to the website blacklist and commits/pushes to GitHub
     :param message_parts:
@@ -315,14 +315,13 @@ def command_blacklist_website(message_parts, ev_user_name, ev_room, ev_user_id,
         item_to_blacklist=website_pattern,
         username=ev_user_name,
         chat_profile_link=chat_user_profile_link,
-        message_id=message_id,
         code_permissions=datahandling.is_code_privileged(ev_room, ev_user_id, wrap2)
     )
     return Response(command_status=result[0], message=result[1])
 
 
 # noinspection PyIncorrectDocstring,PyUnusedLocal
-def command_blacklist_keyword(message_parts, ev_user_name, ev_room, ev_user_id, wrap2, message_id, *args, **kwargs):
+def command_blacklist_keyword(message_parts, ev_user_name, ev_room, ev_user_id, wrap2, *args, **kwargs):
     """
     Adds a string to the keyword blacklist and commits/pushes to GitHub
     :param message_parts:
@@ -344,14 +343,13 @@ def command_blacklist_keyword(message_parts, ev_user_name, ev_room, ev_user_id,
         item_to_blacklist=keyword_pattern,
         username=ev_user_name,
         chat_profile_link=chat_user_profile_link,
-        message_id=message_id,
         code_permissions=datahandling.is_code_privileged(ev_room, ev_user_id, wrap2)
     )
     return Response(command_status=result[0], message=result[1])
 
 
 # noinspection PyIncorrectDocstring,PyUnusedLocal
-def command_watch_keyword(message_parts, ev_user_name, ev_room, ev_user_id, wrap2, message_id, *args, **kwargs):
+def command_watch_keyword(message_parts, ev_user_name, ev_room, ev_user_id, wrap2, *args, **kwargs):
     """
     Adds a string to the watched keywords list and commits/pushes to GitHub
     :param message_parts:
@@ -375,14 +373,13 @@ def command_watch_keyword(message_parts, ev_user_name, ev_room, ev_user_id, wrap
         item_to_blacklist=watchlist_entry,
         username=ev_user_name,
         chat_profile_link=chat_user_profile_link,
-        message_id=message_id,
         code_permissions=datahandling.is_code_privileged(ev_room, ev_user_id, wrap2)
     )
     return Response(command_status=result[0], message=result[1])
 
 
 # noinspection PyIncorrectDocstring,PyUnusedLocal
-def command_blacklist_username(message_parts, ev_user_name, ev_room, ev_user_id, wrap2, message_id, *args, **kwargs):
+def command_blacklist_username(message_parts, ev_user_name, ev_room, ev_user_id, wrap2, *args, **kwargs):
     """
     Adds a string to the username blacklist and commits/pushes to GitHub
     :param message_parts:
@@ -404,7 +401,6 @@ def command_blacklist_username(message_parts, ev_user_name, ev_room, ev_user_id,
         item_to_blacklist=username_pattern,
         username=ev_user_name,
         chat_profile_link=chat_user_profile_link,
-        message_id=message_id,
         code_permissions=datahandling.is_code_privileged(ev_room, ev_user_id, wrap2)
     )
     return Response(command_status=result[0], message=result[1])

gitmanager.py

@@ -25,7 +25,6 @@ def add_to_blacklist(cls, **kwargs):
         blacklist = kwargs.get("blacklist", "")
         item_to_blacklist = kwargs.get("item_to_blacklist", "")
         username = kwargs.get("username", "")
-        message_id = kwargs.get("message_id", "<unknown>")
         chat_profile_link = kwargs.get("chat_profile_link", "http://chat.stackexchange.com/users")
         code_permissions = kwargs.get("code_permissions", False)
 
@@ -138,9 +137,7 @@ def add_to_blacklist(cls, **kwargs):
                 git.add('watched_keywords.txt')
 
             git.commit("--author='SmokeDetector <smokey@erwaysoftware.com>'",
-                       "-m", u"Auto {0} of {1} by {2} --autopull".format(op, item, username),
-                       "-m", u"Request: https://chat.stackexchange.com/transcript/message/{0}#{0}".format(message_id))
-            commit_sha = git('rev-parse', 'HEAD')
+                       "-m", u"Auto {0} of {1} by {2} --autopull".format(op, item, username))
 
             if code_permissions:
                 git.checkout("master")
@@ -196,15 +193,7 @@ def add_to_blacklist(cls, **kwargs):
         finally:
             cls.gitmanager_lock.release()
 
-        return (
-            True,
-            "{0}ed {1}: [`{2}`](https://github.com/Charcoal-SE/SmokeDetector/commit/{3})".format(
-                op.title(),
-                item,
-                commit_sha[:7],
-                commit_sha
-            )
-        )
+        return (True, "{0}ed {1}".format(op.title(), item))
 
     @staticmethod
     def current_git_status():