slack.py 2.10.1: Merge with mainline

This is version 2.10.1 of slack.py (currently the most recent), copied
over from the wee-slack repo.

Author: trygveaa

python/slack.py

@@ -76,7 +76,7 @@
 
 SCRIPT_NAME = "slack"
 SCRIPT_AUTHOR = "Trygve Aaberge <[email protected]>"
-SCRIPT_VERSION = "2.10.0"
+SCRIPT_VERSION = "2.10.1"
 SCRIPT_LICENSE = "MIT"
 SCRIPT_DESC = "Extends WeeChat for typing notification/search/etc on slack.com"
 REPO_URL = "https://github.com/wee-slack/wee-slack"
@@ -1777,9 +1777,11 @@ def connect(self):
                     # only http proxy is currently supported
                     proxy = ProxyWrapper()
                     timeout = config.slack_timeout / 1000
+                    cookie = SlackRequest(self.team, "").options()["cookie"]
                     if proxy.has_proxy:
                         ws = create_connection(
                             self.ws_url,
+                            cookie=cookie,
                             timeout=timeout,
                             sslopt=sslopt_ca_certs,
                             http_proxy_host=proxy.proxy_address,
@@ -1788,7 +1790,10 @@ def connect(self):
                         )
                     else:
                         ws = create_connection(
-                            self.ws_url, timeout=timeout, sslopt=sslopt_ca_certs
+                            self.ws_url,
+                            cookie=cookie,
+                            timeout=timeout,
+                            sslopt=sslopt_ca_certs,
                         )
 
                     self.hook = w.hook_fd(
@@ -2519,7 +2524,7 @@ def buffer_prnt(
             w.prnt_date_tags(self.channel_buffer, ts.major, tags, data)
             if no_log:
                 w.buffer_set(self.channel_buffer, "print_hooks_enabled", "1")
-            if backlog or self_msg:
+            if backlog or (self_msg and tagset != "join"):
                 self.mark_read(ts, update_remote=False, force=True)
 
     def store_message(self, message_to_store):
@@ -3421,7 +3426,7 @@ def render(self, force=False):
 
         text += unfurl_refs(unwrap_attachments(self, text))
         text += unfurl_refs(unwrap_files(self, self.message_json, text))
-        text += unfurl_refs(unwrap_huddle(self, self.message_json))
+        text += unfurl_refs(unwrap_huddle(self, self.message_json, text))
         text = unhtmlescape(text.lstrip().replace("\t", "    "))
 
         text += create_reactions_string(
@@ -3438,7 +3443,10 @@ def render(self, force=False):
                 ),
             )
 
-        text = replace_string_with_emoji(text)
+        # replace_string_with_emoji() was called on blocks earlier via
+        # unfurl_blocks(), so exclude them here
+        text_to_replace = text[len(blocks_rendered) :]
+        text = text[: len(blocks_rendered)] + replace_string_with_emoji(text_to_replace)
 
         self.message_json["_rendered_text"] = text
         return text
@@ -4135,6 +4143,9 @@ def process_pong(message_json, eventrouter, team, channel, metadata):
 def process_message(
     message_json, eventrouter, team, channel, metadata, history_message=False
 ):
+    if channel is None:
+        return
+
     subtype = message_json.get("subtype")
     if (
         not history_message
@@ -4318,7 +4329,7 @@ def process_reply(message_json, eventrouter, team, channel, metadata):
 
 def process_channel_marked(message_json, eventrouter, team, channel, metadata):
     ts = message_json.get("ts")
-    if ts:
+    if ts and channel is not None:
         channel.mark_read(ts=ts, force=True, update_remote=False)
     else:
         dbg("tried to mark something weird {}".format(message_json))
@@ -4343,7 +4354,14 @@ def process_thread_marked(message_json, eventrouter, team, channel, metadata):
 
 
 def process_channel_joined(message_json, eventrouter, team, channel, metadata):
-    channel.update_from_message_json(message_json["channel"])
+    if channel is None:
+        channel = create_channel_from_info(
+            eventrouter, message_json["channel"], team, team.myidentifier, team.users
+        )
+        team.channels[message_json["channel"]["id"]] = channel
+    else:
+        channel.update_from_message_json(message_json["channel"])
+
     channel.open()
 
 
@@ -4356,6 +4374,8 @@ def process_channel_created(message_json, eventrouter, team, channel, metadata):
 
 
 def process_channel_rename(message_json, eventrouter, team, channel, metadata):
+    if channel is None:
+        return
     channel.set_name(message_json["channel"]["name"])
 
 
@@ -4402,6 +4422,9 @@ def process_group_joined(message_json, eventrouter, team, channel, metadata):
 
 def process_reaction_added(message_json, eventrouter, team, channel, metadata):
     channel = team.channels.get(message_json["item"].get("channel"))
+    if channel is None:
+        return
+
     if message_json["item"].get("type") == "message":
         ts = SlackTS(message_json["item"]["ts"])
 
@@ -4415,6 +4438,9 @@ def process_reaction_added(message_json, eventrouter, team, channel, metadata):
 
 def process_reaction_removed(message_json, eventrouter, team, channel, metadata):
     channel = team.channels.get(message_json["item"].get("channel"))
+    if channel is None:
+        return
+
     if message_json["item"].get("type") == "message":
         ts = SlackTS(message_json["item"]["ts"])
 
@@ -4434,7 +4460,10 @@ def process_subteam_created(subteam_json, eventrouter, team, channel, metadata):
 
 
 def process_subteam_updated(subteam_json, eventrouter, team, channel, metadata):
-    current_subteam_info = team.subteams[subteam_json["subteam"]["id"]]
+    current_subteam_info = team.subteams.get(subteam_json["subteam"]["id"])
+    if current_subteam_info is None:
+        return
+
     is_member = team.myidentifier in subteam_json["subteam"].get("users", [])
     new_subteam_info = SlackSubteam(
         team.identifier, is_member=is_member, **subteam_json["subteam"]
@@ -4606,7 +4635,7 @@ def unfurl_blocks(blocks):
                         lines = [
                             "> {}".format(line)
                             for e in element["elements"]
-                            for line in unfurl_block_element(e).split("\n")
+                            for line in unfurl_block_rich_text_element(e).split("\n")
                         ]
                         block_text.extend(lines)
                     elif element["type"] == "rich_text_preformatted":
@@ -4737,7 +4766,7 @@ def unfurl_rich_text_section(block):
         texts.extend(reversed(colors_remove))
         texts.extend(colors_apply)
         texts.extend(characters_apply)
-        texts.append(unfurl_block_element(element))
+        texts.append(unfurl_block_rich_text_element(element))
         prev_element = element
 
     text = "".join(texts)
@@ -4748,16 +4777,9 @@ def unfurl_rich_text_section(block):
         return text
 
 
-def unfurl_block_element(element):
-    if element["type"] == "mrkdwn":
-        return render_formatting(element["text"])
-    elif element["type"] in ["text", "plain_text"]:
-        return element["text"]
-    elif element["type"] == "image":
-        if element.get("alt_text"):
-            return "{} ({})".format(element["image_url"], element["alt_text"])
-        else:
-            return element["image_url"]
+def unfurl_block_rich_text_element(element):
+    if element["type"] == "text":
+        return htmlescape(element["text"])
     elif element["type"] == "link":
         text = element.get("text")
         if text and text != element["url"]:
@@ -4777,6 +4799,24 @@ def unfurl_block_element(element):
         return resolve_ref("@{}".format(element["range"]))
     elif element["type"] == "channel":
         return resolve_ref("#{}".format(element["channel_id"]))
+    else:
+        dbg("Unsupported rich text element: '{}'".format(json.dumps(element)), level=4)
+        return colorize_string(
+            config.color_deleted,
+            '<<Unsupported rich text element type "{}">>'.format(element["type"]),
+        )
+
+
+def unfurl_block_element(element):
+    if element["type"] == "mrkdwn":
+        return render_formatting(element["text"])
+    elif element["type"] == "plain_text":
+        return element["text"]
+    elif element["type"] == "image":
+        if element.get("alt_text"):
+            return "{} ({})".format(element["image_url"], element["alt_text"])
+        else:
+            return element["image_url"]
     else:
         dbg("Unsupported block element: '{}'".format(json.dumps(element)), level=4)
         return colorize_string(
@@ -4832,6 +4872,10 @@ def unfurl_ref(match):
     return re.sub(r"<([^|>]*)(?:\|([^>]*))?>", unfurl_ref, text)
 
 
+def htmlescape(text):
+    return text.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
+
+
 def unhtmlescape(text):
     return text.replace("&lt;", "<").replace("&gt;", ">").replace("&amp;", "&")
 
@@ -4974,19 +5018,14 @@ def unwrap_attachments(message, text_before):
     return "\n".join(attachment_texts)
 
 
-def unwrap_huddle(message, message_json):
+def unwrap_huddle(message, message_json, text_before):
     """
     If huddle is linked to message, append huddle information and link
     to connect.
     """
     huddle_texts = []
 
     if "room" in message_json:
-        for block in message_json.get("blocks"):
-            for element in block.get("elements"):
-                for element2 in element.get("elements"):
-                    huddle_texts.append(element2.get("text"))
-
         if "name" in message_json.get("room"):
             room_name = message_json.get("room").get("name")
 
@@ -5000,6 +5039,8 @@ def unwrap_huddle(message, message_json):
                 )
             )
 
+    if text_before:
+        huddle_texts.insert(0, "")
     return "\n".join(huddle_texts)
 
 
@@ -5263,7 +5304,7 @@ def tag(
     slack_tag = "slack_{}".format(tagset or "default")
     nick_tag = ["nick_{}".format(user).replace(" ", "_")] if user else []
     tags = [ts_tag, slack_tag] + nick_tag + tagsets.get(tagset, [])
-    if self_msg or backlog:
+    if (self_msg and tagset != "join") or backlog:
         tags = tags_set_notify_none(tags)
         if self_msg:
             tags += ["self_msg"]
@@ -5956,7 +5997,14 @@ def command_reply(data, current_buffer, args):
     In either case, -alsochannel also sends the reply to the parent channel.
     """
     channel = EVENTROUTER.weechat_controller.buffers[current_buffer]
+
     parts = args.split(None, 1)
+    if len(parts) < 1:
+        w.prnt(
+            "", 'Too few arguments for command "/reply" (help on command: /help reply)'
+        )
+        return w.WEECHAT_RC_ERROR
+
     if parts[0] == "-alsochannel":
         args = parts[1]
         broadcast = True