projects
/
euphorik.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ADD avancement sur les trolls, partie d'administration presque terminée
[euphorik.git]
/
modules
/
erl
/
euphorik_protocole.erl
diff --git
a/modules/erl/euphorik_protocole.erl
b/modules/erl/euphorik_protocole.erl
index
5c8d6d8
..
fcce9c3
100755
(executable)
--- a/
modules/erl/euphorik_protocole.erl
+++ b/
modules/erl/euphorik_protocole.erl
@@
-208,10
+208,13
@@
wait_event([{page, "admin"}, {last_troll, Last_troll}]) ->
{trolls, {array,
lists:map(
fun(T) ->
{trolls, {array,
lists:map(
fun(T) ->
+ {ok, User} = euphorik_bd:user_by_id(T#troll.id_user),
{struct,
[
{troll_id, T#troll.id},
{struct,
[
{troll_id, T#troll.id},
- {content, T#troll.content}
+ {content, T#troll.content},
+ {author, User#user.pseudo},
+ {author_id, User#user.id}
]
}
end,
]
}
end,
@@
-304,7
+307,7
@@
ban(
if User2#user.login =:= [] -> ""; true -> "(" ++ User2#user.login ++ ")" end,
if Duration =< 15 -> "kické"; true -> "banni" end,
format_minutes(Duration),
if User2#user.login =:= [] -> ""; true -> "(" ++ User2#user.login ++ ")" end,
if Duration =< 15 -> "kické"; true -> "banni" end,
format_minutes(Duration),
- if Reason =/= [] -> " Raison: " ++ Reason; true -> "" end ++ "."
+ if Reason =/= [] -> "
-
Raison: " ++ Reason; true -> "" end ++ "."
]
))),
json_reponse_ok();
]
))),
json_reponse_ok();
@@
-333,7
+336,7
@@
slap(
euphorik_bd:nouveau_message_sys(lists:flatten(io_lib:format("~s s'auto slap~s.",
[
User1#user.pseudo,
euphorik_bd:nouveau_message_sys(lists:flatten(io_lib:format("~s s'auto slap~s.",
[
User1#user.pseudo,
- if Reason =/= [] -> " Raison: " ++ Reason; true -> "" end
+ if Reason =/= [] -> "
-
Raison: " ++ Reason; true -> "" end
]
)));
{ok, User2 = #user{ek_master = false}} ->
]
)));
{ok, User2 = #user{ek_master = false}} ->
@@
-341,7
+344,7
@@
slap(
[
User2#user.pseudo,
User1#user.pseudo,
[
User2#user.pseudo,
User1#user.pseudo,
- if Reason =/= [] -> " Raison: " ++ Reason; true -> "" end ++ "."
+ if Reason =/= [] -> "
-
Raison: " ++ Reason; true -> "" end ++ "."
]
))),
json_reponse_ok();
]
))),
json_reponse_ok();
@@
-390,7
+393,7
@@
mod_troll(
User_id = User#user.id,
case euphorik_bd:troll_by_id(Troll_id) of
{ok, #troll{id_user = User_id}} ->
User_id = User#user.id,
case euphorik_bd:troll_by_id(Troll_id) of
{ok, #troll{id_user = User_id}} ->
- euphorik_bd:mod_troll(
User#user.
id, Content),
+ euphorik_bd:mod_troll(
Troll_
id, Content),
json_reponse_ok();
_ ->
erreur("Vous ne posséder pas ce troll")
json_reponse_ok();
_ ->
erreur("Vous ne posséder pas ce troll")
@@
-412,7
+415,7
@@
del_troll(
User_id = User#user.id,
case euphorik_bd:troll_by_id(Troll_id) of
{ok, #troll{id_user = User_id}} ->
User_id = User#user.id,
case euphorik_bd:troll_by_id(Troll_id) of
{ok, #troll{id_user = User_id}} ->
- euphorik_bd:del_troll(
User#user.
id),
+ euphorik_bd:del_troll(
Troll_
id),
json_reponse_ok();
_ ->
erreur("Vous ne posséder pas ce troll")
json_reponse_ok();
_ ->
erreur("Vous ne posséder pas ce troll")