X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_protocole.erl;h=3305c378d318821821d18c5136291f0e7a0389ad;hp=35742c98bf056bbb08e5d58c21774c5502e05be2;hb=8bede29111bde3481ed8b3d6637c241c8d241544;hpb=3e001701b9e33b21a9587ada7fbe1f1e3fa178fb

diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index 35742c9..3305c37 100755
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -117,17 +117,11 @@ profile(
       {conversations, {array, Conversations_json}}
    ]
 ) ->
-   % est-ce que les messages auquel on répond existent ?
-   Conversations = lists:foldr(
-      fun({struct, [{root, Root}, {page, Page}]}, Acc) ->
-         Message_existe = euphorik_bd:message_existe(Root),
-         if  Message_existe ->
-            [{Root, Page} | Acc];
-            true ->
-               Acc
-         end
+   % virage des messages qui n'existent pas
+   Conversations = lists:dropwhile(
+      fun(Message_id) ->
+         not euphorik_bd:message_existe(Message_id)
       end,
-      [],
       Conversations_json
    ),
    %  TODO : pas très beau, mieux vaut construire un #user
@@ -666,22 +660,7 @@ json_reponse_login_ok(User) ->
          {nick_format, atom_to_list(User#user.nick_format)},
          {view_times, User#user.view_times},
          {view_tooltips, User#user.view_tooltips},
-         {main_page, User#user.page_principale},
-         {conversations, 
-            {array,
-               lists:map(
-                  fun(C) ->
-                     {struct,
-                        [
-                           {root, element(1, C)},
-                           {page, element(2, C)}
-                        ]
-                     }
-                  end,
-                  User#user.conversations
-               )
-            }
-         },
-      {ek_master, User#user.ek_master}
+         {conversations, {array, User#user.conversations } },
+         {ek_master, User#user.ek_master}
       ]
    }.