X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_protocole.erl;h=194961ed631acc0da5ed3c7436ae92e4e1c81a4c;hb=13bf850da2316cde3ad2ff8d5c26fb32928bf7b4;hp=548f4af205492e44e2b79e5af5d7321ae0cb8099;hpb=46b6cab14594802cdb4db9e3d77082815182073b;p=euphorik.git diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl index 548f4af..194961e 100755 --- a/modules/erl/euphorik_protocole.erl +++ b/modules/erl/euphorik_protocole.erl @@ -5,12 +5,13 @@ -module(euphorik_protocole). -export([ - register/1, - login/1, + register/2, + login/2, logout/1, profile/1, wait_event/1, put_message/1, + ban/1, erreur/1 ]). @@ -20,32 +21,51 @@ % Une utilisateur s'enregistre avec un tuple {Login, Password}. -register([{login, Login}, {password, Password}]) -> - case euphorik_minichat:user_by_login(Login) of - {ok, _} -> - erreur("Login déjà existant"); - _ -> - User = euphorik_minichat:nouveau_user(Login, Password, generer_cookie()), - json_reponse_login_ok(User) +register([{login, Login}, {password, Password}], IP) -> + Can_register = euphorik_bd:can_register(IP), + if Can_register -> + case euphorik_bd:user_by_login(Login) of + {ok, _} -> + erreur("Login déjà existant"); + _ -> + User = euphorik_bd:nouveau_user(Login, Password, generer_cookie()), + euphorik_bd:update_ip(User#user.id, IP), + json_reponse_login_ok(User) + end; + true -> + erreur_register_flood() end; % Enregistrement sans {Login, Password} -register([]) -> - User = euphorik_minichat:nouveau_user("", generer_cookie()), - json_reponse_login_ok(User). +register([], IP) -> + Can_register = euphorik_bd:can_register(IP), + if Can_register -> + User = euphorik_bd:nouveau_user("", generer_cookie()), + euphorik_bd:update_ip(User#user.id, IP), + json_reponse_login_ok(User); + true -> + erreur_register_flood() + end. + +erreur_register_flood() -> + erreur("Trop de register (flood)"). % Un utilisateur se logge (avec un couple {login, mot de passe}) -login([{login, Login}, {password, Password}]) -> - loginUser(euphorik_minichat:user_by_login_password(Login, Password)); +login([{login, Login}, {password, Password}], IP) -> + loginUser(euphorik_bd:user_by_login_password(Login, Password), IP); % Un utilisateur se logge (avec un cookie) -login([{cookie, Cookie}]) -> - loginUser(euphorik_minichat:user_by_cookie(Cookie)). +login([{cookie, Cookie}], IP) -> + loginUser(euphorik_bd:user_by_cookie(Cookie), IP). -loginUser({ok, User}) -> - euphorik_minichat:update_date_derniere_connexion(User#user.id), +loginUser({ok, User}, IP) -> + euphorik_bd:update_ip(User#user.id, IP), + euphorik_bd:update_date_derniere_connexion(User#user.id), json_reponse_login_ok(User); -loginUser(_) -> - erreur("Erreur login"). +loginUser(_, _) -> + % 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,14 +89,15 @@ profile( {nick, Pseudo}, {email, Email}, {css, Css}, + {nick_format, Nick_format_str}, {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) -> - Message_existe = euphorik_minichat:message_existe(Root), + fun({struct, [{root, Root}, {page, Page}]}, Acc) -> + Message_existe = euphorik_bd:message_existe(Root), if Message_existe -> [{Root, Page} | Acc]; true -> @@ -86,7 +107,7 @@ profile( [], Conversations_json ), - case euphorik_minichat:set_profile(Cookie, Login, Password, Pseudo, Email, Css, Main_page, Conversations) of + case euphorik_bd: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 -> @@ -98,15 +119,20 @@ profile( % Renvoie les messages appropriés. % last_message id et cookie sont facultatifs -% TODO : erreur : {badmatch,false} wait_event(Data) -> Cookie = case lists:keysearch(cookie, 1, Data) of {value, {_, C}} -> C; _ -> inconnu end, Last_message_id = case lists:keysearch(last_message_id, 1, Data) of {value, {_, Id}} -> Id; _ -> 0 end, {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), - User = case euphorik_minichat:user_by_cookie(Cookie) of + 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_bd:user_by_cookie(Cookie) of {ok, U} -> U; _ -> inconnu end, @@ -122,35 +148,35 @@ wait_event(Data) -> lists:map( fun({Mess, Repond_a}) -> Est_proprietaire = User =/= inconnu andalso User#user.id =:= Mess#minichat.auteur_id, - A_repondu_a_message = User =/= inconnu andalso euphorik_minichat:a_repondu_a_message(User#user.id, Mess#minichat.id), - Est_une_reponse_a_user = User =/= inconnu andalso euphorik_minichat:est_une_reponse_a_user(User#user.id, Mess#minichat.id), - % io:format("Repond_a : ~p~n", [Repond_a]), + A_repondu_a_message = User =/= inconnu andalso euphorik_bd:a_repondu_a_message(User#user.id, Mess#minichat.id), + Est_une_reponse_a_user = User =/= inconnu andalso euphorik_bd:est_une_reponse_a_user(User#user.id, Mess#minichat.id), User_mess = if Mess#minichat.auteur_id =:= 0 -> inconnu; true -> - {ok, U2} = euphorik_minichat:user_by_id(Mess#minichat.auteur_id), + {ok, U2} = euphorik_bd:user_by_id(Mess#minichat.auteur_id), U2 end, - {struct, [ - {id, Mess#minichat.id}, - {date, format_date(Mess#minichat.date)}, - {system, Mess#minichat.auteur_id =:= 0}, - {owner, Est_proprietaire}, - {answered, A_repondu_a_message}, - {is_a_reply, Est_une_reponse_a_user}, - {nick, Mess#minichat.pseudo}, - {login, if User_mess =:= inconnu -> Mess#minichat.pseudo; true -> User_mess#user.login end}, - {content, Mess#minichat.contenu}, - {answer_to, {array, lists:map( - fun(Id_mess) -> - {ok, M} = euphorik_minichat:message_by_id(Id_mess), - {ok, User_reponse} = euphorik_minichat:user_by_mess(M#minichat.id), - {struct, [{id, M#minichat.id}, {nick, M#minichat.pseudo}, {login, User_reponse#user.login}]} - end, - Repond_a - )}} - ]} + {struct, [ + {id, Mess#minichat.id}, + {date, format_date(Mess#minichat.date)}, + {system, Mess#minichat.auteur_id =:= 0}, + {owner, Est_proprietaire}, + {answered, A_repondu_a_message}, + {is_a_reply, Est_une_reponse_a_user}, + {nick, Mess#minichat.pseudo}, + {login, if User_mess =:= inconnu -> Mess#minichat.pseudo; true -> User_mess#user.login end}, + {content, Mess#minichat.contenu}, + {answer_to, {array, lists:map( + fun(Id_mess) -> + {ok, M} = euphorik_bd:message_by_id(Id_mess), + {ok, User_reponse} = euphorik_bd:user_by_mess(M#minichat.id), + {struct, [{id, M#minichat.id}, {nick, M#minichat.pseudo}, {login, User_reponse#user.login}]} + end, + Repond_a + )}}, + {ek_master, User_mess#user.ek_master} + ]} end, Conv ) @@ -177,15 +203,15 @@ put_message( {answer_to, {array, Answer_to}} ] ) -> - case euphorik_minichat:user_by_cookie(Cookie) of + case euphorik_bd:user_by_cookie(Cookie) of {ok, User} -> Strip_content = string:strip(Content), 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 + euphorik_bd:update_pseudo_user(User#user.id, Nick), + case euphorik_bd:nouveau_message(Strip_content, User#user.id, Answer_to) of erreur -> erreur("Impossible d'ajouter un nouveau message"); _ -> json_reponse_ok() @@ -196,6 +222,27 @@ put_message( end. +% bannissement d'un utilisateur (son ip est bannie) +ban( + [ + {cookie, Cookie}, + {duration, Duration}, + {user_id, User_id} + ]) -> + % controle que l'utilisateur est un admin + case euphorik_bd:user_by_cookie(Cookie) of + {ok, User = #user{ek_master = true}} -> + case euphorik_bd:user_by_id(User_id) of + {ok, User} -> + euphorik_bd:ban(User#user.last_ip, Duration); + _ -> + erreur("Utilisateur à bannir inconnu") + end; + _ -> + erreur("Utilisateur inconnu ou non ek master") + end. + + % Construit une erreur erreur(Message) -> { @@ -226,9 +273,7 @@ format_date(Date) -> end ++ io_lib:format("~2.10.0B:~2.10.0B:~2.10.0B", [Heure, Minute, Seconde]) ). - - -%%%%%%%%% %%%%%%%%% + json_reponse_ok() -> {struct, [{reply, "ok"}]}. @@ -245,22 +290,23 @@ 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, 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 ) } - } + }, + {ek_master, User#user.ek_master} ] }. - - -%%%%%%%%% %%%%%%%%%