diff options
| author | Trygve Aaberge <trygveaa@gmail.com> | 2020-05-16 15:05:16 +0200 |
|---|---|---|
| committer | Trygve Aaberge <trygveaa@gmail.com> | 2020-05-30 21:13:21 +0200 |
| commit | 7db608ca556129fda4a358f3c51771bbad4e809f (patch) | |
| tree | 493eb870d7090fcab13745b52054d064cf440196 | |
| parent | 940b15b0f359f4b551339622748741bafd4e4c76 (diff) | |
| download | wee-slack-7db608ca556129fda4a358f3c51771bbad4e809f.tar.gz | |
Don't fall back to ts for thread hash
We don't allow the ts to be used in commands, so it doesn't make sense
to fall back to it. After the latest commits, hash is always available,
so just use that.
| -rw-r--r-- | wee_slack.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/wee_slack.py b/wee_slack.py index 95b2492..9be69ff 100644 --- a/wee_slack.py +++ b/wee_slack.py @@ -2127,8 +2127,10 @@ class SlackChannel(SlackChannelCommon): def render(self, message, force=False): text = message.render(force) if isinstance(message, SlackThreadMessage): - thread_id = message.parent_message.hash or message.parent_message.ts - return colorize_string(get_thread_color(thread_id), '[{}]'.format(thread_id)) + ' {}'.format(text) + thread_hash = self.hashed_messages[message.thread_ts] + hash_str = colorize_string( + get_thread_color(str(thread_hash)), '[{}]'.format(thread_hash)) + return '{} {}'.format(hash_str, text) return text @@ -2405,11 +2407,11 @@ class SlackThreadChannel(SlackChannelCommon): return set() def formatted_name(self, style="default"): - hash_or_ts = self.parent_message.hash or self.thread_ts + thread_hash = self.parent_message.hash styles = { - "default": " +{}".format(hash_or_ts), - "long_default": "{}.{}".format(self.parent_channel.formatted_name(style="long_default"), hash_or_ts), - "sidebar": " +{}".format(hash_or_ts), + "default": " +{}".format(thread_hash), + "long_default": "{}.{}".format(self.parent_channel.formatted_name(style="long_default"), thread_hash), + "sidebar": " +{}".format(thread_hash), } return styles[style] |