X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;ds=sidebyside;f=modules%2Ferl%2Feuphorik_protocole.erl;h=518d22d19ad55ee39418dbcbfaeb6cb3f12b4c1e;hb=4a6c575807a90370c0069b688026b10102e1ce10;hp=a34eae63058baf9e4e61e61fa75879e9db7a5423;hpb=c6a3cf5c036c651fbe9d4d7c0e0ce34d991d3509;p=euphorik.git
diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index a34eae6..518d22d 100755
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -15,13 +15,13 @@
%
% 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).
+-author("Greg Burri ").
-export([
register/2,
login/2,
@@ -30,9 +30,6 @@
put_message/1,
ban/1,
slap/1,
- put_troll/1,
- mod_troll/1,
- del_troll/1,
unban_ip/1,
list_banned_ips/1,
erreur/1
@@ -57,7 +54,7 @@ register([{login, Login}, {password, Password}, {profile, Profile_json}], IP) ->
erreur_register_flood()
end;
% Enregistrement sans {Login, Password}
-register([{profile, Profile_json}], IP) ->
+register([{profile, Profile_json}], IP) ->
Can_register = euphorik_bd:can_register(IP),
if Can_register ->
Profile = profile_from_json(Profile_json),
@@ -67,17 +64,17 @@ register([{profile, Profile_json}], IP) ->
true ->
erreur_register_flood()
end.
-
+
erreur_register_flood() ->
erreur(20).
-
+
% Un utilisateur se logge (avec un couple {login, mot de passe})
login([{login, Login}, {password, Password}], IP) ->
case euphorik_bd:user_by_login_password(Login, Password) of
{ok, User} ->
loginUser(User, IP);
- _ ->
+ _ ->
timer:sleep(?TEMPS_ATTENTE_ERREUR_LOGIN),
erreur(30)
end;
@@ -90,20 +87,20 @@ login([{cookie, Cookie}], IP) ->
timer:sleep(?TEMPS_ATTENTE_ERREUR_LOGIN),
erreur(40)
end.
-
-
+
+
% L'utilisateur donné se logge avec l'ip donnée.
loginUser(User, IP) ->
euphorik_bd:update_ip(User#user.id, IP),
euphorik_bd:update_date_derniere_connexion(User#user.id),
json_reponse_login_ok(User).
-
-
+
+
% Renvoie un string() représentant un cookie en base 36. Il y a 10^32 possibillités.
generer_cookie() ->
{A1, A2, A3} = now(),
random:seed(A1, A2, A3),
- erlang:integer_to_list(random:uniform(math:pow(10, 32)), 36).
+ erlang:integer_to_list(random:uniform(trunc(math:pow(10, 32))), 36).
% Modification du profile.
@@ -164,12 +161,12 @@ profile_from_json(
Chat_order_valide = lists:any(fun(E) -> E =:= Chat_order end, [reverse, chrono]),
if not Chat_order_valide ->
{erreur, Chat_order_str ++ " n'est pas une valeur acceptée pour 'chat_order'"};
- true ->
+ true ->
Nick_format = list_to_atom(Nick_format_str),
Nick_format_valide = lists:any(fun(E) -> E =:= Nick_format end, [nick, login, nick_login]),
if not Nick_format_valide ->
{erreur, Nick_format_str ++ " n'est pas une valeur acceptée pour 'nick_format'"};
- true ->
+ true ->
Ostentatious_master = list_to_atom(Ostentatious_master_str),
Ostentatious_master_valide = lists:any(fun(E) -> E =:= Ostentatious_master end, [invisible, light, heavy]),
if not Ostentatious_master_valide ->
@@ -187,7 +184,7 @@ profile_from_json(
ostentatious_master = Ostentatious_master
}
end
- end
+ end
end.
@@ -199,7 +196,6 @@ wait_event([{page, "chat"} | Data]) ->
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,
- Troll_id = case lists:keysearch(troll_id, 1, Data) of {value, {_, T}} -> T; _ -> 0 end,
{value, {_, {array, Conversations_json}}} = lists:keysearch(conversations, 1, Data),
Racines_conversations = lists:map(
fun({struct, [{root, Racine}, {page, Page} | Reste]}) ->
@@ -212,62 +208,23 @@ wait_event([{page, "chat"} | Data]) ->
{ok, U} -> U;
_ -> inconnu
end,
- case {mnesia:subscribe({table, minichat, detailed}), mnesia:subscribe({table, troll, detailed})} of
- {{error, E}, _} -> E;
- {_, {error, E}} -> E;
+ case mnesia:subscribe({table, minichat, detailed}) of
+ {error, E} -> E;
_ ->
% attente d'événements
- R = wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id, Main_page, Troll_id),
+ R = wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id, Main_page),
mnesia:unsubscribe({table, minichat, detailed}),
- mnesia:unsubscribe({table, troll, detailed}),
R
end;
% Attend un événement pour la page "Admin"
-wait_event([{page, "admin"}, {last_troll, Last_troll}]) ->
- case wait_event_page_admin(Last_troll) of
+wait_event([{page, "admin"}]) ->
+ case wait_event_page_admin() of
banned_ips_refresh ->
- {struct,
- [
- {reply, "banned_ips_refresh"}
- ]
- };
- {mod, Troll} ->
{struct,
[
- {reply, "troll_modified"},
- {troll_id, Troll#troll.id},
- {content, Troll#troll.content}
+ {reply, "banned_ips_refresh"}
]
};
- {add, Trolls} ->
- {struct,
- [
- {reply, "troll_added"},
- {trolls, {array,
- lists:map(
- fun(T) ->
- {ok, #user{profile = Profile} = User} = euphorik_bd:user_by_id(T#troll.id_user),
- {struct,
- [
- {troll_id, T#troll.id},
- {content, T#troll.content},
- {author, Profile#profile.pseudo},
- {author_id, User#user.id}
- ]
- }
- end,
- Trolls
- )
- }}
- ]
- };
- {del, Troll_id} ->
- {struct,
- [
- {reply, "troll_deleted"},
- {troll_id, Troll_id}
- ]
- };
_ ->
erreur(60)
end;
@@ -275,71 +232,60 @@ wait_event(_) ->
erreur(70).
-% Attend un événement pour la page "Chat" et renvoie soit un troll soit les messages manquants au client.
-wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id, Main_page, Troll_id) ->
- % est-ce que le troll est à jour ?
- case euphorik_bd:current_troll() of
- Current when is_record(Current, troll), Current#troll.id =/= Troll_id ->
- {struct, [
- {reply, "new_troll"},
- {troll_id, Current#troll.id},
- {message_id, euphorik_bd:message_id_associe(Current#troll.id)},
- {content, Current#troll.content}
- ]};
- _ ->
- % est-ce qu'il y a des nouveaux messages ?
- case euphorik_minichat_conversation:conversations(Racines_conversations, Message_count, Last_message_id, Main_page) of
- vide ->
- wait_event_bd_page_chat(),
- wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id, Main_page, Troll_id);
- Conversations ->
- % accrochez-vous ca va siouxer ;)
- {struct, [
- {reply, "new_messages"},
- {conversations, {array,
- lists:map(
- fun({Racine, {Conv, Plus}}) ->
- {struct, [
- {last_page, not Plus},
- {first, % le premier message de la conversation
- if Racine =:= undefined orelse Conv =:= [] ->
- null;
- true ->
- {Racine_id, _, _} = Racine,
- case euphorik_bd:message_by_id(Racine_id) of
- {ok, Mess} ->
- json_message(Mess, euphorik_bd:parents(Racine), User);
- _ ->
- null
- end
- end
- },
- {messages, {array,
- lists:map(
- fun({Mess, Repond_a}) ->
- json_message(Mess, Repond_a, User)
- end,
- Conv
- )
- }}
- ]}
- end,
- % on ajoute un 'undefined' correspondant à la premier conversation qui ne possède pas de racine
- % TODO : peut être à revoir car un peu lourd est compliqué
- aggregation_racines_conversations([undefined | Racines_conversations], Conversations)
- )
- }}
- ]}
- end
+% Attend un événement pour la page "Chat" et renvoie les messages manquants au client.
+wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id, Main_page) ->
+ % est-ce qu'il y a des nouveaux messages ?
+ case euphorik_minichat_conversation:conversations(Racines_conversations, Message_count, Last_message_id, Main_page) of
+ vide ->
+ wait_event_bd_page_chat(),
+ wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id, Main_page);
+ Conversations ->
+ % Accrochez-vous ca va siouxer ;).
+ {struct, [
+ {reply, "new_messages"},
+ {conversations, {array,
+ lists:map(
+ fun({Racine, {Conv, Plus}}) ->
+ {struct, [
+ {last_page, not Plus},
+ {first, % le premier message de la conversation
+ if Racine =:= undefined orelse Conv =:= [] ->
+ null;
+ true ->
+ {Racine_id, _, _} = Racine,
+ case euphorik_bd:message_by_id(Racine_id) of
+ {ok, Mess} ->
+ json_message(Mess, euphorik_bd:parents_id(Racine_id), User);
+ _ ->
+ null
+ end
+ end
+ },
+ {messages, {array,
+ lists:map(
+ fun({Mess, Repond_a}) ->
+ json_message(Mess, Repond_a, User)
+ end,
+ Conv
+ )
+ }}
+ ]}
+ end,
+ % on ajoute un 'undefined' correspondant à la premier conversation qui ne possède pas de racine
+ % TODO : peut être à revoir car un peu lourd est compliqué
+ aggregation_racines_conversations([undefined | Racines_conversations], Conversations)
+ )
+ }}
+ ]}
end.
-
-aggregation_racines_conversations(L1, L2) ->
+
+aggregation_racines_conversations(L1, L2) ->
aggregation_racines_conversations(L1, L2, []).
aggregation_racines_conversations([], [], L) -> lists:reverse(L);
aggregation_racines_conversations([E1|R1], [E2|R2], L) ->
aggregation_racines_conversations(R1, R2, [{E1, E2} | L]).
-
+
% Attend un événement lié à la page 'chat'.
@@ -347,71 +293,42 @@ wait_event_bd_page_chat() ->
receive % attente d'un post
{mnesia_table_event, {write, minichat, _Message, [], _}} ->
ok;
- {mnesia_table_event, {write, troll, Troll, [Old_troll | _], _}} when Troll#troll.date_post =/= undefined, Old_troll#troll.date_post == undefined ->
- ok;
{tcp_closed, _} ->
exit(normal);
_ ->
wait_event_bd_page_chat()
% 60 minutes de timeout (on ne sais jamais)
% Après 60 minutes de connexion, le client doit donc reétablir une connexion
- after 1000 * 60 * 60 ->
+ after 1000 * 60 * 60 ->
timeout
end.
% Attent un événement concernant la page admin
-% Renvoie les trolls manquants posté après Last_id ou banned_ips_refresh.
-% Si pas de trolls alors attend un événement tel qu'un ajout, une modification ou une suppression.
-% renvoie :
-% {mod, Troll}
-% ou {add, [Trolls]}
-% ou {del, Troll_id}
-% ou banned_ips_refresh
+% banned_ips_refresh
% ou timeout
-wait_event_page_admin(Last_id) ->
- case {mnesia:subscribe({table, troll, detailed}), mnesia:subscribe({table, ip_table, detailed})} of
- {{error, E}, _ } -> E;
- {_, {error, E}} -> E;
- _ ->
- R = case euphorik_bd:trolls(Last_id) of
- [] -> % pas de trolls
- wait_event_page_admin();
- Trolls ->
- {add, Trolls}
- end,
- mnesia:unsubscribe({table, troll, detailed}),
- mnesia:unsubscribe({table, ip_table, detailed}),
- R
- end.
-
wait_event_page_admin() ->
- % s'il n'y a pas de trolls que l'utilisateur n'a pas connaissance alors on attend un événement
- receive
- % cas où un troll est choisit comme courant
- {mnesia_table_event, {write, troll, Troll, [Old_troll | _], _}}
- when Old_troll#troll.date_post =:= undefined, Troll#troll.date_post =/= undefined ->
- {del, Troll#troll.id};
- {mnesia_table_event, {write, troll, Troll, [_Old_troll | _], _}} ->
- {mod, Troll};
- {mnesia_table_event, {write, troll, Troll, [], _}} ->
- {add, [Troll]};
- {mnesia_table_event, {delete, troll, {troll, Id}, _, _}} ->
- {del, Id};
- {mnesia_table_event, {write, ip_table, IP, [Old_IP | _], _}}
- when Old_IP#ip_table.ban =/= IP#ip_table.ban; Old_IP#ip_table.ban_duration =/= IP#ip_table.ban_duration ->
- banned_ips_refresh;
- {tcp_closed, _} ->
- exit(normal);
+ case mnesia:subscribe({table, ip_table, detailed}) of
+ {error, E} -> E;
_ ->
- wait_event_page_admin()
- % 60 minutes de timeout (on ne sais jamais)
- % Après 60 minutes de connexion, le client doit donc reétablir une connexion
- after 1000 * 60 * 60 ->
- timeout
+ R = receive
+ {mnesia_table_event, {write, ip_table, IP, [Old_IP | _], _}}
+ when Old_IP#ip_table.ban =/= IP#ip_table.ban; Old_IP#ip_table.ban_duration =/= IP#ip_table.ban_duration ->
+ banned_ips_refresh;
+ {tcp_closed, _} ->
+ exit(normal);
+ _ ->
+ wait_event_page_admin()
+ % 60 minutes de timeout (on ne sais jamais)
+ % Après 60 minutes de connexion, le client doit donc reétablir une connexion
+ after 1000 * 60 * 60 ->
+ timeout
+ end,
+ mnesia:unsubscribe({table, ip_table, detailed}),
+ R
end.
-
-
+
+
% Un utilisateur envoie un message
% Answer_to est une liste d'id (int)
put_message(
@@ -480,7 +397,7 @@ ban(
_ ->
erreur(150)
end.
-
+
% slapage d'un user (avertissement)
slap(
@@ -494,7 +411,7 @@ slap(
{ok, User1 = #user{ek_master = true, profile = Profile1}} ->
case euphorik_bd:user_by_id(User_id) of
{ok, User1} ->
- euphorik_bd:nouveau_message_sys(lists:flatten(io_lib:format("~s s'auto slap~s.",
+ euphorik_bd:nouveau_message_sys(lists:flatten(io_lib:format("~s s'auto slap~s.",
[
Profile1#profile.pseudo,
if Reason =/= [] -> " - Raison: " ++ Reason; true -> "" end
@@ -518,75 +435,8 @@ slap(
_ ->
erreur(170)
end.
-
-
-put_troll(
- [
- {cookie, Cookie},
- {content, Content}
- ]
-) ->
- % controle que l'utilisateur est un admin
- case euphorik_bd:user_by_cookie(Cookie) of
- {ok, User = #user{ek_master = true}} ->
- case euphorik_bd:put_troll(User#user.id, Content) of
- max_troll_reached_per_user ->
- erreur(180, [?NB_MAX_TROLL_WAITING_BY_USER]);
- max_troll_reached ->
- erreur(190, [?NB_MAX_TROLL_WAITING]);
- _Id ->
- json_reponse_ok()
- end;
- _ ->
- erreur(200)
- end.
-
-
-mod_troll(
- [
- {cookie, Cookie},
- {troll_id, Troll_id},
- {content, Content}
- ]
-) ->
- % controle que l'utilisateur est un admin
- case euphorik_bd:user_by_cookie(Cookie) of
- {ok, User = #user{ek_master = true}} ->
- User_id = User#user.id,
- case euphorik_bd:troll_by_id(Troll_id) of
- {ok, #troll{id_user = User_id}} ->
- euphorik_bd:mod_troll(Troll_id, Content),
- json_reponse_ok();
- _ ->
- erreur(210)
- end;
- _ ->
- erreur(220)
- end.
-
-del_troll(
- [
- {cookie, Cookie},
- {troll_id, Troll_id}
- ]
-) ->
- % controle que l'utilisateur est un admin
- case euphorik_bd:user_by_cookie(Cookie) of
- {ok, User = #user{ek_master = true}} ->
- User_id = User#user.id,
- case euphorik_bd:troll_by_id(Troll_id) of
- {ok, #troll{id_user = User_id}} ->
- euphorik_bd:del_troll(Troll_id),
- json_reponse_ok();
- _ ->
- erreur(210)
- end;
- _ ->
- erreur(220)
- end.
-
-
+
unban_ip(
[
{cookie, Cookie},
@@ -600,8 +450,8 @@ unban_ip(
_ ->
erreur(230)
end.
-
-
+
+
list_banned_ips(
[
{cookie, Cookie}
@@ -645,12 +495,12 @@ list_banned_ips(
% Construit une erreur
erreur(Num, Args) ->
erreur_json(Num, lists:flatten(io_lib:format(euphorik_bd:get_texte(Num), Args))).
-
-
+
+
erreur(Num) ->
erreur_json(Num, euphorik_bd:get_texte(Num)).
-
-
+
+
erreur_json(Num, Mess) ->
{
struct, [
@@ -659,8 +509,8 @@ erreur_json(Num, Mess) ->
{error_message, Mess}
]
}.
-
-
+
+
% Formatage de minutes.
% par exemple : "1min", "45min", "1h23min", "1jour 2h34min"
format_minutes(Min) ->
@@ -674,8 +524,8 @@ format_minutes(Min) ->
true ->
" " ++ integer_to_list(Minutes) ++ " minute" ++ if Minutes > 1 -> "s"; true -> "" end
end.
-
-
+
+
% Formatage d'une heure
% local_time() -> string
format_date(Date) ->
@@ -690,7 +540,7 @@ format_date(Date) ->
Hier ->
"Hier ";
Annee =:= AnneeNow ->
- io_lib:format("~2.10.0B/~2.10.0B ", [Jour, Mois]);
+ io_lib:format("~2.10.0B/~2.10.0B ", [Jour, Mois]);
true ->
io_lib:format("~2.10.0B/~2.10.0B/~B ", [Jour, Mois, Annee])
end ++
@@ -700,8 +550,8 @@ format_date(Date) ->
json_reponse_ok() ->
{struct, [{reply, "ok"}]}.
-
-
+
+
json_reponse_login_ok(#user{profile = Profile} = User) ->
{
struct, [
@@ -731,7 +581,7 @@ json_reponse_login_ok(#user{profile = Profile} = User) ->
}}
]
}.
-
+
% Renvoie le message formaté en JSON.
% Mess est de type #minichat
% Repond_a est une liste d'id des messages auquel répond Mess
@@ -744,7 +594,7 @@ json_message(Mess, Repond_a, User) ->
{struct, [
{id, Mess#minichat.id},
{user_id, User_mess#user.id},
- {date, format_date(Mess#minichat.date)},
+ {date, case Mess#minichat.date of undefined -> "?"; _ -> format_date(Mess#minichat.date) end},
{system, Mess#minichat.auteur_id =:= 0},
{owner, Est_proprietaire},
{answered, A_repondu_a_message},
@@ -754,7 +604,7 @@ json_message(Mess, Repond_a, User) ->
{content, Mess#minichat.contenu},
{root, Mess#minichat.racine_id},
{answer_to, {array, lists:map(
- fun(Id_mess) ->
+ 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}]}