From fd92e3612760956ca35be5e07cb3d3a3f0ff9150 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Thu, 2 Aug 2018 19:20:54 +0200
Subject: [PATCH] XEP-0184: Require the 'id' attribute in <received/>.

There was no way to implement this specification while not using the
'id' attribute, this makes it explicit in both the text and the schema.
---
 xep-0184.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/xep-0184.xml b/xep-0184.xml
index c7ceb52c..dcd136cb 100644
--- a/xep-0184.xml
+++ b/xep-0184.xml
@@ -27,6 +27,12 @@
   </schemaloc>
   &stpeter;
   &hildjj;
+  <revision>
+    <version>1.4.0</version>
+    <date>2018-08-02</date>
+    <initials>egp</initials>
+    <remark><p>Make the 'id' attribute required, this extension makes no sense otherwise.</p></remark>
+  </revision>
   <revision>
     <version>1.3.0</version>
     <date>2019-05-15</date>
@@ -209,7 +215,7 @@
   <received xmlns='urn:xmpp:receipts' id='richard2-4.1.247'/>
 </message>
 ]]></example>
-  <p>When the recipient sends an ack message, it SHOULD ensure that the message stanza contains only one child element, namely the &lt;received/&gt; element qualified by the 'urn:xmpp:receipts' namespace. In addition, it SHOULD include an 'id' attribute that echoes the 'id' attribute of the content message. Naturally, intermediate entities might add other extension elements to the message when routing or delivering the receipt message, e.g., a &lt;delay/&gt; element as specified in &xep0203;.</p>
+  <p>When the recipient sends an ack message, it SHOULD ensure that the message stanza contains only one child element, namely the &lt;received/&gt; element qualified by the 'urn:xmpp:receipts' namespace, which MUST include an 'id' attribute that echoes the 'id' attribute of the content message. Naturally, intermediate entities might add other extension elements to the message when routing or delivering the receipt message, e.g., a &lt;delay/&gt; element as specified in &xep0203;.</p>
   <p class='box'>Note: It is a good practice to use the same message type as the message that requested the receipt, however a client SHOULD also accept receipts with a different message type. When sending a Receipt for a type='groupchat' message (which is NOT RECOMMENDED), the Receipt must be sent to the bare JID of the room and not to the full JID of the sender.</p>
 </section1>
 
@@ -248,7 +254,7 @@
     <xs:complexType>
       <xs:simpleContent>
         <xs:extension base='empty'>
-          <xs:attribute name='id' type='xs:string' use='optional'/>
+          <xs:attribute name='id' type='xs:string' use='required'/>
         </xs:extension>
       </xs:simpleContent>
     </xs:complexType>