From c39206ad13a88aeab592781cd7affb0739053bc1 Mon Sep 17 00:00:00 2001 From: Daniel Oaks Date: Fri, 29 Sep 2017 08:37:03 +1000 Subject: [PATCH] Don't create new caps out of nowhere, dummy --- irc/capability.go | 3 --- irc/client.go | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/irc/capability.go b/irc/capability.go index 40542a27..f7fc5e4f 100644 --- a/irc/capability.go +++ b/irc/capability.go @@ -32,8 +32,6 @@ const ( InviteNotify Capability = "invite-notify" // MaxLine is this proposed capability: https://github.com/DanielOaks/ircv3-specifications/blob/master+line-lengths/extensions/line-lengths.md MaxLine Capability = "draft/maxline" - // MessageIDs is this draft IRCv3 capability: http://ircv3.net/specs/extensions/message-ids.html - MessageIDs Capability = "draft/message-ids" // MessageTags is this draft IRCv3 capability: http://ircv3.net/specs/core/message-tags-3.3.html MessageTags Capability = "draft/message-tags-0.2" // MultiPrefix is this IRCv3 capability: http://ircv3.net/specs/extensions/multi-prefix-3.1.html @@ -61,7 +59,6 @@ var ( EchoMessage: true, ExtendedJoin: true, InviteNotify: true, - MessageIDs: true, // MaxLine is set during server startup MessageTags: true, MultiPrefix: true, diff --git a/irc/client.go b/irc/client.go index fc7ce23b..d800245a 100644 --- a/irc/client.go +++ b/irc/client.go @@ -600,7 +600,7 @@ func (client *Client) SendFromClient(msgid string, from *Client, tags *map[strin } } // attach message-id - if len(msgid) > 0 && client.capabilities[MessageIDs] { + if len(msgid) > 0 && client.capabilities[MessageTags] { if tags == nil { tags = ircmsg.MakeTags("draft/msgid", msgid) } else {