From 56d94a03046920332155031ac0b871f8df37c30c Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Tue, 23 Mar 2021 16:04:45 -0400
Subject: [PATCH] update autojoins and add new 3.1 options

---
 weechat/.weechat/buflist.conf             |  1 +
 weechat/.weechat/irc.conf                 | 72 +++++++++++++++++++++--
 weechat/.weechat/python/colorize_nicks.py | 15 ++---
 weechat/.weechat/weechat.conf             |  2 +
 4 files changed, 77 insertions(+), 13 deletions(-)

diff --git a/weechat/.weechat/buflist.conf b/weechat/.weechat/buflist.conf
index d8e5e22..24fdba5 100644
--- a/weechat/.weechat/buflist.conf
+++ b/weechat/.weechat/buflist.conf
@@ -21,6 +21,7 @@ nick_prefix = off
 nick_prefix_empty = on
 signals_refresh = ""
 sort = "number"
+use_items = 1
 
 [format]
 buffer = "${format_number}${indent}${format_nick_prefix}${color_hotlist}${if:(${buffer.full_name} =~ ^irc)?${if:(${irc_server.away_time} > 0)?${color:yellow}>}${if:(${irc_channel.part} == 1)?${color:red}_}${if:(${irc_server.is_connected} == 0)?${color:*magenta}*}}${if:${type}==private?↪}${name}"
diff --git a/weechat/.weechat/irc.conf b/weechat/.weechat/irc.conf
index b22179d..46f3941 100644
--- a/weechat/.weechat/irc.conf
+++ b/weechat/.weechat/irc.conf
@@ -131,6 +131,7 @@ charset_message = message
 command = ""
 command_delay = 0
 connection_timeout = 60
+default_chantypes = "#&"
 ipv6 = on
 local_hostname = ""
 msg_kick = ""
@@ -189,7 +190,7 @@ tilde.local_hostname
 tilde.usermode
 tilde.command = "/msg operserv login ${sec.data.pass}"
 tilde.command_delay
-tilde.autojoin = "#.tilde,#ZfA,#anelki,#aussie,#bots,#club,#cosmic,#counting,#counting-meta,#covid19,#ctrl-c,#envs,#envs_german,#espanol,#factorio,#fr,#gemini,#gopher,#helpdesk,#idlerpg,#institute,#irctokens,#linux,#meta,#meta_german,#minecraft,#music,#netnews,#ninja,#nsfw,#opers,#pink,#politics,#prepping,#projects,#red,#secret-sudoers,#sus,#team,#texto-plano,#theasylum,#thunix,#tilde.zone-admin,#tildebot,#tilderadio,#tilderadio-djs,#tildetel,#tildeverse,#vim,#zine"
+tilde.autojoin = "##ekbots,#.tilde,#ZfA,#anelki,#aussie,#bots,#club,#cosmic,#counting,#counting-meta,#covid19,#ctrl-c,#envs,#envs_german,#espanol,#factorio,#fr,#gemini,#gopher,#helpdesk,#idlerpg,#institute,#irctokens,#linux,#meta,#meta_german,#minecraft,#mops,#music,#netnews,#ninja,#nsfw,#opers,#pink,#politics,#prepping,#projects,#red,#secret-sudoers,#sus,#team,#texto-plano,#theasylum,#thunix,#tilde.zone-admin,#tildebot,#tilderadio,#tilderadio-djs,#tildetel,#tildeverse,#vim,#zine"
 tilde.autorejoin
 tilde.autorejoin_delay
 tilde.connection_timeout
@@ -203,6 +204,7 @@ tilde.msg_quit
 tilde.notify
 tilde.split_msg_max_length
 tilde.charset_message
+tilde.default_chantypes
 hashbang.addresses = "irc.hashbang.sh/6697"
 hashbang.proxy
 hashbang.ipv6
@@ -246,6 +248,7 @@ hashbang.msg_quit
 hashbang.notify
 hashbang.split_msg_max_length
 hashbang.charset_message
+hashbang.default_chantypes
 town.addresses = "localhost/2345"
 town.proxy
 town.ipv6
@@ -275,7 +278,7 @@ town.local_hostname
 town.usermode
 town.command
 town.command_delay
-town.autojoin = "#admins,#politics,#announcements,#counting-meta,#counting,#tildetown,#bots"
+town.autojoin = "#admins,#announcements,#bots,#counting,#counting-meta,#politics,#tildetown"
 town.autorejoin
 town.autorejoin_delay
 town.connection_timeout
@@ -289,6 +292,7 @@ town.msg_quit
 town.notify
 town.split_msg_max_length
 town.charset_message
+town.default_chantypes
 esper.addresses = "irc.esper.net/6697"
 esper.proxy
 esper.ipv6
@@ -332,6 +336,7 @@ esper.msg_quit
 esper.notify
 esper.split_msg_max_length
 esper.charset_message
+esper.default_chantypes
 sdf.addresses = "localhost/2346"
 sdf.proxy
 sdf.ipv6
@@ -375,6 +380,7 @@ sdf.msg_quit
 sdf.notify
 sdf.split_msg_max_length
 sdf.charset_message
+sdf.default_chantypes
 darwin.addresses = "irc.darwin.network/6698"
 darwin.proxy
 darwin.ipv6
@@ -418,6 +424,7 @@ darwin.msg_quit
 darwin.notify
 darwin.split_msg_max_length
 darwin.charset_message
+darwin.default_chantypes
 oftc.addresses = "irc.oftc.net/6697"
 oftc.proxy
 oftc.ipv6
@@ -447,7 +454,7 @@ oftc.local_hostname
 oftc.usermode
 oftc.command
 oftc.command_delay
-oftc.autojoin = "#fish,#debian-devel"
+oftc.autojoin = "#debian-devel,#fish"
 oftc.autorejoin
 oftc.autorejoin_delay
 oftc.connection_timeout
@@ -461,6 +468,7 @@ oftc.msg_quit
 oftc.notify
 oftc.split_msg_max_length
 oftc.charset_message
+oftc.default_chantypes
 freenode.addresses = "chat.us.freenode.net/6697"
 freenode.proxy
 freenode.ipv6
@@ -490,7 +498,7 @@ freenode.local_hostname
 freenode.usermode
 freenode.command
 freenode.command_delay
-freenode.autojoin = "##crustaceans,##irctokens,##ircv3-chat,##jan6,##oodnet,#among-sus,#ascii.town,#bitbot,#borgmatic,#byobu,#cmpwn,#fosshost,#fosshost-dev,#fosshost-volunteers,#gitea,#gophernicus,#lobsters,#mastodon,#oragono,#ovh,#pleroma,#tilde.team,#weechat,#weechat-android"
+freenode.autojoin = "##crustaceans,##irctokens,##ircv3-chat,##jan6,##oodnet,#among-sus,#ascii.town,#bitbot,#borgmatic,#byobu,#cmpwn,#composer,#fosshost,#fosshost-dev,#fosshost-volunteers,#gophernicus,#lobsters,#mastodon,#oragono,#ovh,#pleroma,#sr.ht,#tilde.team,#weechat,#weechat-android"
 freenode.autorejoin
 freenode.autorejoin_delay
 freenode.connection_timeout
@@ -504,6 +512,7 @@ freenode.msg_quit
 freenode.notify
 freenode.split_msg_max_length
 freenode.charset_message
+freenode.default_chantypes
 blinkenshell.addresses = "irc.blinkenshell.org/6697"
 blinkenshell.proxy
 blinkenshell.ipv6
@@ -547,6 +556,7 @@ blinkenshell.msg_quit
 blinkenshell.notify
 blinkenshell.split_msg_max_length
 blinkenshell.charset_message
+blinkenshell.default_chantypes
 inspircd.addresses = "irc.inspircd.org"
 inspircd.proxy
 inspircd.ipv6
@@ -590,6 +600,7 @@ inspircd.msg_quit
 inspircd.notify
 inspircd.split_msg_max_length
 inspircd.charset_message
+inspircd.default_chantypes
 slashnet.addresses = "irc.slashnet.org"
 slashnet.proxy
 slashnet.ipv6
@@ -633,6 +644,7 @@ slashnet.msg_quit
 slashnet.notify
 slashnet.split_msg_max_length
 slashnet.charset_message
+slashnet.default_chantypes
 bitlbee.addresses = "localhost"
 bitlbee.proxy
 bitlbee.ipv6
@@ -662,7 +674,7 @@ bitlbee.local_hostname
 bitlbee.usermode
 bitlbee.command
 bitlbee.command_delay
-bitlbee.autojoin = "#biboumi,#cifuzofu,#ejabberd,#gritty,#harris,#hmm,#jabberzac,#joinjabber,#joinjabber-sysadmin,#lobby,#meeting,#movim,#openhardware,#operators,#tilde.team,#xsf,&SMS,&bitlbee,&hmm,&tilde"
+bitlbee.autojoin = "#biboumi,#cifuzofu,#conversations,#darwin,#ejabberd,#gajim,#harris,#joinjabber,#joinjabber-sysadmin,#lobby,#meeting,#movim,#openhardware,#operators,#tilde.team,#xsf,&SMS,&bitlbee,&hmm,&tilde"
 bitlbee.autorejoin
 bitlbee.autorejoin_delay
 bitlbee.connection_timeout
@@ -676,6 +688,7 @@ bitlbee.msg_quit
 bitlbee.notify
 bitlbee.split_msg_max_length
 bitlbee.charset_message
+bitlbee.default_chantypes
 technet.addresses = "uk.technet.xi.ht/6697"
 technet.proxy
 technet.ipv6
@@ -705,7 +718,7 @@ technet.local_hostname
 technet.usermode
 technet.command
 technet.command_delay
-technet.autojoin = "#computertech,#technet"
+technet.autojoin = "#technet"
 technet.autorejoin
 technet.autorejoin_delay
 technet.connection_timeout
@@ -719,6 +732,7 @@ technet.msg_quit
 technet.notify
 technet.split_msg_max_length
 technet.charset_message
+technet.default_chantypes
 pine.addresses = "irc.pine64.org"
 pine.proxy
 pine.ipv6
@@ -762,6 +776,7 @@ pine.msg_quit
 pine.notify
 pine.split_msg_max_length
 pine.charset_message
+pine.default_chantypes
 pc.addresses = "c2.movia.media/6697"
 pc.proxy
 pc.ipv6
@@ -805,3 +820,48 @@ pc.msg_quit
 pc.notify
 pc.split_msg_max_length
 pc.charset_message
+pc.default_chantypes
+freetest.addresses = "niven.freenode.net/9003"
+freetest.proxy
+freetest.ipv6
+freetest.ssl = on
+freetest.ssl_cert
+freetest.ssl_password
+freetest.ssl_priorities
+freetest.ssl_dhkey_size
+freetest.ssl_fingerprint
+freetest.ssl_verify
+freetest.password
+freetest.capabilities
+freetest.sasl_mechanism
+freetest.sasl_username
+freetest.sasl_password
+freetest.sasl_key
+freetest.sasl_timeout
+freetest.sasl_fail
+freetest.autoconnect
+freetest.autoreconnect
+freetest.autoreconnect_delay
+freetest.nicks
+freetest.nicks_alternate
+freetest.username
+freetest.realname
+freetest.local_hostname
+freetest.usermode
+freetest.command
+freetest.command_delay
+freetest.autojoin = "##jess,#freenode"
+freetest.autorejoin
+freetest.autorejoin_delay
+freetest.connection_timeout
+freetest.anti_flood_prio_high
+freetest.anti_flood_prio_low
+freetest.away_check
+freetest.away_check_max_nicks
+freetest.msg_kick
+freetest.msg_part
+freetest.msg_quit
+freetest.notify
+freetest.split_msg_max_length
+freetest.charset_message
+freetest.default_chantypes
diff --git a/weechat/.weechat/python/colorize_nicks.py b/weechat/.weechat/python/colorize_nicks.py
index 19be2fc..cb95a0d 100644
--- a/weechat/.weechat/python/colorize_nicks.py
+++ b/weechat/.weechat/python/colorize_nicks.py
@@ -21,6 +21,8 @@
 #
 #
 # History:
+# 2020-11-29: jess
+#   version 28: fix ignore_tags having been broken by weechat 2.9 changes
 # 2020-05-09: Sébastien Helleu <flashcode@flashtux.org>
 #   version 27: add compatibility with new weechat_print modifier data
 #               (WeeChat >= 2.9)
@@ -88,7 +90,7 @@ w = weechat
 
 SCRIPT_NAME    = "colorize_nicks"
 SCRIPT_AUTHOR  = "xt <xt@bash.no>"
-SCRIPT_VERSION = "27"
+SCRIPT_VERSION = "28"
 SCRIPT_LICENSE = "GPL"
 SCRIPT_DESC    = "Use the weechat nick colors in the chat area"
 
@@ -184,6 +186,7 @@ def colorize_cb(data, modifier, modifier_data, line):
         buffer = w.buffer_search(plugin, buffer_name)
 
     channel = w.buffer_get_string(buffer, 'localvar_channel')
+    tags = tags.split(',')
 
     # Check if buffer has colorized nicks
     if buffer not in colored_nicks:
@@ -196,12 +199,10 @@ def colorize_cb(data, modifier, modifier_data, line):
     reset = w.color('reset')
 
     # Don't colorize if the ignored tag is present in message
-    tags_line = modifier_data.rsplit(';')
-    if len(tags_line) >= 3:
-        tags_line = tags_line[2].split(',')
-        for i in w.config_string(colorize_config_option['ignore_tags']).split(','):
-            if i in tags_line:
-                return line
+    tag_ignores = w.config_string(colorize_config_option['ignore_tags']).split(',')
+    for tag in tags:
+        if tag in tag_ignores:
+            return line
 
     for words in valid_nick_re.findall(line):
         nick = words[1]
diff --git a/weechat/.weechat/weechat.conf b/weechat/.weechat/weechat.conf
index 6fae966..22eaf8a 100644
--- a/weechat/.weechat/weechat.conf
+++ b/weechat/.weechat/weechat.conf
@@ -72,6 +72,7 @@ hotlist_short_names = on
 hotlist_sort = group_time_asc
 hotlist_suffix = ""
 hotlist_unique_numbers = on
+hotlist_update_on_buffer_switch = on
 input_cursor_scroll = 20
 input_share = none
 input_share_overwrite = off
@@ -121,6 +122,7 @@ quote_time_format = "%H:%M:%S"
 read_marker = line
 read_marker_always_show = off
 read_marker_string = "- "
+read_marker_update_on_buffer_switch = on
 save_config_on_exit = on
 save_config_with_fsync = off
 save_layout_on_exit = none