X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/1fe75e33ccfe31692f20633945cea14db888118a..07db71cda082d1d7db7bec491bb60aee5f1e2879:/src/supported.c

diff --git a/src/supported.c b/src/supported.c
index a8f734a..417d4ab 100644
--- a/src/supported.c
+++ b/src/supported.c
@@ -87,9 +87,6 @@
 #include "s_conf.h"
 #include "supported.h"
 #include "chmode.h"
-#include "channel.h"
-
-struct module_modes ModuleModes;
 
 rb_dlink_list isupportlist;
 
@@ -238,10 +235,12 @@ isupport_chanmodes(const void *ptr)
 {
 	static char result[80];
 
-	rb_snprintf(result, sizeof result, "%s%sbq,k,%slj,%s",
+	rb_snprintf(result, sizeof result, "%s%sb%s,k,%sl%s,%s",
 			ConfigChannel.use_except ? "e" : "",
 			ConfigChannel.use_invex ? "I" : "",
-			ModuleModes.MODE_FORWARD ? "f" : "",
+			strcasecmp(ConfigChannel.disabledmodes, "q") ? "" : "q",
+			ConfigChannel.use_forward ? "f" : "",
+			strcasecmp(ConfigChannel.disabledmodes, "j") ? "" : "j",
 			cflagsbuf);
 	return result;
 }