diff --git a/gencapdefs.py b/gencapdefs.py index 8c49fc46..a89dcb9d 100644 --- a/gencapdefs.py +++ b/gencapdefs.py @@ -135,36 +135,12 @@ CAPDEFS = [ url="https://ircv3.net/specs/extensions/userhost-in-names-3.2.html", standard="IRCv3", ), - CapDef( - identifier="ZNCSelfMessage", - name="znc.in/self-message", - url="https://wiki.znc.in/Query_buffers", - standard="ZNC vendor", - ), - CapDef( - identifier="EventPlayback", - name="draft/event-playback", - url="https://github.com/ircv3/ircv3-specifications/pull/362", - standard="proposed IRCv3", - ), - CapDef( - identifier="ZNCPlayback", - name="znc.in/playback", - url="https://wiki.znc.in/Playback", - standard="ZNC vendor", - ), CapDef( identifier="Multiline", name="draft/multiline", url="https://github.com/ircv3/ircv3-specifications/pull/398", standard="proposed IRCv3", ), - CapDef( - identifier="Chathistory", - name="draft/chathistory", - url="https://github.com/ircv3/ircv3-specifications/pull/393", - standard="proposed IRCv3", - ), CapDef( identifier="AccountRegistration", name="draft/account-registration", diff --git a/irc/caps/defs.go b/irc/caps/defs.go index 2b315c88..1b8b8b63 100644 --- a/irc/caps/defs.go +++ b/irc/caps/defs.go @@ -7,7 +7,7 @@ package caps const ( // number of recognized capabilities: - numCapabs = 27 + numCapabs = 23 // length of the uint64 array that represents the bitset: bitsetLen = 1 ) @@ -45,14 +45,6 @@ const ( // https://ircv3.net/specs/extensions/channel-rename ChannelRename Capability = iota - // Chathistory is the proposed IRCv3 capability named "draft/chathistory": - // https://github.com/ircv3/ircv3-specifications/pull/393 - Chathistory Capability = iota - - // EventPlayback is the proposed IRCv3 capability named "draft/event-playback": - // https://github.com/ircv3/ircv3-specifications/pull/362 - EventPlayback Capability = iota - // ExtendedMonitor is the draft IRCv3 capability named "draft/extended-monitor": // https://github.com/ircv3/ircv3-specifications/pull/466 ExtendedMonitor Capability = iota @@ -125,8 +117,6 @@ var ( "chghost", "draft/account-registration", "draft/channel-rename", - "draft/chathistory", - "draft/event-playback", "draft/extended-monitor", "draft/languages", "draft/multiline", diff --git a/irc/config.go b/irc/config.go index 96b67830..325dda0b 100644 --- a/irc/config.go +++ b/irc/config.go @@ -603,7 +603,6 @@ type Config struct { ClientLength int `yaml:"client-length"` AutoresizeWindow custime.Duration `yaml:"autoresize-window"` AutoreplayOnJoin int `yaml:"autoreplay-on-join"` - ChathistoryMax int `yaml:"chathistory-maxmessages"` ZNCMax int `yaml:"znc-maxmessages"` Restrictions struct { ExpireTime custime.Duration `yaml:"expire-time"` @@ -1406,8 +1405,6 @@ func LoadConfig(filename string) (config *Config, err error) { // of this detail config.History.ChannelLength = 0 config.History.ClientLength = 0 - config.Server.supportedCaps.Disable(caps.Chathistory) - config.Server.supportedCaps.Disable(caps.EventPlayback) config.History.Persistent.Enabled = false config.History.Persistent.UnregisteredChannels = false config.History.Persistent.RegisteredChannels = PersistentDisabled