weechat: Update wee-slack and config

diff --git a/weechat/exec.conf b/weechat/exec.conf
index 519ccc1b34b6d316833e0d12cc2f73113c9e4483..db02a5b7080b2019c64ce2e6ac4a4c347be0c449 100644 (file)
--- a/weechat/exec.conf
+++ b/weechat/exec.conf
@@ -12,6 +12,7 @@
 [command]
 default_options = ""
 purge_delay = 0
+shell = "sh"
 
 [color]
 flag_finished = lightred

diff --git a/weechat/plugins.conf b/weechat/plugins.conf
index c1135a0a4b41e0ebcf63bf0bba0d471875d903e4..fbb23eabb3fa99d4b42d0a8609277430abdb1250 100644 (file)
--- a/weechat/plugins.conf
+++ b/weechat/plugins.conf
@@ -76,12 +76,17 @@ python.slack.auto_open_threads = "false"
 python.slack.background_load_all_history = "false"
 python.slack.cache_messages = "true"
 python.slack.channel_name_typing_indicator = "true"
+python.slack.color_buflist_muted_channels = "darkgray"
+python.slack.color_edited_suffix = "095"
+python.slack.color_reaction_suffix = "darkgray"
+python.slack.color_thread_suffix = "lightcyan"
 python.slack.colorize_messages = "0"
 python.slack.colorize_private_chats = "0"
 python.slack.debug_level = "3"
 python.slack.debug_mode = "false"
 python.slack.distracting_channels = "lunch"
 python.slack.external_user_suffix = "*"
+python.slack.files_download_location = ""
 python.slack.group_name_prefix = "&"
 python.slack.map_underline_to = "_"
 python.slack.migrated = "true"
@@ -93,11 +98,13 @@ python.slack.render_italic_as = "italic"
 python.slack.send_typing_notice = "false"
 python.slack.server_aliases = ""
 python.slack.shared_name_prefix = "%"
-python.slack.short_buffer_names = "false"
+python.slack.short_buffer_names = "true"
+python.slack.show_buflist_presence = "true"
 python.slack.show_reaction_nicks = "0"
 python.slack.slack_api_token = "${sec.data.slack_uh}"
 python.slack.slack_timeout = "20000"
 python.slack.switch_buffer_on_join = "1"
+python.slack.thread_messages_in_channel = "false"
 python.slack.thread_suffix_color = "lightcyan"
 python.slack.trigger_value = "0"
 python.slack.unfurl_auto_link_display = "both"
@@ -169,11 +176,16 @@ python.screen_away.time_format = "time format append to away message"
 python.slack.auto_open_threads = "Automatically open threads when mentioned or inresponse to own messages."
 python.slack.background_load_all_history = "Load history for each channel in the background as soon as it opens, rather than waiting for the user to look at it."
 python.slack.channel_name_typing_indicator = "Change the prefix of a channel from # to > when someone is typing in it. Note that this will (temporarily) affect the sort order if you sort buffers by name rather than by number."
+python.slack.color_buflist_muted_channels = "Color to use for muted channels in the buflist"
+python.slack.color_edited_suffix = "Color to use for (edited) suffix on messages that have been edited."
+python.slack.color_reaction_suffix = "Color to use for the [:wave:(@user)] suffix on messages that have reactions attached to them."
+python.slack.color_thread_suffix = "Color to use for the [thread: XXX] suffix on messages that have threads attached to them."
 python.slack.colorize_private_chats = "Whether to use nick-colors in DM windows."
 python.slack.debug_level = "Show only this level of debug info (or higher) when debug_mode is on. Lower levels -> more messages."
 python.slack.debug_mode = "Open a dedicated buffer for debug messages and start logging to it. How verbose the logging is depends on log_level."
 python.slack.distracting_channels = "List of channels to hide."
 python.slack.external_user_suffix = "The suffix appended to nicks to indicate external users."
+python.slack.files_download_location = "If set, file attachments will be automatically downloaded to this location."
 python.slack.group_name_prefix = "The prefix of buffer names for groups (private channels)."
 python.slack.map_underline_to = "When sending underlined text to slack, use this formatting character for it. The default ("_") sends it as italics. Use "*" to send bold instead."
 python.slack.muted_channels_activity = "Control which activity you see from muted channels, either none, personal_highlights, all_highlights or all. none: Don't show any activity. personal_highlights: Only show personal highlights, i.e. not @channel and @here. all_highlights: Show all highlights, but not other messages. all: Show all activity, like other channels."
@@ -184,11 +196,13 @@ python.slack.render_italic_as = "When receiving bold text from Slack, render it
 python.slack.send_typing_notice = "Alert Slack users when you are typing a message in the input bar (Requires reload)"
 python.slack.server_aliases = "A comma separated list of `subdomain:alias` pairs. The alias will be used instead of the actual name of the slack (in buffer names, logging, etc). E.g `work:no_fun_allowed` would make your work slack show up as `no_fun_allowed` rather than `work.slack.com`."
 python.slack.shared_name_prefix = "The prefix of buffer names for shared channels."
-python.slack.short_buffer_names = "Use `foo.#channel` rather than `foo.slack.com.#channel` as the internal name for Slack buffers. Overrides server_aliases."
+python.slack.short_buffer_names = "Use `foo.#channel` rather than `foo.slack.com.#channel` as the internal name for Slack buffers."
+python.slack.show_buflist_presence = "Display a `+` character in the buffer list for present users."
 python.slack.show_reaction_nicks = "Display the name of the reacting user(s) alongside each reactji."
 python.slack.slack_api_token = "List of Slack API tokens, one per Slack instance you want to connect to. See the README for details on how to get these."
 python.slack.slack_timeout = "How long (ms) to wait when communicating with Slack."
 python.slack.switch_buffer_on_join = "When /joining a channel, automatically switch to it as well."
+python.slack.thread_messages_in_channel = "When enabled shows thread messages in the parent channel."
 python.slack.thread_suffix_color = "Color to use for the [thread: XXX] suffix on messages that have threads attached to them."
 python.slack.unfurl_auto_link_display = "When displaying ("unfurling") links to channels/users/etc, determine what is displayed when the text matches the url without the protocol. This happens when Slack automatically creates links, e.g. from words separated by dots or email addresses. Set it to "text" to only display the text written by the user, "url" to only display the url or "both" (the default) to display both."
 python.slack.unfurl_ignore_alt_text = "When displaying ("unfurling") links to channels/users/etc, ignore the "alt text" present in the message and instead use the canonical name of the thing being linked to."

diff --git a/weechat/python/wee-slack b/weechat/python/wee-slack
index fab34dc3431c41bb51b36951f558a44290d90467..00093fa633b3a602384864f54167e90f7cffe336 160000 (submodule)
--- a/weechat/python/wee-slack
+++ b/weechat/python/wee-slack
@@ -1 +1 @@
-Subproject commit fab34dc3431c41bb51b36951f558a44290d90467
+Subproject commit 00093fa633b3a602384864f54167e90f7cffe336

diff --git a/weechat/relay.conf b/weechat/relay.conf
index 565dd145b36f9b2efe027876467b552293a09a0e..ef5619a91f4d31fcfddde4b793cda67b444bd21d 100644 (file)
--- a/weechat/relay.conf
+++ b/weechat/relay.conf
@@ -35,6 +35,8 @@ max_clients = 5
 password = ""
 ssl_cert_key = "%h/ssl/relay.pem"
 ssl_priorities = "NORMAL:-VERS-SSL3.0"
+totp_secret = ""
+totp_window = 0
 websocket_allowed_origins = ""
 
 [irc]

diff --git a/weechat/weechat.conf b/weechat/weechat.conf
index 3ef52b7cb770edcb15a3054c950b8ecbc1858bf4..8864280ec74f6a74a3dce644cec6318f8248179f 100644 (file)
--- a/weechat/weechat.conf
+++ b/weechat/weechat.conf
@@ -438,6 +438,8 @@ ctrl-X = "/input switch_active_buffer"
 ctrl-Y = "/input clipboard_paste"
 meta-meta-OP = "/bar scroll buflist * b"
 meta-meta-OQ = "/bar scroll buflist * e"
+meta-meta2-11~ = "/bar scroll buflist * b"
+meta-meta2-12~ = "/bar scroll buflist * e"
 meta-meta2-1~ = "/window scroll_top"
 meta-meta2-23~ = "/bar scroll nicklist * b"
 meta-meta2-24~ = "/bar scroll nicklist * e"
@@ -485,6 +487,10 @@ meta-Oa = "/input history_global_previous"
 meta-Ob = "/input history_global_next"
 meta-Oc = "/input move_next_word"
 meta-Od = "/input move_previous_word"
+meta2-11^ = "/bar scroll buflist * -100%"
+meta2-11~ = "/bar scroll buflist * -100%"
+meta2-12^ = "/bar scroll buflist * +100%"
+meta2-12~ = "/bar scroll buflist * +100%"
 meta2-15~ = "/buffer -1"
 meta2-17~ = "/buffer +1"
 meta2-18~ = "/window -1"
@@ -493,10 +499,14 @@ meta2-1;3A = "/buffer -1"
 meta2-1;3B = "/buffer +1"
 meta2-1;3C = "/buffer +1"
 meta2-1;3D = "/buffer -1"
+meta2-1;3P = "/bar scroll buflist * b"
+meta2-1;3Q = "/bar scroll buflist * e"
 meta2-1;5A = "/input history_global_previous"
 meta2-1;5B = "/input history_global_next"
 meta2-1;5C = "/input move_next_word"
 meta2-1;5D = "/input move_previous_word"
+meta2-1;5P = "/bar scroll buflist * -100%"
+meta2-1;5Q = "/bar scroll buflist * +100%"
 meta2-1~ = "/input move_beginning_of_line"
 meta2-200~ = "/input paste_start"
 meta2-201~ = "/input paste_stop"
@@ -676,6 +686,11 @@ meta2-A = "/cursor move up"
 meta2-B = "/cursor move down"
 meta2-C = "/cursor move right"
 meta2-D = "/cursor move left"
+@chat(python.*):D = "hsignal:slack_cursor_delete"
+@chat(python.*):L = "hsignal:slack_cursor_linkarchive"
+@chat(python.*):M = "hsignal:slack_cursor_message"
+@chat(python.*):R = "hsignal:slack_cursor_reply"
+@chat(python.*):T = "hsignal:slack_cursor_thread"
 @item(buffer_nicklist):K = "/window ${_window_number};/kickban ${nick}"
 @item(buffer_nicklist):b = "/window ${_window_number};/ban ${nick}"
 @item(buffer_nicklist):k = "/window ${_window_number};/kick ${nick}"
@@ -703,6 +718,7 @@ meta2-D = "/cursor move left"
 @chat(perl.iset):button2* = "hsignal:iset_mouse"
 @chat(perl.iset):wheeldown = "/repeat 5 /iset **down"
 @chat(perl.iset):wheelup = "/repeat 5 /iset **up"
+@chat(python.*):button2 = "hsignal:slack_mouse"
 @chat(script.scripts):button1 = "/window ${_window_number};/script go ${_chat_line_y}"
 @chat(script.scripts):button2 = "/window ${_window_number};/script go ${_chat_line_y};/script installremove -q ${script_name_with_extension}"
 @chat(script.scripts):wheeldown = "/script down 5"