From 97cb6900a918211c16ef12fd6d294023cbaf0c11 Mon Sep 17 00:00:00 2001 From: Peter Saint-Andre Date: Mon, 8 Oct 2012 09:51:12 -0600 Subject: [PATCH] 0.7 --- xep-0280.xml | 85 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 34 deletions(-) diff --git a/xep-0280.xml b/xep-0280.xml index 007276fe..88689b01 100644 --- a/xep-0280.xml +++ b/xep-0280.xml @@ -39,6 +39,12 @@ linuxwolf@outer-planes.net linuxwolf@outer-planes.net + + 0.7 + 2012-10-12 + mm +

Moved carbons <received/> and <sent/> flags from being a sibling of <forwarded/> to being a parent of <forwarded/>, in compliance with XEP-0297.

 + 0.6 2012-01-06 @@ -114,7 +120,7 @@ -

If a server implements the Message Carbons capability, it MUST specify the "urn:xmpp:carbons:1" feature in its service discovery information features as specified in &xep0030; or section 6.3 of &xep0115;. Clients SHOULD NOT attempt to enable or disable Carbons if their server does not support this feature.

+

If a server implements the Message Carbons capability, it MUST specify the "urn:xmpp:carbons:2" feature in its service discovery information features as specified in &xep0030; or section 6.3 of &xep0115;. Clients SHOULD NOT attempt to enable or disable Carbons if their server does not support this feature.

... - + ... ]]> @@ -142,7 +148,7 @@ - + ]]>

Carbons will generally be enabled before the client sends the first undirected presence, to ensure that all inbound messages will be delivered according to the Carbon rules. The server will respond with an IQ result when Carbons are enabled:

- + ]]>

The server will respond with an IQ result when Carbons are disabled:

]]> -

The copies sent to the Carbon-enabled resources are wrapped using &xep0297;. The wrapping message SHOULD maintain the same 'type' attribute value; the 'from' attribute MUST be the Carbon-enabled user's bare JID (e.g. "localpart@domain"); and the 'to' attribute SHOULD be the full JID of the resource receiving the copy. The content of the wrapping message MUST contain a <received xmlns='urn:xmpp:carbons:1'/> element and a <forwarded xmlns='urn:xmpp:forward:0'/> which contains the original message (properly namespaced as "jabber:client"):

+

The copies sent to the Carbon-enabled resources are wrapped using &xep0297;. The wrapping message SHOULD maintain the same 'type' attribute value; the 'from' attribute MUST be the Carbon-enabled user's bare JID (e.g. "localpart@domain"); and the 'to' attribute SHOULD be the full JID of the resource receiving the copy. The content of the wrapping message MUST contain a <received xmlns='urn:xmpp:carbons:2'/> element and a <forwarded xmlns='urn:xmpp:forward:0'/> which contains the original message (properly namespaced as "jabber:client"):

- - - - What man art thou that, thus bescreen'd in night, so stumblest on my counsel? - 0e3141cd80894871a68e6fe6b1ec56fa - - + + + + What man art thou that, thus bescreen'd in night, so stumblest on my counsel? + 0e3141cd80894871a68e6fe6b1ec56fa + + + ]]> @@ -297,7 +304,7 @@ 0e3141cd80894871a68e6fe6b1ec56fa ]]> -

The copies sent to the Carbon-enabled resources are wrapped using &xep0297;. The wrapping message SHOULD maintain the same 'type' attribute value; the 'from' attribute MUST be the Carbon-enabled user's bare JID (e.g. "localpart@domain"); and the 'to' attribute SHOULD be the full JID of the resource receiving the copy. The content of the wrapping message MUST contain a <sent xmlns='urn:xmpp:carbons:1'/> element and a <forwarded xmlns='urn:xmpp:forward:0'/> which contains the original message (properly namespaced as "jabber:client"):

+

The copies sent to the Carbon-enabled resources are wrapped using &xep0297;. The wrapping message SHOULD maintain the same 'type' attribute value; the 'from' attribute MUST be the Carbon-enabled user's bare JID (e.g. "localpart@domain"); and the 'to' attribute SHOULD be the full JID of the resource receiving the copy. The content of the wrapping message MUST contain a <sent xmlns='urn:xmpp:carbons:2'/> element and a <forwarded xmlns='urn:xmpp:forward:0'/> which contains the original message (properly namespaced as "jabber:client"):

- - - - Neither, fair saint, if either thee dislike. - 0e3141cd80894871a68e6fe6b1ec56fa - - + + + + Neither, fair saint, if either thee dislike. + 0e3141cd80894871a68e6fe6b1ec56fa + + + ]]>

Some clients might want to avoid carbons on a single message, while still keeping all of the other semantics of Carbon support. This might be useful for clients sending end-to-end encrypted messages, for example.

-

To avoid a message being Carbon-copied to its other resources, the sending client MUST add a private element in the "urn:xmpp:carbons:1" namespace. When the sending server receives the message, it MUST NOT make carbon copies to the other Carbons-enabled resources, and MUST remove the private element before forwarding the message to the intended recipient.

+

To avoid a message being Carbon-copied to its other resources, the sending client MUST add a private element in the "urn:xmpp:carbons:2" namespace. When the sending server receives the message, it MUST NOT make carbon copies to the other Carbons-enabled resources, and MUST remove the private element before forwarding the message to the intended recipient.

Note: use of the private mechanism will lead to partial conversations on other devices. This is the intended effect.

@@ -332,7 +340,7 @@ type='chat'> Neither, fair saint, if either thee dislike. 0e3141cd80894871a68e6fe6b1ec56fa - + ]]>

This specification defines the following XML namespace:

    -
  • urn:xmpp:carbons:1
    • +
  • urn:xmpp:carbons:2

Upon advancement of this specification from a status of Experimental to a status of Draft, the ®ISTRAR; shall add the foregoing namespace to the registry located at &NAMESPACES;, as described in Section 4 of &xep0053;.

 @@ -393,8 +401,8 @@ @@ -403,15 +411,24 @@ - + - + - + + + + + + + ]]>