Merge pull request #167 from TaloDev/develop

Release 0.38.0

Author: tudddorrr

addons/talo/apis/players_api.gd

@@ -76,15 +76,20 @@ func update() -> TaloPlayer:
 			return null
 
 ## Merge all of the data from player_id2 into player_id1 and delete player_id2.
-func merge(player_id1: String, player_id2: String) -> TaloPlayer:
+func merge(player_id1: String, player_id2: String, options := MergeOptions.new()) -> TaloPlayer:
 	var res := await client.make_request(HTTPClient.METHOD_POST, "/merge", {
 		playerId1 = player_id1,
 		playerId2 = player_id2
 	})
 
 	match res.status:
 		200:
-			return TaloPlayer.new(res.body.player)
+			var player := TaloPlayer.new(res.body.player)
+			if options.post_merge_identity_service != "":
+				var alias := player.get_alias(options.post_merge_identity_service)
+				if alias != null:
+					await identify(alias.service, alias.identifier)
+			return player
 		_:
 			return null
 
@@ -169,3 +174,6 @@ class SearchPage:
 		self.count = count
 		self.items_per_page = items_per_page
 		self.is_last_page = is_last_page
+
+class MergeOptions:
+	var post_merge_identity_service: String = ""

addons/talo/apis/saves_api.gd

@@ -140,8 +140,8 @@ func update_save(save: TaloGameSave, new_name: String = "") -> TaloGameSave:
 	_saves_manager.replace_save(save)
 	return save
 
-## Delete the given save.
-func delete_save(save: TaloGameSave) -> void:
+## Delete the given save. Optionally unload the save if it is the current save (default false).
+func delete_save(save: TaloGameSave, unload_if_current_save: bool = false) -> void:
 	if not await Talo.is_offline():
 		if Talo.identity_check() != OK:
 			return
@@ -153,7 +153,8 @@ func delete_save(save: TaloGameSave) -> void:
 	_saves_manager.all_saves = _saves_manager.all_saves.filter(func (s: TaloGameSave): s.id != save.id)
 	_saves_manager.delete_offline_save(save)
 
-	if _saves_manager.current_save and _saves_manager.current_save.id == save.id:
+	var is_current_save := _saves_manager.current_save and _saves_manager.current_save.id == save.id
+	if unload_if_current_save and is_current_save:
 		unload_current_save()
 
 ## Get the format version for the current save.

addons/talo/plugin.cfg

@@ -3,5 +3,5 @@
 name="Talo Game Services"
 description="Talo (https://trytalo.com) is an open-source game backend. Talo's Godot plugin is the easiest way to add leaderboards, player authentication, socket-based multiplayer and more to your game."
 author="trytalo"
-version="0.37.0"
+version="0.38.0"
 script="talo_autoload.gd"

addons/talo/talo_client.gd

@@ -1,7 +1,7 @@
 class_name TaloClient extends Node
 
 # automatically updated with a pre-commit hook
-const TALO_CLIENT_VERSION = "0.37.0"
+const TALO_CLIENT_VERSION = "0.38.0"
 
 var _base_url: String
 
@@ -39,6 +39,7 @@ func make_request(method: HTTPClient.Method, url: String, body: Dictionary = {},
 	var http_request := HTTPRequest.new()
 	add_child(http_request)
 	http_request.timeout = 5
+	http_request.accept_gzip = true
 	http_request.name = "%s %s" % [_get_method_name(method), url]
 
 	http_request.request(full_url, all_headers, method, request_body)

addons/talo/utils/session_manager.gd

@@ -41,8 +41,8 @@ func get_verification_alias_id() -> int:
 
 func handle_session_created(alias: Dictionary, session_token: String, socket_token: String) -> void:
 	Talo.current_alias = TaloPlayerAlias.new(alias)
-	Talo.players.identified.emit(Talo.current_player)
 	_save_session(session_token)
+	Talo.players.identified.emit(Talo.current_player)
 	Talo.socket.set_socket_token(socket_token)
 
 func check_for_session() -> bool: