X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_protocole.erl;h=c2cb9846b537865c4faec2cd79644060b46a5af4;hp=4eed84db9696d82ed069351c0160f8424a679ddf;hb=2faefc542de20cfcc0220b5c7fd7982dd0fbbfd4;hpb=b5878679d51e91e8a86dd042251c91290bf8caf2

diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index 4eed84d..c2cb984 100755
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -1,19 +1,16 @@
 % coding: utf-8
-% Ce module gére les différents message envoyé par le client (javascript) via AJAX.
-% Par exemple le client peut demander les derniers messages du minichat.
-% Les messages sont au format XML, la plus part des fonctions accepte un xmlDocument() et renvoie un string()
-% qui est la réponse XML.
-% Example XML : http://www.erlang.org/doc/apps/xmerl/xmerl_ug.html.
+% 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).
 -export([
-   nouveau_user_login/1,
+   register/1,
    login/1,
    logout/1,
    profile/1,
-   refreshMessage/1,
-   message/1,
+   wait_event/1,
+   put_message/1,
    erreur/1
 ]).
 
@@ -21,23 +18,20 @@
 -include("../include/euphorik_bd.hrl").
 -include("../include/euphorik_defines.hrl").
 
-   
+
 % Une utilisateur s'enregistre avec un tuple {Login, Password}.
-register([]) ->
-   {Login, Password, Login_deja_pris} = case {xmerl_xpath:string("login", Action), xmerl_xpath:string("password", Action)} of
-      {[#xmlElement{content = [#xmlText{value = L}]}], [#xmlElement{content = [#xmlText{value = P}]}]} ->
-         {L, P, case euphorik_minichat:user_by_login(L) of {ok, _} -> true; _ -> false end};
-      _ -> {[], [], false}
-   end,      
-   simple_xml_to_string(
-      if Login_deja_pris-> 
-            xml_reponse_login_pas_ok("Login déjà pris");
-         true ->
-            Cookie = generer_cookie(),
-            User = euphorik_minichat:nouveau_user(Login, Password, Cookie),
-            xml_reponse_login_ok(User)      
-      end
-   ).
+register([{login, Login}, {password, Password}]) ->
+   case euphorik_minichat:user_by_login(Login) of
+      {ok, _} ->
+         erreur("Login déjà existant");
+      _ ->
+         User = euphorik_minichat:nouveau_user(Login, Password, generer_cookie()),
+         json_reponse_login_ok(User)
+   end;
+% Enregistrement sans {Login, Password}
+register([]) ->   
+   User = euphorik_minichat:nouveau_user("<nick>", generer_cookie()),
+   json_reponse_login_ok(User).
    
 
 % Un utilisateur se logge (avec un couple {login, mot de passe})
@@ -51,7 +45,10 @@ loginUser({ok, User}) ->
    euphorik_minichat:update_date_derniere_connexion(User#user.id),
    json_reponse_login_ok(User);
 loginUser(_) ->
-   erreur("Erreur login").
+   % ajoute un délais d'attente (TODO : un autre moyen plus élégant ?)
+   receive after 1000 ->
+      erreur("Erreur login")
+   end.
    
    
 % Renvoie un string() représentant un cookie en base 36. Il y a 10^32 possibillités.
@@ -72,26 +69,28 @@ profile(
       {cookie, Cookie},
       {login, Login},
       {password, Password},
-      {pseudo, Pseudo},
+      {nick, Pseudo},
       {email, Email},
       {css, Css},
+      {nick_format, Nick_format_str},
       {main_page, Main_page},
       {conversations, {array, Conversations_json}}
    ]
 ) ->
    % est-ce que les messages auquel on répond existent ?
    Conversations = lists:foldr(
-      fun([struct, {root, Root}, {page, Page}], Acc) ->
+      fun({struct, [{root, Root}, {page, Page}]}, Acc) ->
          Message_existe = euphorik_minichat:message_existe(Root),
          if  Message_existe ->
             [{Root, Page} | Acc];
-         true ->
-            Acc
+            true ->
+               Acc
+         end
       end,
       [],
       Conversations_json
    ),
-   case euphorik_minichat:set_profile(Cookie, Login, Password, Pseudo, Email, Css, Main_page, Conversations) of
+   case euphorik_minichat:set_profile(Cookie, Login, Password, Pseudo, Email, Css, list_to_atom(Nick_format_str), Main_page, Conversations) of
       ok ->
          json_reponse_ok();
       login_deja_pris ->
@@ -102,130 +101,103 @@ profile(
 
 
 % Renvoie les messages appropriés.
-wait_event(
-   [
-      {cookie, Cookie},
-      {message_count, Message_count} | Reste
-   ]
-) ->
-   % Last message id est facultatif
-   Last_message_id = case lists:keysearch(last_message_id, 1, Reste) of
-      {Id, _} -> Id;
-      _ -> 0
-   end,
-   {Main_page, _} = lists:keysearch(main_page, 1, Reste),
-   {{array, Conversations_json}, _} = lists:keysearch(conversations, 1, Reste),
+% last_message id et cookie sont facultatifs
+% TODO : erreur : {badmatch,false}
+wait_event(Data) ->
+   Cookie = case lists:keysearch(cookie, 1, Data) of {value, {_, C}} -> C; _ -> inconnu end,
+   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,
+   {value, {_, {array, Conversations_json}}} = lists:keysearch(conversations, 1, Data),
+   Conversations = lists:map(fun({struct, [{root, Racine}, {page, Page}]}) -> {Racine, Page} end, Conversations_json),
    User = case euphorik_minichat:user_by_cookie(Cookie) of
-      {ok U} -> U;
+      {ok, U} -> U;
       _ -> inconnu
    end,
-   {stuct, [
+   {struct, [
       {reply, "new_message"},
-      {conversations, {array,
-         TODO ...
-      }   
-   ]}
-   
-            % accrochez-vous ca va siouxer ;)
-            [{reponse, [{name, "refreshMessages"}],
-               lists:map(
-                  fun({Conv, Plus}) ->
-                     {conversation, [], 
-                        [{autresPages, [], [atom_to_list(Plus)]} |
-                           lists:map(
-                              fun({Mess, Repond_a}) ->                                 
-                                 Est_proprietaire = User =/= inconnu andalso User#user.id =:= Mess#minichat.auteur_id,
-                                 A_repondu_a_message = User =/= inconnu andalso euphorik_minichat:a_repondu_a_message(User#user.id, Mess#minichat.id),
-                                 Est_une_reponse_a_user = User =/= inconnu andalso euphorik_minichat:est_une_reponse_a_user(User#user.id, Mess#minichat.id),
-                                 User_mess =
-                                    if Mess#minichat.auteur_id =:= 0 ->
-                                          inconnu;
-                                       true ->
-                                          {ok, U2} = euphorik_minichat:user_by_id(Mess#minichat.auteur_id),
-                                          U2
-                                    end,
-                                 {message, [{id, erlang:integer_to_list(Mess#minichat.id, 36)}],
-                                    [
-                                       {date, [], [format_date(Mess#minichat.date)]},
-                                       {systeme, [], [atom_to_list(Mess#minichat.auteur_id =:= 0)]},
-                                       {proprietaire, [], [atom_to_list(Est_proprietaire)]},
-                                       {repondu, [], [atom_to_list(A_repondu_a_message)]},
-                                       {reponse, [], [atom_to_list(Est_une_reponse_a_user)]},
-                                       {pseudo, [], [Mess#minichat.pseudo]},
-                                       {login, [], [if User_mess =:= inconnu -> Mess#minichat.pseudo; true -> User_mess#user.login end]},
-                                       {contenu, [], [Mess#minichat.contenu]},
-                                       {repondA, [], xml_repond_a(Repond_a)}
-                                    ]
-                                 }
+      {conversations, {array,
+         % accrochez-vous ca va siouxer ;)
+         lists:map(
+            fun({Conv, Plus}) ->
+               {struct, [
+                  {last_page, not Plus},
+                  {messages, {array, 
+                     lists:map(
+                        fun({Mess, Repond_a}) ->                                 
+                           Est_proprietaire = User =/= inconnu andalso User#user.id =:= Mess#minichat.auteur_id,
+                           A_repondu_a_message = User =/= inconnu andalso euphorik_minichat:a_repondu_a_message(User#user.id, Mess#minichat.id),
+                           Est_une_reponse_a_user = User =/= inconnu andalso euphorik_minichat:est_une_reponse_a_user(User#user.id, Mess#minichat.id),
+                           % io:format("Repond_a : ~p~n", [Repond_a]),
+                           User_mess =
+                              if Mess#minichat.auteur_id =:= 0 ->
+                                    inconnu;
+                                 true ->
+                                    {ok, U2} = euphorik_minichat:user_by_id(Mess#minichat.auteur_id),
+                                    U2
                               end,
-                              Conv
-                           )
-                        ]
-                     }
-                  end,
-                  euphorik_minichat_conversation:conversations(
-                     if User =/= inconnu -> User#user.conversations; true -> [] end,
-                     Nb_message,
-                     Dernier_id,
-                     if User =/= inconnu -> User#user.page_principale; true -> 1 end
-                  )
-               )
-            }];
-         _ ->
-            [{reponse, [{name, "refreshMessages"}], [{erreur, [], ["erreur"]}]}]
-      end
-   ).
+                              {struct, [
+                                 {id, Mess#minichat.id},
+                                 {date, format_date(Mess#minichat.date)},
+                                 {system, Mess#minichat.auteur_id =:= 0},
+                                 {owner, Est_proprietaire},
+                                 {answered, A_repondu_a_message},
+                                 {is_a_reply, Est_une_reponse_a_user},
+                                 {nick, Mess#minichat.pseudo},
+                                 {login, if User_mess =:= inconnu -> Mess#minichat.pseudo; true -> User_mess#user.login end},
+                                 {content, Mess#minichat.contenu},
+                                 {answer_to, {array, lists:map(
+                                    fun(Id_mess) ->                   
+                                       {ok, M} = euphorik_minichat:message_by_id(Id_mess),
+                                       {ok, User_reponse} = euphorik_minichat:user_by_mess(M#minichat.id),
+                                       {struct, [{id, M#minichat.id}, {nick, M#minichat.pseudo}, {login, User_reponse#user.login}]}
+                                    end,
+                                    Repond_a
+                                 )}}
+                              ]}
+                        end,
+                        Conv
+                     )
+                  }}
+               ]}
+            end,
+            euphorik_minichat_conversation:conversations(
+               Conversations,
+               Message_count,
+               Last_message_id,
+               Main_page
+            )
+         )
+      }}
+   ]}.
+            
          
-         
-% Prend une liste de xml text node et en resort un string()
-% xmerl : "test &amp; test" devient deux fragments de texte : "test " et "& test", il faut donc rassembler les morceaux...
-defragmenter(Text_nodes) ->
-   lists:foldl(fun(Node, Acc) -> #xmlText{value = V} = Node, Acc ++ V end, [], Text_nodes).
-
-
 % Un utilisateur envoie un message
-message(Action) ->
-   simple_xml_to_string(
-      case {
-            xmerl_xpath:string("cookie", Action),
-            xmerl_xpath:string("pseudo", Action),
-            xmerl_xpath:string("contenu", Action)
-         } of
-         {
-            [#xmlElement{content = [#xmlText{value = Cookie}]}],
-            [#xmlElement{content = Pseudo_fragments}],
-            [#xmlElement{content = Contenu_fragments}]
-         } ->                    
-            case euphorik_minichat:user_by_cookie(Cookie) of
-               {ok, U} ->
-                  Pseudo = defragmenter(Pseudo_fragments),
-                  Contenu = defragmenter(Contenu_fragments),
-                  % met à jour le pseudo du user
-                  euphorik_minichat:update_pseudo_user(U#user.id, Pseudo),
-                  Reponses = case xmerl_xpath:string("reponses", Action) of
-                     [#xmlElement{content = C}] ->
-                        lists:map(
-                           fun (Reponse) ->
-                              #xmlElement{attributes = [#xmlAttribute{name = id, value = Id_reponse}]} = Reponse,
-                              erlang:list_to_integer(Id_reponse, 36)
-                           end
-                        , C);
-                     _ -> []
-                  end,
-                  Contenu_strip = string:strip(Contenu),
-                  if Contenu_strip =:= [] -> xml_reponse_message(pas_ok);
-                     true ->
-                        case euphorik_minichat:nouveau_message(Contenu, U#user.id, Reponses) of
-                           erreur -> xml_reponse_message(pas_ok);
-                        _ -> xml_reponse_message(ok)
-                        end
-                  end;
-               _ -> xml_reponse_message(pas_ok)
-            end;         
-         _ ->
-            xml_reponse_message(pas_ok)
-      end
-   ).
+put_message(
+   [
+      {cookie, Cookie},
+      {nick, Nick},
+      {content, Content},
+      {answer_to, {array, Answer_to}}
+   ]
+) ->
+   case euphorik_minichat:user_by_cookie(Cookie) of
+      {ok, User} ->
+         Strip_content = string:strip(Content),
+         if (Strip_content =:= []) ->
+               erreur("Message vide");
+            true ->
+               % TODO : non-atomique (update_pseudo+nouveau_message)
+               euphorik_minichat:update_pseudo_user(User#user.id, Nick),
+               case euphorik_minichat:nouveau_message(Strip_content, User#user.id, Answer_to) of
+                     erreur -> erreur("Impossible d'ajouter un nouveau message");
+                  _ ->
+                     json_reponse_ok()
+               end
+         end;
+      _ ->
+         erreur("Utilisateur inconnu")
+      end.
 
 
 % Construit une erreur
@@ -237,7 +209,7 @@ erreur(Message) ->
       ]
    }.
    
-
+   
 % Formatage d'une heure
 % local_time() -> string
 format_date(Date) ->
@@ -246,16 +218,18 @@ format_date(Date) ->
    {{Annee, Mois, Jour}, {Heure, Minute, Seconde}} = DateLocal,
    {{AnneeNow, _, _}, {_, _, _}} = DateNowLocal,
    Hier = calendar:date_to_gregorian_days(element(1, DateLocal)) =:=  calendar:date_to_gregorian_days(element(1, DateNowLocal)) - 1,
-   if element(1, DateLocal) =:= element(1, DateNowLocal) ->
-      "";
-      Hier ->
-         "Hier ";
-      Annee =:= AnneeNow ->
-         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 ++
-   io_lib:format("~2.10.0B:~2.10.0B:~2.10.0B", [Heure, Minute, Seconde]).
+   lists:flatten(
+      if element(1, DateLocal) =:= element(1, DateNowLocal) ->
+         "";
+         Hier ->
+            "Hier ";
+         Annee =:= AnneeNow ->
+            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 ++
+      io_lib:format("~2.10.0B:~2.10.0B:~2.10.0B", [Heure, Minute, Seconde])
+   ).
 
 
 %%%%%%%%% <Réponses JSON> %%%%%%%%%
@@ -263,54 +237,29 @@ format_date(Date) ->
 json_reponse_ok() ->
    {struct, [{reply, "ok"}]}.
    
-
-% Construit une réponse positive à un login
-% si Enregistre vaut true alors cela veut dire que la personne s'est enregistré (elle possède au moins un login et un password)
-xml_reponse_login_ok(User) ->
-   [{reponse, [{name, "login"}],
-      [
-         {statut, [if (User#user.password =/= []) and (User#user.login =/= []) -> "enregistre"; true -> "identifie" end]},
-         {cookie, [User#user.cookie]},
-         {id, [erlang:integer_to_list(User#user.id, 36)]},
-         {pseudo, [User#user.pseudo]},
-         {login, [User#user.login]},
-         {email, [User#user.email]},
-         {css, [User#user.css]},
-         {pagePrincipale, [integer_to_list(User#user.page_principale)]}
-      ] ++ 
-      lists:map(
-         fun(C) -> 
-            {conversation, 
-               [
-                  {racine, [erlang:integer_to_list(element(1, C), 36)]},
-                  {page, [integer_to_list(element(2, C))]}
-               ]
-            }
-         end,
-         User#user.conversations
-      )
-   }].
-   
    
 json_reponse_login_ok(User) ->
    {
       struct, [
          {reply, "login"},
-         {status, if (User#user.password =/= []) and (User#user.login =/= []) -> "enregistre"; true -> "identifie" end},
+         {status, if (User#user.password =/= []) and (User#user.login =/= []) -> "auth_registered"; true -> "auth_not_registered" end},
          {cookie, User#user.cookie},
          {id, User#user.id},
-         {pseudo, User#user.pseudo},
+         {nick, User#user.pseudo},
          {login, User#user.login},
          {email, User#user.email},
          {css, User#user.css},
+         {nick_format, atom_to_list(User#user.nick_format)},
          {main_page, User#user.page_principale},
          {conversations, 
             {array,
                lists:map(
                   fun(C) ->
                      {struct,
-                        {root, element(1, C)},
-                        {page, element(2, C)}
+                        [
+                           {root, element(1, C)},
+                           {page, element(2, C)}
+                        ]
                      }
                   end,
                   User#user.conversations
@@ -321,49 +270,4 @@ json_reponse_login_ok(User) ->
    }.
    
    
-% Construit un réponse négative à un login
-xml_reponse_login_pas_ok(Message) ->
-   [{reponse, [{name, "login"}],
-      [
-         {statut, ["erreur"]},
-         {information, [Message]}
-      ]
-   }].
-   
-   
-% Pas utilisé
-%~ xml_conversation(Mess_id, Nb) ->   
-   %~ {Mess_id, Conversation} = minichat:conversation(Mess_id, Nb),
-   %~ xml_conversation(Conversation).
-%~ xml_conversation([]) -> [];
-%~ xml_conversation(Liste_id) ->
-   %~ lists:map(
-      %~ fun({Id, Sous_liste}) ->
-         %~ {id, [{id, erlang:integer_to_list(Id, 36)}], xml_conversation(Sous_liste)}
-      %~ end,
-      %~ Liste_id
-   %~ ).
-
-
-% Renvoie un element XML representant une liste de messages auquel le message M_id repond
-xml_repond_a(Reponses) ->
-   lists:map(
-      fun(Id_mess) ->
-         {ok, M} = euphorik_minichat:message_by_id(Id_mess),
-         {ok, User} = euphorik_minichat:user_by_mess(Id_mess),
-         {id, [{id, erlang:integer_to_list(M#minichat.id, 36)}, {pseudo, M#minichat.pseudo}, {login, User#user.login}], []}
-      end,
-      Reponses
-   ).
-   
-   
-xml_reponse_message(Ok) ->
-   [
-      {reponse, [{name, "message"}],
-         [
-            {statut, [], [case Ok of ok -> "ok"; pas_ok -> "pas ok" end]}
-         ]
-      }
-   ].
-
-%%%%%%%%% </réponses XML> %%%%%%%%%
+%%%%%%%%% </réponses JSON> %%%%%%%%%