From 67a4c886483b9933e4a888f3115e25849795cfd4 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval+git@progval.net>
Date: Fri, 14 Mar 2025 19:23:06 +0100
Subject: [PATCH 1/4] Document oftc-hybrid's RPL_BANLIST syntax

---
 _data/numerics.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_data/numerics.yaml b/_data/numerics.yaml
index 6414b76..75a4ced 100644
--- a/_data/numerics.yaml
+++ b/_data/numerics.yaml
@@ -1986,9 +1986,9 @@ values:
         name: RPL_BANLIST
         numeric: "367"
         origin: RFC1459
-        format: "<client> <channel> <banid> [[<setter> <time_left>|<time_left> :<reason>]]"
+        format: "<client> <channel> <banid> [[<setter> <time_left>|<setter> <when>|<time_left> :<reason>]]"
         comment: >
-            A ban-list item (See RFC); <setter>, <time left> and <reason> are
+            A ban-list item (See RFC); <setter>, <time left>, <when>, and <reason> are
             additions used by various servers.
 
     -

From 1bf78dc1664a6ab1c6a2d11e0174b1cc1056523c Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval+git@progval.net>
Date: Fri, 14 Mar 2025 19:23:47 +0100
Subject: [PATCH 2/4] Document oftc-hybrid's alternative numerics for
 RPL_QUIETLIST/RPL_ENDOFQUIETLIST

---
 _data/numerics.yaml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/_data/numerics.yaml b/_data/numerics.yaml
index 75a4ced..c78f4bf 100644
--- a/_data/numerics.yaml
+++ b/_data/numerics.yaml
@@ -1798,6 +1798,24 @@ values:
         comment: "MODE +R query"
         conflict: true
 
+    -
+        name: RPL_QUIETLIST
+        numeric: "344"
+        origin: oftc-hybrid
+        format: "<client> <channel> <nick>!<user>@<host> <who> <when>"
+        comment: >
+            Same thing as RPL_BANLIST, but for mode +q (quiet).
+            Not to be confused with the more common RPL_QUIETLIST with numeric 728.
+
+    -
+        name: RPL_ENDOFQUIETLIST
+        numeric: "345"
+        origin: oftc-hybrid
+        format: "<client> <channel> :End of Channel Quiet List"
+        comment: >
+            Same thing as RPL_ENDOFBANLIST, but for mode +q (quiet).
+            Not to be confused with the more common RPL_ENDOFQUIETLIST with numeric 729.
+
     -
         name: RPL_INVITED
         numeric: "345"

From 80f764621ff8bb7d8a50d9246b2fb11dc9922839 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval+git@progval.net>
Date: Fri, 14 Mar 2025 19:24:11 +0100
Subject: [PATCH 3/4] Document oftc-hybrid's RPL_ISCAPTURED/RPL_ISUNCAPTURED

---
 _data/numerics.yaml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/_data/numerics.yaml b/_data/numerics.yaml
index c78f4bf..a17e98b 100644
--- a/_data/numerics.yaml
+++ b/_data/numerics.yaml
@@ -4358,6 +4358,14 @@ values:
         comment: >
             Same thing as RPL_BANLIST, but for mode +q (quiet)
 
+    -
+        name: RPL_ISCAPTURED
+        numeric: "728"
+        origin: oftc-hybrid
+        format: "<client> <target> :Is Captured"
+        comment: >
+            Reply to the oper-only CAPTURE command
+
     -
         name: RPL_ENDOFQUIETLIST
         numeric: "729"
@@ -4366,6 +4374,14 @@ values:
         comment: >
             Same thing as RPL_ENDOFBANLIST, but for mode +q (quiet)
 
+    -
+        name: RPL_ISUNCAPTURED
+        numeric: "729"
+        origin: oftc-hybrid
+        format: "<client> <target> :Is UnCaptured"
+        comment: >
+            Reply to the oper-only UNCAPTURE command
+
     -
         name: RPL_MONONLINE
         numeric: "730"

From 1bfacf31cb63cc1c228c6113cddf52b19f509a77 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval+git@progval.net>
Date: Fri, 14 Mar 2025 19:48:45 +0100
Subject: [PATCH 4/4] Add missing conflict tags

---
 _data/numerics.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/_data/numerics.yaml b/_data/numerics.yaml
index a17e98b..bbc826b 100644
--- a/_data/numerics.yaml
+++ b/_data/numerics.yaml
@@ -1806,6 +1806,7 @@ values:
         comment: >
             Same thing as RPL_BANLIST, but for mode +q (quiet).
             Not to be confused with the more common RPL_QUIETLIST with numeric 728.
+        conflict: true
 
     -
         name: RPL_ENDOFQUIETLIST
@@ -1815,6 +1816,7 @@ values:
         comment: >
             Same thing as RPL_ENDOFBANLIST, but for mode +q (quiet).
             Not to be confused with the more common RPL_ENDOFQUIETLIST with numeric 729.
+        conflict: true
 
     -
         name: RPL_INVITED
@@ -4357,6 +4359,7 @@ values:
         format: "<client> <channel> q <banid> [<time_left> :<reason>]"
         comment: >
             Same thing as RPL_BANLIST, but for mode +q (quiet)
+        conflict: true
 
     -
         name: RPL_ISCAPTURED
@@ -4365,6 +4368,7 @@ values:
         format: "<client> <target> :Is Captured"
         comment: >
             Reply to the oper-only CAPTURE command
+        conflict: true
 
     -
         name: RPL_ENDOFQUIETLIST
@@ -4373,6 +4377,7 @@ values:
         format: "<client> <channel> q :<info>"
         comment: >
             Same thing as RPL_ENDOFBANLIST, but for mode +q (quiet)
+        conflict: true
 
     -
         name: RPL_ISUNCAPTURED
@@ -4381,6 +4386,7 @@ values:
         format: "<client> <target> :Is UnCaptured"
         comment: >
             Reply to the oper-only UNCAPTURE command
+        conflict: true
 
     -
         name: RPL_MONONLINE