From b12406076b98a17adf4c4acf7b6a0a44e0817ba2 Mon Sep 17 00:00:00 2001
From: Ekkie <soelam@live.de>
Date: Fri, 24 Mar 2023 20:26:06 +0100
Subject: [PATCH 1/3] [irssi-conf] Make default network name consistent

Before, the name of the default network was set as "localhost",
"tildenet", "tilde.chat" and "irc". This chooses a more appropriate name
in both irssi's config and startup files: newnet
---
 .irssi/config  | 8 ++++----
 .irssi/startup | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.irssi/config b/.irssi/config
index aea437c..6581c16 100644
--- a/.irssi/config
+++ b/.irssi/config
@@ -1,9 +1,9 @@
 servers = (
-  { address = "irc"; chatnet = "localhost"; port = "6667"; }
+  { address = "irc"; chatnet = "newnet"; port = "6667"; }
 );
 
 chatnets = {
-  tildenet = {
+  newnet = {
     type = "IRC";
     max_kicks = "4";
     max_msgs = "5";
@@ -13,8 +13,8 @@ chatnets = {
 };
 
 channels = (
-  { name = "#club"; chatnet = "tilde.chat"; autojoin = "No"; }
-  { name = "#meta"; chatnet = "tilde.chat"; autojoin = "No"; }
+  { name = "#club"; chatnet = "newnet"; autojoin = "No"; }
+  { name = "#meta"; chatnet = "newnet"; autojoin = "No"; }
 );
 
 aliases = {
diff --git a/.irssi/startup b/.irssi/startup
index 799686a..d57352b 100644
--- a/.irssi/startup
+++ b/.irssi/startup
@@ -1,3 +1,3 @@
-connect irc
+connect newnet
 join #club
 join #meta

From 2dc87f77631cdf5341278d42174b715f4992befe Mon Sep 17 00:00:00 2001
From: Ekkie <soelam@live.de>
Date: Fri, 24 Mar 2023 20:54:22 +0100
Subject: [PATCH 2/3] [irssi-conf] Autojoin in config, not startup

Before, the startup file tries connecting to the default network and
join two channels. However, since irssi just executes the startup file
line by line with little logic behind it, it tries joining the channels
while the user is still connecting.

Instead, this commit sets the channels to autojoin, which only triggers
once the user is connected and, if configured properly, authenticated.
---
 .irssi/config  | 4 ++--
 .irssi/startup | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.irssi/config b/.irssi/config
index 6581c16..59be582 100644
--- a/.irssi/config
+++ b/.irssi/config
@@ -13,8 +13,8 @@ chatnets = {
 };
 
 channels = (
-  { name = "#club"; chatnet = "newnet"; autojoin = "No"; }
-  { name = "#meta"; chatnet = "newnet"; autojoin = "No"; }
+  { name = "#club"; chatnet = "newnet"; autojoin = "yes"; }
+  { name = "#meta"; chatnet = "newnet"; autojoin = "yes"; }
 );
 
 aliases = {
diff --git a/.irssi/startup b/.irssi/startup
index d57352b..fdf0915 100644
--- a/.irssi/startup
+++ b/.irssi/startup
@@ -1,3 +1 @@
 connect newnet
-join #club
-join #meta

From 251191e66fcc04b7540e371c51d2309307720a39 Mon Sep 17 00:00:00 2001
From: Ekkie <soelam@live.de>
Date: Fri, 24 Mar 2023 21:09:25 +0100
Subject: [PATCH 3/3] [irssi-conf] Force starttls off for default net

When connecting to newnet via localhost on tilde.club with tls set to
off, newnet will try to switch to tls using starttls. However, since
irssi is connecting using a hostname set in /etc/hosts (in this case,
"irc"), the presented certificate's CN doesn't match and irssi aborts.
Setting starttls to off forces irssi to connect via plain-text.
---
 .irssi/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.irssi/config b/.irssi/config
index 59be582..9d50a38 100644
--- a/.irssi/config
+++ b/.irssi/config
@@ -1,5 +1,5 @@
 servers = (
-  { address = "irc"; chatnet = "newnet"; port = "6667"; }
+  { address = "irc"; chatnet = "newnet"; port = "6667"; starttls = "no"; }
 );
 
 chatnets = {