X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_protocole.erl;h=154c7d41c8fd279758763fb580ebc7e00a495ae5;hp=548f4af205492e44e2b79e5af5d7321ae0cb8099;hb=7f8025543a7a5d614ec47d18026dc0feb3338fdb;hpb=46b6cab14594802cdb4db9e3d77082815182073b diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl index 548f4af..154c7d4 100755 --- a/modules/erl/euphorik_protocole.erl +++ b/modules/erl/euphorik_protocole.erl @@ -70,12 +70,12 @@ profile( {email, Email}, {css, Css}, {main_page, Main_page}, - {conversations, Conversations_json} + {conversations, {array, Conversations_json}} ] ) -> % est-ce que les messages auquel on répond existent ? Conversations = lists:foldr( - fun([struct, {root, Root}, {page, Page}], Acc) -> + fun({struct, [{root, Root}, {page, Page}]}, Acc) -> Message_existe = euphorik_minichat:message_existe(Root), if Message_existe -> [{Root, Page} | Acc]; @@ -105,7 +105,7 @@ 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, [{racine, Racine}, {page, Page}]}) -> {Racine, Page} end, Conversations_json), + Conversations = lists:map(fun({struct, [{root, Racine}, {page, Page}]}) -> {Racine, Page} end, Conversations_json), User = case euphorik_minichat:user_by_cookie(Cookie) of {ok, U} -> U; _ -> inconnu @@ -251,8 +251,10 @@ json_reponse_login_ok(User) -> lists:map( fun(C) -> {struct, - {root, element(1, C)}, - {page, element(2, C)} + [ + {root, element(1, C)}, + {page, element(2, C)} + ] } end, User#user.conversations