X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_protocole.erl;h=7519ba8f866cc08dc1566f1f8b488a686921bc8e;hb=f6158580ec307685d5ac2075ff7a58f205335690;hp=154c7d41c8fd279758763fb580ebc7e00a495ae5;hpb=7f8025543a7a5d614ec47d18026dc0feb3338fdb;p=euphorik.git

diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index 154c7d4..7519ba8 100755
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -45,7 +45,10 @@ loginUser({ok, User}) ->
    euphorik_minichat:update_date_derniere_connexion(User#user.id),
    json_reponse_login_ok(User);
 loginUser(_) ->
-   erreur("Erreur login").
+   % ajoute un délais d'attente (TODO : un autre moyen plus élégant ?)
+   receive after 1000 ->
+      erreur("Erreur login")
+   end.
    
    
 % Renvoie un string() représentant un cookie en base 36. Il y a 10^32 possibillités.
@@ -69,6 +72,7 @@ profile(
       {nick, Pseudo},
       {email, Email},
       {css, Css},
+      {nick_format, Nick_format_str},
       {main_page, Main_page},
       {conversations, {array, Conversations_json}}
    ]
@@ -86,7 +90,7 @@ profile(
       [],
       Conversations_json
    ),
-   case euphorik_minichat:set_profile(Cookie, Login, Password, Pseudo, Email, Css, Main_page, Conversations) of
+   case euphorik_minichat:set_profile(Cookie, Login, Password, Pseudo, Email, Css, list_to_atom(Nick_format_str), Main_page, Conversations) of
       ok ->
          json_reponse_ok();
       login_deja_pris ->
@@ -105,7 +109,13 @@ wait_event(Data) ->
    {value, {_, Message_count}} = lists:keysearch(message_count, 1, Data),
    Main_page = case lists:keysearch(main_page, 1, Data) of {value, {_, P}} -> P; _ -> 1 end,
    {value, {_, {array, Conversations_json}}} = lists:keysearch(conversations, 1, Data),
-   Conversations = lists:map(fun({struct, [{root, Racine}, {page, Page}]}) -> {Racine, Page} end, Conversations_json),
+   Conversations = lists:map(
+      fun({struct, [{root, Racine}, {page, Page} | Reste]}) ->
+         Last_mess_conv  = case Reste of [{last_message_id, L}] -> L; _ -> 0 end,
+         {Racine, Page, Last_mess_conv}
+      end,
+      Conversations_json
+   ),
    User = case euphorik_minichat:user_by_cookie(Cookie) of
       {ok, U} -> U;
       _ -> inconnu
@@ -245,6 +255,7 @@ json_reponse_login_ok(User) ->
          {login, User#user.login},
          {email, User#user.email},
          {css, User#user.css},
+         {nick_format, atom_to_list(User#user.nick_format)},
          {main_page, User#user.page_principale},
          {conversations, 
             {array,