chathistory: Specify that REDACT in chathistory does not depend on ev…

…ent-playback (#538)
ircv3 · May 4, 2024 · c9ff1a8 · c9ff1a8
1 parent aeef7b6
commit c9ff1a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/extensions/chathistory.md b/extensions/chathistory.md
@@ -68,7 +68,7 @@ A `timestamp` parameter MUST have the format `timestamp=YYYY-MM-DDThh:mm:ss.sssZ
 
 If the `batch` capability was negotiated, the server MUST reply to a successful `CHATHISTORY` command using a [`batch`][batch]. For subcommands that return message history (i.e. all subcommands other than `TARGETS`), the batch MUST have type `chathistory` and take a single additional parameter, the canonical name of the target being queried. For `TARGETS`, the batch MUST have type `draft/chathistory-targets`. If no content exists to return, the server SHOULD return an empty batch in order to avoid the client waiting for a reply.
 
-If the client has not negotiated the `draft/event-playback` capability, the server MUST NOT send any lines other than `PRIVMSG` and `NOTICE` in the reply batch. If the client has negotiated `draft/event-playback`, the server SHOULD send additional lines relevant to the chat history, including but not limited to `TAGMSG`, `JOIN`, `PART`, `QUIT`, `MODE`, `TOPIC`, and `NICK`.
+If the client has not negotiated the `draft/event-playback` capability, the server MUST NOT send any lines other than `PRIVMSG` and `NOTICE` in the reply batch, unless allowed by a capability negotiated by the client. If the client has negotiated `draft/event-playback`, the server SHOULD send additional lines relevant to the chat history, including but not limited to `TAGMSG`, `JOIN`, `PART`, `QUIT`, `MODE`, `TOPIC`, and `NICK`.
 
 #### Subcommands
 

diff --git a/extensions/message-redaction.md b/extensions/message-redaction.md
@@ -77,11 +77,11 @@ If the client is authorised to delete the message, the server:
 After a message is redacted, [`chathistory`][] responses SHOULD either:
 
 * exclude it entirely
-* replace its content and/or tags with a placeholder and
-  add the `REDACT` message to the response (not counting toward message limits)
-  after the redacted message
-* add the `REDACT` message to the response (not counting toward message limits)
-  after the redacted message
+* include a `REDACT` message after the redacted message, which doesn't count towards message limits.
+  The redacted message's content and/or tags MAY be replaced with a placeholder.
+
+The `draft/event-playback` capability is not required in order to include `REDACT` messages
+in `chathistory` responses.
 
 ### Errors