Merge branch 'next' into image-management

[Sone.git] / src / main / resources / templates / insert / sone.xml

diff --git a/src/main/resources/templates/insert/sone.xml b/src/main/resources/templates/insert/sone.xml
index c80dbe7..69f647d 100644 (file)
--- a/src/main/resources/templates/insert/sone.xml
+++ b/src/main/resources/templates/insert/sone.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <sone>
 
-       <id><% currentSone.id></id>
-       <name><% currentSone.name|xml></name>
        <time><% currentSone.time></time>
+       <protocol-version>0</protocol-version>
+
+       <client>
+               <name>Sone</name>
+               <version><% version|xml></version>
+       </client>
 
        <profile>
                <first-name><% currentSone.profile.firstName|xml></first-name>
@@ -12,12 +16,21 @@
                <birth-day><% currentSone.profile.birthDay|xml></birth-day>
                <birth-month><% currentSone.profile.birthMonth|xml></birth-month>
                <birth-year><% currentSone.profile.birthYear|xml></birth-year>
+               <fields>
+                       <%foreach currentSone.profile.fields field>
+                       <field>
+                               <field-name><% field.name|xml></field-name>
+                               <field-value><% field.value|xml></field-value>
+                       </field>
+                       <%/foreach>
+               </fields>
        </profile>
 
        <posts>
                <%foreach currentSone.posts post>
                <post>
                        <id><% post.id|xml></id>
+                       <recipient><%ifnull !post.recipient><% post.recipient.id|xml><%/if></recipient>
                        <time><% post.time></time>
                        <text><% post.text|xml></text>
                </post>
@@ -47,4 +60,10 @@
                <%/foreach>
        </reply-likes>
 
+       <albums>
+               <%foreach currentSone.albums album>
+               <%include insert/include/album.xml>
+               <%/foreach>
+       </albums>
+
 </sone>