From 9180cfa0925e6e14aa298a8f67aadbdb4fa74b88 Mon Sep 17 00:00:00 2001
From: issork <issork@issork.de>
Date: Tue, 19 Dec 2023 19:33:27 +0100
Subject: [PATCH] fixed icon cache and disconnects (thanks to trgKai)

---
 addons/gift/icon_downloader.gd | 14 +++++++++-----
 project.godot                  |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/addons/gift/icon_downloader.gd b/addons/gift/icon_downloader.gd
index b3f25eb..ef934ac 100644
--- a/addons/gift/icon_downloader.gd
+++ b/addons/gift/icon_downloader.gd
@@ -23,7 +23,8 @@ func _init(twitch_api : TwitchAPIConnection, disk_cache_enabled : bool = false)
 
 func poll() -> void:
 	jtvnw_client.poll()
-	if (jtvnw_client.get_status() == HTTPClient.STATUS_BODY):
+	var conn_status = jtvnw_client.get_status()
+	if (conn_status == HTTPClient.STATUS_BODY):
 		jtvnw_response += jtvnw_client.read_response_body_chunk()
 	elif (!jtvnw_response.is_empty()):
 		var img := Image.new()
@@ -34,8 +35,11 @@ func poll() -> void:
 		texture.set_image(img)
 		texture.take_over_path(path)
 		fetched.emit(texture)
-	elif (jtvnw_client.get_status() == HTTPClient.STATUS_CONNECTED && !jtvnw_queue.is_empty()):
-		jtvnw_client.request(HTTPClient.METHOD_GET, jtvnw_queue.front(), ["Accept: image/png"])
+	elif (!jtvnw_queue.is_empty()):
+		if (conn_status == HTTPClient.STATUS_CONNECTED):
+			jtvnw_client.request(HTTPClient.METHOD_GET, jtvnw_queue.front(), ["Accept: image/png"])
+		elif (conn_status == HTTPClient.STATUS_DISCONNECTED || conn_status == HTTPClient.STATUS_CONNECTION_ERROR):
+			jtvnw_client.connect_to_host(JTVNW_URL)
 
 func get_badge(badge_id : String, channel_id : String = "_global", scale : String = "1x") -> Texture2D:
 	var badge_data : PackedStringArray = badge_id.split("/", true, 1)
@@ -78,5 +82,5 @@ func wait_for_fetched(path : String, filepath : String) -> ImageTexture:
 		var last_fetched : ImageTexture = null
 		while (last_fetched == null || last_fetched.resource_path != path):
 			last_fetched = await(fetched)
-		last_fetched.take_over_path(filepath)
-		return load(filepath)
+		last_fetched.take_over_path(path)
+		return load(path)
diff --git a/project.godot b/project.godot
index 3152716..8e9f322 100644
--- a/project.godot
+++ b/project.godot
@@ -12,7 +12,7 @@ config_version=5
 
 config/name="GIFT"
 run/main_scene="res://example/Example.tscn"
-config/features=PackedStringArray("4.1")
+config/features=PackedStringArray("4.2")
 
 [debug]