X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/823e288d575335d536e9afd5428c7000d41456c1..d25c6eb1b223d1a0993dde9a28c97ef95e54bceb:/src/supported.c

diff --git a/src/supported.c b/src/supported.c
index d0d51f1..4ed2616 100644
--- a/src/supported.c
+++ b/src/supported.c
@@ -244,12 +244,20 @@ isupport_chanmodes(const void *ptr)
 	return result;
 }
 
+static const char *
+isupport_chantypes(const void *ptr)
+{
+       return ConfigChannel.use_local_channels ? "&#" : "#";
+}
+
 static const char *
 isupport_chanlimit(const void *ptr)
 {
 	static char result[30];
 
-	rb_snprintf(result, sizeof result, "&#:%i", ConfigChannel.max_chans_per_user);
+	rb_snprintf(result, sizeof result, "%s:%i",
+			ConfigChannel.use_local_channels ? "&#" : "#", 
+			ConfigChannel.max_chans_per_user);
 	return result;
 }
 
@@ -259,9 +267,9 @@ isupport_prefix(const void *ptr)
 	static char result[11];
 
 	rb_snprintf(result, sizeof result, "(%so%sv)%s@%s+",
-			ConfigChannel.use_owner ? "a" : "",
+			ConfigChannel.use_admin ? "a" : "",
 			ConfigChannel.use_halfop ? "h" : "",
-			ConfigChannel.use_owner ? "!" : "",
+			ConfigChannel.use_admin ? "!" : "",
 			ConfigChannel.use_halfop ? "%" : "");
 	return result;
 }
@@ -310,7 +318,7 @@ init_isupport(void)
 	static int channellen = LOC_CHANNELLEN;
 	static int topiclen = TOPICLEN;
 
-	add_isupport("CHANTYPES", isupport_string, "&#");
+	add_isupport("CHANTYPES", isupport_chantypes, NULL);
 	add_isupport("EXCEPTS", isupport_boolean, &ConfigChannel.use_except);
 	add_isupport("INVEX", isupport_boolean, &ConfigChannel.use_invex);
 	add_isupport("CHANMODES", isupport_chanmodes, NULL);