diff --git a/inbox/message-retraction.xml b/xep-0424.xml similarity index 94% rename from inbox/message-retraction.xml rename to xep-0424.xml index 2a05b733..01102a18 100644 --- a/inbox/message-retraction.xml +++ b/xep-0424.xml @@ -9,8 +9,8 @@ Message Retraction This specification defines a method for indicating that a message should be retracted. &LEGALNOTICE; - XXXX - ProtoXEP + 0424 + Experimental Standards Track Standards Council @@ -26,6 +26,12 @@ message-retract &lance; &jcbrand; + + 0.1.0 + 2019-11-01 + XEP Editor (jcb) + Accepted by vote of Council on 2019-10-23. + 0.0.4 2019-09-25 @@ -116,7 +122,7 @@

A client MAY inform the user that a no-longer displayed message did previously exist and has been removed.

Clients MUST set the XEP-0359 'origin id' attribute on sent messages to make them suitable for message retraction.

The Sender MUST NOT send a retraction request for a message with non-messaging payloads. For example, a sender MUST NOT send a retraction for a roster item exchange request or a file transfer part.

-

A retraction (that's not part of a protoXEP message moderation operation) MUST only be processed when both the original message and the retraction request are received from the same bare-JID (in a one-on-one conversation) or full-JID (in a non-anonymous MUC from &xep0045;).

+

A retraction (that's not part of a &xep0425; operation) MUST only be processed when both the original message and the retraction request are received from the same bare-JID (in a one-on-one conversation) or full-JID (in a non-anonymous MUC from &xep0045;).

When used in a semi-anonymous MUC, the recipient client MUST check that a message retraction was sent by the author of the retracted message by checking the occupant id from &xep0421;.

diff --git a/inbox/message-moderation.xml b/xep-0425.xml similarity index 96% rename from inbox/message-moderation.xml rename to xep-0425.xml index 11b4e4ca..f516c56a 100644 --- a/inbox/message-moderation.xml +++ b/xep-0425.xml @@ -9,8 +9,8 @@ Message Moderation This specification defines a method for groupchat moderators to moderate messages. &LEGALNOTICE; - XXXX - ProtoXEP + 0425 + Experimental Standards Track Standards Council @@ -24,6 +24,12 @@ message-moderation &jcbrand; + + 0.1.0 + 2019-11-01 + XEP Editor (jcb) + Accepted by vote of Council on 2019-10-16. + 0.0.1 2019-09-25 @@ -112,7 +118,7 @@ -

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 the protoXEP message-retraction.

+

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.

@@ -135,7 +141,7 @@

A moderator MUST NOT send a moderation request for a message with non-messaging payloads. For example, a moderator MUST NOT moderate a roster item exchange request or a file transfer part.

In MUCs, only moderation messages (not tombstones, but messages containing the <moderate/> element) received from the MUC service itself are legitimate, all other such messages MUST be discarded.

-

If message moderation includes a retraction request, the MUC or other service that supports message retraction SHOULD prevent further distribution of the retracted message by the service and the archiving service MAY replace the retracted message with a tombstone as detailed in (TBD: XEP number for message retractions required).

+

If message moderation includes a retraction request, the MUC or other service that supports message retraction SHOULD prevent further distribution of the retracted message by the service and the archiving service MAY replace the retracted message with a tombstone as detailed in &xep0424;.

There can never be a guarantee that a moderated message will appear as such in all clients. Clients should therefore, when possible, inform users that no such guarantee exists.

diff --git a/xep.ent b/xep.ent index 9f47d515..62e8e9e3 100644 --- a/xep.ent +++ b/xep.ent @@ -1568,3 +1568,5 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates Anonymous unique occupant identifiers for MUCs (XEP-0421) XEP-0421: Anonymous unique occupant identifiers for MUCs <https://xmpp.org/extensions/xep-0421.html>." > Message Fastening (XEP-0422) XEP-0422: Message Fastening <https://xmpp.org/extensions/xep-0422.html>." > XMPP Compliance Suites 2020 (XEP-0423) XEP-0423: XMPP Compliance Suites 2020 <https://xmpp.org/extensions/xep-0423.html>." > +Message Retraction (XEP-0424) XEP-0424: Message Retraction <https://xmpp.org/extensions/xep-0424.html>." > +Message Moderation (XEP-0425) XEP-0425: Message Moderation <https://xmpp.org/extensions/xep-0425.html>." >