summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2018-12-15 21:48:06 +0100
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2018-12-15 21:48:06 +0100
commit71a4a4195292bef8f48e8a533f2d31bc4a53ac2e (patch)
treec1ca60280c192d95a978ea36d22fe68506abe75b /src/roster
parent69968df5ed21045e7a3679239705a397133db67b (diff)
Seems to be working again.
Diffstat (limited to 'src/roster')
-rw-r--r--src/roster/query/rst_load.erl10
-rw-r--r--src/roster/query/rst_update.erl19
2 files changed, 24 insertions, 5 deletions
diff --git a/src/roster/query/rst_load.erl b/src/roster/query/rst_load.erl
index 7871b78..cfd42c7 100644
--- a/src/roster/query/rst_load.erl
+++ b/src/roster/query/rst_load.erl
@@ -52,7 +52,7 @@ authenticate_user (Input) ->
PlayerID = Input#input.player_id,
SessionToken = Input#input.session_token,
- Player = shr_timed_cache:fetch(player_db, any, PlayerID),
+ Player = shr_timed_cache:fetch(player_db, ataxia_security:any(), PlayerID),
case shr_security:credentials_match(SessionToken, Player) of
true -> {ok, Player};
@@ -65,7 +65,13 @@ fetch_data (Player, Input) ->
RosterID = shr_player:get_roster_id(Player),
% InventoryID = shr_player:get_inventory_id(Player),
- Roster = shr_timed_cache:fetch(roster_db, PlayerID, RosterID),
+ Roster =
+ shr_timed_cache:fetch
+ (
+ roster_db,
+ ataxia_security:user_from_id(PlayerID),
+ RosterID
+ ),
%% TODO
%% Inventory = shr_timed_cache:fetch(inventory_db, PlayerID, InventoryID),
diff --git a/src/roster/query/rst_update.erl b/src/roster/query/rst_update.erl
index f329038..dfc634e 100644
--- a/src/roster/query/rst_update.erl
+++ b/src/roster/query/rst_update.erl
@@ -68,7 +68,7 @@ authenticate_user (Input) ->
PlayerID = Input#input.player_id,
SessionToken = Input#input.session_token,
- Player = shr_timed_cache:fetch(player_db, any, PlayerID),
+ Player = shr_timed_cache:fetch(player_db, ataxia_security:any(), PlayerID),
case shr_security:credentials_match(SessionToken, Player) of
true -> {ok, Player};
@@ -81,7 +81,14 @@ fetch_data (Player, Input) ->
RosterID = shr_player:get_roster_id(Player),
_InventoryID = shr_player:get_inventory_id(Player),
- Roster = shr_timed_cache:fetch(roster_db, PlayerID, RosterID),
+ Roster =
+ shr_timed_cache:fetch
+ (
+ roster_db,
+ ataxia_security:user_from_id(PlayerID),
+ RosterID
+ ),
+
% Inventory = shr_timed_cache:fetch(inventory_db, PlayerID, InventoryID),
Inventory = shr_inventory:new(PlayerID),
@@ -153,7 +160,13 @@ commit_update (QueryState, Input) ->
RosterID
),
- shr_timed_cache:update(roster_db, PlayerID, RosterID, UpdatedRoster),
+ shr_timed_cache:update
+ (
+ roster_db,
+ ataxia_security:user_from_id(PlayerID),
+ RosterID,
+ UpdatedRoster
+ ),
'ok'.