projects
/
euphorik.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MOD passage systèmatique par l'objet Communication
[euphorik.git]
/
modules
/
erl
/
euphorik_protocole.erl
diff --git
a/modules/erl/euphorik_protocole.erl
b/modules/erl/euphorik_protocole.erl
index
82a4fce
..
3706f68
100755
(executable)
--- a/
modules/erl/euphorik_protocole.erl
+++ b/
modules/erl/euphorik_protocole.erl
@@
-283,7
+283,7
@@
wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id
{struct, [
\r
{reply, "new_troll"},
\r
{troll_id, Current#troll.id},
\r
{struct, [
\r
{reply, "new_troll"},
\r
{troll_id, Current#troll.id},
\r
- {message_id,
euphorik_bd:message_id_associe(Current#troll.id)
},
\r
+ {message_id,
Current#troll.id_minichat
},
\r
{content, Current#troll.content}
\r
]};
\r
_ ->
\r
{content, Current#troll.content}
\r
]};
\r
_ ->
\r
@@
-308,7
+308,7
@@
wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id
{Racine_id, _, _} = Racine,
\r
case euphorik_bd:message_by_id(Racine_id) of
\r
{ok, Mess} ->
\r
{Racine_id, _, _} = Racine,
\r
case euphorik_bd:message_by_id(Racine_id) of
\r
{ok, Mess} ->
\r
- json_message(Mess, euphorik_bd:parents(Racine), User);
\r
+ json_message(Mess, euphorik_bd:parents(Racine
_id
), User);
\r
_ ->
\r
null
\r
end
\r
_ ->
\r
null
\r
end
\r
@@
-426,7
+426,7
@@
put_message(
{ok, User} ->
\r
case euphorik_bd:est_banni(User#user.id) of
\r
{true, Temps_restant} ->
\r
{ok, User} ->
\r
case euphorik_bd:est_banni(User#user.id) of
\r
{true, Temps_restant} ->
\r
- erreur(80,
format_minutes(Temps_restant)
);
\r
+ erreur(80,
[format_minutes(Temps_restant)]
);
\r
_ ->
\r
Strip_content = string:strip(Content),
\r
if Strip_content =:= [] ->
\r
_ ->
\r
Strip_content = string:strip(Content),
\r
if Strip_content =:= [] ->
\r
@@
-435,7
+435,7
@@
put_message(
% attention : non-atomique (update_pseudo+nouveau_message)
\r
euphorik_bd:update_pseudo_user(User#user.id, Nick),
\r
case euphorik_bd:nouveau_message(Strip_content, User#user.id, Answer_to) of
\r
% attention : non-atomique (update_pseudo+nouveau_message)
\r
euphorik_bd:update_pseudo_user(User#user.id, Nick),
\r
case euphorik_bd:nouveau_message(Strip_content, User#user.id, Answer_to) of
\r
- {erreur, R} -> erreur(100,
R
);
\r
+ {erreur, R} -> erreur(100,
[R]
);
\r
_ ->
\r
json_reponse_ok()
\r
end
\r
_ ->
\r
json_reponse_ok()
\r
end
\r
@@
-462,7
+462,7
@@
ban(
erreur(120);
\r
{ok, #user{ek_master = false, profile = Profile2} = User2} ->
\r
euphorik_bd:ban(User2#user.last_ip, Duration),
\r
erreur(120);
\r
{ok, #user{ek_master = false, profile = Profile2} = User2} ->
\r
euphorik_bd:ban(User2#user.last_ip, Duration),
\r
- euphorik_bd:nouveau_message_sys(lists:flatten(io_lib:format("
''~s~s''
est ~s pour ~s.~s",
\r
+ euphorik_bd:nouveau_message_sys(lists:flatten(io_lib:format("
\"~s~s\"
est ~s pour ~s.~s",
\r
[
\r
Profile2#profile.pseudo,
\r
if User2#user.login =:= [] -> ""; true -> " (" ++ User2#user.login ++ ")" end,
\r
[
\r
Profile2#profile.pseudo,
\r
if User2#user.login =:= [] -> ""; true -> " (" ++ User2#user.login ++ ")" end,
\r
@@
-531,9
+531,9
@@
put_troll(
{ok, User = #user{ek_master = true}} ->
\r
case euphorik_bd:put_troll(User#user.id, Content) of
\r
max_troll_reached_per_user ->
\r
{ok, User = #user{ek_master = true}} ->
\r
case euphorik_bd:put_troll(User#user.id, Content) of
\r
max_troll_reached_per_user ->
\r
- erreur(180,
?NB_MAX_TROLL_WAITING_BY_USER
);
\r
+ erreur(180,
[?NB_MAX_TROLL_WAITING_BY_USER]
);
\r
max_troll_reached ->
\r
max_troll_reached ->
\r
- erreur(190,
?NB_MAX_TROLL_WAITING
);
\r
+ erreur(190,
[?NB_MAX_TROLL_WAITING]
);
\r
_Id ->
\r
json_reponse_ok()
\r
end;
\r
_Id ->
\r
json_reponse_ok()
\r
end;
\r
@@
-744,7
+744,7
@@
json_message(Mess, Repond_a, User) ->
{struct, [
\r
{id, Mess#minichat.id},
\r
{user_id, User_mess#user.id},
\r
{struct, [
\r
{id, Mess#minichat.id},
\r
{user_id, User_mess#user.id},
\r
- {date,
format_date(Mess#minichat.date)
},
\r
+ {date,
case Mess#minichat.date of undefined -> "?"; _ -> format_date(Mess#minichat.date) end
},
\r
{system, Mess#minichat.auteur_id =:= 0},
\r
{owner, Est_proprietaire},
\r
{answered, A_repondu_a_message},
\r
{system, Mess#minichat.auteur_id =:= 0},
\r
{owner, Est_proprietaire},
\r
{answered, A_repondu_a_message},
\r