From dfec4c9200dc0d1522b50074c44a026a073de791 Mon Sep 17 00:00:00 2001
From: JustTemmie <47639983+JustTemmie@users.noreply.github.com>
Date: Mon, 14 Jul 2025 21:46:18 +0200
Subject: [PATCH 1/3] fix: properly support blocked canvases for avatars

---
 components/Avatar.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/components/Avatar.vue b/components/Avatar.vue
index 368316c..b7c4f63 100644
--- a/components/Avatar.vue
+++ b/components/Avatar.vue
@@ -1,9 +1,10 @@
 <template>
-	<Icon v-if="canvasBlocked"
-		name="lucide:user" />
-	<NuxtImg v-else 
+	<NuxtImg v-if="displayAvatar" 
 		:src="displayAvatar"
 		:alt="displayName" />
+	<Icon v-else
+		name="lucide:user"
+		:alt="displayName" />
 </template>
 
 <script lang="ts" setup>
@@ -17,8 +18,7 @@ const props = defineProps<{
 
 
 let displayName: string
-let displayAvatar: string
-let canvasBlocked = false
+let displayAvatar: string | null
 
 const user = props.user || props.member?.user
 
@@ -29,8 +29,10 @@ if (user) {
 	
 	if (user.avatar) {
 		displayAvatar = user.avatar
-	} else {
+	} else if (!isCanvasBlocked()){
 		displayAvatar = generateDefaultIcon(displayName, user.uuid)
+	} else {
+		displayAvatar = null
 	}
 }
 

From b81cd2b73a9a487bd8047229a4bcd225666b991b Mon Sep 17 00:00:00 2001
From: JustTemmie <47639983+JustTemmie@users.noreply.github.com>
Date: Mon, 14 Jul 2025 21:55:10 +0200
Subject: [PATCH 2/3] feat: improve guild icon fallbacks for blocked canvases

---
 layouts/client.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/layouts/client.vue b/layouts/client.vue
index 43c769d..4ede7ab 100644
--- a/layouts/client.vue
+++ b/layouts/client.vue
@@ -19,7 +19,10 @@
 				<div class="left-column-segment" id="left-column-middle">
 					<NuxtLink v-for="guild of guilds" :href="`/servers/${guild.uuid}`">
 						<NuxtImg v-if="guild.icon" class="sidebar-icon" :src="guild.icon" :alt="guild.name"/>
-						<NuxtImg v-else class="sidebar-icon" :src="generateDefaultIcon(guild.name, guild.uuid)" :alt="guild.name"/>
+						<NuxtImg v-else-if="!blockedCanvas" class="sidebar-icon" :src="generateDefaultIcon(guild.name, guild.uuid)" :alt="guild.name"/>
+						<Icon v-else name="lucide:server"
+							:style="`color: ${generateIrcColor(guild.uuid, 50)}`"
+							class="sidebar-icon white" :alt="guild.name" />
 					</NuxtLink>
 				</div>
 				<VerticalSpacer />
@@ -53,6 +56,8 @@ const createButtonContainer = ref<HTMLButtonElement>();
 
 const api = useApi();
 
+const blockedCanvas = isCanvasBlocked()
+
 const options = [
 	{ name: "Join", value: "join", callback: async () => {
 			console.log("join guild!");

From 890c479f2c9b8e86f1ec62698845cfa85449c5d8 Mon Sep 17 00:00:00 2001
From: JustTemmie <47639983+JustTemmie@users.noreply.github.com>
Date: Mon, 14 Jul 2025 21:56:57 +0200
Subject: [PATCH 3/3] style: minor style changes

---
 layouts/client.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/layouts/client.vue b/layouts/client.vue
index 4ede7ab..d2ca6ce 100644
--- a/layouts/client.vue
+++ b/layouts/client.vue
@@ -18,11 +18,17 @@
 				<VerticalSpacer />
 				<div class="left-column-segment" id="left-column-middle">
 					<NuxtLink v-for="guild of guilds" :href="`/servers/${guild.uuid}`">
-						<NuxtImg v-if="guild.icon" class="sidebar-icon" :src="guild.icon" :alt="guild.name"/>
-						<NuxtImg v-else-if="!blockedCanvas" class="sidebar-icon" :src="generateDefaultIcon(guild.name, guild.uuid)" :alt="guild.name"/>
+						<NuxtImg v-if="guild.icon"
+							class="sidebar-icon"
+							:alt="guild.name"
+							:src="guild.icon" />
+						<NuxtImg v-else-if="!blockedCanvas"
+							class="sidebar-icon"
+							:alt="guild.name"
+							:src="generateDefaultIcon(guild.name, guild.uuid)" />
 						<Icon v-else name="lucide:server"
-							:style="`color: ${generateIrcColor(guild.uuid, 50)}`"
-							class="sidebar-icon white" :alt="guild.name" />
+							class="`sidebar-icon ${generateIrcColor(guild.uuid, 50)}``"
+							:alt="guild.name" />
 					</NuxtLink>
 				</div>
 				<VerticalSpacer />