character -> roster

10 files changed, 37 insertions, 40 deletions

diff --git a/conf/yaws.conf.m4 b/conf/yaws.conf.m4
index 544e1eb..cccc34f 100644
--- a/conf/yaws.conf.m4
+++ b/conf/yaws.conf.m4
@@ -110,6 +110,6 @@ keepalive_timeout = 30000
   listen = 0.0.0.0
   docroot = __MAKEFILE_WWW_DIR
   auth_log = true
-  appmods = btl_character_turn btl_load map_load map_update lgn_sign_in lgn_sign_up lgn_recovery chr_load chr_update plr_load
+  appmods = btl_character_turn btl_load map_load map_update lgn_sign_in lgn_sign_up lgn_recovery rst_load rst_update plr_load
   start_mod = qry_handler
 </server>
diff --git a/src/query/qry_handler.erl b/src/query/qry_handler.erl
index a6caf89..deb4e33 100644
--- a/src/query/qry_handler.erl
+++ b/src/query/qry_handler.erl
@@ -23,4 +23,5 @@ start (_YawsParams) ->
    ok = lgn_handler:start(TimedCachesManagerPid),
    ok = btl_handler:start(TimedCachesManagerPid),
    ok = map_handler:start(TimedCachesManagerPid),
+   ok = rst_handler:start(TimedCachesManagerPid),
    ok.
diff --git a/src/character/query/chr_load.erl b/src/roster/query/rst_load.erl
index 3c269d6..761d1c9 100644
--- a/src/character/query/chr_load.erl
+++ b/src/roster/query/rst_load.erl
@@ -1,4 +1,4 @@
--module(chr_load).
+-module(rst_load).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20,7 +20,7 @@
    {
       player :: shr_player:type(),
       inventory :: shr_inventory:type(),
-      roster :: chr_roster:type()
+      roster :: rst_roster:type()
    }
 ).
 
@@ -80,12 +80,12 @@ generate_reply (QueryState) ->
    Roster = QueryState#query_state.roster,
    Inventory = QueryState#query_state.inventory,
 
-   RosterCharacters = chr_roster:get_characters(Roster),
+   RosterCharacters = rst_roster:get_characters(Roster),
    SetInventory = shr_set_inventory:generate(Inventory),
    EncodedRoster =
       array:to_list
       (
-         array:sparse_map(fun chr_add_char:generate/2, RosterCharacters)
+         array:sparse_map(fun rst_add_char:generate/2, RosterCharacters)
       ),
 
    Output = jiffy:encode([SetInventory|EncodedRoster]),
diff --git a/src/character/query/chr_update.erl b/src/roster/query/rst_update.erl
index 568a749..7e53972 100644
--- a/src/character/query/chr_update.erl
+++ b/src/roster/query/rst_update.erl
@@ -1,4 +1,4 @@
--module(chr_update).
+-module(rst_update).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12,7 +12,7 @@
       player_id :: binary(),
       session_token :: binary(),
       character_ix :: non_neg_integer(),
-      character :: chr_character:type()
+      character :: rst_character:type()
    }
 ).
 
@@ -22,7 +22,7 @@
    {
       player :: shr_player:type(),
       inventory :: shr_inventory:type(),
-      roster :: chr_roster:type()
+      roster :: rst_roster:type()
    }
 ).
 
@@ -45,7 +45,7 @@ parse_input (Req) ->
    CharacterIX = maps:get(<<"cix">>, JSONReqMap),
    EncodedCharacter = maps:get(<<"chr">>, JSONReqMap),
 
-   Character = chr_character:decode(EncodedCharacter),
+   Character = rst_character:decode(EncodedCharacter),
 
    #input
    {
@@ -88,7 +88,7 @@ update_data (QueryState, Input) ->
    Inventory = QueryState#query_state.inventory,
    Character = Input#input.character,
 
-   chr_character:validate(Inventory, Character),
+   rst_character:validate(Inventory, Character),
 
    %% TODO [FUNCTION: chr][REQUIRED]: unimplemented.
    QueryState.
@@ -102,7 +102,7 @@ commit_update (QueryState, Input) ->
    Roster = QueryState#query_state.roster,
 
    RosterID = shr_player:get_roster_id(Player),
-   UpdatedRoster = chr_roster:set_character(CharacterIX, Character, Roster),
+   UpdatedRoster = rst_roster:set_character(CharacterIX, Character, Roster),
 
    Query =
       shr_db_query:new
@@ -113,7 +113,7 @@ commit_update (QueryState, Input) ->
          [
             shr_db_query:update_indexed
             (
-               chr_roster:get_characters_field(),
+               rst_roster:get_characters_field(),
                CharacterIX,
                [shr_db_query:set_value(Character)]
             )
diff --git a/src/character/reply/chr_add_char.erl b/src/roster/reply/rst_add_char.erl
index 53a62d6..1e0d1da 100644
--- a/src/character/reply/chr_add_char.erl
+++ b/src/roster/reply/rst_add_char.erl
@@ -1,4 +1,4 @@
--module(chr_add_char).
+-module(rst_add_char).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19,21 +19,21 @@
 -spec generate
    (
       non_neg_integer(),
-      chr_character:type()
+      rst_character:type()
    )
    -> {list(any())}.
 generate (IX, Character) ->
-   {ActiveWeapon, SecondaryWeapon} = chr_character:get_weapon_ids(Character),
+   {ActiveWeapon, SecondaryWeapon} = rst_character:get_weapon_ids(Character),
 
    {
       [
          {<<"msg">>, <<"add_char">>},
          {<<"ix">>, IX},
-         {<<"nam">>, chr_character:get_name(Character)},
+         {<<"nam">>, rst_character:get_name(Character)},
          {<<"awp">>, ActiveWeapon},
          {<<"swp">>, SecondaryWeapon},
-         {<<"ar">>, chr_character:get_armor_id(Character)},
-         {<<"gls">>, array:to_list(chr_character:get_glyph_ids(Character))},
-         {<<"gb">>, chr_character:get_glyph_board_id(Character)}
+         {<<"ar">>, rst_character:get_armor_id(Character)},
+         {<<"gls">>, array:to_list(rst_character:get_glyph_ids(Character))},
+         {<<"gb">>, rst_character:get_glyph_board_id(Character)}
       ]
    }.
diff --git a/src/character/chr_handler.erl b/src/roster/rst_handler.erl
index 7697bcd..3d6073b 100644
--- a/src/character/chr_handler.erl
+++ b/src/roster/rst_handler.erl
@@ -1,4 +1,4 @@
--module(chr_handler).
+-module(rst_handler).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -18,23 +18,18 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -spec start (pid()) -> 'ok'.
 start (TimedCachesManagerPid) ->
-   case shr_database:fetch(char_roster_db, <<"0">>, admin) of
+   case shr_database:fetch(roster_db, <<"0">>, admin) of
       {ok, _} -> ok;
       not_found ->
          shr_database:insert_at
          (
-            char_roster_db,
+            roster_db,
             <<"0">>,
             any,
             any,
-            chr_shim:generate_random_character_roster()
+            rst_shim:generate_random_character_roster()
          )
    end,
-   shr_timed_caches_manager:new_cache
-   (
-      TimedCachesManagerPid,
-      char_roster_db,
-      none
-   ),
+   shr_timed_caches_manager:new_cache(TimedCachesManagerPid, roster_db, none),
 
    ok.
diff --git a/src/character/chr_shim.erl b/src/roster/rst_shim.erl
index 04b3708..57a62f5 100644
--- a/src/character/chr_shim.erl
+++ b/src/roster/rst_shim.erl
@@ -1,4 +1,4 @@
--module(chr_shim).
+-module(rst_shim).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -16,9 +16,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec generate_random_character_roster () -> chr_roster:type().
+-spec generate_random_character_roster () -> rst_roster:type().
 generate_random_character_roster () ->
-   Result = chr_roster:new(<<"0">>, <<"0">>),
+   Result = rst_roster:new(<<"0">>, <<"0">>),
 
    %% TODO [DEBUG][REQUIRED]: unimplemented.
 
diff --git a/src/character/struct/chr_character.erl b/src/roster/struct/rst_character.erl
index 0b1056e..e3663cc 100644
--- a/src/character/struct/chr_character.erl
+++ b/src/roster/struct/rst_character.erl
@@ -1,4 +1,4 @@
--module(chr_character).
+-module(rst_character).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/character/struct/chr_roster.erl b/src/roster/struct/rst_roster.erl
index 99a82fc..a362619 100644
--- a/src/character/struct/chr_roster.erl
+++ b/src/roster/struct/rst_roster.erl
@@ -1,4 +1,4 @@
--module(chr_roster).
+-module(rst_roster).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -11,7 +11,7 @@
    {
       id :: id(),
       owner :: binary(),
-      characters :: array:array(chr_character:type())
+      characters :: array:array(rst_character:type())
    }
 ).
 
@@ -67,19 +67,19 @@ get_id (Roster) -> Roster#roster.id.
 -spec get_owner (type()) -> binary().
 get_owner (Roster) -> Roster#roster.owner.
 
--spec get_characters (type()) -> array:array(chr_character:type()).
+-spec get_characters (type()) -> array:array(rst_character:type()).
 get_characters (Roster) -> Roster#roster.characters.
 
--spec get_character (non_neg_integer(), type()) -> chr_character:type().
+-spec get_character (non_neg_integer(), type()) -> rst_character:type().
 get_character (IX, Roster) -> array:get(IX, Roster#roster.characters).
 
--spec set_characters (array:array(chr_character:type()), type()) -> type().
+-spec set_characters (array:array(rst_character:type()), type()) -> type().
 set_characters (Characters, Roster) -> Roster#roster{ characters = Characters }.
 
 -spec set_character
    (
       non_neg_integer(),
-      chr_character:type(),
+      rst_character:type(),
       type()
    )
    -> type().
@@ -89,7 +89,7 @@ set_character (IX, Character, Roster) ->
       characters = array:set(IX, Character, Roster#roster.characters)
    }.
 
--spec add_character (chr_character:type(), type()) -> type().
+-spec add_character (rst_character:type(), type()) -> type().
 add_character (Character, Roster) ->
    CurrentCharacters = Roster#roster.characters,
    CurrentSize = array:size(CurrentCharacters),
diff --git a/src/shared/reply/shr_disconnected.erl b/src/shared/reply/shr_disconnected.erl
index e7b1813..4f913a5 100644
--- a/src/shared/reply/shr_disconnected.erl
+++ b/src/shared/reply/shr_disconnected.erl
@@ -18,6 +18,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -spec generate () -> {list(any())}.
 generate () ->
+   io:format("User was disconnected.~n"),
    {
       [
          {<<"msg">>, <<"disconnected">>}