From 35e5aa9395bb9505a85c9429a5332bf01f1667f0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 9 Nov 2022 17:49:05 -0800
Subject: [PATCH 1/7] relay/integration icons

---
 package.json                                  |  2 +-
 packages/client/src/pages/admin/index.vue     |  4 +-
 .../client/src/pages/admin/integrations.vue   | 50 ++++++++++---------
 packages/client/src/pages/admin/relays.vue    |  2 +-
 4 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 7dd07f82be..79fb63d2b2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.12",
+	"version": "12.119.0-calc.12.1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue
index 80f6355a32..f4224612b1 100644
--- a/packages/client/src/pages/admin/index.vue
+++ b/packages/client/src/pages/admin/index.vue
@@ -169,12 +169,12 @@ const menuDef = $computed(() => [{
 		to: '/admin/security',
 		active: currentPage?.route.name === 'security',
 	}, {
-		icon: 'ph-planet-bold ph-lg',
+		icon: 'ph-flow-arrow-bold ph-lg',
 		text: i18n.ts.relays,
 		to: '/admin/relays',
 		active: currentPage?.route.name === 'relays',
 	}, {
-		icon: 'ph-share-network-bold ph-lg',
+		icon: 'ph-plug-bold ph-lg',
 		text: i18n.ts.integration,
 		to: '/admin/integrations',
 		active: currentPage?.route.name === 'integrations',
diff --git a/packages/client/src/pages/admin/integrations.vue b/packages/client/src/pages/admin/integrations.vue
index 448f5ce5a1..425c118b6c 100644
--- a/packages/client/src/pages/admin/integrations.vue
+++ b/packages/client/src/pages/admin/integrations.vue
@@ -1,27 +1,29 @@
-<template><MkStickyContainer>
+<template>
+<MkStickyContainer>
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-		<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
-	<FormSuspense :p="init">
-		<FormFolder class="_formBlock">
-			<template #icon><i class="fab fa-twitter"></i></template>
-			<template #label>Twitter</template>
-			<template #suffix>{{ enableTwitterIntegration ? i18n.ts.enabled : i18n.ts.disabled }}</template>
-			<XTwitter/>
-		</FormFolder>
-		<FormFolder class="_formBlock">
-			<template #icon><i class="fab fa-github"></i></template>
-			<template #label>GitHub</template>
-			<template #suffix>{{ enableGithubIntegration ? i18n.ts.enabled : i18n.ts.disabled }}</template>
-			<XGithub/>
-		</FormFolder>
-		<FormFolder class="_formBlock">
-			<template #icon><i class="fab fa-discord"></i></template>
-			<template #label>Discord</template>
-			<template #suffix>{{ enableDiscordIntegration ? i18n.ts.enabled : i18n.ts.disabled }}</template>
-			<XDiscord/>
-		</FormFolder>
-	</FormSuspense>
-</MkSpacer></MkStickyContainer>
+	<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
+		<FormSuspense :p="init">
+			<FormFolder class="_formBlock">
+				<template #icon><i class="fab fa-twitter"></i></template>
+				<template #label>Twitter</template>
+				<template #suffix>{{ enableTwitterIntegration ? i18n.ts.enabled : i18n.ts.disabled }}</template>
+				<XTwitter/>
+			</FormFolder>
+			<FormFolder class="_formBlock">
+				<template #icon><i class="fab fa-github"></i></template>
+				<template #label>GitHub</template>
+				<template #suffix>{{ enableGithubIntegration ? i18n.ts.enabled : i18n.ts.disabled }}</template>
+				<XGithub/>
+			</FormFolder>
+			<FormFolder class="_formBlock">
+				<template #icon><i class="fab fa-discord"></i></template>
+				<template #label>Discord</template>
+				<template #suffix>{{ enableDiscordIntegration ? i18n.ts.enabled : i18n.ts.disabled }}</template>
+				<XDiscord/>
+			</FormFolder>
+		</FormSuspense>
+	</MkSpacer>
+</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
@@ -52,6 +54,6 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.integration,
-	icon: 'ph-share-network-bold ph-lg',
+	icon: 'ph-plug-bold ph-lg',
 });
 </script>
diff --git a/packages/client/src/pages/admin/relays.vue b/packages/client/src/pages/admin/relays.vue
index a3daa29ffe..cf9ce557e1 100644
--- a/packages/client/src/pages/admin/relays.vue
+++ b/packages/client/src/pages/admin/relays.vue
@@ -76,7 +76,7 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.relays,
-	icon: 'ph-planet-bold ph-lg',
+	icon: 'ph-flow-arrow-bold ph-lg',
 });
 </script>
 

From 6868fce23bc7029394af5a2f2af9064604bcc14d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 9 Nov 2022 18:37:36 -0800
Subject: [PATCH 2/7] trailing comma

---
 packages/client/src/store.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index 36fa23b84f..81c008bc98 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -266,7 +266,7 @@ export const defaultStore = markRaw(new Storage('base', {
 	showAdminUpdates: {
 		where: 'account',
 		default: true,
-	}
+	},
 }));
 
 // TODO: 他のタブと永続化されたstateを同期

From 2f7f62c4db019f91fb9c96586fdb8fda99f18c75 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Thu, 10 Nov 2022 04:03:28 +0100
Subject: [PATCH 3/7] docs: fix typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fe076b32f2..5b70c3187a 100644
--- a/README.md
+++ b/README.md
@@ -180,7 +180,7 @@ pm2 start "NODE_ENV=production yarn start" --name Calckey
 ### 🐋 Prebuilt Docker image
 
 ```sh
-docker pull thatonecalculator:calckey
+docker pull thatonecalculator/calckey
 docker up -d
 ```
 

From d209b61ed95cf5c4097343e3396081a30c6fd1c9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 9 Nov 2022 19:59:20 -0800
Subject: [PATCH 4/7] fix pinned users

---
 package.json                                              | 2 +-
 packages/backend/src/server/api/endpoints/pinned-users.ts | 2 +-
 packages/client/src/pages/explore.users.vue               | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 79fb63d2b2..c1fcff1e51 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.12.1",
+	"version": "12.119.0-calc.12.2",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/backend/src/server/api/endpoints/pinned-users.ts b/packages/backend/src/server/api/endpoints/pinned-users.ts
index d2ded60a13..06bf9cc384 100644
--- a/packages/backend/src/server/api/endpoints/pinned-users.ts
+++ b/packages/backend/src/server/api/endpoints/pinned-users.ts
@@ -9,7 +9,7 @@ export const meta = {
 	tags: ['users'],
 
 	requireCredential: false,
-	requireCredentialPrivateMode: true,
+	requireCredentialPrivateMode: false,
 
 	res: {
 		type: 'array',
diff --git a/packages/client/src/pages/explore.users.vue b/packages/client/src/pages/explore.users.vue
index 62902c9066..58b6c9aa99 100644
--- a/packages/client/src/pages/explore.users.vue
+++ b/packages/client/src/pages/explore.users.vue
@@ -6,7 +6,7 @@
 	</MkTab>
 	<div v-if="origin === 'local'">
 		<template v-if="tag == null">
-			<MkFolder v-if="pinnedUsers.length > 0" class="_gap" persist-key="explore-pinned-users">
+			<MkFolder v-if="pinnedUsersList?.length > 0" class="_gap" persist-key="explore-pinned-users">
 				<template #header><i class="ph-bookmark-simple-bold ph-lg ph-fw ph-lg" style="margin-right: 0.5em;"></i>{{ i18n.ts.pinnedUsers }}</template>
 				<XUserList :pagination="pinnedUsers"/>
 			</MkFolder>
@@ -90,6 +90,8 @@ const tagUsers = $computed(() => ({
 	},
 }));
 
+const pinnedUsersList = await os.api('pinned-users');
+
 const pinnedUsers = { endpoint: 'pinned-users' };
 const popularUsers = { endpoint: 'users', limit: 10, noPaging: true, params: {
 	state: 'alive',

From 15430ca0876670c1bb4b32dc8f71988d02a2f31d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 9 Nov 2022 20:06:03 -0800
Subject: [PATCH 5/7] fix pinned users list

---
 package.json                                         |  2 +-
 .../backend/src/server/api/endpoints/pinned-users.ts |  2 +-
 packages/client/src/pages/explore.users.vue          | 12 ++++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index c1fcff1e51..2eb4bae2c4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.12.2",
+	"version": "12.119.0-calc.12.3",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/backend/src/server/api/endpoints/pinned-users.ts b/packages/backend/src/server/api/endpoints/pinned-users.ts
index 06bf9cc384..2514826481 100644
--- a/packages/backend/src/server/api/endpoints/pinned-users.ts
+++ b/packages/backend/src/server/api/endpoints/pinned-users.ts
@@ -2,7 +2,7 @@ import { IsNull } from 'typeorm';
 import { Users } from '@/models/index.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import * as Acct from '@/misc/acct.js';
-import { User } from '@/models/entities/user.js';
+import type { User } from '@/models/entities/user.js';
 import define from '../define.js';
 
 export const meta = {
diff --git a/packages/client/src/pages/explore.users.vue b/packages/client/src/pages/explore.users.vue
index 58b6c9aa99..871fa00428 100644
--- a/packages/client/src/pages/explore.users.vue
+++ b/packages/client/src/pages/explore.users.vue
@@ -6,7 +6,7 @@
 	</MkTab>
 	<div v-if="origin === 'local'">
 		<template v-if="tag == null">
-			<MkFolder v-if="pinnedUsersList?.length > 0" class="_gap" persist-key="explore-pinned-users">
+			<MkFolder v-if="pinnedUsersList.length > 0" class="_gap" persist-key="explore-pinned-users">
 				<template #header><i class="ph-bookmark-simple-bold ph-lg ph-fw ph-lg" style="margin-right: 0.5em;"></i>{{ i18n.ts.pinnedUsers }}</template>
 				<XUserList :pagination="pinnedUsers"/>
 			</MkFolder>
@@ -80,6 +80,8 @@ watch(() => props.tag, () => {
 	if (tagsEl) tagsEl.toggleContent(props.tag == null);
 });
 
+watch(() => pinnedUsersList, () => {})
+
 const tagUsers = $computed(() => ({
 	endpoint: 'hashtags/users' as const,
 	limit: 30,
@@ -90,7 +92,13 @@ const tagUsers = $computed(() => ({
 	},
 }));
 
-const pinnedUsersList = await os.api('pinned-users');
+let pinnedUsersList = [];
+
+os.api('pinned-users').then(res => {
+	res?.forEach(u => {
+		pinnedUsersList.push(u);
+	});
+});
 
 const pinnedUsers = { endpoint: 'pinned-users' };
 const popularUsers = { endpoint: 'users', limit: 10, noPaging: true, params: {

From c331d23b3f350e12aef4d2fe6ca411964c730b97 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 9 Nov 2022 20:09:41 -0800
Subject: [PATCH 6/7] console log

---
 package.json                                |  2 +-
 packages/client/src/pages/explore.users.vue | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 2eb4bae2c4..716ba82528 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.12.3",
+	"version": "12.119.0-calc.12.4",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/explore.users.vue b/packages/client/src/pages/explore.users.vue
index 871fa00428..ac8ece1e17 100644
--- a/packages/client/src/pages/explore.users.vue
+++ b/packages/client/src/pages/explore.users.vue
@@ -80,8 +80,6 @@ watch(() => props.tag, () => {
 	if (tagsEl) tagsEl.toggleContent(props.tag == null);
 });
 
-watch(() => pinnedUsersList, () => {})
-
 const tagUsers = $computed(() => ({
 	endpoint: 'hashtags/users' as const,
 	limit: 30,
@@ -92,13 +90,8 @@ const tagUsers = $computed(() => ({
 	},
 }));
 
-let pinnedUsersList = [];
-
-os.api('pinned-users').then(res => {
-	res?.forEach(u => {
-		pinnedUsersList.push(u);
-	});
-});
+const pinnedUsersList = os.api('pinned-users');
+console.log(pinnedUsersList);
 
 const pinnedUsers = { endpoint: 'pinned-users' };
 const popularUsers = { endpoint: 'users', limit: 10, noPaging: true, params: {

From 2589ca1a3bf85c0e28e76a2605cfee13d4215251 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 9 Nov 2022 20:44:43 -0800
Subject: [PATCH 7/7] me when the

---
 package.json                                |  2 +-
 packages/client/src/pages/explore.users.vue | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 716ba82528..06ae03b8cb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.12.4",
+	"version": "12.119.0-calc.12.5",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/explore.users.vue b/packages/client/src/pages/explore.users.vue
index ac8ece1e17..b97825e2a9 100644
--- a/packages/client/src/pages/explore.users.vue
+++ b/packages/client/src/pages/explore.users.vue
@@ -6,7 +6,7 @@
 	</MkTab>
 	<div v-if="origin === 'local'">
 		<template v-if="tag == null">
-			<MkFolder v-if="pinnedUsersList.length > 0" class="_gap" persist-key="explore-pinned-users">
+			<MkFolder v-show="thereArePinnedUsers" class="_gap" persist-key="explore-pinned-users">
 				<template #header><i class="ph-bookmark-simple-bold ph-lg ph-fw ph-lg" style="margin-right: 0.5em;"></i>{{ i18n.ts.pinnedUsers }}</template>
 				<XUserList :pagination="pinnedUsers"/>
 			</MkFolder>
@@ -75,11 +75,16 @@ let origin = $ref('local');
 let tagsEl = $ref<InstanceType<typeof MkFolder>>();
 let tagsLocal = $ref([]);
 let tagsRemote = $ref([]);
+let thereArePinnedUsers = $ref(false);
 
 watch(() => props.tag, () => {
 	if (tagsEl) tagsEl.toggleContent(props.tag == null);
 });
 
+watch(() => pinnedUsersList, () => {
+	if (pinnedUsersList?.length > 0) thereArePinnedUsers = true;
+});
+
 const tagUsers = $computed(() => ({
 	endpoint: 'hashtags/users' as const,
 	limit: 30,
@@ -90,8 +95,9 @@ const tagUsers = $computed(() => ({
 	},
 }));
 
-const pinnedUsersList = os.api('pinned-users');
-console.log(pinnedUsersList);
+const pinnedUsersList = await os.api('pinned-users');
+
+if (pinnedUsersList?.length > 0) { thereArePinnedUsers = true; }
 
 const pinnedUsers = { endpoint: 'pinned-users' };
 const popularUsers = { endpoint: 'users', limit: 10, noPaging: true, params: {