projects
/
euphorik.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
REPORT de la branche 1.1 : 477->494
[euphorik.git]
/
modules
/
erl
/
euphorik_protocole.erl
diff --git
a/modules/erl/euphorik_protocole.erl
b/modules/erl/euphorik_protocole.erl
index
4f30ae7
..
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
@@
-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
@@
-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