simplify includes, relay

apps/server/include/authtoken.hrl

@@ -1,5 +1,2 @@
--record(authtoken, {
-          token :: string(),
-          id    :: 'PlayerId'()
-          }).
+-record(authtoken, {token :: string(), id}).
 

apps/server/include/basic_types.hrl

@@ -1,23 +1,20 @@
 -ifndef(BASIC_TYPES).
 -define(BASIC_TYPES, true).
 
--type 'PlayerId'()   :: any() | 0.
+-type 'PlayerId'()   :: any().
 -type 'GameId'()     :: any().
--type 'SocialActionEnum'() :: integer().
--type 'MonitorRef'() :: reference().
 
 -record('PlayerInfo', {
-          id         :: 'PlayerId'(),
-          login      :: string(),
-          name       :: string(),
-          surname    :: string(),
-          age        :: integer(),
-          skill :: integer(),
-          score :: integer(),
-          avatar_url :: string(),
-          robot = false :: boolean()
-         }).
-
--record('PlayerStats', {id,game,per_flavour}).
+    id :: 'PlayerId'(),
+    login :: string(),
+    name :: string(),
+    surname :: string(),
+    seat_num,
+    connected,
+    age :: integer(),
+    skill :: integer(),
+    score :: integer(),
+    avatar_url :: string(),
+    robot = false :: boolean() }).
 
 -endif.

apps/server/include/requests.hrl

@@ -10,6 +10,7 @@
 -record(chat, {chat_id :: 'GameId'(), message :: string()}).
 -record(game_action, {game :: 'GameId'(), action, args = []}).
 -record(social_action, {game :: 'GameId'(), type, recipient::'PlayerId'()}).
+-record(pause_game, {table_id :: integer(),game :: 'GameId'(),action}).
 
 % event notifications from server to client
 
@@ -17,7 +18,6 @@
 -record(chat_event, {chat :: 'GameId'(), content, author_id::'PlayerId'(),author_nick::string() }).
 -record(social_event, {type,game::'GameId'(),initiator::'PlayerId'(),recipient::'PlayerId'()}).
 -record(stats_event, {player_id :: 'PlayerId'(), games, reveals, protocol}).
--record(pause_game, {table_id :: integer(),game :: 'GameId'(),action}).
 -record(game_paused, {table_id :: integer(), game :: 'GameId'(),action,who :: 'PlayerId'(),retries}).
 -record(disconnect, {reason_id,reason}).
 -record(player_left, {player :: 'PlayerId'(),human_replaced=false,replacement::'PlayerId'()}).

apps/server/src/game_app.erl

@@ -1,7 +1,6 @@
 -module(game_app).
 -behaviour(application).
 -export([start/2, start/0, stop/0, stop/1]).
--include_lib("eunit/include/eunit.hrl").
 
 start() -> start(init,[]).
 start(_StartType, _StartArgs) -> game_sup:start_link().

apps/server/src/game_session.erl

@@ -230,7 +230,7 @@ handle_relay_message(Msg, _SubscrId, #state{rpc = RPC} = State) ->
 %% because the user for example was moved to another table.
 handle_relay_kick({rejoin, GameId}, _SubscrId,
                   #state{user = User, games = Games, rpc = RPC} = State) ->
-    gas:info(?MODULE,"Requesting main relay info...",[]),
+    gas:info(?MODULE,"Rejoin request from relay. GameId ~p User ~p",[GameId,User#'PlayerInfo'.id]),
     register_user_by_module(RPC,User,GameId,State);
 
 handle_relay_kick(Reason, _SubscrId, #state{rpc = RPC} = State) ->

apps/server/src/modules/relay_ng.erl → apps/server/src/modules/relay.erl

@@ -29,7 +29,7 @@
 %% {relay_kick, SubscrId, Reason}
 %% {relay_event, SubscrId, Event}
 
--module(relay_ng).
+-module(relay).
 
 -behaviour(gen_server).
 %% --------------------------------------------------------------------

apps/server/src/okey/game_okey_bot.erl

@@ -23,7 +23,7 @@
         user :: #'PlayerInfo'{},
         uid :: 'PlayerId'(),
         owner :: pid(),
-        owner_mon :: 'MonitorRef'(),
+        owner_mon,
         session :: pid(),
         gid :: 'GameId'(),
         bot :: pid(),

apps/server/src/okey/game_okey_table.erl

@@ -59,7 +59,7 @@
 
 -define(HAND_SIZE, 14).
 -define(SEATS_NUM, 4).
--define(RELAY, relay_ng).
+-define(RELAY, relay).
 -define(DESK, game_okey_desk).
 -define(SCORING, game_okey_scoring).
 

apps/server/src/tavla/game_tavla_bot.erl

@@ -23,7 +23,7 @@
         players,
         uid :: 'PlayerId'(),
         owner :: pid(),
-        owner_mon :: 'MonitorRef'(),
+        owner_mon,
         session :: pid(),
         gid :: 'GameId'(),
         bot :: pid(),

apps/server/src/tavla/game_tavla_ng_table.erl

@@ -55,7 +55,7 @@
 -define(STATE_PAUSE, state_pause).
 -define(STATE_SET_FINISHED, state_set_finished).
 
--define(RELAY, relay_ng).
+-define(RELAY, relay).
 -define(DESK, game_tavla_ng_desk).
 -define(SCORING, game_tavla_ng_scoring).
 -define(LIB, game_tavla_lib).