aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Huber <rhuber@gmail.com>2016-09-28 11:51:26 -0700
committerRyan Huber <rhuber@gmail.com>2016-09-28 11:51:26 -0700
commit7e01ad2a25831769e85b5251c909d86de84a8678 (patch)
tree74d989bc699edfe9d72c988b36fbeeeaefa6ae40
parentbda434dbd1f29278c718d4b07b7b3b445489823b (diff)
downloadwee-slack-7e01ad2a25831769e85b5251c909d86de84a8678.tar.gz
fixed up per tfheen's suggestions
-rw-r--r--wee_slack.py15
1 files changed, 5 insertions, 10 deletions
diff --git a/wee_slack.py b/wee_slack.py
index c28950d..f2c4bba 100644
--- a/wee_slack.py
+++ b/wee_slack.py
@@ -598,7 +598,6 @@ class Channel(object):
self.current_short_name = ""
self.detach_buffer()
if update_remote:
- # t = time.time()
async_slack_api_request(self.server.domain, self.server.token, SLACK_API_TRANSLATOR[self.type]["leave"], {"channel": self.identifier})
def closed(self):
@@ -623,8 +622,6 @@ class Channel(object):
return typing
def mark_read(self, update_remote=True):
- # t = time.time()
-
if self.channel_buffer:
w.buffer_set(self.channel_buffer, "unread", "")
if update_remote:
@@ -1010,10 +1007,11 @@ class Message(object):
def __lt__(self, other):
return self.ts < other.ts
-# Only run this function if we're in a slack buffer, else ignore
-
def slack_buffer_or_ignore(f):
+ """
+ Only run this function if we're in a slack buffer, else ignore
+ """
@wraps(f)
def wrapper(current_buffer, *args, **kwargs):
server = servers.find(current_domain_name())
@@ -2148,11 +2146,8 @@ def complete_next_cb(data, buffer, command):
return w.WEECHAT_RC_OK_EAT
return w.WEECHAT_RC_OK
-# Slack specific requests
-
-# NOTE: switched to async because sync slowed down the UI
-
+# Slack specific requests
def async_slack_api_request(domain, token, request, post_data, priority=False):
if not STOP_TALKING_TO_SLACK:
post_data["token"] = token
@@ -2423,7 +2418,7 @@ if __name__ == "__main__":
main_weechat_buffer = w.info_get("irc_buffer", "{}.{}".format(domain, "DOESNOTEXIST!@#$"))
message_cache = collections.defaultdict(list)
- cache_load()
+ # cache_load()
servers = SearchList()
for token in slack_api_token.split(','):