{cookie, Cookie},
{login, Login},
{password, Password},
- {pseudo, Pseudo},
+ {nick, Pseudo},
{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];
{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\r
{ok, U} -> U;\r
_ -> inconnu\r
if (Strip_content =:= []) ->
erreur("Message vide");
true ->
+ % TODO : non-atomique (update_pseudo+nouveau_message)
+ euphorik_minichat:update_pseudo_user(User#user.id, Nick),
case euphorik_minichat:nouveau_message(Strip_content, User#user.id, Answer_to) of
- erreur -> erreur("Impossible d'ajouter un nouveau message");
+ erreur -> erreur("Impossible d'ajouter un nouveau message");
_ ->
- euphorik_minichat:update_pseudo_user(User#user.id, Nick),
- json_reponse_ok()
+ json_reponse_ok()
end
end;
_ ->
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