Merge branch 'master' of github.com:PUNCH-Cyber/stoq-plugins-public

* 'master' of github.com:PUNCH-Cyber/stoq-plugins-public: slack: handling dictionary returns from slack api redis: fixing documenation in redis.stoq
PUNCH-Cyber · Feb 23, 2018 · 471c565 · 471c565
2 parents 7ea8b07 + 5c1ad23
commit 471c565
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/source/redis/redis/redis.stoq b/source/redis/redis/redis.stoq
@@ -29,6 +29,6 @@ min_stoq_version = 0.10.13
 # Does this plugin support multiprocessing?
 multiprocess = False
 
-# Host of the RabbitMQ server
+# Host of the Redis server
 redis_host = 127.0.0.1
 redis_port = 6379
diff --git a/worker/slack/slack/slack.py b/worker/slack/slack/slack.py
@@ -347,7 +347,8 @@ def get_user_info(self, id):
         # Use Slack's user.info API call to gather information on the user
         # that submitted the file
         userinfo = self.slackclient.api_call("users.info", **{'user': id})
-        userinfo = self.stoq.loads(userinfo)
+        if type(userinfo) is not dict:
+            userinfo = self.stoq.loads(userinfo)
 
         # If an error was produced, return that instead
         if 'error' in userinfo: