Merge branch 'master' of github.com:kakaranet/games

apps/face/src/index.erl

@@ -102,13 +102,14 @@ body() ->
       #button{ id = player_info, body = <<"PlayerInfo">>, postback = player_info}
     ].
 
-event(terminate) -> wf:user(undefined), wf:info("terminate");
+event(terminate) -> wf:info("terminate");
 event(init) -> event(attach), event(join);
 event(login_button) -> wf:wire(protocol:logout());
 event(join) -> wf:wire(protocol:join(wf:to_list(?GAMEID)));
 event(take) -> wf:wire(protocol:take(wf:to_list(?GAMEID), wf:q(take_combo)));
 
 event(player_info) -> 
+    1/0,
     User = user(),
     wf:wire(protocol:player_info(
         wf:f("'~s'",[wf:to_list(User#user.id)]),wf:f("'~s'",[game_okey])));

apps/server/src/auth_server.erl

@@ -20,20 +20,14 @@
     #'PlayerInfo'{name = <<"Ilya">>, surname = <<"Prigogine">>, login = <<"synergetics">>, robot = true},
     #'PlayerInfo'{name = <<"Mother">>, surname = <<"Teresa">>, login = <<"peace">>, robot = true}]).
 
--record(state, {
-          spare = ?SPARE_LOGINS,
-          tokens
-         }).
+-record(state, {spare = ?SPARE_LOGINS,tokens}).
 
-spare() -> [ P#'PlayerInfo'{id =list_to_binary(binary_to_list(P#'PlayerInfo'.login) ++
-         integer_to_list(id_generator:get_id2()))} || P <- ?SPARE_LOGINS ].
+spare() -> [ P#'PlayerInfo'{id =wf:to_binary(wf:to_list(P#'PlayerInfo'.login) ++
+              wf:to_list(id_generator:get_id2()))} || P <- ?SPARE_LOGINS ].
 
 start_link() -> gen_server:start_link({local, ?SERVER}, ?MODULE, [], []).
-store_token(GameId, Token, UserId) when is_list(Token) -> store_token(GameId, list_to_binary(Token), UserId);
-store_token(GameId, Token, UserId) when is_binary(Token) -> gen_server:call(?SERVER, {store_token, GameId, Token, UserId}).
-get_user_info(Token) when is_list(Token)  -> get_user_info(list_to_binary(Token));
-get_user_info(Token) when is_binary(Token) -> gen_server:call(?SERVER, {get_user_info, Token}).
-get_user_info_by_user_id(UserId) when is_list(UserId) -> get_user_info_by_user_id(list_to_binary(UserId));
+store_token(GameId, Token, UserId) -> gen_server:call(?SERVER, {store_token, GameId, Token, UserId}).
+get_user_info(Token) -> gen_server:call(?SERVER, {get_user_info, Token}).
 get_user_info_by_user_id(UserId) -> user_info(UserId).
 generate_token(Game,User) -> T = base64:encode(crypto:rand_bytes(100)), store_token(Game,T,User).
 
@@ -72,8 +66,7 @@ code_change(_OldVsn, State, _Extra) -> {ok, State}.
 robot_credentials() ->
     Pos = crypto:rand_uniform(1, length(?SPARE_LOGINS) + 1),
     H0 = lists:nth(Pos, ?SPARE_LOGINS),
-    Id = list_to_binary(binary_to_list(H0#'PlayerInfo'.login) ++
-         integer_to_list(id_generator:get_id2())),
+    Id = wf:to_binary(wf:to_list(H0#'PlayerInfo'.login) ++ wf:to_list(id_generator:get_id2())),
     H0#'PlayerInfo'{id = Id}.
 
 store_token(GameId, E, Token, UserId) ->
@@ -97,7 +90,7 @@ user_info(#user{}=UserData) ->
         surname = wf:to_binary(UserData#user.surnames)};
 
 
-user_info(UserId) when is_list(UserId); is_binary(UserId) ->
+user_info(UserId) ->
     case kvs:get(user,UserId) of
         {ok, UserData} ->
 %            gas:info(?MODULE,"User Data: ~p",[UserData]),

apps/server/src/game_manager.erl

@@ -12,6 +12,8 @@
 -include_lib("db/include/scoring.hrl").
 -record(state, { game_tavla = 0, game_okey = 0 }).
 
+online() -> [X||X<-qlc:e(gproc:table()),element(1,X)=={p,l,broadcast}].
+
 destroy_game(Pid,Sup) -> game_sup:stop_game(Sup,Pid).
 
 gen_game_id() ->

apps/server/src/game_session.erl

@@ -149,7 +149,7 @@ code_change(_OldVsn, State, _Extra) ->
 handle_client_request(#session_attach{token = Token}, _From,
                       #state{user = undefined} = State) ->
     gas:info(?MODULE,"Checking session token: ~p", [Token]),
-    case auth_server:get_user_info(Token) of
+    case auth_server:get_user_info(wf:to_binary(Token)) of
         false ->
             gas:error(?MODULE,"failed session attach: ~p", [Token]),
             {stop, normal, {error, invalid_token}, State};

apps/server/src/okey/game_okey_ng_table_trn.erl

@@ -521,7 +521,7 @@ handle_player_action(#player{id = PlayerId, seat_num = SeatNum, user_id = UserId
                      #state{game_id = GameId, table_id = TableId} = StateData) ->
     {Keys,Values} = lists:unzip(Args),
     ExtAction = list_to_tuple([Action|Values]),
-    gas:info(?MODULE,"OKEY_NG_TABLE_TRN <~p,~p> Player <~p> (~p) submit the game action: ~p.",
+    gas:info(?MODULE,"OKEY_NG_TABLE_TRN <~p,~p> Player <~p> (~p)~n submit the game action: ~p.",
         [GameId, TableId, PlayerId, UserId, ExtAction]),
     do_action(SeatNum, ExtAction, From, StateName, StateData);