Merge pull request #2008 from slingamn/chathistory_isupport

fix CHATHISTORY 005 token name
ergochat · Nov 30, 2022 · a5983a1 · a5983a1
2 parents e20c983 + ebda5e6
commit a5983a1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/irc/config.go b/irc/config.go
@@ -1589,7 +1589,7 @@ func (config *Config) generateISupport() (err error) {
 	isupport.Add("CHANLIMIT", fmt.Sprintf("%s:%d", chanTypes, config.Channels.MaxChannelsPerClient))
 	isupport.Add("CHANMODES", chanmodesToken)
 	if config.History.Enabled && config.History.ChathistoryMax > 0 {
-		isupport.Add("draft/CHATHISTORY", strconv.Itoa(config.History.ChathistoryMax))
+		isupport.Add("CHATHISTORY", strconv.Itoa(config.History.ChathistoryMax))
 	}
 	isupport.Add("CHANNELLEN", strconv.Itoa(config.Limits.ChannelLen))
 	isupport.Add("CHANTYPES", chanTypes)

diff --git a/irctest b/irctest
+56 −5		.github/workflows/test-devel.yml
+9 −5		.github/workflows/test-devel_release.yml
+56 −5		.github/workflows/test-stable.yml
+1 −1		.pre-commit-config.yaml
+7 −0		Makefile
+31 −20		irctest/basecontrollers.py
+4 −7		irctest/controllers/anope_services.py
+2 −3		irctest/controllers/atheme_services.py
+6 −6		irctest/controllers/bahamut.py
+2 −3		irctest/controllers/base_hybrid.py
+245 −0		irctest/controllers/dlk_services.py
+4 −6		irctest/controllers/ergo.py
+1 −2		irctest/controllers/inspircd.py
+2 −3		irctest/controllers/irc2.py
+2 −3		irctest/controllers/ircu2.py
+1 −4		irctest/controllers/limnoria.py
+1 −2		irctest/controllers/mammon.py
+2 −3		irctest/controllers/ngircd.py
+2 −3		irctest/controllers/snircd.py
+6 −6		irctest/controllers/sopel.py
+90 −80		irctest/controllers/unrealircd.py
+15 −4		irctest/dashboard/format.py
+4 −0		irctest/server_tests/account_registration.py
+37 −1		irctest/server_tests/away.py
+8 −0		irctest/server_tests/sasl.py
+48 −0		irctest/server_tests/time.py
+1 −1		irctest/server_tests/who.py
+4 −1		irctest/server_tests/whois.py
+16 −10		irctest/server_tests/whowas.py
+2 −48		make_workflows.py
+44 −0		workflows.yml