aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAidan Epstein <aidan@jmad.org>2020-03-25 19:54:37 -0700
committerAidan Epstein <aidan@jmad.org>2020-03-25 19:56:25 -0700
commit499f95de0a8258311708fc725cc72c94dfc184bb (patch)
treee9e8aaeb44f49c1230c6659e1e59a29e96c7d276
parent7f51b5e85ad51c0418363e979876a48ef8035d7b (diff)
downloadwee-slack-499f95de0a8258311708fc725cc72c94dfc184bb.tar.gz
Fix typo in subprocess_thread_message, and reorder messages.
-rw-r--r--wee_slack.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/wee_slack.py b/wee_slack.py
index 9f70475..9d20551 100644
--- a/wee_slack.py
+++ b/wee_slack.py
@@ -3029,10 +3029,10 @@ def subprocess_thread_message(message_json, eventrouter, team, channel, history_
if parent_message.thread_channel and parent_message.thread_channel.active:
parent_message.thread_channel.buffer_prnt(message.sender, parent_message.thread_channel.render(message), message.ts, history_message=history_message, tag_nick=message.sender_plain)
- elif message.ts > message.message_json.get("last_read", SlackTS()) and parent_message.subscribed:
- parent_message.notify_thread(action="subscribed", sender_id=message_json["user"])
elif message.ts > channel.last_read and message.has_mention():
parent_message.notify_thread(action="mention", sender_id=message_json["user"])
+ elif message.ts > parent_message.message_json.get("last_read", SlackTS()) and parent_message.subscribed:
+ parent_message.notify_thread(action="subscribed", sender_id=message_json["user"])
if config.thread_messages_in_channel or message_json["subtype"] == "thread_broadcast":
thread_tag = "thread_broadcast" if message_json["subtype"] == "thread_broadcast" else "thread_message"