From 244c4e0ba6dfdb9baa9fdd85fcbe155f65fd95b6 Mon Sep 17 00:00:00 2001
From: neon443 <69979447+neon443@users.noreply.github.com>
Date: Thu, 16 Oct 2025 21:31:58 +0100
Subject: [PATCH] cleaned up code :sob:

---
 StickerSlack/Emoji/SlackResponse.swift | 13 ++++++++-----
 StickerSlack/Resources/testData.json   |  5 +----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/StickerSlack/Emoji/SlackResponse.swift b/StickerSlack/Emoji/SlackResponse.swift
index 6ca7e8a..7d3414d 100644
--- a/StickerSlack/Emoji/SlackResponse.swift
+++ b/StickerSlack/Emoji/SlackResponse.swift
@@ -15,14 +15,17 @@ struct SlackResponse: Codable {
 		let initialMap = emoji.map {
 			Emoji(name: $0.key, url: $0.value)
 		}
-		initialMap.map {
+		return initialMap.map {
 			var ret = $0
-			ret.urlString = ret.urlString.prefix(6) == "alias:" ? initialMap.first(where: { $0.name == ret.name })!.url : ret.urlString
+			if ret.urlString.prefix(6) == "alias:" {
+				if let orig = initialMap.first(where: {
+					$0.name == "\(ret.urlString.dropFirst(6))"
+				}) {
+					ret.urlString = orig.urlString
+				}
+			}
 			return ret
 		}
-		return emoji.map {
-			Emoji(name: $0.key, url: $0.value)
-		}
 	}
 }
 
diff --git a/StickerSlack/Resources/testData.json b/StickerSlack/Resources/testData.json
index 190f8fc..18b31d1 100644
--- a/StickerSlack/Resources/testData.json
+++ b/StickerSlack/Resources/testData.json
@@ -12,8 +12,6 @@
 		"thumbsup_all": "https://emoji.slack-edge.com/T0266FRGM/thumbsup_all/50096a1020.png",
 		"slack_call": "https://emoji.slack-edge.com/T0266FRGM/slack_call/b81fffd6dd.png",
 		"shipit": "alias:squirrel",
-		"white_square": "alias:white_large_square",
-		"black_square": "alias:black_large_square",
 		"simple_smile": "https://a.slack-edge.com/80588/img/emoji_2017_12_06/apple/simple_smile.png",
 		"neckbeard": "https://emoji.slack-edge.com/T0266FRGM/neckbeard/c8ec7bf188.png",
 		"metal": "https://emoji.slack-edge.com/T0266FRGM/metal/9f936a4278.png",
@@ -21,7 +19,6 @@
 		"feelsgood": "https://emoji.slack-edge.com/T0266FRGM/feelsgood/7bcbaa15fa.png",
 		"finnadie": "https://emoji.slack-edge.com/T0266FRGM/finnadie/08e66eb46d.png",
 		"goberserk": "https://emoji.slack-edge.com/T0266FRGM/goberserk/d8b892d59b.png",
-		"godmode": "https://emoji.slack-edge.com/T0266FRGM/godmode/1bd6476fbb.png",
-		"hurtrealbad": "https://emoji.slack-edge.com\""
+		"godmode": "https://emoji.slack-edge.com/T0266FRGM/godmode/1bd6476fbb.png"
 	}
 }