From 7b32b16565429597741dd680a6b00c89479befcb Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Fri, 5 Mar 2021 11:33:45 -0500
Subject: [PATCH] update autojoins

---
 weechat/.weechat/irc.conf                     | 59 ++++++++++++++++---
 weechat/.weechat/plugins.conf                 |  4 +-
 weechat/.weechat/python/autoload/wee_slack.py |  1 +
 weechat/.weechat/weechat.conf                 |  1 +
 4 files changed, 55 insertions(+), 10 deletions(-)
 create mode 120000 weechat/.weechat/python/autoload/wee_slack.py

diff --git a/weechat/.weechat/irc.conf b/weechat/.weechat/irc.conf
index ecf0325..b22179d 100644
--- a/weechat/.weechat/irc.conf
+++ b/weechat/.weechat/irc.conf
@@ -189,7 +189,7 @@ tilde.local_hostname
 tilde.usermode
 tilde.command = "/msg operserv login ${sec.data.pass}"
 tilde.command_delay
-tilde.autojoin = "#opers,#music,#counting,#counting-meta,#irctokens,#factorio,#tilde.zone-admin,#tildebot,#envs_german,#secret-sudoers,#prepping,##ekbots,#anelki,#sus,#netnews,#zine,#aussie,#theasylum,#ZfA,#.tilde,#minecraft,#idlerpg,#vim,#nsfw,#meta_german,#linux,#gopher,#tildeverse,#bungame,#projects,#espanol,#thunix,#ctrl-c,#envs,#tilderadio-djs,#covid19,#geocities,#fr,#bread,#red,#politics,#institute,#meta,#pink,#cosmic,#texto-plano,#tilderadio,#team,#helpdesk,#tildetel,#bots,#gemini,#club"
+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.autorejoin
 tilde.autorejoin_delay
 tilde.connection_timeout
@@ -232,7 +232,7 @@ hashbang.local_hostname
 hashbang.usermode
 hashbang.command
 hashbang.command_delay
-hashbang.autojoin = "#!opers,#!cast,#!os,#!social,#!"
+hashbang.autojoin = "#!,#!cast,#!opers,#!os,#!social"
 hashbang.autorejoin
 hashbang.autorejoin_delay
 hashbang.connection_timeout
@@ -275,7 +275,7 @@ town.local_hostname
 town.usermode
 town.command
 town.command_delay
-town.autojoin = "#admins,#politics,#tildetown,#bots,#announcements,#counting-meta,#counting"
+town.autojoin = "#admins,#politics,#announcements,#counting-meta,#counting,#tildetown,#bots"
 town.autorejoin
 town.autorejoin_delay
 town.connection_timeout
@@ -361,7 +361,7 @@ sdf.local_hostname
 sdf.usermode
 sdf.command
 sdf.command_delay
-sdf.autojoin = "#spanish"
+sdf.autojoin = "#sdf,#spanish"
 sdf.autorejoin
 sdf.autorejoin_delay
 sdf.connection_timeout
@@ -490,7 +490,7 @@ freenode.local_hostname
 freenode.usermode
 freenode.command
 freenode.command_delay
-freenode.autojoin = "##oodnet,#gophernicus,##jan6,#fosshost-dev,#fosshost-volunteers,##irctokens,##ircv3-chat,##crustaceans,#weechat-android,#among-sus,#ascii.town,#oragono,#tilde.team,#fosshost,#pleroma,#sr.ht,#gitea,#lobsters,#cmpwn,#bitbot,#ovh,#mastodon,#code4lib,#weechat,#borgmatic,#openwrt"
+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.autorejoin
 freenode.autorejoin_delay
 freenode.connection_timeout
@@ -662,7 +662,7 @@ bitlbee.local_hostname
 bitlbee.usermode
 bitlbee.command
 bitlbee.command_delay
-bitlbee.autojoin = "&bitlbee,&hmm,#harris,&SMS,#gritty,#cifuzofu,#soprani.ca,&tilde,#jabberzac,#joinjabber,#joinjabber-sysadmin,#hmm,#tilde.team,#lobby,#conversations,#ejabberd,#operators"
+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.autorejoin
 bitlbee.autorejoin_delay
 bitlbee.connection_timeout
@@ -705,7 +705,7 @@ technet.local_hostname
 technet.usermode
 technet.command
 technet.command_delay
-technet.autojoin = "#technet,#computertech"
+technet.autojoin = "#computertech,#technet"
 technet.autorejoin
 technet.autorejoin_delay
 technet.connection_timeout
@@ -748,7 +748,7 @@ pine.local_hostname
 pine.usermode
 pine.command
 pine.command_delay
-pine.autojoin = "#pinephone,#pine-community"
+pine.autojoin = "#pine-community"
 pine.autorejoin
 pine.autorejoin_delay
 pine.connection_timeout
@@ -762,3 +762,46 @@ pine.msg_quit
 pine.notify
 pine.split_msg_max_length
 pine.charset_message
+pc.addresses = "c2.movia.media/6697"
+pc.proxy
+pc.ipv6
+pc.ssl = on
+pc.ssl_cert
+pc.ssl_password
+pc.ssl_priorities
+pc.ssl_dhkey_size
+pc.ssl_fingerprint
+pc.ssl_verify = off
+pc.password = "${sec.data.paranoidserverpass}"
+pc.capabilities
+pc.sasl_mechanism
+pc.sasl_username
+pc.sasl_password
+pc.sasl_key
+pc.sasl_timeout
+pc.sasl_fail
+pc.autoconnect
+pc.autoreconnect
+pc.autoreconnect_delay
+pc.nicks
+pc.nicks_alternate
+pc.username
+pc.realname
+pc.local_hostname
+pc.usermode
+pc.command
+pc.command_delay
+pc.autojoin = "#cnc"
+pc.autorejoin
+pc.autorejoin_delay
+pc.connection_timeout
+pc.anti_flood_prio_high
+pc.anti_flood_prio_low
+pc.away_check
+pc.away_check_max_nicks
+pc.msg_kick
+pc.msg_part
+pc.msg_quit
+pc.notify
+pc.split_msg_max_length
+pc.charset_message
diff --git a/weechat/.weechat/plugins.conf b/weechat/.weechat/plugins.conf
index 18e8583..caa23ef 100644
--- a/weechat/.weechat/plugins.conf
+++ b/weechat/.weechat/plugins.conf
@@ -56,7 +56,7 @@ python.apply_corrections.data_timeout = "60"
 python.apply_corrections.message_limit = "2"
 python.apply_corrections.print_format = "[nick]: [corrected]"
 python.apply_corrections.print_limit = "1"
-python.autojoinem.sorted = "off"
+python.autojoinem.sorted = "on"
 python.autosavekey.add = "on"
 python.autosavekey.mute = "off"
 python.autosavekey.secure = "on"
@@ -132,7 +132,7 @@ python.slack.shared_name_prefix = "%"
 python.slack.short_buffer_names = "false"
 python.slack.show_buflist_presence = "true"
 python.slack.show_reaction_nicks = "false"
-python.slack.slack_api_token = "${sec.data.remotesslacktoken}"
+python.slack.slack_api_token = "${sec.data.remotesslacktoken},${sec.data.moviaslacktoken}"
 python.slack.slack_timeout = "20000"
 python.slack.switch_buffer_on_join = "true"
 python.slack.thread_messages_in_channel = "false"
diff --git a/weechat/.weechat/python/autoload/wee_slack.py b/weechat/.weechat/python/autoload/wee_slack.py
new file mode 120000
index 0000000..a77c3bb
--- /dev/null
+++ b/weechat/.weechat/python/autoload/wee_slack.py
@@ -0,0 +1 @@
+../wee_slack.py
\ No newline at end of file
diff --git a/weechat/.weechat/weechat.conf b/weechat/.weechat/weechat.conf
index e46a7d9..6fae966 100644
--- a/weechat/.weechat/weechat.conf
+++ b/weechat/.weechat/weechat.conf
@@ -363,6 +363,7 @@ default.current = on
 [notify]
 irc.server.tilde = highlight
 perl.highmon = none
+python.slack.haulerads.#device-dev = highlight
 
 [filter]
 irc_smart = on;*;irc_smart_filter;*