X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/7956414175ec44d7e594f7dfcfd842cdfb8a9823..0eceaff17a0fd935caa086ee43b328b0ea9282a5:/src/supported.c

diff --git a/src/supported.c b/src/supported.c
index d0d51f1..14cee91 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;
 }
 
@@ -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);