Merge pull request #2006 from progval/ratified-extmonitor

Use ratified extended-monitor cap name

gencapdefs.py

@@ -63,6 +63,12 @@ CAPDEFS = [
         url="https://ircv3.net/specs/extensions/extended-join-3.1.html",
         standard="IRCv3",
     ),
+    CapDef(
+        identifier="ExtendedMonitor",
+        name="extended-monitor",
+        url="https://ircv3.net/specs/extensions/extended-monitor.html",
+        standard="IRCv3",
+    ),
     CapDef(
         identifier="InviteNotify",
         name="invite-notify",
@@ -177,12 +183,6 @@ CAPDEFS = [
         url="https://github.com/ircv3/ircv3-specifications/pull/435",
         standard="draft IRCv3",
     ),
-    CapDef(
-        identifier="ExtendedMonitor",
-        name="draft/extended-monitor",
-        url="https://github.com/ircv3/ircv3-specifications/pull/466",
-        standard="draft IRCv3",
-    ),
     CapDef(
         identifier="ReadMarker",
         name="draft/read-marker",

irc/caps/defs.go

@@ -53,10 +53,6 @@ const (
 	// 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
-
 	// Languages is the proposed IRCv3 capability named "draft/languages":
 	// https://gist.github.com/DanielOaks/8126122f74b26012a3de37db80e4e0c6
 	Languages Capability = iota
@@ -85,6 +81,10 @@ const (
 	// https://ircv3.net/specs/extensions/extended-join-3.1.html
 	ExtendedJoin Capability = iota
 
+	// ExtendedMonitor is the IRCv3 capability named "extended-monitor":
+	// https://ircv3.net/specs/extensions/extended-monitor.html
+	ExtendedMonitor Capability = iota
+
 	// InviteNotify is the IRCv3 capability named "invite-notify":
 	// https://ircv3.net/specs/extensions/invite-notify-3.2.html
 	InviteNotify Capability = iota
@@ -143,7 +143,6 @@ var (
 		"draft/channel-rename",
 		"draft/chathistory",
 		"draft/event-playback",
-		"draft/extended-monitor",
 		"draft/languages",
 		"draft/multiline",
 		"draft/read-marker",
@@ -151,6 +150,7 @@ var (
 		"echo-message",
 		"ergo.chat/nope",
 		"extended-join",
+		"extended-monitor",
 		"invite-notify",
 		"labeled-response",
 		"message-tags",