Merge branch 'staging' of https://github.com/OperationCode/operationcode-pybot into staging

# Conflicts:
#	pybot/endpoints/slack/commands.py
#	pybot/endpoints/slack/events.py
#	pybot/endpoints/slack/messages.py

Author: wimo7083

pybot/endpoints/slack/commands.py

@@ -105,6 +105,3 @@ async def slash_repeat(command: Command, app: SirBot):
 
     method_type, message = get_slash_repeat_messages(slack_id, channel_id, command['text'])
     await slack.query(method_type, message)
-
-
-

pybot/endpoints/slack/event_messages/tech.py

@@ -67,9 +67,8 @@ def remove_tech(self, initial_input):
         return initial_input.split('!tech', 1)[1]
 
     async def grab_values(self) -> dict:
-
         if not self.input_text:
-            return {'message': self._help_text()}
+            return {'message': {'text' : self._help_text(), 'channel': self.channel_id,}}
 
         else:
             if not self.response_params:
@@ -86,8 +85,7 @@ async def _parse_input(self) -> None:
 
     def _help_text(self):
         return ('Use this to find descriptions of common and useful tech terms. Examples:\n' +
-                '"/resources Javascript", for self study\n' +
-                '"/resources loud Javascript", to announce to channel' +
+                '"!tech Java" or "!tech prolog"' +
                 self._source_text())
 
     def _source_text(self):

pybot/endpoints/slack/messages.py

@@ -21,35 +21,37 @@ def create_endpoints(plugin):
     plugin.on_message(".*@channel", here_bad)
     plugin.on_message(".*codervets", not_named)
 
-def not_bot_message(event: Message):
-    return 'message' not in event or 'subtype' not in event['message'] or event['message']['subtype'] != 'bot_message'
 
+def not_bot_message(event: Message):
+    value = 'message' not in event or 'subtype' not in event or event['subtype'] != 'bot_message'
+    return value
 
-async def message_changed(event: Message, app: SirBot):
-    """
-    Logs all message edits not made by a bot.
-    """
 def not_bot_delete(event: Message):
     return 'previous_message' not in event or 'bot_id' not in event['previous_message']
 
+
 async def not_named(event: Message, app: SirBot):
     response = {'channel': event['channel'], 'text': f'<@{event["user"]}> - How dare you utter the Dark Lord\'s name'}
-    await app.plugins["slack"].api.query(methods.CHAT_POST_MESSAGE, data=response )
+    await app.plugins["slack"].api.query(methods.CHAT_POST_MESSAGE, data=response)
+
 
 async def here_bad(event: Message, app: SirBot):
-    response = {'channel': event['channel'], 'text': f'<@{event["user"]}> - you are a very bad person for using that command'}
-    await app.plugins["slack"].api.query(methods.CHAT_POST_MESSAGE, data=response )
+    response = {'channel': event['channel'],
+                'text': f'<@{event["user"]}> - you are a very bad person for using that command'}
+    await app.plugins["slack"].api.query(methods.CHAT_POST_MESSAGE, data=response)
+
 
 async def tech_tips(event: Message, app: SirBot):
-    logger.info(
-        f'tech logging: {event}')
-    try:
-        tech_terms: dict = await TechTerms(event['channel'], event['user'],
+    if not_bot_message(event):
+        logger.info(
+            f'tech logging: {event}')
+        try:
+            tech_terms: dict = await TechTerms(event['channel'], event['user'],
                                            event.get('text'), app).grab_values()
 
-        await app.plugins["slack"].api.query(methods.CHAT_POST_MESSAGE, tech_terms['message'])
-    except Exception as E:
-        logger.exception(E)
+            await app.plugins["slack"].api.query(methods.CHAT_POST_MESSAGE, tech_terms['message'])
+        except Exception as E:
+            logger.exception(E)
 
 
 async def message_changed(event: Message, app: SirBot):
@@ -70,7 +72,7 @@ async def message_deleted(event: Message, app: SirBot):
     """
     Logs all message deletions not made by a bot.
     """
-    if not_bot_message(event):
+    if not_bot_delete(event):
         try:
             logger.info(
                 f'CHANGE_LOGGING: deleted: {event["ts"]} for user: {event["previous_message"]["user"]}\n{event}')