From e519056443ce88db40afadd035f3ed1b81a06fd4 Mon Sep 17 00:00:00 2001
From: Steve Kille <Steve Kille>
Date: Thu, 22 Dec 2016 08:35:25 +0000
Subject: [PATCH] Use XEP-0297 for forwarding history in 1:1 conversion

---
 xep-0369.xml | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/xep-0369.xml b/xep-0369.xml
index 5530826c..d55e9fb7 100644
--- a/xep-0369.xml
+++ b/xep-0369.xml
@@ -289,7 +289,7 @@
     <table caption="Standard MIX Nodes">
       <tr><th>Name</th><th>Node</th><th>Description</th><th>Update</th><th>Distribution</th></tr>
       <tr><td>Messages</td><td>'urn:xmpp:mix:nodes:messages'</td><td>For distributing messages to the channel. Each item of this node will contain a message sent to the channel.</td><td>Message</td><td>Message</td></tr>
-      <tr><td>Participants</td><td>'urn:xmpp:mix:nodes:participants'</td><td>For storing the list of participants and the associated nick.  Channel participants are added when they join the channel and removed when they leave </td><td>Automatic</td><td>PubSub</td></tr>
+      <tr><td>Participants</td><td>'urn:xmpp:mix:nodes:participants'</td><td>For storing the list of participants and the associated nick.  Channel participants are added when they join the channel and removed when they leave </td><td>Join/Leave/Set Nick</td><td>PubSub</td></tr>
       <tr><td>JID Map</td><td>'urn:xmpp:mix:nodes:jidmap'</td><td>For storing a list of anonymized bare JIDs from the participants node with a 1:1 mapping to the corresponding real JIDs.</td><td>Automatic</td><td>PubSub</td></tr>
       <tr><td>Presence</td><td>'urn:xmpp:mix:nodes:presence'</td><td>For storing information about the availability status of online participants, which may include multiple clients for a single participant.</td><td>Presence</td><td>Presence</td></tr>
       <tr><td>Information</td><td>'urn:xmpp:mix:nodes:info'</td><td>For storing general channel information, such as description. </td><td>PubSub</td><td>PubSub</td></tr>
@@ -1711,26 +1711,24 @@ A client creates a channel by sending a simple request to the MIX service.   A c
        A common use case for an ad hoc channel is where two users are engaged in a 1:1 chat and wish to broaden the discussion. Prior to bringing more users into a channel, using standard invitation process, there is a need to move a dialogue.  The first step is for one of the two users to create an ad hoc channel, as described in the previous section.   The other user will then be invited, and can switch to the new channel.
      </p>
      <p>
-       It may also be useful to share some or all of the messages from the 1:1 discussion into the new channel.  The mechanism to do this is to have a special message format that includes information on the original message.
-       This will generally be done by the user creating the channel before the other user is invited, but may be sent by either the user creating the channel or the 1:1 chat partner at any time.
-       These messages are marked as &lt;resend&gt; which includes  an number of parameters facilitate appropriate display of this selected chat history.   This has the following parameters:
-    </p>
-     <ul>
-       <li>'time': the original message time.</li>
-       <li>'from': the original sender.</li>
-       <li>'to': the original recipient.</li>
-     </ul>
-     <example caption="Resending a message to create History" ><![CDATA[
+       It may also be useful to share some or all of the messages from the 1:1 discussion into the new channel.  The mechanism to do this is to forward messages to be shared in the MUC using &xep0297;.  A body SHOULD not be used in the outer message//
+       This will generally be done by the user creating the channel before the other user is invited, but may be sent by either the user creating the channel or the 1:1 chat partner at any time subsequently.
+     </p>
+     <example caption="Forwarding a message to create History" ><![CDATA[
 <message from='hag66@shakespeare.example/pda'
          to='A1B2C345@mix.shakespeare.example'
          id='92vax143g'
          type='groupchat'>
-  <body>Harpier cries: 'tis time, 'tis time.</body>
-  <resend xmlns='urn:xmpp:mix:0'
-      time='2010-07-10T23:08:25Z'
-      from='hag67@shakespeare.example/pda'
-      to='hag66@shakespeare.example/pda'
-   </resend>
+         <forwarded xmlns='urn:xmpp:forward:0'>
+          <delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>
+          <message from='hag67@shakespeare.example/pda'
+                   id='0202197'
+                   to='hag66@shakespeare.example/pda'
+                   type='chat'
+                   xmlns='jabber:client'>
+              <body>Harpier cries: 'tis time, 'tis time.</body>
+          </message>
+        </forwarded>
 </message>
 ]]></example>
    </section3>