From a0bd03f9d5168c6d521051aebb34eb6b13f77ff7 Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Wed, 27 May 2020 11:13:14 -0400
Subject: [PATCH] update weechat configs

- add more nick colors
- update hashbang oper config
- update autojoins
---
 weechat/.weechat/irc.conf     | 53 +++++++++++++++++++++++++++++++----
 weechat/.weechat/trigger.conf | 32 +++++++++++++++++++++
 weechat/.weechat/weechat.conf |  2 +-
 3 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/weechat/.weechat/irc.conf b/weechat/.weechat/irc.conf
index 5db441f..a5ff25d 100644
--- a/weechat/.weechat/irc.conf
+++ b/weechat/.weechat/irc.conf
@@ -124,7 +124,7 @@ autorejoin = off
 autorejoin_delay = 30
 away_check = 0
 away_check_max_nicks = 25
-capabilities = "account-notify,away-notify,cap-notify,chghost,extended-join,invite-notify,multi-prefix,server-time,userhost-in-names,sasl"
+capabilities = "account-notify,away-notify,cap-notify,chghost,extended-join,invite-notify,multi-prefix,server-time,userhost-in-names"
 charset_message = message
 command = ""
 command_delay = 0
@@ -187,7 +187,7 @@ tilde.local_hostname
 tilde.usermode
 tilde.command = "/msg operserv login ${sec.data.pass}"
 tilde.command_delay
-tilde.autojoin = "#meta,#secret-sudoers,#admin,#opers,#music,#politics,#gopher,#tildeverse,#idlerpg,#tilderadio,#minecraft,#tildelinux,#cosmic,#institute,#.tilde,#tildetel,#thunix,#theasylum,#aussie,#uucp,#projects,#hamradio,#vim,#black,#pink,#~,#netnews,#bots,#ctrl-c,#radiofreqs,#envs,#wilde,#tildegames,#tildenet,#gemini,#club,#zine,#team,#summit,#geocities,#services,#helpdesk,#honeypot,#flamewars,#counting,#covid19,#rw.rs,#counting-meta,#irctokens,#linux,#one,#fr,#factorio,#cute,#pinebox,#the1024club :10:20,secretsudoteam,adminsonly"
+tilde.autojoin = "#meta,#secret-sudoers,#admin,#opers,#music,#politics,#gopher,#tildeverse,#idlerpg,#tilderadio,#minecraft,#tildelinux,#cosmic,#institute,#.tilde,#tildetel,#thunix,#theasylum,#aussie,#uucp,#projects,#hamradio,#vim,#black,#pink,#~,#netnews,#bots,#ctrl-c,#radiofreqs,#envs,#wilde,#tildegames,#tildenet,#gemini,#club,#zine,#team,#geocities,#helpdesk,#flamewars,#counting,#covid19,#rw.rs,#counting-meta,#irctokens,#linux,#one,#fr,#factorio,#cute,#pinebox,#the1024club,#tv,#wotd :10:20,secretsudoteam,adminsonly"
 tilde.autorejoin
 tilde.autorejoin_delay
 tilde.connection_timeout
@@ -213,7 +213,7 @@ hashbang.ssl_fingerprint
 hashbang.ssl_verify
 hashbang.password
 hashbang.capabilities
-hashbang.sasl_mechanism
+hashbang.sasl_mechanism = external
 hashbang.sasl_username
 hashbang.sasl_password
 hashbang.sasl_key
@@ -228,7 +228,7 @@ hashbang.username
 hashbang.realname
 hashbang.local_hostname
 hashbang.usermode
-hashbang.command = "/oper benharri x"
+hashbang.command
 hashbang.command_delay
 hashbang.autojoin = "#!opers,#!politics,#!os,#!social,#!,#!cast"
 hashbang.autorejoin
@@ -488,7 +488,7 @@ freenode.local_hostname
 freenode.usermode
 freenode.command
 freenode.command_delay
-freenode.autojoin = "#weechat,##oodnet,#lobsters,#gitea,#mastodon,#pleroma,#pleroma-offtopic,#oragono,#sr.ht,#cmpwn,#bitbot,#gophernicus,##jan6,#ascii.town,#thelounge,##ircv3-chat,#!,#futel,#trashtown,#weechat-android,#lobsters-boil,##proggit-superfriends,#ovh,#tilde.team 6:10"
+freenode.autojoin = "#weechat,##oodnet,#lobsters,#gitea,#mastodon,#pleroma,#pleroma-offtopic,#oragono,#sr.ht,#cmpwn,#bitbot,#gophernicus,##jan6,#ascii.town,#thelounge,##ircv3-chat,#!,#futel,#trashtown,#weechat-android,#lobsters-boil,#ovh,#tilde.team,#rspamd,#fosshost,#fosshost-meet,#fosshost-dev 6:10"
 freenode.autorejoin
 freenode.autorejoin_delay
 freenode.connection_timeout
@@ -889,3 +889,46 @@ unix.msg_quit
 unix.notify
 unix.split_msg_max_length
 unix.charset_message
+irctokens.addresses = "irctokens.org/6697"
+irctokens.proxy
+irctokens.ipv6
+irctokens.ssl = on
+irctokens.ssl_cert
+irctokens.ssl_password
+irctokens.ssl_priorities
+irctokens.ssl_dhkey_size
+irctokens.ssl_fingerprint
+irctokens.ssl_verify
+irctokens.password
+irctokens.capabilities
+irctokens.sasl_mechanism
+irctokens.sasl_username
+irctokens.sasl_password
+irctokens.sasl_key
+irctokens.sasl_timeout
+irctokens.sasl_fail
+irctokens.autoconnect
+irctokens.autoreconnect
+irctokens.autoreconnect_delay
+irctokens.nicks
+irctokens.nicks_alternate
+irctokens.username
+irctokens.realname
+irctokens.local_hostname
+irctokens.usermode
+irctokens.command
+irctokens.command_delay
+irctokens.autojoin = "#test,#bap"
+irctokens.autorejoin
+irctokens.autorejoin_delay
+irctokens.connection_timeout
+irctokens.anti_flood_prio_high
+irctokens.anti_flood_prio_low
+irctokens.away_check
+irctokens.away_check_max_nicks
+irctokens.msg_kick
+irctokens.msg_part
+irctokens.msg_quit
+irctokens.notify
+irctokens.split_msg_max_length
+irctokens.charset_message
diff --git a/weechat/.weechat/trigger.conf b/weechat/.weechat/trigger.conf
index 7c441d0..59aacb8 100644
--- a/weechat/.weechat/trigger.conf
+++ b/weechat/.weechat/trigger.conf
@@ -57,6 +57,38 @@ greentext.hook = modifier
 greentext.post_action = none
 greentext.regex = "/(.*)/${tg_prefix}\t${color:34}${tg_message}"
 greentext.return_code = ok
+ircd_notice_con.arguments = "weechat_print"
+ircd_notice_con.command = ""
+ircd_notice_con.conditions = "${tg_tags} =~ irc_notice"
+ircd_notice_con.enabled = on
+ircd_notice_con.hook = modifier
+ircd_notice_con.post_action = none
+ircd_notice_con.regex = "/(CONNECT:)(.*: )([^ !]+)(!.*)/${color:02}${re:1}${color:reset}${re:2}${color:14}${re:3}${color:reset}${re:4}/"
+ircd_notice_con.return_code = ok
+ircd_notice_con_main.arguments = "weechat_print"
+ircd_notice_con_main.command = ""
+ircd_notice_con_main.conditions = "${tg_tags} =~ irc_notice"
+ircd_notice_con_main.enabled = on
+ircd_notice_con_main.hook = modifier
+ircd_notice_con_main.post_action = none
+ircd_notice_con_main.regex = "/(CONNECT:)(.*class )(main)(.*)/${re:1}${re:2}${color:01}${re:3}${color:reset}${re:4}/"
+ircd_notice_con_main.return_code = ok
+ircd_notice_quit.arguments = "weechat_print"
+ircd_notice_quit.command = ""
+ircd_notice_quit.conditions = "${tg_tags} =~ irc_notice"
+ircd_notice_quit.enabled = on
+ircd_notice_quit.hook = modifier
+ircd_notice_quit.post_action = none
+ircd_notice_quit.regex = "/(QUIT:)(.*: )([^ !]+)(!.*)/${color:03}${re:1}${color:reset}${re:2}${color:06}${re:3}${color:reset}${re:4}/"
+ircd_notice_quit.return_code = ok
+ircd_notice_xline.arguments = "weechat_print"
+ircd_notice_xline.command = ""
+ircd_notice_xline.conditions = "${tg_tags} =~ irc_notice"
+ircd_notice_xline.enabled = on
+ircd_notice_xline.hook = modifier
+ircd_notice_xline.post_action = none
+ircd_notice_xline.regex = "/(XLINE:)(.*)/${color:01}${re:1}${color:reset}${re:2}/"
+ircd_notice_xline.return_code = ok
 msg_auth.arguments = "5000|irc_message_auth"
 msg_auth.command = ""
 msg_auth.conditions = ""
diff --git a/weechat/.weechat/weechat.conf b/weechat/.weechat/weechat.conf
index 4813dbc..ce555b1 100644
--- a/weechat/.weechat/weechat.conf
+++ b/weechat/.weechat/weechat.conf
@@ -155,7 +155,7 @@ chat_host = cyan
 chat_inactive_buffer = default
 chat_inactive_window = default
 chat_nick = lightcyan
-chat_nick_colors = "cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue,31,35,38,40,49,63,70,80,92,99,112,126,130,138,142,148,160,162,167,169,174,176,178,184,186,210,212,215,247"
+chat_nick_colors = "cyan,magenta,green,brown,lightblue,default,lightcyan,lightgreen,blue,22,31,35,38,40,49,63,70,80,87,92,99,112,119,126,130,138,142,146,148,160,162,167,169,174,176,178,184,186,191,200,202,206,210,212,215,225,226,247"
 chat_nick_offline = blue
 chat_nick_offline_highlight = default
 chat_nick_offline_highlight_bg = blue