Skip to content

Commit 586aff9

Browse files
committed
allow empty file response
1 parent cf35584 commit 586aff9

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

Services/PreviewService.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public async Task<Preview> GetItemPreview(string tag, int size = 32)
6666
var uri = skyCryptClient.BuildUri(request);
6767
var response = await GetProxied(uri, size);
6868
var hash = Encoding.UTF8.GetString(MD5.Create().ComputeHash(Encoding.UTF8.GetBytes(tag)));
69-
var brokenFilehash = new HashSet<string>() { "1mfgd8A3YEGnfidqz4q0xg==" };
69+
var brokenFilehash = new HashSet<string>() { "1mfgd8A3YEGnfidqz4q0xg==", null };
7070

7171
if (hash == "��D`��9��U�\u0006�/�o" && !uri.Authority.Contains("coflnet"))
7272
{
@@ -76,12 +76,11 @@ public async Task<Preview> GetItemPreview(string tag, int size = 32)
7676
response = await GetProxied(uri, size);
7777
Console.WriteLine($"retrying with coflnet {uri} {response.StatusCode}");
7878
}
79-
var fileHashBase64 = Convert.ToBase64String(MD5.Create().ComputeHash(response.RawBytes));
79+
var fileHashBase64 = response?.RawBytes == null ? null : Convert.ToBase64String(MD5.Create().ComputeHash(response.RawBytes));
8080
Items.Client.Model.Item details = null;
8181
if (response.StatusCode != System.Net.HttpStatusCode.OK || brokenFilehash.Contains(fileHashBase64))
8282
{
83-
var isPet = tag.StartsWith("PET_");
84-
if (!isPet)
83+
if (!NBT.IsPet(tag))
8584
dev.Logger.Instance.Error($"Failed to load item preview for {tag} from {uri} code {response.StatusCode}");
8685
var info = await DiHandler.GetService<Items.Client.Api.IItemsApi>().ItemItemTagGetWithHttpInfoAsync(tag, true);
8786
Console.WriteLine($"info {info.StatusCode}");
@@ -101,7 +100,7 @@ public async Task<Preview> GetItemPreview(string tag, int size = 32)
101100
Console.WriteLine($"retrieving from api");
102101
url = await GetIconUrl(tag);
103102
};
104-
if(url.StartsWith("https://texture"))
103+
if (url.StartsWith("https://texture"))
105104
{
106105
url = ConvertTextureUrlToSkull(config["SKYCRYPT_BASE_URL"], url);
107106
}

0 commit comments

Comments
 (0)