X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_protocole.erl;h=24768ea022b807288c02709277c55571733377a2;hp=4f30ae7bb8ccf5855a87ec1a3f97ee7e1909bf43;hb=861bc33f2a9d811fd6a60b11929ef74e2404848d;hpb=15f8b5143c6b9dcfe86eda84c22c31826a7f3d1c diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl index 4f30ae7..24768ea 100755 --- 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, [ {reply, "new_troll"}, {troll_id, Current#troll.id}, - {message_id, euphorik_bd:message_id_associe(Current#troll.id)}, + {message_id, Current#troll.id_minichat}, {content, Current#troll.content} ]}; _ -> @@ -308,7 +308,7 @@ wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id {Racine_id, _, _} = Racine, case euphorik_bd:message_by_id(Racine_id) of {ok, Mess} -> - json_message(Mess, euphorik_bd:parents(Racine), User); + json_message(Mess, euphorik_bd:parents(Racine_id), User); _ -> null end @@ -462,7 +462,7 @@ ban( erreur(120); {ok, #user{ek_master = false, profile = Profile2} = User2} -> euphorik_bd:ban(User2#user.last_ip, Duration), - euphorik_bd:nouveau_message_sys(lists:flatten(io_lib:format("''~s~s'' est ~s pour ~s.~s", + euphorik_bd:nouveau_message_sys(lists:flatten(io_lib:format("\"~s~s\" est ~s pour ~s.~s", [ Profile2#profile.pseudo, if User2#user.login =:= [] -> ""; true -> " (" ++ User2#user.login ++ ")" end,