From a4486c236a3bf15192d0500b3a1892f7465826c7 Mon Sep 17 00:00:00 2001
From: Geert Hauwaerts <geert@hauwaerts.be>
Date: Wed, 26 May 2021 09:24:32 +0300
Subject: [PATCH 01/31] Irssi does not take a political stance.

---
 README.md                  |  2 +-
 docs/help/in/admin.in      |  2 +-
 docs/help/in/channel.in    |  8 ++++----
 docs/help/in/connect.in    |  6 +++---
 docs/help/in/disconnect.in |  2 +-
 docs/help/in/info.in       |  2 +-
 docs/help/in/join.in       |  2 +-
 docs/help/in/knock.in      |  2 +-
 docs/help/in/log.in        |  8 ++++----
 docs/help/in/motd.in       |  2 +-
 docs/help/in/names.in      |  2 +-
 docs/help/in/nctcp.in      |  2 +-
 docs/help/in/network.in    |  6 +++---
 docs/help/in/part.in       |  2 +-
 docs/help/in/query.in      |  4 ++--
 docs/help/in/recode.in     |  2 +-
 docs/help/in/reconnect.in  |  2 +-
 docs/help/in/server.in     | 16 ++++++++--------
 docs/manual.txt            |  2 +-
 docs/proxy.txt             |  2 +-
 docs/startup-HOWTO.html    |  4 ++--
 docs/startup-HOWTO.txt     |  4 ++--
 irssi.conf                 |  8 ++++----
 23 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/README.md b/README.md
index d1232764..08be65b4 100644
--- a/README.md
+++ b/README.md
@@ -72,4 +72,4 @@ Irssi is always looking for developers. Feel free to submit patches through
 GitHub pull requests.
 
 You can also contact the Irssi developers in
-[#irssi](https://irssi.org/support/irc/) on irc.libera.chat.
+[#irssi](https://irssi.org/support/irc/) on freenode.
diff --git a/docs/help/in/admin.in b/docs/help/in/admin.in
index acb6e1ae..2b6f8b73 100644
--- a/docs/help/in/admin.in
+++ b/docs/help/in/admin.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /ADMIN
-    /ADMIN irc.libera.chat
+    /ADMIN orwell.freenode.net
     /ADMIN mike
 
 %9See also:%9 INFO
diff --git a/docs/help/in/channel.in b/docs/help/in/channel.in
index d9be8cf5..86e824c2 100644
--- a/docs/help/in/channel.in
+++ b/docs/help/in/channel.in
@@ -33,12 +33,12 @@
 
     /CHANNEL
     /CHANNEL LIST
-    /CHANNEL ADD -auto #irssi liberachat
+    /CHANNEL ADD -auto #irssi Freenode
     /CHANNEL ADD -auto #basementcat Quakenet secret_lair
-    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout liberachat
+    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout Freenode
     /CHANNEL ADD -auto -bots 'Q!TheQBot@CServe.quakenet.org' -botcmd '^MSG Q op #irssi' #irssi Quakenet
-    /CHANNEL MODIFY -noauto #irssi liberachat
-    /CHANNEL REMOVE #hideout liberachat
+    /CHANNEL MODIFY -noauto #irssi Freenode
+    /CHANNEL REMOVE #hideout Freenode
 
 %9Special Example:%9
 
diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index d4375eec..e861ad74 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -34,9 +34,9 @@
 
 %9Examples:%9
 
-    /CONNECT liberachat
-    /CONNECT -6 liberachat
-    /CONNECT -4 -! -host staff.irssi.org -network liberachat irc.libera.chat
+    /CONNECT Freenode
+    /CONNECT -6 Freenode
+    /CONNECT -4 -! -host staff.irssi.org -network Freenode orwell.freenode.net
     /CONNECT irc.irssi.org 6667 WzerT8zq mike
 
 %9See also:%9 DISCONNECT, RMRECONNS, SERVER
diff --git a/docs/help/in/disconnect.in b/docs/help/in/disconnect.in
index c53b1e60..bd4a4e17 100644
--- a/docs/help/in/disconnect.in
+++ b/docs/help/in/disconnect.in
@@ -18,7 +18,7 @@
 
 %9Examples:%9
 
-    /DISCONNECT liberachat I'm off for today, take care!
+    /DISCONNECT Freenode I'm off for today, take care!
     /DISCONNECT * Vacation time :D
     /DISCONNECT
 
diff --git a/docs/help/in/info.in b/docs/help/in/info.in
index d8d8cfc9..275f349d 100644
--- a/docs/help/in/info.in
+++ b/docs/help/in/info.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /INFO
-    /INFO irc.libera.chat
+    /INFO orwell.freenode.net
 
 %9See also:%9 ADMIN
 
diff --git a/docs/help/in/join.in b/docs/help/in/join.in
index adf7158e..39fa23f8 100644
--- a/docs/help/in/join.in
+++ b/docs/help/in/join.in
@@ -20,7 +20,7 @@
     /JOIN #irssi
     /JOIN #basementcat secret_lair
     /JOIN -invite
-    /JOIN -liberachat #github,#libera,#irssi
+    /JOIN -freenode #github,#freenode,#irssi
 
 %9See also:%9 KICK, PART
 
diff --git a/docs/help/in/knock.in b/docs/help/in/knock.in
index ce8f9aa0..bb554d55 100644
--- a/docs/help/in/knock.in
+++ b/docs/help/in/knock.in
@@ -23,7 +23,7 @@
 %9Examples:%9
 
     /KNOCK #irssi
-    /KNOCK #libera
+    /KNOCK #freenode
     /KNOCK #github
 
 %9See also:%9 INVITE, JOIN
diff --git a/docs/help/in/log.in b/docs/help/in/log.in
index 3ca8782c..e4743d46 100644
--- a/docs/help/in/log.in
+++ b/docs/help/in/log.in
@@ -33,10 +33,10 @@
 %9Examples:%9
 
     /LOG OPEN -targets mike ~/irclogs/mike.log MSGS
-    /LOG OPEN -targets #irssi ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
-    /LOG CLOSE ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
-    /LOG STOP ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
-    /LOG START ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
+    /LOG OPEN -targets #irssi-freenode ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG CLOSE ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG STOP ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG START ~/irclogs/freenode/irssi-%%Y-%%m-%%d
 
     /SET autolog ON
 
diff --git a/docs/help/in/motd.in b/docs/help/in/motd.in
index 6e86681e..e33a1c75 100644
--- a/docs/help/in/motd.in
+++ b/docs/help/in/motd.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /MOTD
-    /MOTD irc.libera.chat
+    /MOTD orwel.freenode.org
     /MOTD bob
 
 %9See also:%9 ADMIN, INFO, LINKS, MAP
diff --git a/docs/help/in/names.in b/docs/help/in/names.in
index 974b845f..8fd8cf91 100644
--- a/docs/help/in/names.in
+++ b/docs/help/in/names.in
@@ -21,7 +21,7 @@
 %9Examples:%9
 
     /NAMES -ops
-    /NAMES -voices #irssi,#libera
+    /NAMES -voices #irssi,#freenode
 
 %9See also:%9 JOIN, PART, WHO, WHOIS
 
diff --git a/docs/help/in/nctcp.in b/docs/help/in/nctcp.in
index 9f516730..93c3f3ec 100644
--- a/docs/help/in/nctcp.in
+++ b/docs/help/in/nctcp.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /NCTCP #irssi VERSION King of the Jungle v1.0
-    /NCTCP bob,#libera USERINFO I am bob :p
+    /NCTCP bob,#freenode USERINFO I am bob :p
 
 %9See also:%9 CTCP
 
diff --git a/docs/help/in/network.in b/docs/help/in/network.in
index 0542bd7d..fbdaa0b4 100644
--- a/docs/help/in/network.in
+++ b/docs/help/in/network.in
@@ -59,11 +59,11 @@
 %9Examples:%9
 
     /NETWORK ADD -usermode +giw EFnet
-    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org liberachat
-    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' liberachat
+    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org Freenode
+    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' Freenode
     /NETWORK ADD -autosendcmd '^MSG Q@CServe.quakenet.org AUTH mike WzerT8zq; WAIT 2000; OPER mike WzerT8zq; WAIT 2000; MODE mike +kXP' Quakenet
     /NETWORK MODIFY -usermode +gi EFnet
-    /NETWORK REMOVE liberachat
+    /NETWORK REMOVE Freenode
 
 %9See also:%9 CHANNEL, CONNECT, SERVER
 
diff --git a/docs/help/in/part.in b/docs/help/in/part.in
index f89769cc..e96abfbb 100644
--- a/docs/help/in/part.in
+++ b/docs/help/in/part.in
@@ -14,7 +14,7 @@
 %9Examples:%9
 
     /PART #irssi
-    /PART #libera,#irssi
+    /PART #freenode,#irssi
 
 %9See also:%9 JOIN, KICK
 
diff --git a/docs/help/in/query.in b/docs/help/in/query.in
index a34f85e8..1c0ba5b9 100644
--- a/docs/help/in/query.in
+++ b/docs/help/in/query.in
@@ -17,8 +17,8 @@
 %9Examples:%9
 
     /QUERY mike
-    /QUERY -liberachat bob
-    /QUERY -liberachat -window sarah
+    /QUERY -freenode bob
+    /QUERY -freenode -window sarah
 
 %9See also:%9 MSG, UNQUERY, WINDOW
 
diff --git a/docs/help/in/recode.in b/docs/help/in/recode.in
index 760c66cd..63f52339 100644
--- a/docs/help/in/recode.in
+++ b/docs/help/in/recode.in
@@ -22,7 +22,7 @@
 %9Examples:%9
 
     /RECODE
-    /RECODE ADD liberachat/mike utf-8
+    /RECODE ADD Freenode/mike utf-8
     /RECODE ADD #korea euc-kr
     /RECODE REMOVE #korea
 
diff --git a/docs/help/in/reconnect.in b/docs/help/in/reconnect.in
index 87beb95a..aa1dc946 100644
--- a/docs/help/in/reconnect.in
+++ b/docs/help/in/reconnect.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /RECONNECT
-    /RECONNECT liberachat
+    /RECONNECT Freenode
     /RECONNECT EFnet BRB :)
 
 %9See also:%9 CONNECT, DISCONNECT, NETWORK, RMRECONNS, SERVER
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index f7d907f3..beb75114 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -61,15 +61,15 @@
 %9Examples:%9
 
     /SERVER
-    /SERVER CONNECT irc.libera.chat
-    /SERVER CONNECT +irc.libera.chat
-    /SERVER ADD -network liberachat -noautosendcmd irc.libera.chat
-    /SERVER ADD -! -auto -host staff.irssi.org -4 -network liberachat -noproxy irc.libera.chat 6667
-    /SERVER MODIFY -network liberachat -noauto irc.libera.chat
-    /SERVER MODIFY -network liberachat irc.libera.chat 6697 -
-    /SERVER REMOVE irc.libera.chat 6667 liberachat
+    /SERVER CONNECT chat.freenode.net
+    /SERVER CONNECT +chat.freenode.net
+    /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
+    /SERVER ADD -! -auto -host staff.irssi.org -4 -network Freenode -noproxy orwell.freenode.net 6667
+    /SERVER MODIFY -network Freenode -noauto orwell.freenode.net
+    /SERVER MODIFY -network Freenode orwell.freenode.net 6697 -
+    /SERVER REMOVE orwell.freenode.net 6667 Freenode
     /SERVER PURGE
-    /SERVER PURGE irc.libera.chat
+    /SERVER PURGE orwell.freenode.net
 
 %9See also:%9 CHANNEL, CONNECT, DISCONNECT, NETWORK, RECONNECT, RMRECONNS
 
diff --git a/docs/manual.txt b/docs/manual.txt
index 5f0eac51..0f24ffe3 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -349,7 +349,7 @@
 	after connecting to the network. This is useful for automatically 
 	identifying yourself to NickServ, for example
 
-	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" liberachat
+	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" freenode
 
 	/NETWORK REMOVE <name>
 
diff --git a/docs/proxy.txt b/docs/proxy.txt
index 172770e8..224d24e3 100644
--- a/docs/proxy.txt
+++ b/docs/proxy.txt
@@ -24,7 +24,7 @@ You really should set some password for the proxy with:
 Then you'll need to configure the ports/ircnets the proxy listens in,
 something like:
 
-  /SET irssiproxy_ports IRCnet=2777 EFNet=2778 liberachat=2779
+  /SET irssiproxy_ports ircnet=2777 efnet=2778 freenode=2779
 
 There we have 3 different irc networks answering in 3 ports. Note that
 you'll have to make the correct /IRCNET ADD and /SERVER ADD commands to
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index b0c68f1f..48f6e6df 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -68,7 +68,7 @@
 
 <p>And to connect to one of those networks and join a channel:</p>
 
-<div><div><pre><code>/CONNECT liberachat
+<div><div><pre><code>/CONNECT Freenode
 /JOIN #irssi
 </code></pre></div></div>
 
@@ -94,7 +94,7 @@
 
 <p>If you have irssi 0.8.18 or higher and the irc network supports it, you can use SASL instead of nickserv, which is more reliable:</p>
 
-<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN liberachat
+<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
 </code></pre></div></div>
 
 <p>These commands have many more options, see their help for details:</p>
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index bff33108..61de27e3 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -43,7 +43,7 @@ has a few predefined networks, to list them:
 
 And to connect to one of those networks and join a channel:
 
-/CONNECT liberachat
+/CONNECT Freenode
 /JOIN #irssi
 
 To add more networks:
@@ -67,7 +67,7 @@ wait for 2 seconds before joining channels:
 If you have irssi 0.8.18 or higher and the irc network supports it, you can use
 SASL instead of nickserv, which is more reliable:
 
-/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN liberachat
+/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
 
 These commands have many more options, see their help for details:
 
diff --git a/irssi.conf b/irssi.conf
index 21c3ba4c..edaeb3f5 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -2,7 +2,7 @@ servers = (
   { address = "irc.dal.net";       chatnet = "DALnet";    port = "6667"; },
   { address = "ssl.efnet.org";     chatnet = "EFNet";     port = "9999"; use_tls = "yes"; tls_verify = "no"; },
   { address = "irc.esper.net";     chatnet = "EsperNet";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "irc.libera.chat";   chatnet = "liberachat";port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "chat.freenode.net"; chatnet = "Freenode";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
   { address = "irc.gamesurge.net"; chatnet = "GameSurge"; port = "6667"; },
   { address = "ssl.ircnet.ovh";    chatnet = "IRCnet";    port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
   { address = "open.ircnet.net";   chatnet = "IRCnet";    port = "6667"; },
@@ -34,7 +34,7 @@ chatnets = {
     max_msgs  = "4";
     max_whois = "1";
   };
-  liberachat = {
+  Freenode = {
     type      = "IRC";
     max_kicks = "1";
     max_msgs  = "4";
@@ -95,8 +95,8 @@ chatnets = {
 
 channels = (
   { name = "#lobby";     chatnet = "EsperNet";  autojoin = "No"; },
-  { name = "#libera";    chatnet = "liberachat";autojoin = "No"; },
-  { name = "#irssi";     chatnet = "liberachat";autojoin = "No"; },
+  { name = "#freenode";  chatnet = "Freenode";  autojoin = "No"; },
+  { name = "#irssi";     chatnet = "Freenode";  autojoin = "No"; },
   { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; },
   { name = "#irssi";     chatnet = "IRCNet";    autojoin = "No"; },
   { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; },

From 1773fa8d191c9f1dcc7c1e59dbcdf31c1263c918 Mon Sep 17 00:00:00 2001
From: Geert Hauwaerts <geert@hauwaerts.be>
Date: Thu, 27 May 2021 20:47:09 +0300
Subject: [PATCH 02/31] Applied the updated docs changes in line with the
 upcoming blog post.

---
 README.md                  |  2 +-
 docs/help/in/admin.in      |  2 +-
 docs/help/in/channel.in    |  8 +++---
 docs/help/in/connect.in    |  6 ++---
 docs/help/in/disconnect.in |  2 +-
 docs/help/in/info.in       |  2 +-
 docs/help/in/join.in       |  2 +-
 docs/help/in/knock.in      |  2 +-
 docs/help/in/log.in        |  8 +++---
 docs/help/in/motd.in       |  2 +-
 docs/help/in/names.in      |  2 +-
 docs/help/in/nctcp.in      |  2 +-
 docs/help/in/network.in    |  6 ++---
 docs/help/in/part.in       |  2 +-
 docs/help/in/query.in      |  4 +--
 docs/help/in/recode.in     |  2 +-
 docs/help/in/reconnect.in  |  2 +-
 docs/help/in/server.in     | 16 +++++------
 docs/manual.txt            |  2 +-
 docs/proxy.txt             |  2 +-
 docs/startup-HOWTO.html    |  4 +--
 docs/startup-HOWTO.txt     |  4 +--
 irssi.conf                 | 54 ++++++++++++++++++++++----------------
 23 files changed, 73 insertions(+), 65 deletions(-)

diff --git a/README.md b/README.md
index 08be65b4..d229391a 100644
--- a/README.md
+++ b/README.md
@@ -72,4 +72,4 @@ Irssi is always looking for developers. Feel free to submit patches through
 GitHub pull requests.
 
 You can also contact the Irssi developers in
-[#irssi](https://irssi.org/support/irc/) on freenode.
+[#irssi](https://irssi.org/support/irc/) on irc.example.com.
diff --git a/docs/help/in/admin.in b/docs/help/in/admin.in
index 2b6f8b73..cfe66eba 100644
--- a/docs/help/in/admin.in
+++ b/docs/help/in/admin.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /ADMIN
-    /ADMIN orwell.freenode.net
+    /ADMIN irc.example.com
     /ADMIN mike
 
 %9See also:%9 INFO
diff --git a/docs/help/in/channel.in b/docs/help/in/channel.in
index 86e824c2..0e15b6d5 100644
--- a/docs/help/in/channel.in
+++ b/docs/help/in/channel.in
@@ -33,12 +33,12 @@
 
     /CHANNEL
     /CHANNEL LIST
-    /CHANNEL ADD -auto #irssi Freenode
+    /CHANNEL ADD -auto #irssi ExampleNet
     /CHANNEL ADD -auto #basementcat Quakenet secret_lair
-    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout Freenode
+    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout ExampleNet
     /CHANNEL ADD -auto -bots 'Q!TheQBot@CServe.quakenet.org' -botcmd '^MSG Q op #irssi' #irssi Quakenet
-    /CHANNEL MODIFY -noauto #irssi Freenode
-    /CHANNEL REMOVE #hideout Freenode
+    /CHANNEL MODIFY -noauto #irssi ExampleNet
+    /CHANNEL REMOVE #hideout ExampleNet
 
 %9Special Example:%9
 
diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index e861ad74..4d59dde1 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -34,9 +34,9 @@
 
 %9Examples:%9
 
-    /CONNECT Freenode
-    /CONNECT -6 Freenode
-    /CONNECT -4 -! -host staff.irssi.org -network Freenode orwell.freenode.net
+    /CONNECT ExampleNet
+    /CONNECT -6 ExampleNet
+    /CONNECT -4 -! -host staff.irssi.org -network ExampleNet irc.example.com
     /CONNECT irc.irssi.org 6667 WzerT8zq mike
 
 %9See also:%9 DISCONNECT, RMRECONNS, SERVER
diff --git a/docs/help/in/disconnect.in b/docs/help/in/disconnect.in
index bd4a4e17..88772e1e 100644
--- a/docs/help/in/disconnect.in
+++ b/docs/help/in/disconnect.in
@@ -18,7 +18,7 @@
 
 %9Examples:%9
 
-    /DISCONNECT Freenode I'm off for today, take care!
+    /DISCONNECT ExampleNet I'm off for today, take care!
     /DISCONNECT * Vacation time :D
     /DISCONNECT
 
diff --git a/docs/help/in/info.in b/docs/help/in/info.in
index 275f349d..41578501 100644
--- a/docs/help/in/info.in
+++ b/docs/help/in/info.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /INFO
-    /INFO orwell.freenode.net
+    /INFO irc.example.com
 
 %9See also:%9 ADMIN
 
diff --git a/docs/help/in/join.in b/docs/help/in/join.in
index 39fa23f8..55190267 100644
--- a/docs/help/in/join.in
+++ b/docs/help/in/join.in
@@ -20,7 +20,7 @@
     /JOIN #irssi
     /JOIN #basementcat secret_lair
     /JOIN -invite
-    /JOIN -freenode #github,#freenode,#irssi
+    /JOIN -ExampleNet #github,#example,#irssi
 
 %9See also:%9 KICK, PART
 
diff --git a/docs/help/in/knock.in b/docs/help/in/knock.in
index bb554d55..3e2fdbdb 100644
--- a/docs/help/in/knock.in
+++ b/docs/help/in/knock.in
@@ -23,7 +23,7 @@
 %9Examples:%9
 
     /KNOCK #irssi
-    /KNOCK #freenode
+    /KNOCK #example
     /KNOCK #github
 
 %9See also:%9 INVITE, JOIN
diff --git a/docs/help/in/log.in b/docs/help/in/log.in
index e4743d46..dfe26e30 100644
--- a/docs/help/in/log.in
+++ b/docs/help/in/log.in
@@ -33,10 +33,10 @@
 %9Examples:%9
 
     /LOG OPEN -targets mike ~/irclogs/mike.log MSGS
-    /LOG OPEN -targets #irssi-freenode ~/irclogs/freenode/irssi-%%Y-%%m-%%d
-    /LOG CLOSE ~/irclogs/freenode/irssi-%%Y-%%m-%%d
-    /LOG STOP ~/irclogs/freenode/irssi-%%Y-%%m-%%d
-    /LOG START ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG OPEN -targets #irssi ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d
+    /LOG CLOSE ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d
+    /LOG STOP ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d
+    /LOG START ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d
 
     /SET autolog ON
 
diff --git a/docs/help/in/motd.in b/docs/help/in/motd.in
index e33a1c75..ee1233b2 100644
--- a/docs/help/in/motd.in
+++ b/docs/help/in/motd.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /MOTD
-    /MOTD orwel.freenode.org
+    /MOTD irc.example.com
     /MOTD bob
 
 %9See also:%9 ADMIN, INFO, LINKS, MAP
diff --git a/docs/help/in/names.in b/docs/help/in/names.in
index 8fd8cf91..deccea40 100644
--- a/docs/help/in/names.in
+++ b/docs/help/in/names.in
@@ -21,7 +21,7 @@
 %9Examples:%9
 
     /NAMES -ops
-    /NAMES -voices #irssi,#freenode
+    /NAMES -voices #irssi,#example
 
 %9See also:%9 JOIN, PART, WHO, WHOIS
 
diff --git a/docs/help/in/nctcp.in b/docs/help/in/nctcp.in
index 93c3f3ec..68d789d6 100644
--- a/docs/help/in/nctcp.in
+++ b/docs/help/in/nctcp.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /NCTCP #irssi VERSION King of the Jungle v1.0
-    /NCTCP bob,#freenode USERINFO I am bob :p
+    /NCTCP bob,#example USERINFO I am bob :p
 
 %9See also:%9 CTCP
 
diff --git a/docs/help/in/network.in b/docs/help/in/network.in
index fbdaa0b4..183fd5b5 100644
--- a/docs/help/in/network.in
+++ b/docs/help/in/network.in
@@ -59,11 +59,11 @@
 %9Examples:%9
 
     /NETWORK ADD -usermode +giw EFnet
-    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org Freenode
-    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' Freenode
+    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org ExampleNet
+    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' ExampleNet
     /NETWORK ADD -autosendcmd '^MSG Q@CServe.quakenet.org AUTH mike WzerT8zq; WAIT 2000; OPER mike WzerT8zq; WAIT 2000; MODE mike +kXP' Quakenet
     /NETWORK MODIFY -usermode +gi EFnet
-    /NETWORK REMOVE Freenode
+    /NETWORK REMOVE ExampleNet
 
 %9See also:%9 CHANNEL, CONNECT, SERVER
 
diff --git a/docs/help/in/part.in b/docs/help/in/part.in
index e96abfbb..51be59bd 100644
--- a/docs/help/in/part.in
+++ b/docs/help/in/part.in
@@ -14,7 +14,7 @@
 %9Examples:%9
 
     /PART #irssi
-    /PART #freenode,#irssi
+    /PART #example,#irssi
 
 %9See also:%9 JOIN, KICK
 
diff --git a/docs/help/in/query.in b/docs/help/in/query.in
index 1c0ba5b9..85f2556e 100644
--- a/docs/help/in/query.in
+++ b/docs/help/in/query.in
@@ -17,8 +17,8 @@
 %9Examples:%9
 
     /QUERY mike
-    /QUERY -freenode bob
-    /QUERY -freenode -window sarah
+    /QUERY -ExampleNet bob
+    /QUERY -ExampleNet -window sarah
 
 %9See also:%9 MSG, UNQUERY, WINDOW
 
diff --git a/docs/help/in/recode.in b/docs/help/in/recode.in
index 63f52339..c34822de 100644
--- a/docs/help/in/recode.in
+++ b/docs/help/in/recode.in
@@ -22,7 +22,7 @@
 %9Examples:%9
 
     /RECODE
-    /RECODE ADD Freenode/mike utf-8
+    /RECODE ADD ExampleNet/mike utf-8
     /RECODE ADD #korea euc-kr
     /RECODE REMOVE #korea
 
diff --git a/docs/help/in/reconnect.in b/docs/help/in/reconnect.in
index aa1dc946..f2148c90 100644
--- a/docs/help/in/reconnect.in
+++ b/docs/help/in/reconnect.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /RECONNECT
-    /RECONNECT Freenode
+    /RECONNECT ExampleNet
     /RECONNECT EFnet BRB :)
 
 %9See also:%9 CONNECT, DISCONNECT, NETWORK, RMRECONNS, SERVER
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index beb75114..8a4d8887 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -61,15 +61,15 @@
 %9Examples:%9
 
     /SERVER
-    /SERVER CONNECT chat.freenode.net
-    /SERVER CONNECT +chat.freenode.net
-    /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
-    /SERVER ADD -! -auto -host staff.irssi.org -4 -network Freenode -noproxy orwell.freenode.net 6667
-    /SERVER MODIFY -network Freenode -noauto orwell.freenode.net
-    /SERVER MODIFY -network Freenode orwell.freenode.net 6697 -
-    /SERVER REMOVE orwell.freenode.net 6667 Freenode
+    /SERVER CONNECT irc.example.com
+    /SERVER CONNECT +irc.example.com
+    /SERVER ADD -network ExampleNet -noautosendcmd irc.example.com
+    /SERVER ADD -! -auto -host staff.irssi.org -4 -network ExampleNet -noproxy irc.example.com 6667
+    /SERVER MODIFY -network ExampleNet -noauto irc.example.com
+    /SERVER MODIFY -network ExampleNet irc.example.com 6697 -
+    /SERVER REMOVE irc.example.com 6667 ExampleNet
     /SERVER PURGE
-    /SERVER PURGE orwell.freenode.net
+    /SERVER PURGE irc.example.com
 
 %9See also:%9 CHANNEL, CONNECT, DISCONNECT, NETWORK, RECONNECT, RMRECONNS
 
diff --git a/docs/manual.txt b/docs/manual.txt
index 0f24ffe3..29065feb 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -349,7 +349,7 @@
 	after connecting to the network. This is useful for automatically 
 	identifying yourself to NickServ, for example
 
-	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" freenode
+	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" ExampleNet
 
 	/NETWORK REMOVE <name>
 
diff --git a/docs/proxy.txt b/docs/proxy.txt
index 224d24e3..9ed7ecdb 100644
--- a/docs/proxy.txt
+++ b/docs/proxy.txt
@@ -24,7 +24,7 @@ You really should set some password for the proxy with:
 Then you'll need to configure the ports/ircnets the proxy listens in,
 something like:
 
-  /SET irssiproxy_ports ircnet=2777 efnet=2778 freenode=2779
+  /SET irssiproxy_ports IRCnet=2777 EFNet=2778 ExampleNet=2779
 
 There we have 3 different irc networks answering in 3 ports. Note that
 you'll have to make the correct /IRCNET ADD and /SERVER ADD commands to
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index 48f6e6df..ecbeb467 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -68,7 +68,7 @@
 
 <p>And to connect to one of those networks and join a channel:</p>
 
-<div><div><pre><code>/CONNECT Freenode
+<div><div><pre><code>/CONNECT ExampleNet
 /JOIN #irssi
 </code></pre></div></div>
 
@@ -94,7 +94,7 @@
 
 <p>If you have irssi 0.8.18 or higher and the irc network supports it, you can use SASL instead of nickserv, which is more reliable:</p>
 
-<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
+<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN ExampleNet
 </code></pre></div></div>
 
 <p>These commands have many more options, see their help for details:</p>
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index 61de27e3..84397f33 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -43,7 +43,7 @@ has a few predefined networks, to list them:
 
 And to connect to one of those networks and join a channel:
 
-/CONNECT Freenode
+/CONNECT LiberaChat
 /JOIN #irssi
 
 To add more networks:
@@ -67,7 +67,7 @@ wait for 2 seconds before joining channels:
 If you have irssi 0.8.18 or higher and the irc network supports it, you can use
 SASL instead of nickserv, which is more reliable:
 
-/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
+/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN ExampleNet
 
 These commands have many more options, see their help for details:
 
diff --git a/irssi.conf b/irssi.conf
index edaeb3f5..9faa8973 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -1,18 +1,19 @@
 servers = (
-  { address = "irc.dal.net";       chatnet = "DALnet";    port = "6667"; },
-  { address = "ssl.efnet.org";     chatnet = "EFNet";     port = "9999"; use_tls = "yes"; tls_verify = "no"; },
-  { address = "irc.esper.net";     chatnet = "EsperNet";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "chat.freenode.net"; chatnet = "Freenode";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "irc.gamesurge.net"; chatnet = "GameSurge"; port = "6667"; },
-  { address = "ssl.ircnet.ovh";    chatnet = "IRCnet";    port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "open.ircnet.net";   chatnet = "IRCnet";    port = "6667"; },
-  { address = "irc.ircsource.net"; chatnet = "IRCSource"; port = "6667"; },
-  { address = "irc.netfuze.net";   chatnet = "NetFuze";   port = "6667"; },
-  { address = "irc.oftc.net";      chatnet = "OFTC";      port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "irc.quakenet.org";  chatnet = "QuakeNet";  port = "6667"; },
-  { address = "irc.rizon.net";     chatnet = "Rizon";     port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "silc.silcnet.org";  chatnet = "SILC";      port = "706";  },
-  { address = "irc.undernet.org";  chatnet = "Undernet";  port = "6667"; }
+  { address = "irc.dal.net";       chatnet = "DALnet";     port = "6667"; },
+  { address = "ssl.efnet.org";     chatnet = "EFNet";      port = "9999"; use_tls = "yes"; tls_verify = "no"; },
+  { address = "irc.esper.net";     chatnet = "EsperNet";   port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "chat.freenode.net"; chatnet = "Freenode";   port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "irc.gamesurge.net"; chatnet = "GameSurge";  port = "6667"; },
+  { address = "ssl.ircnet.ovh";    chatnet = "IRCnet";     port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "open.ircnet.net";   chatnet = "IRCnet";     port = "6667"; },
+  { address = "irc.ircsource.net"; chatnet = "IRCSource";  port = "6667"; },
+  { address = "irc.libera.chat";   chatnet = "LiberaChat"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "irc.netfuze.net";   chatnet = "NetFuze";    port = "6667"; },
+  { address = "irc.oftc.net";      chatnet = "OFTC";       port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "irc.quakenet.org";  chatnet = "QuakeNet";   port = "6667"; },
+  { address = "irc.rizon.net";     chatnet = "Rizon";      port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "silc.silcnet.org";  chatnet = "SILC";       port = "706";  },
+  { address = "irc.undernet.org";  chatnet = "Undernet";   port = "6667"; }
 );
 
 chatnets = {
@@ -58,6 +59,12 @@ chatnets = {
     max_msgs  = "4";
     max_whois = "1";
   };
+  LiberaChat = {
+    type      = "IRC";
+    max_kicks = "1";
+    max_msgs  = "4";
+    max_whois = "1";
+  };
   NetFuze = {
     type      = "IRC";
     max_kicks = "1";
@@ -94,15 +101,16 @@ chatnets = {
 };
 
 channels = (
-  { name = "#lobby";     chatnet = "EsperNet";  autojoin = "No"; },
-  { name = "#freenode";  chatnet = "Freenode";  autojoin = "No"; },
-  { name = "#irssi";     chatnet = "Freenode";  autojoin = "No"; },
-  { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; },
-  { name = "#irssi";     chatnet = "IRCNet";    autojoin = "No"; },
-  { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; },
-  { name = "#netfuze";   chatnet = "NetFuze";   autojoin = "No"; },
-  { name = "#oftc";      chatnet = "OFTC";      autojoin = "No"; },
-  { name = "silc";       chatnet = "SILC";      autojoin = "No"; }
+  { name = "#lobby";     chatnet = "EsperNet";   autojoin = "No"; },
+  { name = "#freenode";  chatnet = "Freenode";   autojoin = "No"; },
+  { name = "#gamesurge"; chatnet = "GameSurge";  autojoin = "No"; },
+  { name = "#irssi";     chatnet = "IRCNet";     autojoin = "No"; },
+  { name = "#ircsource"; chatnet = "IRCSource";  autojoin = "No"; },
+  { name = "#libera";    chatnet = "LiberaChat"; autojoin = "No"; },
+  { name = "#irssi";     chatnet = "LiberaChat"; autojoin = "No"; },
+  { name = "#netfuze";   chatnet = "NetFuze";    autojoin = "No"; },
+  { name = "#oftc";      chatnet = "OFTC";       autojoin = "No"; },
+  { name = "silc";       chatnet = "SILC";       autojoin = "No"; }
 );
 
 aliases = {

From a5d4fd5aa7ad1d57c0b8e11e382944a3654cfa00 Mon Sep 17 00:00:00 2001
From: Geert Hauwaerts <geert@hauwaerts.be>
Date: Thu, 27 May 2021 20:50:38 +0300
Subject: [PATCH 03/31] Changed the support channel to LiberaChat.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d229391a..d1232764 100644
--- a/README.md
+++ b/README.md
@@ -72,4 +72,4 @@ Irssi is always looking for developers. Feel free to submit patches through
 GitHub pull requests.
 
 You can also contact the Irssi developers in
-[#irssi](https://irssi.org/support/irc/) on irc.example.com.
+[#irssi](https://irssi.org/support/irc/) on irc.libera.chat.

From 939b773b8bea76dcf4ab33bb53d9899c84c218fb Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 1 Sep 2021 13:37:07 +0200
Subject: [PATCH 04/31] Revert "Changed the support channel to LiberaChat."

This reverts commit a5d4fd5aa7ad1d57c0b8e11e382944a3654cfa00.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d1232764..d229391a 100644
--- a/README.md
+++ b/README.md
@@ -72,4 +72,4 @@ Irssi is always looking for developers. Feel free to submit patches through
 GitHub pull requests.
 
 You can also contact the Irssi developers in
-[#irssi](https://irssi.org/support/irc/) on irc.libera.chat.
+[#irssi](https://irssi.org/support/irc/) on irc.example.com.

From 1a30e646d9a450b19582bdf306d7aad66730a632 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 1 Sep 2021 13:37:17 +0200
Subject: [PATCH 05/31] Revert "Applied the updated docs changes in line with
 the upcoming blog post."

This reverts commit 1773fa8d191c9f1dcc7c1e59dbcdf31c1263c918.
---
 README.md                  |  2 +-
 docs/help/in/admin.in      |  2 +-
 docs/help/in/channel.in    |  8 +++---
 docs/help/in/connect.in    |  6 ++---
 docs/help/in/disconnect.in |  2 +-
 docs/help/in/info.in       |  2 +-
 docs/help/in/join.in       |  2 +-
 docs/help/in/knock.in      |  2 +-
 docs/help/in/log.in        |  8 +++---
 docs/help/in/motd.in       |  2 +-
 docs/help/in/names.in      |  2 +-
 docs/help/in/nctcp.in      |  2 +-
 docs/help/in/network.in    |  6 ++---
 docs/help/in/part.in       |  2 +-
 docs/help/in/query.in      |  4 +--
 docs/help/in/recode.in     |  2 +-
 docs/help/in/reconnect.in  |  2 +-
 docs/help/in/server.in     | 16 +++++------
 docs/manual.txt            |  2 +-
 docs/proxy.txt             |  2 +-
 docs/startup-HOWTO.html    |  4 +--
 docs/startup-HOWTO.txt     |  4 +--
 irssi.conf                 | 54 ++++++++++++++++----------------------
 23 files changed, 65 insertions(+), 73 deletions(-)

diff --git a/README.md b/README.md
index d229391a..08be65b4 100644
--- a/README.md
+++ b/README.md
@@ -72,4 +72,4 @@ Irssi is always looking for developers. Feel free to submit patches through
 GitHub pull requests.
 
 You can also contact the Irssi developers in
-[#irssi](https://irssi.org/support/irc/) on irc.example.com.
+[#irssi](https://irssi.org/support/irc/) on freenode.
diff --git a/docs/help/in/admin.in b/docs/help/in/admin.in
index cfe66eba..2b6f8b73 100644
--- a/docs/help/in/admin.in
+++ b/docs/help/in/admin.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /ADMIN
-    /ADMIN irc.example.com
+    /ADMIN orwell.freenode.net
     /ADMIN mike
 
 %9See also:%9 INFO
diff --git a/docs/help/in/channel.in b/docs/help/in/channel.in
index 0e15b6d5..86e824c2 100644
--- a/docs/help/in/channel.in
+++ b/docs/help/in/channel.in
@@ -33,12 +33,12 @@
 
     /CHANNEL
     /CHANNEL LIST
-    /CHANNEL ADD -auto #irssi ExampleNet
+    /CHANNEL ADD -auto #irssi Freenode
     /CHANNEL ADD -auto #basementcat Quakenet secret_lair
-    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout ExampleNet
+    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout Freenode
     /CHANNEL ADD -auto -bots 'Q!TheQBot@CServe.quakenet.org' -botcmd '^MSG Q op #irssi' #irssi Quakenet
-    /CHANNEL MODIFY -noauto #irssi ExampleNet
-    /CHANNEL REMOVE #hideout ExampleNet
+    /CHANNEL MODIFY -noauto #irssi Freenode
+    /CHANNEL REMOVE #hideout Freenode
 
 %9Special Example:%9
 
diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index 4d59dde1..e861ad74 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -34,9 +34,9 @@
 
 %9Examples:%9
 
-    /CONNECT ExampleNet
-    /CONNECT -6 ExampleNet
-    /CONNECT -4 -! -host staff.irssi.org -network ExampleNet irc.example.com
+    /CONNECT Freenode
+    /CONNECT -6 Freenode
+    /CONNECT -4 -! -host staff.irssi.org -network Freenode orwell.freenode.net
     /CONNECT irc.irssi.org 6667 WzerT8zq mike
 
 %9See also:%9 DISCONNECT, RMRECONNS, SERVER
diff --git a/docs/help/in/disconnect.in b/docs/help/in/disconnect.in
index 88772e1e..bd4a4e17 100644
--- a/docs/help/in/disconnect.in
+++ b/docs/help/in/disconnect.in
@@ -18,7 +18,7 @@
 
 %9Examples:%9
 
-    /DISCONNECT ExampleNet I'm off for today, take care!
+    /DISCONNECT Freenode I'm off for today, take care!
     /DISCONNECT * Vacation time :D
     /DISCONNECT
 
diff --git a/docs/help/in/info.in b/docs/help/in/info.in
index 41578501..275f349d 100644
--- a/docs/help/in/info.in
+++ b/docs/help/in/info.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /INFO
-    /INFO irc.example.com
+    /INFO orwell.freenode.net
 
 %9See also:%9 ADMIN
 
diff --git a/docs/help/in/join.in b/docs/help/in/join.in
index 55190267..39fa23f8 100644
--- a/docs/help/in/join.in
+++ b/docs/help/in/join.in
@@ -20,7 +20,7 @@
     /JOIN #irssi
     /JOIN #basementcat secret_lair
     /JOIN -invite
-    /JOIN -ExampleNet #github,#example,#irssi
+    /JOIN -freenode #github,#freenode,#irssi
 
 %9See also:%9 KICK, PART
 
diff --git a/docs/help/in/knock.in b/docs/help/in/knock.in
index 3e2fdbdb..bb554d55 100644
--- a/docs/help/in/knock.in
+++ b/docs/help/in/knock.in
@@ -23,7 +23,7 @@
 %9Examples:%9
 
     /KNOCK #irssi
-    /KNOCK #example
+    /KNOCK #freenode
     /KNOCK #github
 
 %9See also:%9 INVITE, JOIN
diff --git a/docs/help/in/log.in b/docs/help/in/log.in
index dfe26e30..e4743d46 100644
--- a/docs/help/in/log.in
+++ b/docs/help/in/log.in
@@ -33,10 +33,10 @@
 %9Examples:%9
 
     /LOG OPEN -targets mike ~/irclogs/mike.log MSGS
-    /LOG OPEN -targets #irssi ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d
-    /LOG CLOSE ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d
-    /LOG STOP ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d
-    /LOG START ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d
+    /LOG OPEN -targets #irssi-freenode ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG CLOSE ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG STOP ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG START ~/irclogs/freenode/irssi-%%Y-%%m-%%d
 
     /SET autolog ON
 
diff --git a/docs/help/in/motd.in b/docs/help/in/motd.in
index ee1233b2..e33a1c75 100644
--- a/docs/help/in/motd.in
+++ b/docs/help/in/motd.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /MOTD
-    /MOTD irc.example.com
+    /MOTD orwel.freenode.org
     /MOTD bob
 
 %9See also:%9 ADMIN, INFO, LINKS, MAP
diff --git a/docs/help/in/names.in b/docs/help/in/names.in
index deccea40..8fd8cf91 100644
--- a/docs/help/in/names.in
+++ b/docs/help/in/names.in
@@ -21,7 +21,7 @@
 %9Examples:%9
 
     /NAMES -ops
-    /NAMES -voices #irssi,#example
+    /NAMES -voices #irssi,#freenode
 
 %9See also:%9 JOIN, PART, WHO, WHOIS
 
diff --git a/docs/help/in/nctcp.in b/docs/help/in/nctcp.in
index 68d789d6..93c3f3ec 100644
--- a/docs/help/in/nctcp.in
+++ b/docs/help/in/nctcp.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /NCTCP #irssi VERSION King of the Jungle v1.0
-    /NCTCP bob,#example USERINFO I am bob :p
+    /NCTCP bob,#freenode USERINFO I am bob :p
 
 %9See also:%9 CTCP
 
diff --git a/docs/help/in/network.in b/docs/help/in/network.in
index 183fd5b5..fbdaa0b4 100644
--- a/docs/help/in/network.in
+++ b/docs/help/in/network.in
@@ -59,11 +59,11 @@
 %9Examples:%9
 
     /NETWORK ADD -usermode +giw EFnet
-    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org ExampleNet
-    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' ExampleNet
+    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org Freenode
+    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' Freenode
     /NETWORK ADD -autosendcmd '^MSG Q@CServe.quakenet.org AUTH mike WzerT8zq; WAIT 2000; OPER mike WzerT8zq; WAIT 2000; MODE mike +kXP' Quakenet
     /NETWORK MODIFY -usermode +gi EFnet
-    /NETWORK REMOVE ExampleNet
+    /NETWORK REMOVE Freenode
 
 %9See also:%9 CHANNEL, CONNECT, SERVER
 
diff --git a/docs/help/in/part.in b/docs/help/in/part.in
index 51be59bd..e96abfbb 100644
--- a/docs/help/in/part.in
+++ b/docs/help/in/part.in
@@ -14,7 +14,7 @@
 %9Examples:%9
 
     /PART #irssi
-    /PART #example,#irssi
+    /PART #freenode,#irssi
 
 %9See also:%9 JOIN, KICK
 
diff --git a/docs/help/in/query.in b/docs/help/in/query.in
index 85f2556e..1c0ba5b9 100644
--- a/docs/help/in/query.in
+++ b/docs/help/in/query.in
@@ -17,8 +17,8 @@
 %9Examples:%9
 
     /QUERY mike
-    /QUERY -ExampleNet bob
-    /QUERY -ExampleNet -window sarah
+    /QUERY -freenode bob
+    /QUERY -freenode -window sarah
 
 %9See also:%9 MSG, UNQUERY, WINDOW
 
diff --git a/docs/help/in/recode.in b/docs/help/in/recode.in
index c34822de..63f52339 100644
--- a/docs/help/in/recode.in
+++ b/docs/help/in/recode.in
@@ -22,7 +22,7 @@
 %9Examples:%9
 
     /RECODE
-    /RECODE ADD ExampleNet/mike utf-8
+    /RECODE ADD Freenode/mike utf-8
     /RECODE ADD #korea euc-kr
     /RECODE REMOVE #korea
 
diff --git a/docs/help/in/reconnect.in b/docs/help/in/reconnect.in
index f2148c90..aa1dc946 100644
--- a/docs/help/in/reconnect.in
+++ b/docs/help/in/reconnect.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /RECONNECT
-    /RECONNECT ExampleNet
+    /RECONNECT Freenode
     /RECONNECT EFnet BRB :)
 
 %9See also:%9 CONNECT, DISCONNECT, NETWORK, RMRECONNS, SERVER
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 8a4d8887..beb75114 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -61,15 +61,15 @@
 %9Examples:%9
 
     /SERVER
-    /SERVER CONNECT irc.example.com
-    /SERVER CONNECT +irc.example.com
-    /SERVER ADD -network ExampleNet -noautosendcmd irc.example.com
-    /SERVER ADD -! -auto -host staff.irssi.org -4 -network ExampleNet -noproxy irc.example.com 6667
-    /SERVER MODIFY -network ExampleNet -noauto irc.example.com
-    /SERVER MODIFY -network ExampleNet irc.example.com 6697 -
-    /SERVER REMOVE irc.example.com 6667 ExampleNet
+    /SERVER CONNECT chat.freenode.net
+    /SERVER CONNECT +chat.freenode.net
+    /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
+    /SERVER ADD -! -auto -host staff.irssi.org -4 -network Freenode -noproxy orwell.freenode.net 6667
+    /SERVER MODIFY -network Freenode -noauto orwell.freenode.net
+    /SERVER MODIFY -network Freenode orwell.freenode.net 6697 -
+    /SERVER REMOVE orwell.freenode.net 6667 Freenode
     /SERVER PURGE
-    /SERVER PURGE irc.example.com
+    /SERVER PURGE orwell.freenode.net
 
 %9See also:%9 CHANNEL, CONNECT, DISCONNECT, NETWORK, RECONNECT, RMRECONNS
 
diff --git a/docs/manual.txt b/docs/manual.txt
index 29065feb..0f24ffe3 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -349,7 +349,7 @@
 	after connecting to the network. This is useful for automatically 
 	identifying yourself to NickServ, for example
 
-	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" ExampleNet
+	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" freenode
 
 	/NETWORK REMOVE <name>
 
diff --git a/docs/proxy.txt b/docs/proxy.txt
index 9ed7ecdb..224d24e3 100644
--- a/docs/proxy.txt
+++ b/docs/proxy.txt
@@ -24,7 +24,7 @@ You really should set some password for the proxy with:
 Then you'll need to configure the ports/ircnets the proxy listens in,
 something like:
 
-  /SET irssiproxy_ports IRCnet=2777 EFNet=2778 ExampleNet=2779
+  /SET irssiproxy_ports ircnet=2777 efnet=2778 freenode=2779
 
 There we have 3 different irc networks answering in 3 ports. Note that
 you'll have to make the correct /IRCNET ADD and /SERVER ADD commands to
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index ecbeb467..48f6e6df 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -68,7 +68,7 @@
 
 <p>And to connect to one of those networks and join a channel:</p>
 
-<div><div><pre><code>/CONNECT ExampleNet
+<div><div><pre><code>/CONNECT Freenode
 /JOIN #irssi
 </code></pre></div></div>
 
@@ -94,7 +94,7 @@
 
 <p>If you have irssi 0.8.18 or higher and the irc network supports it, you can use SASL instead of nickserv, which is more reliable:</p>
 
-<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN ExampleNet
+<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
 </code></pre></div></div>
 
 <p>These commands have many more options, see their help for details:</p>
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index 84397f33..61de27e3 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -43,7 +43,7 @@ has a few predefined networks, to list them:
 
 And to connect to one of those networks and join a channel:
 
-/CONNECT LiberaChat
+/CONNECT Freenode
 /JOIN #irssi
 
 To add more networks:
@@ -67,7 +67,7 @@ wait for 2 seconds before joining channels:
 If you have irssi 0.8.18 or higher and the irc network supports it, you can use
 SASL instead of nickserv, which is more reliable:
 
-/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN ExampleNet
+/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
 
 These commands have many more options, see their help for details:
 
diff --git a/irssi.conf b/irssi.conf
index 9faa8973..edaeb3f5 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -1,19 +1,18 @@
 servers = (
-  { address = "irc.dal.net";       chatnet = "DALnet";     port = "6667"; },
-  { address = "ssl.efnet.org";     chatnet = "EFNet";      port = "9999"; use_tls = "yes"; tls_verify = "no"; },
-  { address = "irc.esper.net";     chatnet = "EsperNet";   port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "chat.freenode.net"; chatnet = "Freenode";   port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "irc.gamesurge.net"; chatnet = "GameSurge";  port = "6667"; },
-  { address = "ssl.ircnet.ovh";    chatnet = "IRCnet";     port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "open.ircnet.net";   chatnet = "IRCnet";     port = "6667"; },
-  { address = "irc.ircsource.net"; chatnet = "IRCSource";  port = "6667"; },
-  { address = "irc.libera.chat";   chatnet = "LiberaChat"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "irc.netfuze.net";   chatnet = "NetFuze";    port = "6667"; },
-  { address = "irc.oftc.net";      chatnet = "OFTC";       port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "irc.quakenet.org";  chatnet = "QuakeNet";   port = "6667"; },
-  { address = "irc.rizon.net";     chatnet = "Rizon";      port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "silc.silcnet.org";  chatnet = "SILC";       port = "706";  },
-  { address = "irc.undernet.org";  chatnet = "Undernet";   port = "6667"; }
+  { address = "irc.dal.net";       chatnet = "DALnet";    port = "6667"; },
+  { address = "ssl.efnet.org";     chatnet = "EFNet";     port = "9999"; use_tls = "yes"; tls_verify = "no"; },
+  { address = "irc.esper.net";     chatnet = "EsperNet";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "chat.freenode.net"; chatnet = "Freenode";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "irc.gamesurge.net"; chatnet = "GameSurge"; port = "6667"; },
+  { address = "ssl.ircnet.ovh";    chatnet = "IRCnet";    port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "open.ircnet.net";   chatnet = "IRCnet";    port = "6667"; },
+  { address = "irc.ircsource.net"; chatnet = "IRCSource"; port = "6667"; },
+  { address = "irc.netfuze.net";   chatnet = "NetFuze";   port = "6667"; },
+  { address = "irc.oftc.net";      chatnet = "OFTC";      port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "irc.quakenet.org";  chatnet = "QuakeNet";  port = "6667"; },
+  { address = "irc.rizon.net";     chatnet = "Rizon";     port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "silc.silcnet.org";  chatnet = "SILC";      port = "706";  },
+  { address = "irc.undernet.org";  chatnet = "Undernet";  port = "6667"; }
 );
 
 chatnets = {
@@ -59,12 +58,6 @@ chatnets = {
     max_msgs  = "4";
     max_whois = "1";
   };
-  LiberaChat = {
-    type      = "IRC";
-    max_kicks = "1";
-    max_msgs  = "4";
-    max_whois = "1";
-  };
   NetFuze = {
     type      = "IRC";
     max_kicks = "1";
@@ -101,16 +94,15 @@ chatnets = {
 };
 
 channels = (
-  { name = "#lobby";     chatnet = "EsperNet";   autojoin = "No"; },
-  { name = "#freenode";  chatnet = "Freenode";   autojoin = "No"; },
-  { name = "#gamesurge"; chatnet = "GameSurge";  autojoin = "No"; },
-  { name = "#irssi";     chatnet = "IRCNet";     autojoin = "No"; },
-  { name = "#ircsource"; chatnet = "IRCSource";  autojoin = "No"; },
-  { name = "#libera";    chatnet = "LiberaChat"; autojoin = "No"; },
-  { name = "#irssi";     chatnet = "LiberaChat"; autojoin = "No"; },
-  { name = "#netfuze";   chatnet = "NetFuze";    autojoin = "No"; },
-  { name = "#oftc";      chatnet = "OFTC";       autojoin = "No"; },
-  { name = "silc";       chatnet = "SILC";       autojoin = "No"; }
+  { name = "#lobby";     chatnet = "EsperNet";  autojoin = "No"; },
+  { name = "#freenode";  chatnet = "Freenode";  autojoin = "No"; },
+  { name = "#irssi";     chatnet = "Freenode";  autojoin = "No"; },
+  { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; },
+  { name = "#irssi";     chatnet = "IRCNet";    autojoin = "No"; },
+  { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; },
+  { name = "#netfuze";   chatnet = "NetFuze";   autojoin = "No"; },
+  { name = "#oftc";      chatnet = "OFTC";      autojoin = "No"; },
+  { name = "silc";       chatnet = "SILC";      autojoin = "No"; }
 );
 
 aliases = {

From 82d2cd88e78b4bffe0c710dd940d1771506eced6 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Wed, 1 Sep 2021 13:37:37 +0200
Subject: [PATCH 06/31] Revert "Irssi does not take a political stance."

This reverts commit a4486c236a3bf15192d0500b3a1892f7465826c7.
---
 README.md                  |  2 +-
 docs/help/in/admin.in      |  2 +-
 docs/help/in/channel.in    |  8 ++++----
 docs/help/in/connect.in    |  6 +++---
 docs/help/in/disconnect.in |  2 +-
 docs/help/in/info.in       |  2 +-
 docs/help/in/join.in       |  2 +-
 docs/help/in/knock.in      |  2 +-
 docs/help/in/log.in        |  8 ++++----
 docs/help/in/motd.in       |  2 +-
 docs/help/in/names.in      |  2 +-
 docs/help/in/nctcp.in      |  2 +-
 docs/help/in/network.in    |  6 +++---
 docs/help/in/part.in       |  2 +-
 docs/help/in/query.in      |  4 ++--
 docs/help/in/recode.in     |  2 +-
 docs/help/in/reconnect.in  |  2 +-
 docs/help/in/server.in     | 16 ++++++++--------
 docs/manual.txt            |  2 +-
 docs/proxy.txt             |  2 +-
 docs/startup-HOWTO.html    |  4 ++--
 docs/startup-HOWTO.txt     |  4 ++--
 irssi.conf                 |  8 ++++----
 23 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/README.md b/README.md
index 08be65b4..d1232764 100644
--- a/README.md
+++ b/README.md
@@ -72,4 +72,4 @@ Irssi is always looking for developers. Feel free to submit patches through
 GitHub pull requests.
 
 You can also contact the Irssi developers in
-[#irssi](https://irssi.org/support/irc/) on freenode.
+[#irssi](https://irssi.org/support/irc/) on irc.libera.chat.
diff --git a/docs/help/in/admin.in b/docs/help/in/admin.in
index 2b6f8b73..acb6e1ae 100644
--- a/docs/help/in/admin.in
+++ b/docs/help/in/admin.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /ADMIN
-    /ADMIN orwell.freenode.net
+    /ADMIN irc.libera.chat
     /ADMIN mike
 
 %9See also:%9 INFO
diff --git a/docs/help/in/channel.in b/docs/help/in/channel.in
index 86e824c2..d9be8cf5 100644
--- a/docs/help/in/channel.in
+++ b/docs/help/in/channel.in
@@ -33,12 +33,12 @@
 
     /CHANNEL
     /CHANNEL LIST
-    /CHANNEL ADD -auto #irssi Freenode
+    /CHANNEL ADD -auto #irssi liberachat
     /CHANNEL ADD -auto #basementcat Quakenet secret_lair
-    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout Freenode
+    /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout liberachat
     /CHANNEL ADD -auto -bots 'Q!TheQBot@CServe.quakenet.org' -botcmd '^MSG Q op #irssi' #irssi Quakenet
-    /CHANNEL MODIFY -noauto #irssi Freenode
-    /CHANNEL REMOVE #hideout Freenode
+    /CHANNEL MODIFY -noauto #irssi liberachat
+    /CHANNEL REMOVE #hideout liberachat
 
 %9Special Example:%9
 
diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index e861ad74..d4375eec 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -34,9 +34,9 @@
 
 %9Examples:%9
 
-    /CONNECT Freenode
-    /CONNECT -6 Freenode
-    /CONNECT -4 -! -host staff.irssi.org -network Freenode orwell.freenode.net
+    /CONNECT liberachat
+    /CONNECT -6 liberachat
+    /CONNECT -4 -! -host staff.irssi.org -network liberachat irc.libera.chat
     /CONNECT irc.irssi.org 6667 WzerT8zq mike
 
 %9See also:%9 DISCONNECT, RMRECONNS, SERVER
diff --git a/docs/help/in/disconnect.in b/docs/help/in/disconnect.in
index bd4a4e17..c53b1e60 100644
--- a/docs/help/in/disconnect.in
+++ b/docs/help/in/disconnect.in
@@ -18,7 +18,7 @@
 
 %9Examples:%9
 
-    /DISCONNECT Freenode I'm off for today, take care!
+    /DISCONNECT liberachat I'm off for today, take care!
     /DISCONNECT * Vacation time :D
     /DISCONNECT
 
diff --git a/docs/help/in/info.in b/docs/help/in/info.in
index 275f349d..d8d8cfc9 100644
--- a/docs/help/in/info.in
+++ b/docs/help/in/info.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /INFO
-    /INFO orwell.freenode.net
+    /INFO irc.libera.chat
 
 %9See also:%9 ADMIN
 
diff --git a/docs/help/in/join.in b/docs/help/in/join.in
index 39fa23f8..adf7158e 100644
--- a/docs/help/in/join.in
+++ b/docs/help/in/join.in
@@ -20,7 +20,7 @@
     /JOIN #irssi
     /JOIN #basementcat secret_lair
     /JOIN -invite
-    /JOIN -freenode #github,#freenode,#irssi
+    /JOIN -liberachat #github,#libera,#irssi
 
 %9See also:%9 KICK, PART
 
diff --git a/docs/help/in/knock.in b/docs/help/in/knock.in
index bb554d55..ce8f9aa0 100644
--- a/docs/help/in/knock.in
+++ b/docs/help/in/knock.in
@@ -23,7 +23,7 @@
 %9Examples:%9
 
     /KNOCK #irssi
-    /KNOCK #freenode
+    /KNOCK #libera
     /KNOCK #github
 
 %9See also:%9 INVITE, JOIN
diff --git a/docs/help/in/log.in b/docs/help/in/log.in
index e4743d46..3ca8782c 100644
--- a/docs/help/in/log.in
+++ b/docs/help/in/log.in
@@ -33,10 +33,10 @@
 %9Examples:%9
 
     /LOG OPEN -targets mike ~/irclogs/mike.log MSGS
-    /LOG OPEN -targets #irssi-freenode ~/irclogs/freenode/irssi-%%Y-%%m-%%d
-    /LOG CLOSE ~/irclogs/freenode/irssi-%%Y-%%m-%%d
-    /LOG STOP ~/irclogs/freenode/irssi-%%Y-%%m-%%d
-    /LOG START ~/irclogs/freenode/irssi-%%Y-%%m-%%d
+    /LOG OPEN -targets #irssi ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
+    /LOG CLOSE ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
+    /LOG STOP ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
+    /LOG START ~/irclogs/liberachat/irssi-%%Y-%%m-%%d
 
     /SET autolog ON
 
diff --git a/docs/help/in/motd.in b/docs/help/in/motd.in
index e33a1c75..6e86681e 100644
--- a/docs/help/in/motd.in
+++ b/docs/help/in/motd.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /MOTD
-    /MOTD orwel.freenode.org
+    /MOTD irc.libera.chat
     /MOTD bob
 
 %9See also:%9 ADMIN, INFO, LINKS, MAP
diff --git a/docs/help/in/names.in b/docs/help/in/names.in
index 8fd8cf91..974b845f 100644
--- a/docs/help/in/names.in
+++ b/docs/help/in/names.in
@@ -21,7 +21,7 @@
 %9Examples:%9
 
     /NAMES -ops
-    /NAMES -voices #irssi,#freenode
+    /NAMES -voices #irssi,#libera
 
 %9See also:%9 JOIN, PART, WHO, WHOIS
 
diff --git a/docs/help/in/nctcp.in b/docs/help/in/nctcp.in
index 93c3f3ec..9f516730 100644
--- a/docs/help/in/nctcp.in
+++ b/docs/help/in/nctcp.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /NCTCP #irssi VERSION King of the Jungle v1.0
-    /NCTCP bob,#freenode USERINFO I am bob :p
+    /NCTCP bob,#libera USERINFO I am bob :p
 
 %9See also:%9 CTCP
 
diff --git a/docs/help/in/network.in b/docs/help/in/network.in
index fbdaa0b4..0542bd7d 100644
--- a/docs/help/in/network.in
+++ b/docs/help/in/network.in
@@ -59,11 +59,11 @@
 %9Examples:%9
 
     /NETWORK ADD -usermode +giw EFnet
-    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org Freenode
-    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' Freenode
+    /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org liberachat
+    /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' liberachat
     /NETWORK ADD -autosendcmd '^MSG Q@CServe.quakenet.org AUTH mike WzerT8zq; WAIT 2000; OPER mike WzerT8zq; WAIT 2000; MODE mike +kXP' Quakenet
     /NETWORK MODIFY -usermode +gi EFnet
-    /NETWORK REMOVE Freenode
+    /NETWORK REMOVE liberachat
 
 %9See also:%9 CHANNEL, CONNECT, SERVER
 
diff --git a/docs/help/in/part.in b/docs/help/in/part.in
index e96abfbb..f89769cc 100644
--- a/docs/help/in/part.in
+++ b/docs/help/in/part.in
@@ -14,7 +14,7 @@
 %9Examples:%9
 
     /PART #irssi
-    /PART #freenode,#irssi
+    /PART #libera,#irssi
 
 %9See also:%9 JOIN, KICK
 
diff --git a/docs/help/in/query.in b/docs/help/in/query.in
index 1c0ba5b9..a34f85e8 100644
--- a/docs/help/in/query.in
+++ b/docs/help/in/query.in
@@ -17,8 +17,8 @@
 %9Examples:%9
 
     /QUERY mike
-    /QUERY -freenode bob
-    /QUERY -freenode -window sarah
+    /QUERY -liberachat bob
+    /QUERY -liberachat -window sarah
 
 %9See also:%9 MSG, UNQUERY, WINDOW
 
diff --git a/docs/help/in/recode.in b/docs/help/in/recode.in
index 63f52339..760c66cd 100644
--- a/docs/help/in/recode.in
+++ b/docs/help/in/recode.in
@@ -22,7 +22,7 @@
 %9Examples:%9
 
     /RECODE
-    /RECODE ADD Freenode/mike utf-8
+    /RECODE ADD liberachat/mike utf-8
     /RECODE ADD #korea euc-kr
     /RECODE REMOVE #korea
 
diff --git a/docs/help/in/reconnect.in b/docs/help/in/reconnect.in
index aa1dc946..87beb95a 100644
--- a/docs/help/in/reconnect.in
+++ b/docs/help/in/reconnect.in
@@ -15,7 +15,7 @@
 %9Examples:%9
 
     /RECONNECT
-    /RECONNECT Freenode
+    /RECONNECT liberachat
     /RECONNECT EFnet BRB :)
 
 %9See also:%9 CONNECT, DISCONNECT, NETWORK, RMRECONNS, SERVER
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index beb75114..f7d907f3 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -61,15 +61,15 @@
 %9Examples:%9
 
     /SERVER
-    /SERVER CONNECT chat.freenode.net
-    /SERVER CONNECT +chat.freenode.net
-    /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
-    /SERVER ADD -! -auto -host staff.irssi.org -4 -network Freenode -noproxy orwell.freenode.net 6667
-    /SERVER MODIFY -network Freenode -noauto orwell.freenode.net
-    /SERVER MODIFY -network Freenode orwell.freenode.net 6697 -
-    /SERVER REMOVE orwell.freenode.net 6667 Freenode
+    /SERVER CONNECT irc.libera.chat
+    /SERVER CONNECT +irc.libera.chat
+    /SERVER ADD -network liberachat -noautosendcmd irc.libera.chat
+    /SERVER ADD -! -auto -host staff.irssi.org -4 -network liberachat -noproxy irc.libera.chat 6667
+    /SERVER MODIFY -network liberachat -noauto irc.libera.chat
+    /SERVER MODIFY -network liberachat irc.libera.chat 6697 -
+    /SERVER REMOVE irc.libera.chat 6667 liberachat
     /SERVER PURGE
-    /SERVER PURGE orwell.freenode.net
+    /SERVER PURGE irc.libera.chat
 
 %9See also:%9 CHANNEL, CONNECT, DISCONNECT, NETWORK, RECONNECT, RMRECONNS
 
diff --git a/docs/manual.txt b/docs/manual.txt
index 0f24ffe3..5f0eac51 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -349,7 +349,7 @@
 	after connecting to the network. This is useful for automatically 
 	identifying yourself to NickServ, for example
 
-	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" freenode
+	/NETWORK ADD -autosendcmd "/^msg NickServ identify secret" liberachat
 
 	/NETWORK REMOVE <name>
 
diff --git a/docs/proxy.txt b/docs/proxy.txt
index 224d24e3..172770e8 100644
--- a/docs/proxy.txt
+++ b/docs/proxy.txt
@@ -24,7 +24,7 @@ You really should set some password for the proxy with:
 Then you'll need to configure the ports/ircnets the proxy listens in,
 something like:
 
-  /SET irssiproxy_ports ircnet=2777 efnet=2778 freenode=2779
+  /SET irssiproxy_ports IRCnet=2777 EFNet=2778 liberachat=2779
 
 There we have 3 different irc networks answering in 3 ports. Note that
 you'll have to make the correct /IRCNET ADD and /SERVER ADD commands to
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index 48f6e6df..b0c68f1f 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -68,7 +68,7 @@
 
 <p>And to connect to one of those networks and join a channel:</p>
 
-<div><div><pre><code>/CONNECT Freenode
+<div><div><pre><code>/CONNECT liberachat
 /JOIN #irssi
 </code></pre></div></div>
 
@@ -94,7 +94,7 @@
 
 <p>If you have irssi 0.8.18 or higher and the irc network supports it, you can use SASL instead of nickserv, which is more reliable:</p>
 
-<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
+<div><div><pre><code>/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN liberachat
 </code></pre></div></div>
 
 <p>These commands have many more options, see their help for details:</p>
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index 61de27e3..bff33108 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -43,7 +43,7 @@ has a few predefined networks, to list them:
 
 And to connect to one of those networks and join a channel:
 
-/CONNECT Freenode
+/CONNECT liberachat
 /JOIN #irssi
 
 To add more networks:
@@ -67,7 +67,7 @@ wait for 2 seconds before joining channels:
 If you have irssi 0.8.18 or higher and the irc network supports it, you can use
 SASL instead of nickserv, which is more reliable:
 
-/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
+/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN liberachat
 
 These commands have many more options, see their help for details:
 
diff --git a/irssi.conf b/irssi.conf
index edaeb3f5..21c3ba4c 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -2,7 +2,7 @@ servers = (
   { address = "irc.dal.net";       chatnet = "DALnet";    port = "6667"; },
   { address = "ssl.efnet.org";     chatnet = "EFNet";     port = "9999"; use_tls = "yes"; tls_verify = "no"; },
   { address = "irc.esper.net";     chatnet = "EsperNet";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "chat.freenode.net"; chatnet = "Freenode";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "irc.libera.chat";   chatnet = "liberachat";port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
   { address = "irc.gamesurge.net"; chatnet = "GameSurge"; port = "6667"; },
   { address = "ssl.ircnet.ovh";    chatnet = "IRCnet";    port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
   { address = "open.ircnet.net";   chatnet = "IRCnet";    port = "6667"; },
@@ -34,7 +34,7 @@ chatnets = {
     max_msgs  = "4";
     max_whois = "1";
   };
-  Freenode = {
+  liberachat = {
     type      = "IRC";
     max_kicks = "1";
     max_msgs  = "4";
@@ -95,8 +95,8 @@ chatnets = {
 
 channels = (
   { name = "#lobby";     chatnet = "EsperNet";  autojoin = "No"; },
-  { name = "#freenode";  chatnet = "Freenode";  autojoin = "No"; },
-  { name = "#irssi";     chatnet = "Freenode";  autojoin = "No"; },
+  { name = "#libera";    chatnet = "liberachat";autojoin = "No"; },
+  { name = "#irssi";     chatnet = "liberachat";autojoin = "No"; },
   { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; },
   { name = "#irssi";     chatnet = "IRCNet";    autojoin = "No"; },
   { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; },

From 42f749346b375ccd5e46527a21ff2e7192273f5f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 8 Sep 2021 13:03:03 +0200
Subject: [PATCH 07/31] Merge pull request #34 from ailin-nemui/no-maxline

remove oragono.io/maxline-2

(cherry picked from commit 7e1401140412361b813accd99aa367658435c12f)
---
 NEWS                       |  4 +---
 src/irc/core/irc-servers.c | 21 ---------------------
 src/irc/core/irc-servers.h |  1 -
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/NEWS b/NEWS
index b3282761..8be7531e 100644
--- a/NEWS
+++ b/NEWS
@@ -134,9 +134,7 @@ v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	  /SET show_account_notify to enable
 	+ Add support for IRCv3 invite-notify (#1094)
 	+ Add support for receiving IRCv3 message-tags (#576, #1090)
-	+ Add support for sending IRCv3 message-tags (#1092)
-	+ Add support for the oragono.io/maxline-2 CAP to increase IRC
-	  protocol line length (#1092)
+	+ Add support for sending IRCv3 message-tags (#1092, an#34)
 	+ Enable the znc.in/self-message CAP by default (#1123)
 	+ Add support for IRCv3 away-notify. /SET away_notify_public
 	  to enable (#1099, GL#33, #1105)
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 1c9f0cec..664ca9a4 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -282,7 +282,6 @@ static void server_init_1(IRC_SERVER_REC *server)
 		irc_cap_toggle(server, CAP_SASL, TRUE);
 	}
 
-	irc_cap_toggle(server, CAP_MAXLINE, TRUE);
 	irc_cap_toggle(server, CAP_MULTI_PREFIX, TRUE);
 	irc_cap_toggle(server, CAP_EXTENDED_JOIN, TRUE);
 	irc_cap_toggle(server, CAP_SETNAME, TRUE);
@@ -647,24 +646,6 @@ static void sig_server_quit(IRC_SERVER_REC *server, const char *msg)
 	g_free(recoded);
 }
 
-static void cap_maxline(IRC_SERVER_REC *server)
-{
-	unsigned int maxline = 0;
-	gboolean parse_successful = FALSE;
-	const char *maxline_str;
-
-	maxline_str = g_hash_table_lookup(server->cap_supported, CAP_MAXLINE);
-	if (maxline_str != NULL) {
-		parse_successful = parse_uint(maxline_str, NULL, 10, &maxline);
-
-	}
-
-	if (parse_successful &&
-	    maxline >= MAX_IRC_MESSAGE_LEN + 2 /* 2 bytes for CR+LF */) {
-		server->max_message_len = maxline - 2;
-	}
-}
-
 void irc_server_send_action(IRC_SERVER_REC *server, const char *target, const char *data)
 {
 	char *recoded;
@@ -1226,7 +1207,6 @@ void irc_servers_init(void)
 	signal_add_first("server disconnected", (SIGNAL_FUNC) sig_disconnected);
 	signal_add_last("server destroyed", (SIGNAL_FUNC) sig_destroyed);
 	signal_add_last("server quit", (SIGNAL_FUNC) sig_server_quit);
-	signal_add("server cap ack " CAP_MAXLINE, (SIGNAL_FUNC) cap_maxline);
 	signal_add("event 670", (SIGNAL_FUNC) event_starttls);
 	signal_add("event 451", (SIGNAL_FUNC) event_registerfirst);
 	signal_add("server cap end", (SIGNAL_FUNC) event_capend);
@@ -1258,7 +1238,6 @@ void irc_servers_deinit(void)
 	signal_remove("server disconnected", (SIGNAL_FUNC) sig_disconnected);
 	signal_remove("server destroyed", (SIGNAL_FUNC) sig_destroyed);
         signal_remove("server quit", (SIGNAL_FUNC) sig_server_quit);
-	signal_remove("server cap ack " CAP_MAXLINE, (SIGNAL_FUNC) cap_maxline);
 	signal_remove("event 670", (SIGNAL_FUNC) event_starttls);
 	signal_remove("event 451", (SIGNAL_FUNC) event_registerfirst);
 	signal_remove("server cap end", (SIGNAL_FUNC) event_capend);
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 93fa02a4..903de773 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -15,7 +15,6 @@
 #define MAX_IRC_USER_TAGS_LEN 4094
 
 #define CAP_LS_VERSION "302"
-#define CAP_MAXLINE "oragono.io/maxline-2"
 #define CAP_MESSAGE_TAGS "message-tags"
 #define CAP_SASL "sasl"
 #define CAP_MULTI_PREFIX "multi-prefix"

From 0f3e95892de7e7a360336fcc9739e770916a9156 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 8 Sep 2021 13:03:14 +0200
Subject: [PATCH 08/31] Merge pull request #35 from ailin-nemui/fixes

duplicate issue in NEWS

(cherry picked from commit d3e105a3963cbc693ac316ae884b000902999828)
---
 NEWS | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 8be7531e..ced7bcd5 100644
--- a/NEWS
+++ b/NEWS
@@ -127,8 +127,7 @@ v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	  join_extended_account, that theme writers need to take into
 	  account if desired.
 
-	+ Add support for IRCv3 setname (#1093, #1104, #1254, GL#33,
-	  #1104, #1254)
+	+ Add support for IRCv3 setname (#1093, #1104, #1254, GL#33)
 	+ Add support for IRCv3 account-notify (#1100, #1098, GL#33,
 	  #1105, #1131). Credit to oss-fuzz
 	  /SET show_account_notify to enable

From 8b49cd012dc4af4040eb4ef03939e80072d40a5f Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 15 Sep 2021 17:56:45 +0200
Subject: [PATCH 09/31] Merge pull request #36 from
 ailin-nemui/missing-hilights

correctly store updated message levels e.g. from /hilight

(cherry picked from commit ad8221835c90969a6ba87807b072ba9f4d63bd48)
---
 NEWS                             | 5 +++--
 src/fe-text/textbuffer-formats.c | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index ced7bcd5..b7c62b93 100644
--- a/NEWS
+++ b/NEWS
@@ -2,9 +2,10 @@ v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	* /SET resolve_reverse_lookup setting was removed (#1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed
 	  (#1146). By Shivaram Lingamneni
+
 	* The display system now renders formats on the fly (#1079,
-	  #1188, #1191, #1192, #1204, #1205, #1209, an#13, an#14, an#28,
-	  an#29)
+	  #1188, #1191, #1192, #1204, #1205, #1209, #1349, an#13,
+	  an#14, an#28, an#29, an#36)
 
 	  This major change will break scripts that try to modify
 	  printed text during "print text" signal (#1189). They need
diff --git a/src/fe-text/textbuffer-formats.c b/src/fe-text/textbuffer-formats.c
index 20abc0df..50d6250a 100644
--- a/src/fe-text/textbuffer-formats.c
+++ b/src/fe-text/textbuffer-formats.c
@@ -265,7 +265,7 @@ static void sig_gui_print_text_finished(WINDOW_REC *window, TEXT_DEST_REC *dest)
 
 	info->meta = line_meta_create(dest->meta);
 
-	info->level |= MSGLEVEL_FORMAT;
+	info->level = dest->level | MSGLEVEL_FORMAT;
 
 	/* the line will be inserted into the view with textbuffer_view_insert_line by
 	   gui-printtext.c:view_add_eol */

From 0932bbed7b1f51a00cfee231632e67ab9118da75 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 21 Sep 2021 22:35:30 +0200
Subject: [PATCH 10/31] Merge pull request #37 from ailin-nemui/int-min-reached

fix pedantic error in MSGLEVEL enum

(cherry picked from commit b0fdbb144d5c5723269b2571761b0a073a392454)
---
 src/core/levels.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/levels.h b/src/core/levels.h
index 04893b34..7f1aa931 100644
--- a/src/core/levels.h
+++ b/src/core/levels.h
@@ -42,7 +42,7 @@ enum {
 	MSGLEVEL_HIDDEN       = 0x10000000, /* Hidden from view */
 	MSGLEVEL_RESERVED1    = 0x20000000,
 	MSGLEVEL_RESERVED2    = 0x40000000,
-	MSGLEVEL_FORMAT       = 0x80000000  /* Format data */
+	MSGLEVEL_FORMAT       = (int)0x80000000  /* Format data */
 };
 /* clang-format on */
 

From 117758fb9046a859ecfacaab7ab1a7a2e35377e6 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 22 Sep 2021 11:25:32 +0200
Subject: [PATCH 11/31] Merge pull request #40 from ailin-nemui/gh-actions

update github actions ubuntu version to 18.04 and meson to <0.60.0

(cherry picked from commit db705278d2f766433d3c28f776241c4997efde70)
---
 .github/workflows/check.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 61de72ff..97cb3feb 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - name: prepare required software
         run: |
-          sudo apt install $apt_build_deps $apt_build_deps_autotools
+          sudo apt update && sudo apt install $apt_build_deps $apt_build_deps_autotools
       - uses: actions/checkout@main
       - name: make dist
         run: |
@@ -38,18 +38,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-16.04, ubuntu-latest]
+        os: [ubuntu-18.04, ubuntu-latest]
         builder: [meson, configure]
         compiler: [clang, gcc]
         flags: [regular]
         include:
-          - os: ubuntu-16.04
+          - os: ubuntu-18.04
             builder: meson
             meson_ver: ==0.49.2
             setuptools_ver: <51
           - os: ubuntu-latest
             builder: meson
-            meson_ver: <0.59.0
+            meson_ver: <0.60.0
           - os: ubuntu-latest
             builder: meson
             flags: meson-latest FAILURE-OK
@@ -64,7 +64,7 @@ jobs:
           meson_ver: ${{ matrix.meson_ver }}
           setuptools_ver: ${{ matrix.setuptools_ver }}
         run: |
-          sudo apt install $apt_build_deps $apt_build_deps_${{ matrix.builder }}
+          sudo apt update && sudo apt install $apt_build_deps $apt_build_deps_${{ matrix.builder }}
           eval "$get_pip_build_deps_${{ matrix.builder }}"
           curl -SLf https://github.com/irssi-import/actions-irssi/raw/master/check-irssi/render.pl -o ~/render.pl && chmod +x ~/render.pl
       - name: unpack archive

From 0ba449d8be26b047eea3b0b7e4ecdcba906f03f8 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 22 Sep 2021 12:33:10 +0200
Subject: [PATCH 12/31] Merge pull request #39 from ailin-nemui/sync

run syncdocs.sh and syncscripts.sh

(cherry picked from commit 85a9dc146d803be344bf3806395ac294d6929c13)
---
 docs/faq.html           |   4 +-
 docs/faq.txt            |   6 +-
 docs/startup-HOWTO.html |   4 +-
 docs/startup-HOWTO.txt  |   4 +-
 scripts/quitmsg.pl      |  27 +++-----
 scripts/scriptassist.pl | 139 +++++++++++++++++++++++++---------------
 6 files changed, 104 insertions(+), 80 deletions(-)

diff --git a/docs/faq.html b/docs/faq.html
index 7c17f45d..50b404a0 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -2,7 +2,7 @@
 <h1>Frequently Asked Questions</h1>
     <h3 id="q-why-doesnt-irssi-display-colors-even-when-ircii-etc-displays-them">Q: Why doesn’t irssi display colors even when ircii etc. displays them?</h3>
 
-<p>A: They force ANSI colors even if terminal doesn’t support them. By default, irssi uses colors only if terminfo/termcap so says. The correct way to fix this would be to change your TERM environment to a value where colors work, like xterm-color or color_xterm (eg. <code>TERM=xterm-color irssi</code>). If this doesn’t help, then use the evil way of <code>/SET term_force_colors ON</code>.</p>
+<p>A: They force ANSI colors even if terminal doesn’t support them. By default, irssi uses colors only if terminfo/termcap so says. The correct way to fix this would be to change your TERM environment to a value where colors work, like xterm-256color or color_xterm (eg. <code>TERM=xterm-256color irssi</code>). If this doesn’t help, then use the evil way of <code>/SET term_force_colors ON</code>.</p>
 
 <h3 id="q-how-do-i-easily-write-text-to-channel-that-starts-with--character">Q: How do I easily write text to channel that starts with ‘/’ character?</h3>
 
@@ -54,7 +54,7 @@
 
 <h3 id="q-will-there-be-detach-like-feature">Q: Will there be /DETACH-like feature?</h3>
 
-<p>A: <a href="https://tmux.github.io/">tmux</a>, <a href="https://www.gnu.org/software/screen/screen.html">screen</a> and <a href="http://dtach.sf.net/">dtach</a> can be used to do it just fine.</p>
+<p>A: <a href="https://tmux.github.io/">tmux</a>, <a href="https://www.gnu.org/software/screen/screen.html">screen</a> and <a href="https://sourceforge.net/projects/dtach/">dtach</a> can be used to do it just fine.</p>
 
 <h3 id="q-how-do-i-run-scripts-automatically-at-startup">Q: How do I run scripts automatically at startup?</h3>
 
diff --git a/docs/faq.txt b/docs/faq.txt
index 0d0b5f46..0fcc156a 100644
--- a/docs/faq.txt
+++ b/docs/faq.txt
@@ -4,8 +4,8 @@ Q: Why doesn’t irssi display colors even when ircii etc. displays them?
 A: They force ANSI colors even if terminal doesn’t support them. By default,
    irssi uses colors only if terminfo/termcap so says. The correct way to fix this
    would be to change your TERM environment to a value where colors work, like
-   xterm-color or color_xterm (eg. TERM=xterm-color irssi). If this doesn’t help,
-   then use the evil way of /SET term_force_colors ON.
+   xterm-256color or color_xterm (eg. TERM=xterm-256color irssi). If this doesn’t
+   help, then use the evil way of /SET term_force_colors ON.
 
 Q: How do I easily write text to channel that starts with ‘/’ character?
 A: / /text
@@ -119,6 +119,6 @@ A: Check [6]here
    [1] https://github.com/irssi-import/xirssi
    [2] https://tmux.github.io/
    [3] https://www.gnu.org/software/screen/screen.html
-   [4] http://dtach.sf.net/
+   [4] https://sourceforge.net/projects/dtach/
    [5] https://dgl.cx/irssi/hack-whois-in-current-window.pl
    [6] https://irssi.org/assets/irssi.wav
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index b0c68f1f..696dea4d 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -226,7 +226,7 @@ Ctrl-P, Ctrl-N            - Jump to previous / next window
 
 <p>And finally channels:</p>
 
-<div><div><pre><code>/CHANNEL ADD -auto -bots *!*user@host -botcmd "/^msg $0 op pass" #irssi efnet
+<div><div><pre><code>/CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
 /CHANNEL ADD -auto #secret IRCnet password
 </code></pre></div></div>
 
@@ -395,7 +395,7 @@ Ctrl-X                - set the next server in list active
 
 <p><code>/HELP bind</code> tells pretty much everything there is to know about keyboard bindings. However, there’s the problem of how to bind some non-standard keys. They might differ a bit with each terminal, so you’ll need to find out what exactly the keypress produces. Easiest way to check that would be to see what it prints in <code>cat</code>. Here’s an example for pressing F1 key:</p>
 
-<div><div><pre><code> [user@host] ~% cat
+<div><div><pre><code> [cras@hurina] ~% cat
  ^[OP
 </code></pre></div></div>
 
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index bff33108..90d278de 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -218,7 +218,7 @@ IRC network, other servers are automatically connected in same network if the
 
 And finally channels:
 
-/CHANNEL ADD -auto -bots *!*user@host -botcmd "/^msg $0 op pass" #irssi efnet
+/CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
 /CHANNEL ADD -auto #secret IRCnet password
 
 -bots and -botcmd should be the only ones needing a bit of explaining. They’re
@@ -442,7 +442,7 @@ They might differ a bit with each terminal, so you’ll need to find out what
 exactly the keypress produces. Easiest way to check that would be to see what
 it prints in cat. Here’s an example for pressing F1 key:
 
- [user@host] ~% cat
+ [cras@hurina] ~% cat
  ^[OP
 
 So in irssi you would use /BIND ^[OP /ECHO F1 pressed. If you use multiple
diff --git a/scripts/quitmsg.pl b/scripts/quitmsg.pl
index e289468c..102d9aa5 100644
--- a/scripts/quitmsg.pl
+++ b/scripts/quitmsg.pl
@@ -6,36 +6,27 @@ use Irssi::Irc;
 use strict;
 use vars qw($VERSION %IRSSI);
 
-$VERSION = "1.00";
+$VERSION = "1.01";
 %IRSSI = (
     authors     => 'Timo Sirainen',
     name        => 'quitmsg',
     description => 'Random quit messages',
     license     => 'Public Domain',
-    changed	=> 'Sun Mar 10 23:18 EET 2002'
+    changed	=> 'Mon Jul 22 20:00 EET 2020'
 );
 
-my $quitfile = glob "~/.irssi/irssi.quit";
+my $quitfile = Irssi::get_irssi_dir() . "/irssi.quit";
 
 sub cmd_quit {
 	my ($data, $server, $channel) = @_;
 	return if ($data ne "");
+	
+	open (my $fh, "<", $quitfile) || return;
+	my @lines = <$fh>;
 
-	open (f, "<", $quitfile) || return;
-	my $lines = 0; while(<f>) { $lines++; };
-
-	my $line = int(rand($lines))+1;
-
-	my $quitmsg;
-	seek(f, 0, 0); $. = 0;
-	while(<f>) {
-		next if ($. != $line);
-
-		chomp;
-		$quitmsg = $_;
-		last;
-	}
-	close(f);
+	my $quitmsg = $lines[int(rand(@lines))];
+	chomp($quitmsg);
+	close($fh);
 
 	foreach my $server (Irssi::servers) {
 		$server->command("/disconnect ".$server->{tag}." $quitmsg");
diff --git a/scripts/scriptassist.pl b/scripts/scriptassist.pl
index 536ef33a..cf02d57e 100644
--- a/scripts/scriptassist.pl
+++ b/scripts/scriptassist.pl
@@ -5,7 +5,7 @@
 
 use strict;
 
-our $VERSION = '2003020807';
+our $VERSION = '2020042700';
 our %IRSSI = (
     authors     => 'Stefan \'tommie\' Tomanek',
     contact     => 'stefan@pico.ruhr.de',
@@ -23,12 +23,15 @@ use Irssi 20020324;
 use CPAN::Meta::YAML;
 use LWP::UserAgent;
 use POSIX;
+use version;
 
 # GnuPG is not always needed
 $have_gpg = 0;
 eval "use GnuPG qw(:algo :trust);";
 $have_gpg = 1 if not ($@);
 
+my $irssi_version = qv(Irssi::parse_special('v$J') =~ s/-.*//r);
+
 sub show_help {
     my $help = "scriptassist $VERSION
 /scriptassist check
@@ -39,15 +42,15 @@ sub show_help {
     Search the script database
 /scriptassist info <scripts>
     Display information about <scripts>
-".#/scriptassist ratings <scripts>
-#    Retrieve the average ratings of the the scripts
-#/scriptassist top <num>
-#    Retrieve the first <num> top rated scripts
-"/scriptassist new <num>
+/scriptassist ratings <scripts|all>
+    Retrieve the average ratings of the the scripts
+/scriptassist top <num>
+    Retrieve the first <num> top rated scripts
+/scriptassist new <num>
     Display the newest <num> scripts
-".#/scriptassist rate <script> <stars>
-#    Rate the script with a number of stars ranging from 0-5
-"/scriptassist contact <script>
+/scriptassist rate <script>
+    Rate the script if you like it
+/scriptassist contact <script>
     Write an email to the author of the script
     (Requires OpenURL)
 /scriptassist cpan <module>
@@ -95,6 +98,7 @@ sub call_openurl {
 	$code->($url);
     } else {
         print CLIENTCRAP "%R>>%n Please install openurl.pl";
+        print CLIENTCRAP "%R>>%n    or open < $url > manually";
     }
 }
 
@@ -188,7 +192,7 @@ sub get_unknown {
     foreach (keys %$db) {
 	next unless defined $db->{$_}{commands};
 	foreach my $item (split / /, $db->{$_}{commands}) {
-	    return { $_ => $db->{$_} } if ($item =~ /^$cmd$/i);
+	    return { $_ => +{%{$db->{$_}}} } if ($item =~ /^$cmd$/i);
 	}
     }
     return undef;
@@ -264,47 +268,80 @@ sub script_info {
 		$result{$sname}{modules}{$mod}{installed} = module_exist($mod);
 	    }
 	}
-	if (defined $xml->{$plname}{depends}) {
-	    my $depends = $xml->{$plname}{depends};
-	    foreach my $dep (split(/ /, $depends)) {
-		$result{$sname}{depends}{$dep}{installed} = 1;
-	    }
-	}
+	# if (defined $xml->{$plname}{depends}) {
+	#     my $depends = $xml->{$plname}{depends};
+	#     foreach my $dep (split(/ /, $depends)) {
+	# 	$result{$sname}{depends}{$dep}{installed} = 1; #(defined ${ 'Irssi::Script::'.$dep });
+	#     }
+	# }
     }
     return \%result;
 }
 
+sub get_rate_url {
+    my ($src) = @_;
+    my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30);
+    $ua->agent('ScriptAssist/'.$VERSION);
+    my $request = HTTP::Request->new('GET', $src);
+    my $response = $ua->request($request);
+    unless ($response->is_success) {
+	my $error = join "\n", $response->status_line(), (grep / at .* line \d+/, split "\n", $response->content()), '';
+	die("Fetching ratings location failed: $error");
+    }
+    my $votes_url;
+    for my $tag ($response->content() =~ /<script([^>]*)>/g) {
+	my $attr = " $tag ";
+	($votes_url = $1) =~ s/\.\w+$/.yml/
+	    if $attr =~ /\sasync\s/ && $attr =~ m{\ssrc="(https?://.*?/votes\.\w+)"\s};
+    }
+    unless ($votes_url) {
+	die("Fetching ratings failed: Could not find votes script\n");
+    }
+    $request = HTTP::Request->new('GET', $votes_url);
+    $response = $ua->request($request);
+    if (!$response->is_success) {
+	my $error = join "\n", $response->status_line(), (grep / at .* line \d+/, split "\n", $response->content()), '';
+	die("Fetching ratings failed: $error");
+    }
+    my $data = $response->content();
+    utf8::decode($data);
+    CPAN::Meta::YAML->read_string($data)->[0];
+}
+
 sub rate_script {
     my ($script, $stars) = @_;
-    my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30);
-    $ua->agent('ScriptAssist/'.2003020803);
-    my $request = HTTP::Request->new('GET', 'http://ratings.irssi.de/irssirate.pl?&stars='.$stars.'&mode=rate&script='.$script);
-    my $response = $ua->request($request);
-    unless ($response->is_success() && $response->content() =~ /You already rated this script/) {
-	return 1;
-    } else {
-	return 0;
-    }
+    my $xml = get_scripts();
+    my $votes = get_rate_url(map { $_->{source} } values %$xml);
+    my ($sname, $plname, $pname) = get_names($script, $xml);
+    die "Script $script not found\n" unless $votes->{$plname};
+    return $votes->{$plname}{u}
 }
 
 sub get_ratings {
     my ($scripts, $limit) = @_;
-    my $ua = LWP::UserAgent->new(env_proxy=>1, keep_alive=>1, timeout=>30);
-    $ua->agent('ScriptAssist/'.2003020803);
-    my $script = join(',', @{$scripts});
-    my $request = HTTP::Request->new('GET', 'http://ratings.irssi.de/irssirate.pl?script='.$script.'&sort=rating&limit='.$limit);
-    my $response = $ua->request($request);
-    my %result;
-    if ($response->is_success()) {
-	foreach (split /\n/, $response->content()) {
-	    if (/<tr><td><a href=".*?">(.*?)<\/a>/) {
-		my $entry = $1;
-		if (/"><\/td><td>([0-9.]+)<\/td><td>(.*?)<\/td><td>/) {
-		    $result{$entry} = [$1, $2];
-		}
-	    }
+    my $xml = get_scripts();
+    my $votes = get_rate_url(map { $_->{source} } values %$xml);
+    foreach (keys %{$votes}) {
+	if ($xml->{$_}) {
+	    $xml->{$_}{votes} = $votes->{$_}{v};
 	}
     }
+    my %result;
+    if (@{$scripts}) {
+	foreach (@{$scripts}) {
+	    my ($sname, $plname, $pname) = get_names($_, $xml);
+	    next unless (defined $xml->{$plname} || ( exists $Irssi::Script::{$pname} && exists $Irssi::Script::{$pname}{IRSSI} ));
+	    $result{$plname} = [$xml->{$plname}{votes}];
+	}
+    } else {
+	my @keys = sort { $xml->{$b}{votes} <=> $xml->{$a}{votes}
+		  || $xml->{$b}{modified} cmp $xml->{$a}{modified} }
+	    grep { !$xml->{$_}{HIDDEN} && $xml->{$_}{votes} ne '' } keys %$xml;
+	foreach (splice @keys, 0, $limit) {
+	    $result{$_} = [$xml->{$_}{votes}];
+	}
+    }
+    die "No such script found\n" unless keys %result;
     return \%result;
 }
 
@@ -597,13 +634,8 @@ sub print_rate {
     my (%data) = @_;
     my $line;
     foreach my $script (sort keys(%data)) {
-	if ($data{$script}) {
-            $line .= "%go%n %9".$script."%9 has been rated";
-        } else {
-            $line .= "%ro%n %9".$script."%9 : Already rated this script";
-        }
+	call_openurl($data{$script});
     }
-    print CLIENTCRAP draw_box('ScriptAssist', $line, 'rating', 1) ;
 }
 
 sub print_ratings {
@@ -617,8 +649,7 @@ sub print_ratings {
 	    push @line, "%yo%n";
 	}
         push @line, "%9".$script."%9";
-	push @line, $data{$script}{rating};
-	push @line, "[".$data{$script}{votes}." votes]";
+	push @line, "[".(length $data{$script}{rating} ? $data{$script}{rating} : 'no')." votes]";
 	push @table, \@line;
     }
     print CLIENTCRAP draw_box('ScriptAssist', array2table(@table), 'ratings', 1) ;
@@ -845,7 +876,8 @@ sub get_scripts {
 	}
 	$fetched = 1;
 	my $data = $response->content();
-	my ($src, $type);
+	my $src = $site;
+	my $type = '';
 	if ($site =~ /(.*\/).+\.(.+)/) {
 	    $src = $1;
 	    $type = $2;
@@ -1115,9 +1147,9 @@ sub cmd_scripassist {
     } elsif ($args[0] eq 'ratings' && defined $args[1]) {
 	shift @args;
 	bg_do("ratings ".join(' ', @args));
-    } elsif ($args[0] eq 'rate' && defined $args[1] && defined $args[2]) {
+    } elsif ($args[0] eq 'rate' && defined $args[1]) {
 	shift @args;
-	bg_do("rate ".join(' ', @args)) if ($args[2] >= 0 && $args[2] < 6);
+	bg_do("rate ".join(' ', @args));
     } elsif ($args[0] eq 'info' && defined $args[1]) {
 	shift @args;
 	bg_do("info ".join(' ', @args));
@@ -1158,6 +1190,7 @@ sub sig_command_script_load {
 sub sig_default_command {
     my ($cmd, $server) = @_;
     return unless Irssi::settings_get_bool("scriptassist_check_unknown_commands");
+    return if ($cmd =~ /^\d+$/ && $irssi_version >= v1.2.0 && Irssi::settings_get_bool("window_number_commands"));
     bg_do('unknown '.$cmd);
 }
 
@@ -1213,11 +1246,11 @@ foreach my $cmd ( ( 'check',
 		    'search',
 #		    '-h',
 		    'help',
-#		    'ratings',
-#		    'rate',
+		    'ratings',
+		    'rate',
 		    'info',
 #		    'echo',
-#		    'top',
+		    'top',
 		    'cpan',
 		    'autorun',
 		    'new' ) ) {

From 5bff40593f4331466e27ac3a4c947654884325be Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 29 Sep 2021 18:59:09 +0200
Subject: [PATCH 13/31] Merge pull request #41 from ailin-nemui/ports

fix /server modify port argument order

(cherry picked from commit 235c5b03281a3ae5c7849921cebbf7d46d39a4fc)
---
 src/fe-common/core/fe-server.c      | 24 +++++++++++++++---------
 src/fe-common/core/module-formats.c |  6 ++++--
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c
index 78e7202c..ab76c363 100644
--- a/src/fe-common/core/fe-server.c
+++ b/src/fe-common/core/fe-server.c
@@ -124,17 +124,17 @@ static void cmd_server_add_modify(const char *data, gboolean add)
 
 	port = old_port = -1;
 
-	if (*portstr != '\0')
-		port = add_port = atoi(portstr);
+	value = g_hash_table_lookup(optlist, "port");
+	if (value != NULL && *value != '\0')
+		port = add_port = atoi(value);
 	else if (g_hash_table_lookup(optlist, "tls") ||
 		 g_hash_table_lookup(optlist, "ssl"))
 		add_port = DEFAULT_SERVER_ADD_TLS_PORT;
 	else
 		add_port = DEFAULT_SERVER_ADD_PORT;
 
-	value = g_hash_table_lookup(optlist, "port");
-	if (value != NULL && *value != '\0')
-		old_port = atoi(value);
+	if (*portstr != '\0')
+		old_port = atoi(portstr);
 
 	chatnet = g_hash_table_lookup(optlist, "network");
 
@@ -307,12 +307,14 @@ static void cmd_server_remove(const char *data)
 	SERVER_SETUP_REC *rec;
 	char *addr, *port, *chatnet;
 	void *free_arg;
+	int portnum;
 
 	if (!cmd_get_params(data, &free_arg, 3, &addr, &port, &chatnet))
 		return;
 	if (*addr == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 
 	if (*port == '\0') {
+		portnum = DEFAULT_SERVER_ADD_PORT;
 		if (*chatnet == '\0')
 			rec = server_setup_find(addr, -1, NULL);
 		else
@@ -320,17 +322,21 @@ static void cmd_server_remove(const char *data)
 	}
 	else
 	{
+		portnum = atoi(port);
 		if (*chatnet == '\0')
-			rec = server_setup_find(addr, atoi(port), NULL);
+			rec = server_setup_find(addr, portnum, NULL);
 		else
-			rec = server_setup_find(addr, atoi(port), chatnet);
+			rec = server_setup_find(addr, portnum, chatnet);
 	}
 
 	if (rec == NULL)
-		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_SETUPSERVER_NOT_FOUND, addr, port);
+		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_SETUPSERVER_NOT_FOUND, addr,
+		            portnum);
 	else {
+		portnum = rec->port;
 		server_setup_remove(rec);
-		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_SETUPSERVER_REMOVED, addr, port);
+		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_SETUPSERVER_REMOVED, addr,
+		            portnum);
 	}
 
 	cmd_params_free(free_arg);
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index 0319ee11..e22b5e78 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -22,6 +22,7 @@
 #include <irssi/src/fe-common/core/formats.h>
 
 FORMAT_REC fecommon_core_formats[] = {
+	/* clang-format off */
 	{ MODULE_NAME, "Core", 0 },
 
 	/* ---- */
@@ -87,8 +88,8 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "server_reconnect_removed", "Removed reconnection to server {server $0} port {hilight $1}", 3, { 0, 1, 0 } },
 	{ "server_reconnect_not_found", "Reconnection tag {server $0} not found", 1, { 0 } },
 	{ "setupserver_added", "Server {server $0} saved", 2, { 0, 1 } },
-	{ "setupserver_removed", "Server {server $0} removed", 2, { 0, 1 } },
-	{ "setupserver_not_found", "Server {server $0} not found", 2, { 0, 1 } },
+	{ "setupserver_removed", "Server {server $0} {hilight $1} removed", 2, { 0, 1 } },
+	{ "setupserver_not_found", "Server {server $0} {hilight $1} not found", 2, { 0, 1 } },
 	{ "your_nick", "Your nickname is {nick $0}", 1, { 0 } },
 
 	/* ---- */
@@ -316,4 +317,5 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "tls_protocol_version", "Protocol: {hilight $0} ({hilight $1} bit, {hilight $2})", 3, { 0, 1, 0 } },
 
 	{ NULL, NULL, 0 }
+	/* clang-format on */
 };

From 96d99534c349f6843ed65751be5f4e58cbac7349 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 29 Sep 2021 19:11:35 +0200
Subject: [PATCH 14/31] update NEWS

---
 NEWS | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index b7c62b93..801a490b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,11 @@
-v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
+v1.3.0-an 2021-09-29  Ailin Nemui <Nei>
 	* /SET resolve_reverse_lookup setting was removed (#1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed
 	  (#1146). By Shivaram Lingamneni
 
 	* The display system now renders formats on the fly (#1079,
 	  #1188, #1191, #1192, #1204, #1205, #1209, #1349, an#13,
-	  an#14, an#28, an#29, an#36)
+	  an#14, an#28, an#29, an#36, an#37)
 
 	  This major change will break scripts that try to modify
 	  printed text during "print text" signal (#1189). They need
@@ -139,7 +139,6 @@ v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	+ Add support for IRCv3 away-notify. /SET away_notify_public
 	  to enable (#1099, GL#33, #1105)
 	+ Add support for IRCv3 chghost (#1096, GL#33, #1105)
-	+ Add support for IRCv3 account-notify.
 	+ Add support for IRCv3 server-time. /SET show_server_time to
 	  enable (#1108)
 	+ Add support for logging IRCv3 server-time.
@@ -239,12 +238,13 @@ v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	- Fix /SERVER ADD -matrix -network my_matrix_network
           (an#12). By Andrej Kacian
 	- Fix /SERVER ADD creating duplicated entries in the config
-          file (#1317, an#22)
+          file (#1317, an#22, an#41)
 	- Fix critical when SASL user is set and SASL password is
           empty (#1325, an#21)
-	- Misc fixes (#1106, #1141, #1272, #1297)
+	- Misc fixes (#1106, #1141, #1272, #1297, an#35)
 	- Fuzz fixes (#1116, #1117, #1119, #1125, #1126, an#20)
 	- Build system fixes (#1101, #1102, #1069, #1140, #1181, #1253)
+	- Sync docs and scripts (an#39)
 	- Text and Help updates
 	  - add -tls_* options to manual (#1029, #1030). By Jacob
             V. Rasmussen
@@ -260,9 +260,10 @@ v1.3.0-an 2021-09-05  Ailin Nemui <Nei>
 	  - Add documentation for escaping some characters (#1329,
             #1330, an#9). By Guntbert Reiter
 	  - Fix some typos (#1336, an#10). By Francis Mteo
+	  - Document $abiversion and parse_special (an#38). By bw1
 	- Infrastructure updates:
 	  - Support for Github Actions (#1039, #1103, #1160, #1212,
-            #1231, #1252, #1261)
+            #1231, #1252, #1261, an#40)
 	  - Run clang-format on pull requests (#1172, #1173, #1184,
             #1230, #1247, #1287)
 	  - Run abidiff on pull requests (#1179, #1195)

From 44298db8143d2da7fba6a641123425f91b97918f Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Wed, 6 Oct 2021 15:37:15 +0200
Subject: [PATCH 15/31] chghost news

---
 NEWS | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/NEWS b/NEWS
index 801a490b..f3726fb3 100644
--- a/NEWS
+++ b/NEWS
@@ -139,6 +139,13 @@ v1.3.0-an 2021-09-29  Ailin Nemui <Nei>
 	+ Add support for IRCv3 away-notify. /SET away_notify_public
 	  to enable (#1099, GL#33, #1105)
 	+ Add support for IRCv3 chghost (#1096, GL#33, #1105)
+
+	  For servers with broken chghost implementation that fill the
+	  status window with host changed messages, one may add "quote
+	  cap req -chghost" to the -autosendcmd or, if the host change
+	  messages are entirely undesired, "/format -delete
+	  host_changed"
+
 	+ Add support for IRCv3 server-time. /SET show_server_time to
 	  enable (#1108)
 	+ Add support for logging IRCv3 server-time.

From 3bb8c619e231ada6ffa99d44f88917389cad00a3 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Sun, 10 Oct 2021 12:45:21 +0200
Subject: [PATCH 16/31] Merge pull request #43 from ailin-nemui/server-outgoing

remove newline from "server outgoing modify"

(cherry picked from commit ea961623f575529ab2a94d7d394b399d29729b57)
---
 docs/signals.txt           |  2 +-
 src/irc/core/irc-servers.c | 25 ++++++++++++++++++++-----
 src/irc/core/irc.c         | 28 +++++++++++++++++++++-------
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/docs/signals.txt b/docs/signals.txt
index 6128084b..da72ef57 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -151,7 +151,7 @@ irc.c:
  "whois default event", SERVER_REC, char *args, char *sender_nick, char *sender_address
 
  "server incoming", SERVER_REC, char *data
- "server outgoing modify", SERVER_REC, GString *data
+ "server outgoing modify", SERVER_REC, GString *data, int crlf
 
 (for perl parser..)
  "redir "<cmd>, SERVER_REC, char *args, char *sender_nick, char *sender_address
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 664ca9a4..82989534 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -718,6 +718,7 @@ static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
 	GString *str;
 	long usecs;
 	char *cmd;
+	int crlf;
 
 	if (!IS_IRC_SERVER(server))
 		return 0;
@@ -741,15 +742,29 @@ static int server_cmd_timeout(IRC_SERVER_REC *server, gint64 now)
 
 	/* send command */
 	str = g_string_new(cmd);
-	signal_emit("server outgoing modify", 2, server, str);
+
+	if (str->len > 2 && str->str[str->len - 2] == '\r')
+		crlf = 2;
+	else if (str->len > 1 && str->str[str->len - 1] == '\n')
+		crlf = 1;
+	else
+		crlf = 0;
+
+	if (crlf)
+		g_string_truncate(str, str->len - crlf);
+
+	signal_emit("server outgoing modify", 3, server, str, crlf);
 	if (str->len) {
+		if (crlf == 2)
+			g_string_append(str, "\r\n");
+		else if (crlf == 1)
+			g_string_append(str, "\n");
+
 		irc_server_send_data(server, str->str, str->len);
 
 		/* add to rawlog without [CR+]LF */
-		if (str->len > 2 && str->str[str->len - 2] == '\r')
-			str->str[str->len - 2] = '\0';
-		else if (str->str[str->len - 1] == '\n')
-			str->str[str->len - 1] = '\0';
+		if (crlf)
+			g_string_truncate(str, str->len - crlf);
 		rawlog_output(server->rawlog, str->str);
 		server_redirect_command(server, str->str, redirect);
 	}
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index c17e2470..62bc0bc8 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -115,20 +115,34 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd, int irc_send_whe
 
 	if (!raw) {
 		/* Add CR+LF to command */
-		g_string_append_c(str, 13);
-		g_string_append_c(str, 10);
+		g_string_append(str, "\r\n");
 	}
 
 	if (irc_send_when == IRC_SEND_NOW) {
-		signal_emit("server outgoing modify", 2, server, str);
+		int crlf;
+
+		if (str->len > 2 && str->str[str->len - 2] == '\r')
+			crlf = 2;
+		else if (str->len > 1 && str->str[str->len - 1] == '\n')
+			crlf = 1;
+		else
+			crlf = 0;
+
+		if (crlf)
+			g_string_truncate(str, str->len - crlf);
+
+		signal_emit("server outgoing modify", 3, server, str, crlf);
 		if (str->len) {
+			if (crlf == 2)
+				g_string_append(str, "\r\n");
+			else if (crlf == 1)
+				g_string_append(str, "\n");
+
 			irc_server_send_data(server, str->str, str->len);
 
 			/* add to rawlog without [CR+]LF */
-			if (str->len > 2 && str->str[str->len - 2] == '\r')
-				str->str[str->len - 2] = '\0';
-			else if (str->str[str->len - 1] == '\n')
-				str->str[str->len - 1] = '\0';
+			if (crlf)
+				g_string_truncate(str, str->len - crlf);
 			rawlog_output(server->rawlog, str->str);
 			server_redirect_command(server, str->str, server->redirect_next);
 		}

From 23abfb912368e96c57797ac90298f5b194861a87 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Mon, 11 Oct 2021 22:08:14 +0200
Subject: [PATCH 17/31] Merge pull request #44 from ailin-nemui/lag

fix max_lag disconnect

(cherry picked from commit 6db881d8ef70b261b1f237188b53a1de76c6fadb)
---
 src/irc/core/lag.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irc/core/lag.c b/src/irc/core/lag.c
index 6af8524c..aef5e617 100644
--- a/src/irc/core/lag.c
+++ b/src/irc/core/lag.c
@@ -104,7 +104,7 @@ static int sig_check_lag(void)
 
 		if (rec->lag_sent != 0) {
 			/* waiting for lag reply */
-			if (max_lag > 1 && now - rec->lag_sent > max_lag * G_TIME_SPAN_SECOND) {
+			if (max_lag > 1 && now - (rec->lag_sent / G_TIME_SPAN_SECOND) > max_lag) {
 				/* too much lag, disconnect */
 				signal_emit("server lag disconnect", 1, rec);
 				rec->connection_lost = TRUE;

From 47f8582e68637b118a713a8115c7c54db3b2afb2 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Mon, 11 Oct 2021 22:10:47 +0200
Subject: [PATCH 18/31] update NEWS

---
 NEWS | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index f3726fb3..2e45ac1a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-v1.3.0-an 2021-09-29  Ailin Nemui <Nei>
+v1.3.0-an 2021-10-11  Ailin Nemui <Nei>
 	* /SET resolve_reverse_lookup setting was removed (#1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed
 	  (#1146). By Shivaram Lingamneni
@@ -187,7 +187,7 @@ v1.3.0-an 2021-09-29  Ailin Nemui <Nei>
 	+ Allow -tls_ca{file,path} '' to unset an argument (#730,
 	  #1060, an#30)
 	+ Add a "server outgoing modify" signal to intercept outgoing
-	  messages (#1148, #1151, an#15). Original by
+	  messages (#1148, #1151, an#15, an#43). Original by
 	  JustAnotherArchivist
 	- remove some hard-coded 510 byte assumptions (#1086)
 	- Several fixes for error checks in SSL (#944, #1037, #943,
@@ -211,7 +211,7 @@ v1.3.0-an 2021-09-29  Ailin Nemui <Nei>
           #891, #1129). By Dan Collins
 	- Fix /IGNORE not setting the right level in irc_op_public
           messages (#1280). Credit to oss-fuzz
-	- Fix GTimeVal deprecation (#1141, #1144, #1145)
+	- Fix GTimeVal deprecation (#1141, #1144, #1145, #1350, an#44)
 
 	  If multi-version compatibility is desired, module authors
 	  can find an example of backwards compatible code in

From bdadbb183f5ac53ff33c872a022580fc6ccb4e56 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 9 Nov 2021 14:48:54 +0100
Subject: [PATCH 19/31] Merge pull request #48 from ailin-nemui/news

add news ref

(cherry picked from commit b9f773ba6a8913eff2812da122a62528550b0534)
---
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 2e45ac1a..84ab808a 100644
--- a/NEWS
+++ b/NEWS
@@ -39,7 +39,7 @@ v1.3.0-an 2021-10-11  Ailin Nemui <Nei>
 	      /SET show_names_on_join_limit -1
 
 	* -tls_verify is now enabled by default (#1170, an#18, #1309,
-           an#23)
+           an#23, #1343, #1351)
 
 	  This may cause an ugly display of notls_verify in the output
 	  of /SERVER LIST, even on plain-text connection, on old

From eed9b32f9718ab516df66065c983fac742b8693d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 10 Nov 2021 14:12:47 +0100
Subject: [PATCH 20/31] Merge pull request #49 from ailin-nemui/dccmsgs

fix stuck meta on dcc chat

(cherry picked from commit a54a00c803067bfc669658f64aaac54dfe95c69b)
---
 NEWS                   | 6 +++---
 src/irc/dcc/dcc-chat.c | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 84ab808a..09514639 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,11 @@
-v1.3.0-an 2021-10-11  Ailin Nemui <Nei>
+v1.3.0-an 2021-11-11  Ailin Nemui <Nei>
 	* /SET resolve_reverse_lookup setting was removed (#1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed
 	  (#1146). By Shivaram Lingamneni
 
 	* The display system now renders formats on the fly (#1079,
-	  #1188, #1191, #1192, #1204, #1205, #1209, #1349, an#13,
-	  an#14, an#28, an#29, an#36, an#37)
+	  #1188, #1191, #1192, #1204, #1205, #1209, #1349, #1355,
+	  an#13, an#14, an#28, an#29, an#36, an#37, an#49)
 
 	  This major change will break scripts that try to modify
 	  printed text during "print text" signal (#1189). They need
diff --git a/src/irc/dcc/dcc-chat.c b/src/irc/dcc/dcc-chat.c
index 3f471eac..68da0e27 100644
--- a/src/irc/dcc/dcc-chat.c
+++ b/src/irc/dcc/dcc-chat.c
@@ -318,13 +318,17 @@ void dcc_chat_input(CHAT_DCC_REC *dcc)
 		}
 
 		if (ret > 0) {
+			SERVER_REC *server;
 			char *recoded;
 
 			dcc->transfd += ret;
 
-			recoded = recode_in(SERVER(dcc->server), str, dcc->nick);
+			server = SERVER(dcc->server);
+			recoded = recode_in(server, str, dcc->nick);
 			signal_emit("dcc chat message", 2, dcc, recoded);
 			g_free(recoded);
+			if (server != NULL)
+				server_meta_clear_all(server);
 		}
 	} while (ret > 0);
 }

From 05063da9995f1d7b69f02a36a4f6d861dfbf891e Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 11 Nov 2021 10:54:09 +0100
Subject: [PATCH 21/31] tag as 1.3.0-pre8

---
 configure.ac | 2 +-
 meson.build  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3a9e7bd6..66e9096a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.3-head)
+AC_INIT(irssi, 1.3.0-pre8)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)
diff --git a/meson.build b/meson.build
index bd192a92..4e2a7a89 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('irssi', 'c',
-  version : '1.3-head',
+  version : '1.3.0-pre8',
   meson_version : '>=0.49',
   default_options : ['warning_level=1'])
 

From bb1957bafbc740db0ebaf5b3d084945f636f2c9a Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 1 Dec 2021 22:51:43 +0100
Subject: [PATCH 22/31] Merge pull request #51 from ailin-nemui/help

fix help text wrt SERVER command

(cherry picked from commit d33fd0c5da2287f5496a4a78940490f0c4466428)
---
 docs/help/in/server.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index f7d907f3..9a7bb550 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -51,10 +51,9 @@
     When using the ADD parameter on a server that already exists, the
     configuration will be merged with each other.
 
-    When using the command without any of the given parameters, it will
-    connect to the specified server; the server in the active window will be
-    disconnected unless you prepend the server with the '+' character; the same
-    method is applicable to the CONNECT parameter.
+    When using the CONNECT parameter, it will connect to the specified
+    server; the server in the active window will be disconnected
+    unless you prepend the server with the '+' character.
 
     Specify '-' as password to remove a server password
 

From 6763be847f781c4e8bcaad6ab9973d05566f0a56 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Wed, 1 Dec 2021 23:34:53 +0100
Subject: [PATCH 23/31] Merge pull request #52 from ailin-nemui/help

fix help text wrt SERVER LIST command

(cherry picked from commit 8281b103108820aa104c8e0fe5c33960838d2f99)
---
 docs/help/in/server.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 9a7bb550..84294af6 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -5,7 +5,7 @@
 
 %9Parameters:%9
 
-    LIST:               Displays the list of servers you are connected to.
+    LIST:               Displays the list of servers you have configured.
     CONNECT:            Connects to the given server.
     ADD:                Adds a server to your configuration.
     MODIFY:             Modifies a server in your configuration.

From dbf9fc3dfcc1752003f7e167261b917d5b94aaf2 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 17 Dec 2021 22:29:15 +0100
Subject: [PATCH 24/31] Merge pull request #53 from ailin-nemui/keepops

keep own ops status on /upgrade

(cherry picked from commit a2feef5e735d3bb3d5a4eecb05e813ba6bd2fe95)
---
 src/irc/core/massjoin.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c
index b8b8912f..15a9a9a8 100644
--- a/src/irc/core/massjoin.c
+++ b/src/irc/core/massjoin.c
@@ -43,13 +43,6 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 
 	g_return_if_fail(data != NULL);
 
-	if (g_ascii_strcasecmp(nick, server->nick) == 0) {
-		/* You joined, do not massjoin */
-		send_massjoin = FALSE;
-	} else {
-		send_massjoin = TRUE;
-	}
-
 	params = event_get_params(data, 3, &channel, &account, &realname);
 
 	ptr = strchr(channel, 7); /* ^G does something weird.. */
@@ -62,6 +55,19 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
 		return;
 	}
 
+	if (g_ascii_strcasecmp(nick, server->nick) == 0) {
+		/* do not overwrite our /UPGRADEd ownnick */
+		if (chanrec->session_rejoin) {
+			g_free(params);
+			return;
+		} else {
+			/* You joined, do not massjoin */
+			send_massjoin = FALSE;
+		}
+	} else {
+		send_massjoin = TRUE;
+	}
+
 	/* check that the nick isn't already in nicklist. seems to happen
 	   sometimes (server desyncs or something?) */
 	nickrec = nicklist_find(CHANNEL(chanrec), nick);

From 85a6ade7e883b582afb230abd5afa302d0f42c49 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 17 Dec 2021 22:42:13 +0100
Subject: [PATCH 25/31] tag as 1.3.1-an

---
 NEWS                | 5 +++++
 configure.ac        | 2 +-
 meson.build         | 2 +-
 src/core/expandos.c | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 09514639..649f3669 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+v1.3.1-an 2021-12-17  Ailin Nemui <Nei>
+	- Minor help fixes (an#51, an#52)
+	- Fix regression where own channel status was forgotten after
+          /UPGRADE (#1357, an#53)
+
 v1.3.0-an 2021-11-11  Ailin Nemui <Nei>
 	* /SET resolve_reverse_lookup setting was removed (#1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed
diff --git a/configure.ac b/configure.ac
index 66e9096a..bf5f6c18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.3.0-pre8)
+AC_INIT(irssi, 1.3.1-an)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)
diff --git a/meson.build b/meson.build
index 4e2a7a89..79f3b58b 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('irssi', 'c',
-  version : '1.3.0-pre8',
+  version : '1.3.1-an',
   meson_version : '>=0.49',
   default_options : ['warning_level=1'])
 
diff --git a/src/core/expandos.c b/src/core/expandos.c
index da84b568..0f317e51 100644
--- a/src/core/expandos.c
+++ b/src/core/expandos.c
@@ -322,7 +322,7 @@ static char *expando_last_invite(SERVER_REC *server, void *item, int *free_ret)
 /* client version text string */
 static char *expando_version(SERVER_REC *server, void *item, int *free_ret)
 {
-	return PACKAGE_VERSION "-an";
+	return PACKAGE_VERSION;
 }
 
 /* current value of CMDCHARS */

From c96a8d9fae80384be56e2a87e7d967066919fb90 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Thu, 30 Dec 2021 23:23:53 +0100
Subject: [PATCH 26/31] Merge pull request #54 from ailin-nemui/chantypes

use chantypes instead of # for irc channel defaults

(cherry picked from commit f7fd4d72e488081f180fc1f4cc8bb269e50a9067)
---
 src/irc/core/irc-channels.c | 31 +++++++++++++++++++++----------
 src/irc/core/irc-servers.c  |  5 +++--
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c
index 6d38c560..b0fba9b1 100644
--- a/src/irc/core/irc-channels.c
+++ b/src/irc/core/irc-channels.c
@@ -63,6 +63,20 @@ IRC_CHANNEL_REC *irc_channel_create(IRC_SERVER_REC *server, const char *name,
 #define get_join_key(key) \
 	(((key) == NULL || *(key) == '\0') ? "x" : (key))
 
+static char *force_channel_name(IRC_SERVER_REC *server, const char *name)
+{
+	char *chantypes;
+
+	if (server_ischannel(SERVER(server), name))
+		return g_strdup(name);
+
+	chantypes = g_hash_table_lookup(server->isupport, "chantypes");
+	if (chantypes == NULL || *chantypes == '\0')
+		chantypes = "#";
+
+	return g_strdup_printf("%c%s", *chantypes, name);
+}
+
 static void irc_channels_join(IRC_SERVER_REC *server, const char *data,
 			      int automatic)
 {
@@ -99,8 +113,7 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data,
 	tmp = chanlist;
 	for (;; tmp++) {
 		if (*tmp !=  NULL) {
-			channel = server_ischannel(SERVER(server), *tmp) ? g_strdup(*tmp) :
-			g_strdup_printf("#%s", *tmp);
+			channel = force_channel_name(server, *tmp);
 
 			chanrec = irc_channel_find(server, channel);
 			if (chanrec == NULL) {
@@ -170,17 +183,14 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data,
 }
 
 /* function for finding IRC channels - adds support for !channels */
-static CHANNEL_REC *irc_channel_find_server(SERVER_REC *server,
-					    const char *channel)
+static CHANNEL_REC *irc_channel_find_server(IRC_SERVER_REC *server, const char *channel)
 {
 	GSList *tmp;
 	char *fmt_channel;
 
 	/* if 'channel' has no leading # this lookup is going to fail, add a
 	 * octothorpe in front of it to handle this case. */
-	fmt_channel = server_ischannel(SERVER(server), channel) ?
-	    g_strdup(channel) :
-	    g_strdup_printf("#%s", channel);
+	fmt_channel = force_channel_name(server, channel);
 
 	for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
 		CHANNEL_REC *rec = tmp->data;
@@ -189,12 +199,12 @@ static CHANNEL_REC *irc_channel_find_server(SERVER_REC *server,
                         continue;
 
 		/* check both !ABCDEchannel and !channel */
-		if (IRC_SERVER(server)->nick_comp_func(fmt_channel, rec->name) == 0) {
+		if (server->nick_comp_func(fmt_channel, rec->name) == 0) {
 			g_free(fmt_channel);
 			return rec;
 		}
 
-		if (IRC_SERVER(server)->nick_comp_func(fmt_channel, rec->visible_name) == 0) {
+		if (server->nick_comp_func(fmt_channel, rec->visible_name) == 0) {
 			g_free(fmt_channel);
 			return rec;
 		}
@@ -210,7 +220,8 @@ static void sig_server_connected(SERVER_REC *server)
 	if (!IS_IRC_SERVER(server))
 		return;
 
-	server->channel_find_func = irc_channel_find_server;
+	server->channel_find_func =
+	    (CHANNEL_REC * (*) (SERVER_REC *, const char *) ) irc_channel_find_server;
 	server->channels_join = (void (*) (SERVER_REC *, const char *, int))
 		irc_channels_join;
 }
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 82989534..092eb7af 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -84,10 +84,11 @@ static int ischannel_func(SERVER_REC *server, const char *data)
 		chantypes = "#&!+"; /* normal, local, secure, modeless */
 
 	statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg");
-	if (statusmsg == NULL)
+	if (statusmsg == NULL && strchr(chantypes, '@') == NULL)
 		statusmsg = "@";
 
-	data += strspn(data, statusmsg);
+	if (statusmsg != NULL)
+		data += strspn(data, statusmsg);
 
 	/* strchr(3) considers the trailing NUL as part of the string, make sure
 	 * we didn't advance too much. */

From 3603d47990480d4899a79f2bae815996975ce068 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Fri, 14 Jan 2022 11:29:25 +0100
Subject: [PATCH 27/31] Merge pull request #56 from ailin-nemui/line-bookmark

fix crash in Perl's $view->set_bookmark

(cherry picked from commit 95e3fea62236b606b9c9e4d0c4231c75589ef71f)
---
 NEWS                              | 3 ++-
 src/perl/textui/TextBufferView.xs | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 649f3669..0a49cc3a 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,8 @@ v1.3.1-an 2021-12-17  Ailin Nemui <Nei>
           /UPGRADE (#1357, an#53)
 
 v1.3.0-an 2021-11-11  Ailin Nemui <Nei>
-	* /SET resolve_reverse_lookup setting was removed (#1135)
+	* /SET resolve_reverse_lookup setting was removed (#1034,
+          #1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed
 	  (#1146). By Shivaram Lingamneni
 
diff --git a/src/perl/textui/TextBufferView.xs b/src/perl/textui/TextBufferView.xs
index 43aba4e6..e4cfe674 100644
--- a/src/perl/textui/TextBufferView.xs
+++ b/src/perl/textui/TextBufferView.xs
@@ -49,14 +49,14 @@ textbuffer_view_scroll_line(view, line)
 	Irssi::TextUI::TextBufferView view
 	Irssi::TextUI::Line line
 CODE:
-	textbuffer_view_scroll_line(view, line->line);
+	textbuffer_view_scroll_line(view, Line(line));
 
 Irssi::TextUI::LineCache
 textbuffer_view_get_line_cache(view, line)
 	Irssi::TextUI::TextBufferView view
 	Irssi::TextUI::Line line
 CODE:
-	RETVAL = textbuffer_view_get_line_cache(view, line->line);
+	RETVAL = textbuffer_view_get_line_cache(view, Line(line));
 OUTPUT:
 	RETVAL
 
@@ -65,7 +65,7 @@ textbuffer_view_remove_line(view, line)
 	Irssi::TextUI::TextBufferView view
 	Irssi::TextUI::Line line
 CODE:
-	textbuffer_view_remove_line(view, line->line);
+	textbuffer_view_remove_line(view, Line(line));
 
 void
 textbuffer_view_remove_all_lines(view)
@@ -82,7 +82,7 @@ textbuffer_view_set_bookmark(view, name, line)
 	char *name
 	Irssi::TextUI::Line line
 CODE:
-	textbuffer_view_set_bookmark(view, name, line->line);
+	textbuffer_view_set_bookmark(view, name, Line(line));
 
 void
 textbuffer_view_set_bookmark_bottom(view, name)

From b60b0f0ff94acae339cf36b611f03e318362b006 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Fri, 14 Jan 2022 13:18:41 +0100
Subject: [PATCH 28/31] tag as 1.3.2-an

---
 NEWS         | 6 ++++++
 configure.ac | 2 +-
 meson.build  | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 0a49cc3a..5464ad05 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+v1.3.2-an 2022-01-14  Ailin Nemui <Nei>
+	- CHANTYPES take precedence over (missing) STATUSMSG in /join
+          (#1358, an#54)
+	- Fix crash in Perl's $view->set_bookmark (freebsd#254237,
+          an#56)
+
 v1.3.1-an 2021-12-17  Ailin Nemui <Nei>
 	- Minor help fixes (an#51, an#52)
 	- Fix regression where own channel status was forgotten after
diff --git a/configure.ac b/configure.ac
index bf5f6c18..87dcbc32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.3.1-an)
+AC_INIT(irssi, 1.3.2-an)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)
diff --git a/meson.build b/meson.build
index 79f3b58b..64dd04cf 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('irssi', 'c',
-  version : '1.3.1-an',
+  version : '1.3.2-an',
   meson_version : '>=0.49',
   default_options : ['warning_level=1'])
 

From 0bd7fc459c7c9c6f217537fba59524a3cec93d21 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 21 Feb 2022 16:50:10 +0100
Subject: [PATCH 29/31] revert branding

---
 NEWS                         |  2 +-
 README.md                    | 24 ++++++++++++------------
 configure.ac                 |  2 +-
 meson.build                  |  2 +-
 src/fe-text/module-formats.c |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/NEWS b/NEWS
index 5464ad05..c81398b2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-v1.3.2-an 2022-01-14  Ailin Nemui <Nei>
+v1.3.2 2022-xx-xx The Irssi team <staff@irssi.org>
 	- CHANTYPES take precedence over (missing) STATUSMSG in /join
           (#1358, an#54)
 	- Fix crash in Perl's $view->set_bookmark (freebsd#254237,
diff --git a/README.md b/README.md
index 21fa14e8..475caeaa 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-# Neırssi
+# [Irssi](https://irssi.org)
 
-![Build Status](https://github.com/ailin-nemui/irssi/workflows/Check%20Irssi/badge.svg?branch=master)
+![Build Status](https://github.com/irssi/irssi/workflows/Check%20Irssi/badge.svg?branch=master)
 
-Neırssi is a modular text mode chat client mostly compatible with
-[Irssi](https://irssi.org). It comes with IRC support built in, and
-there are third party [ICB](https://github.com/jperkin/irssi-icb),
+Irssi is a modular text mode chat client. It comes with IRC support
+built in, and there are third party
+[ICB](https://github.com/jperkin/irssi-icb),
 [SILC](http://www.silcnet.org/),
 [XMPP](http://cybione.org/~irssi-xmpp/) (Jabber),
 [PSYC](http://about.psyc.eu/Irssyc) and
@@ -13,14 +13,14 @@ available.
 
 ![irssi](https://user-images.githubusercontent.com/5665186/32180643-cf127f60-bd92-11e7-8aa2-882313ce1d8e.png)
 
-## [Download information](https://ailin-nemui.github.io/irssi/Getting.html)
+## [Download information](https://irssi.org/download/)
 
 #### Development source installation
 
 [Ninja](https://ninja-build.org/) 1.5 and [Meson](https://mesonbuild.com/) 0.49
 
 ```
-git clone https://github.com/ailin-nemui/irssi
+git clone https://github.com/irssi/irssi
 cd irssi
 meson Build
 ninja -C Build && sudo ninja -C Build install
@@ -28,7 +28,7 @@ ninja -C Build && sudo ninja -C Build install
 
 #### Release source installation
 
-* Download [release](https://github.com/ailin-nemui/irssi/releases)
+* Download [release](https://github.com/irssi/irssi/releases)
 * Verify signature
 ```
 tar xJf irssi-*.tar.xz
@@ -46,17 +46,17 @@ ninja -C Build && sudo ninja -C Build install
 
 #### See the [INSTALL](INSTALL) file for details
 
-## Documentation
+## [Documentation](https://irssi.org/documentation/)
 
-* [New users guide](https://ailin-nemui.github.io/irssi/New-users.html)
+* [Frequently Asked Questions](https://irssi.org/documentation/faq)
+* [Startup How-To](https://irssi.org/documentation/startup)
 * Check the built-in `/HELP`, it has all the details on command syntax
-* Other random Irssi documentation on https://irssi.org/documentation/
 
 ## [Themes](https://irssi-import.github.io/themes/)
 
 ## [Scripts](https://scripts.irssi.org/)
 
-## [Modules](https://ailin-nemui.github.io/irssi/Modules.html)
+## [Modules](https://irssi.org/modules/)
 
 ## [Security information](https://irssi.org/security/)
 
diff --git a/configure.ac b/configure.ac
index 87dcbc32..c91bde95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.3.2-an)
+AC_INIT(irssi, 1.3.2)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)
diff --git a/meson.build b/meson.build
index 64dd04cf..58052054 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('irssi', 'c',
-  version : '1.3.2-an',
+  version : '1.3.2',
   meson_version : '>=0.49',
   default_options : ['warning_level=1'])
 
diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c
index e9d4fab9..e9111c2d 100644
--- a/src/fe-text/module-formats.c
+++ b/src/fe-text/module-formats.c
@@ -84,7 +84,7 @@ FORMAT_REC gui_text_formats[] =
 	{ NULL, "Welcome", 0 },
 
 	{ "irssi_banner",
-	  "Neırssi v$J", 0 },
+	  "Irssi v$J", 0 },
 	{ "welcome_firsttime",
 	  "- - - - - - - - - - - - - - - - - - - - - - - - - - - -\n"
 	  "Hi there! If this is your first time using Irssi, you%:"

From 2f700bebc7dcd89ad893f1b4a288987419daeec9 Mon Sep 17 00:00:00 2001
From: Doug Freed <dwfreed@mtu.edu>
Date: Sun, 24 Apr 2022 20:07:30 +0000
Subject: [PATCH 30/31] NEWS: remove 2 lines that would be confusing

---
 NEWS | 2 --
 1 file changed, 2 deletions(-)

diff --git a/NEWS b/NEWS
index c81398b2..5b2040e8 100644
--- a/NEWS
+++ b/NEWS
@@ -4,12 +4,10 @@ v1.3.2 2022-xx-xx The Irssi team <staff@irssi.org>
 	- Fix crash in Perl's $view->set_bookmark (freebsd#254237,
           an#56)
 
-v1.3.1-an 2021-12-17  Ailin Nemui <Nei>
 	- Minor help fixes (an#51, an#52)
 	- Fix regression where own channel status was forgotten after
           /UPGRADE (#1357, an#53)
 
-v1.3.0-an 2021-11-11  Ailin Nemui <Nei>
 	* /SET resolve_reverse_lookup setting was removed (#1034,
           #1135)
 	* Irssi will try to connect on IPv4 if IPv6 connection failed

From 6d2cfc24b7e1a254d5cdb0202a55d58973c9da33 Mon Sep 17 00:00:00 2001
From: Doug Freed <dwfreed@mtu.edu>
Date: Sun, 24 Apr 2022 20:40:01 +0000
Subject: [PATCH 31/31] Clean up remaining branding reverts

---
 README.md                    | 4 ++--
 src/fe-text/module-formats.c | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 475caeaa..ea4b817b 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ ninja -C Build && sudo ninja -C Build install
 #### Release source installation
 
 * Download [release](https://github.com/irssi/irssi/releases)
-* Verify signature
+* [Verify](https://irssi.org/download/#release-sources) signature
 ```
 tar xJf irssi-*.tar.xz
 cd irssi-*
@@ -62,7 +62,7 @@ ninja -C Build && sudo ninja -C Build install
 
 Please report security issues to staff@irssi.org. Thanks!
 
-## [Bugs](https://github.com/irssi/irssi/issues) / Suggestions / Contributing
+## [Bugs](https://github.com/irssi/irssi/issues) / Suggestions / [Contributing](https://irssi.org/development/)
 
 Check the GitHub issues if it is already listed in there; if not, open
 an issue on GitHub or send a mail to [staff@irssi.org](mailto:staff@irssi.org).
diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c
index e9111c2d..7cdc5654 100644
--- a/src/fe-text/module-formats.c
+++ b/src/fe-text/module-formats.c
@@ -84,7 +84,11 @@ FORMAT_REC gui_text_formats[] =
 	{ NULL, "Welcome", 0 },
 
 	{ "irssi_banner",
-	  "Irssi v$J", 0 },
+	  " ___           _%:"
+	  "|_ _|_ _ _____(_)%:"
+	  " | || '_(_-<_-< |%:"
+	  "|___|_| /__/__/_|%:"
+	  "Irssi v$J - https://irssi.org", 0 },
 	{ "welcome_firsttime",
 	  "- - - - - - - - - - - - - - - - - - - - - - - - - - - -\n"
 	  "Hi there! If this is your first time using Irssi, you%:"