From 4c4d95ad85252a211104d61c2533f574919f577b Mon Sep 17 00:00:00 2001 From: JC Brand Date: Mon, 11 Nov 2019 11:02:50 +0100 Subject: [PATCH] XEP-0425: Update tombstone markup and fix examples Mandate use of stanza-id instead of origin-id --- xep-0425.xml | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/xep-0425.xml b/xep-0425.xml index f516c56a..834ec7f8 100644 --- a/xep-0425.xml +++ b/xep-0425.xml @@ -24,6 +24,12 @@ message-moderation &jcbrand; + + 0.2.0 + 2019-11-11 + jcb + Replace the message contents with a tombstone (instead of replacing the message itself) + 0.1.0 2019-11-01 @@ -65,8 +71,8 @@

Consider a situation where a user sends a message that may be deemed inappropriate by a groupchat moderator. The groupchat service will append a &xep0359; stanza ID to the message before relaying it to all participants..

- This message contains information not appropriate for this room. + + DM me for free magic potions! ]]> @@ -85,12 +91,12 @@

If the moderator is allowed to moderate the message, the groupchat service will send a message stanza to all participants (including the moderator), indicating that the message has been retracted and by whom.

-

This message will use &xep0422; to indicate that it applies to the moderated message, by referring to its XEP-0359 origin ID.

+

This message will use &xep0422; to indicate that it applies to the moderated message, by referring to its XEP-0359 Stanza ID.

+ - + This message contains inappropriate content for this forum @@ -106,7 +112,7 @@

In case the message could for some reason not be retracted, the grouchat service responds with an IQ stanza of type error.

+ @@ -118,21 +124,23 @@ -

An archiving service MAY replace the contents of a message that was retracted due to moderation with a 'tombstone' similar to the one described in &xep0424;.

-

The archiving service replaces the message with a <moderated/> element which contains a <retracted/> element. The <moderated/> element MUST include a 'by' attribute specifying the JID of the moderating entity. The <retracted/> element SHOULD contain a 'from' attribute which points to the JID of the author of the retracted message.

-

If the message was sent in a semi-anonymous MUC, the occupant id from &xep0421; needs to be included for the moderator and the message author in the <moderated/> and <retracted/> elements respectively.

+

A &xep0313; service MAY replace the contents of a message, that was retracted due to moderation, with a 'tombstone' similar to the one described in &xep0424;.

+

The archiving service replaces the message contents (i.e. the <body/> and any related elements which might leak information about the original message) with a <moderated/> element which in turn contains a <retracted/> element. The <moderated/> element MUST have a 'by' attribute specifying the JID of the moderating entity.

+

If the message was sent in a semi-anonymous MUC, the occupant id from &xep0421; SHOULD be included for the moderator and the message author in the <moderated/> and <retracted/> elements respectively.

- + - - - - - - This message contains inappropriate content for this forum + + + + + + This message contains inappropriate content for this forum + + ]]>