X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_protocole.erl;h=c15ada1f1910d03b855ef9bb8b2e5c5b628c89c2;hp=8056f6be6f3b9d3cf2d8fff69ee6bcc26bb06b84;hb=994f68e1f8a7a43b55d6bd6214b2a0066671ba74;hpb=327c3bd99f586f3cf3af55f9adb10a71eb78cdd4 diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl index 8056f6b..c15ada1 100755 --- a/modules/erl/euphorik_protocole.erl +++ b/modules/erl/euphorik_protocole.erl @@ -1,7 +1,25 @@ -% coding: utf-8 +% coding: utf-8 +% Copyright 2008 Grégory Burri +% +% This file is part of Euphorik. +% +% Euphorik is free software: you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation, either version 3 of the License, or +% (at your option) any later version. +% +% Euphorik is distributed in the hope that it will be useful, +% but WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +% GNU General Public License for more details. +% +% You should have received a copy of the GNU General Public License +% along with Euphorik. If not, see . +% % Ce module gére les différents messages envoyés par le client (javascript) via AJAX. % Les messages donnés ainsi que les réponses sont au format JSON. % @author G.Burri + -module(euphorik_protocole). -export([ @@ -20,7 +38,6 @@ list_banned_ips/1, erreur/1 ]). --include_lib("xmerl/include/xmerl.hrl"). -include("../include/euphorik_bd.hrl"). -include("../include/euphorik_defines.hrl"). @@ -68,13 +85,13 @@ loginUser({ok, User}, IP) -> json_reponse_login_ok(User); loginUser(_, _) -> % ajoute un délais d'attente - timer:sleep(1000), - erreur("Erreur login"). + timer:sleep(?TEMPS_ATTENTE_ERREUR_LOGIN), + erreur("Couple login/pass introuvable"). % Renvoie un string() représentant un cookie en base 36. Il y a 10^32 possibillités. generer_cookie() -> - {A1,A2,A3} = now(), + {A1, A2, A3} = now(), random:seed(A1, A2, A3), erlang:integer_to_list(random:uniform(math:pow(10, 32)), 36). @@ -94,24 +111,30 @@ profile( {email, Email}, {css, Css}, {nick_format, Nick_format_str}, - {main_page, Main_page}, + {view_times, View_times}, + {view_tooltips, View_tooltips}, {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 ), - case euphorik_bd:set_profile(Cookie, Login, Password, Pseudo, Email, Css, list_to_atom(Nick_format_str), Main_page, Conversations) of + % TODO : pas très beau, mieux vaut construire un #user + case euphorik_bd:set_profile( + Cookie, + Login, + Password, + Pseudo, + Email, + Css, + list_to_atom(Nick_format_str), + View_times, + View_tooltips, + Conversations) of ok -> json_reponse_ok(); login_deja_pris -> @@ -211,6 +234,7 @@ wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id {struct, [ {reply, "new_troll"}, {troll_id, Current#troll.id}, + {message_id, euphorik_bd:message_id_associe(Current#troll.id)}, {content, Current#troll.content} ]}; _ -> @@ -218,7 +242,6 @@ wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id case euphorik_minichat_conversation:conversations(Racines_conversations, Message_count, Last_message_id, Main_page) of vide -> wait_event_bd_page_chat(), - % TODO : l'appel est-il bien tail-recursive ? wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id, Main_page, Troll_id); Conversations -> % accrochez-vous ca va siouxer ;) @@ -247,6 +270,7 @@ wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id {nick, Mess#minichat.pseudo}, {login, User_mess#user.login}, {content, Mess#minichat.contenu}, + {root, Mess#minichat.racine_id}, {answer_to, {array, lists:map( fun(Id_mess) -> {ok, M} = euphorik_bd:message_by_id(Id_mess), @@ -286,7 +310,7 @@ wait_event_bd_page_chat() -> % Après 60 minutes de connexion, le client doit donc reétablir une connexion after 1000 * 60 * 60 -> timeout - end. + end. % Attent un événement concernant la page admin @@ -360,7 +384,7 @@ put_message( if Strip_content =:= [] -> erreur("Message vide"); true -> - % TODO : non-atomique (update_pseudo+nouveau_message) + % attention : non-atomique (update_pseudo+nouveau_message) euphorik_bd:update_pseudo_user(User#user.id, Nick), case euphorik_bd:nouveau_message(Strip_content, User#user.id, Answer_to) of {erreur, R} -> erreur("Impossible d'ajouter un nouveau message. Raison : " ++ R); @@ -523,7 +547,7 @@ unban_ip( ) -> case euphorik_bd:user_by_cookie(Cookie) of {ok, #user{ek_master = true}} -> - euphorik_bd:deban(unserialize_ip(IP)), + euphorik_bd:deban(euphorik_common:unserialize_ip(IP)), json_reponse_ok(); _ -> erreur("Seul les ekMaster peuvent connaitre la liste des ips bannies") @@ -545,7 +569,7 @@ list_banned_ips( fun({IP, T, Users}) -> {struct, [ - {ip, serialize_ip(IP)}, + {ip, euphorik_common:serialize_ip(IP)}, {remaining_time, format_minutes(T)}, {users, {array, lists:map( fun({Pseudo, Login}) -> @@ -579,17 +603,6 @@ erreur(Message) -> ] }. - -serialize_ip(IP) -> - lists:flatten(io_lib:format("~w.~w.~w.~w", tuple_to_list(IP))). - - -unserialize_ip(IP) -> - case io_lib:fread("~d.~d.~d.~d", IP) of - {ok, [A, B, C, D], []} -> {A, B, C, D}; - _ -> erreur - end. - % Formatage de minutes. % par exemple : "1min", "45min", "1h23min", "1jour 2h34min" @@ -644,22 +657,9 @@ json_reponse_login_ok(User) -> {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, - lists:map( - fun(C) -> - {struct, - [ - {root, element(1, C)}, - {page, element(2, C)} - ] - } - end, - User#user.conversations - ) - } - }, - {ek_master, User#user.ek_master} + {view_times, User#user.view_times}, + {view_tooltips, User#user.view_tooltips}, + {conversations, {array, User#user.conversations } }, + {ek_master, User#user.ek_master} ] }.