summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2019-01-04 17:25:39 +0100
committernsensfel <SpamShield0@noot-noot.org>2019-01-04 17:25:39 +0100
commit83cd7ce064b8a46a106dc855d748b1bd7e45af01 (patch)
treecee5d4e3d21936925f8108940c35533f9f6484f5 /src/login/query
parent895a5348f521b16b3a6e32d921f7f23ec8f3036e (diff)
Removes 'id' field from ataxia entry values.
While sometimes usefull as a way to retrieve the object's ID, they were both redundant (you can't get the object without its ID anyway) and bothersome to maintain (insert + update, which would have required setting up a bounty for any insert).
Diffstat (limited to 'src/login/query')
-rw-r--r--src/login/query/lgn_sign_in.erl5
-rw-r--r--src/login/query/lgn_sign_up.erl12
2 files changed, 11 insertions, 6 deletions
diff --git a/src/login/query/lgn_sign_in.erl b/src/login/query/lgn_sign_in.erl
index 6d4892d..c1db8f6 100644
--- a/src/login/query/lgn_sign_in.erl
+++ b/src/login/query/lgn_sign_in.erl
@@ -18,7 +18,7 @@
(
query_state,
{
- player_id :: binary(),
+ player_id :: shr_player:id(),
player :: shr_player:type()
}
).
@@ -122,8 +122,9 @@ commit_update (QueryState) ->
-spec generate_reply(query_state()) -> binary().
generate_reply (QueryState) ->
Player = QueryState#query_state.player,
+ PlayerID = QueryState#query_state.player_id,
- SetSession = lgn_set_session:generate(Player),
+ SetSession = lgn_set_session:generate(PlayerID, Player),
Output = jiffy:encode([SetSession]),
Output.
diff --git a/src/login/query/lgn_sign_up.erl b/src/login/query/lgn_sign_up.erl
index 0d974ff..2ab8ef3 100644
--- a/src/login/query/lgn_sign_up.erl
+++ b/src/login/query/lgn_sign_up.erl
@@ -19,7 +19,8 @@
(
query_state,
{
- player :: shr_player:type()
+ player :: shr_player:type(),
+ player_id :: shr_player:id()
}
).
@@ -54,18 +55,21 @@ register_user (Input) ->
Password = Input#input.password,
Email = Input#input.email,
- GeneratedPlayer = bnt_generate_player:attempt(Username, Password, Email),
+ {GeneratedPlayerID, GeneratedPlayer} =
+ bnt_generate_player:attempt(Username, Password, Email),
#query_state
{
- player = GeneratedPlayer
+ player = GeneratedPlayer,
+ player_id = GeneratedPlayerID
}.
-spec generate_reply(query_state()) -> binary().
generate_reply (QueryState) ->
Player = QueryState#query_state.player,
+ PlayerID = QueryState#query_state.player_id,
- SetSession = lgn_set_session:generate(Player),
+ SetSession = lgn_set_session:generate(PlayerID, Player),
Output = jiffy:encode([SetSession]),
Output.