From a0142ce38463e3835ff67e14efcafefdd6d4a084 Mon Sep 17 00:00:00 2001
From: jesopo <github@lolnerd.net>
Date: Wed, 17 Mar 2021 20:29:07 +0000
Subject: [PATCH 1/2] add IRC_CHATNET_REC->usermode to perl chatnet hashes

---
 src/perl/irc/Irc.xs   | 9 +++++++++
 src/perl/irc/module.h | 1 +
 2 files changed, 10 insertions(+)

diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index f973da22..7ee47180 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -3,6 +3,12 @@
 
 static int initialized = FALSE;
 
+static void perl_irc_chatnet_fill_hash(HV *hv, IRC_CHATNET_REC *chatnet)
+{
+	perl_chatnet_fill_hash(hv, (CHATNET_REC *) chatnet);
+	(void) hv_store(hv, "usermode", 8, new_pv(chatnet->usermode), 0);
+}
+
 static void perl_irc_connect_fill_hash(HV *hv, IRC_SERVER_CONNECT_REC *conn)
 {
 	perl_connect_fill_hash(hv, (SERVER_CONNECT_REC *) conn);
@@ -233,6 +239,9 @@ CODE:
 
 	chat_type = chat_protocol_lookup("IRC");
 
+	irssi_add_object(module_get_uniq_id("CHATNET", 0),
+			 chat_type, "Irssi::Irc::Chatnet",
+			 (PERL_OBJECT_FUNC) perl_irc_chatnet_fill_hash);
 	irssi_add_object(module_get_uniq_id("SERVER CONNECT", 0),
 			 chat_type, "Irssi::Irc::Connect",
 			 (PERL_OBJECT_FUNC) perl_irc_connect_fill_hash);
diff --git a/src/perl/irc/module.h b/src/perl/irc/module.h
index 71801419..3dcfb065 100644
--- a/src/perl/irc/module.h
+++ b/src/perl/irc/module.h
@@ -1,6 +1,7 @@
 #include <irssi/src/perl/common/module.h>
 
 #include <irssi/src/irc/core/irc.h>
+#include <irssi/src/irc/core/irc-chatnets.h>
 #include <irssi/src/irc/core/irc-servers.h>
 #include <irssi/src/irc/core/irc-channels.h>
 #include <irssi/src/irc/core/irc-queries.h>

From 8b597cb75320c7c6ba4fcaefc75c8020899f465c Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5401s.localdomain>
Date: Thu, 1 Apr 2021 21:21:06 +0200
Subject: [PATCH 2/2] fix clang formatting

---
 .clang-format       | 2 +-
 src/perl/irc/Irc.xs | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.clang-format b/.clang-format
index 1180910e..a0cb79c0 100644
--- a/.clang-format
+++ b/.clang-format
@@ -27,7 +27,7 @@ Language: Cpp
 Cpp11BracedListStyle: false
 MaxEmptyLinesToKeep: 1
 PointerAlignment: Right
-SortIncludes: true
+SortIncludes: false
 SpaceAfterCStyleCast: true
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements
diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index 7ee47180..33be93d5 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -239,9 +239,8 @@ CODE:
 
 	chat_type = chat_protocol_lookup("IRC");
 
-	irssi_add_object(module_get_uniq_id("CHATNET", 0),
-			 chat_type, "Irssi::Irc::Chatnet",
-			 (PERL_OBJECT_FUNC) perl_irc_chatnet_fill_hash);
+	irssi_add_object(module_get_uniq_id("CHATNET", 0), chat_type, "Irssi::Irc::Chatnet",
+	                 (PERL_OBJECT_FUNC) perl_irc_chatnet_fill_hash);
 	irssi_add_object(module_get_uniq_id("SERVER CONNECT", 0),
 			 chat_type, "Irssi::Irc::Connect",
 			 (PERL_OBJECT_FUNC) perl_irc_connect_fill_hash);