From c9ff1a82caa995ee05f0f63bccf33df82e563d64 Mon Sep 17 00:00:00 2001 From: Val Lorentz Date: Sat, 4 May 2024 11:53:48 +0200 Subject: [PATCH] chathistory: Specify that REDACT in chathistory does not depend on event-playback (#538) --- extensions/chathistory.md | 2 +- extensions/message-redaction.md | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extensions/chathistory.md b/extensions/chathistory.md index db65e7f6b..7a0741185 100644 --- 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 index 79cb07394..4c22af3ff 100644 --- 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