From 09ebbe1d4983ae01a7f714de5e15c4f0a71c3a17 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Thu, 25 Aug 2022 18:49:28 +0200
Subject: [PATCH 1/3] show software name and version in instance ticker

---
 .../client/src/components/instance-ticker.vue | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/instance-ticker.vue b/packages/client/src/components/instance-ticker.vue
index 12861f995..04d9c0e22 100644
--- a/packages/client/src/components/instance-ticker.vue
+++ b/packages/client/src/components/instance-ticker.vue
@@ -1,7 +1,8 @@
 <template>
-<div class="hpaizdrt" :style="bg">
+<div class="hpaizdrt" :style="bg" v-tooltip="instance.softwareName + ' ' + instance.softwareVersion">
 	<img v-if="instance.faviconUrl" class="icon" :src="instance.faviconUrl"/>
 	<span class="name">{{ instance.name }}</span>
+	<span v-if="instance.softwareName" class="software">{{ instance.softwareName }}</span>
 </div>
 </template>
 
@@ -13,6 +14,8 @@ const props = defineProps<{
 		faviconUrl?: string;
 		name: string;
 		themeColor?: string;
+		softwareName?: string;
+		softwareVersion?: string;
 	};
 }>();
 
@@ -21,6 +24,8 @@ const instance = props.instance ?? {
 	faviconUrl: '/favicon.ico',
 	name: instanceName,
 	themeColor: (document.querySelector('meta[name="theme-color-orig"]') as HTMLMetaElement).content,
+	softwareName: 'misskey',
+	softwareVersion: '',
 };
 
 const themeColor = instance.themeColor ?? '#777777';
@@ -33,6 +38,7 @@ const bg = {
 <style lang="scss" scoped>
 .hpaizdrt {
 	$height: 1.1rem;
+	position: relative;
 
 	height: $height;
 	border-radius: 4px 0 0 4px;
@@ -59,11 +65,24 @@ const bg = {
 	}
 
 	> .name {
-		margin-left: 4px;
+		margin-left: .3em;
 		line-height: $height;
 		font-size: 0.9em;
 		vertical-align: top;
 		font-weight: bold;
 	}
+
+	> .software {
+		float: right;
+		margin-right: .3em;
+		line-height: $height;
+		font-size: 0.9em;
+		vertical-align: top;
+
+		color: var(--fg);
+		text-shadow: none;
+
+		text-transform: capitalize;
+	}
 }
 </style>

From 2e3bd6ddc252138882a7cc8f2692679aff549222 Mon Sep 17 00:00:00 2001
From: Chloe Kudryavtsev <code@toast.bunkerlabs.net>
Date: Thu, 25 Aug 2022 17:18:02 -0400
Subject: [PATCH 2/3] feat: show real local info in instance ticker

add software info to client meta-config, "Foundkey" as default site name
---
 packages/client/src/components/instance-ticker.vue | 6 +++---
 packages/client/src/config.ts                      | 3 ++-
 packages/client/vite.config.ts                     | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/components/instance-ticker.vue b/packages/client/src/components/instance-ticker.vue
index 04d9c0e22..fde6ec207 100644
--- a/packages/client/src/components/instance-ticker.vue
+++ b/packages/client/src/components/instance-ticker.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script lang="ts" setup>
-import { instanceName } from '@/config';
+import { instanceName, version, software } from '@/config';
 
 const props = defineProps<{
 	instance?: {
@@ -24,8 +24,8 @@ const instance = props.instance ?? {
 	faviconUrl: '/favicon.ico',
 	name: instanceName,
 	themeColor: (document.querySelector('meta[name="theme-color-orig"]') as HTMLMetaElement).content,
-	softwareName: 'misskey',
-	softwareVersion: '',
+	softwareName: software,
+	softwareVersion: version,
 };
 
 const themeColor = instance.themeColor ?? '#777777';
diff --git a/packages/client/src/config.ts b/packages/client/src/config.ts
index 8283fc44b..c20232e7e 100644
--- a/packages/client/src/config.ts
+++ b/packages/client/src/config.ts
@@ -10,6 +10,7 @@ export const lang = localStorage.getItem('lang');
 export const langs = _LANGS_;
 export const locale = JSON.parse(localStorage.getItem('locale'));
 export const version = _VERSION_;
-export const instanceName = siteName === 'Misskey' ? host : siteName;
+export const software = _SOFTWARE_;
+export const instanceName = siteName === 'FoundKey' ? host : siteName;
 export const ui = localStorage.getItem('ui');
 export const debug = localStorage.getItem('debug') === 'true';
diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts
index c66c5ccc2..443582a8d 100644
--- a/packages/client/vite.config.ts
+++ b/packages/client/vite.config.ts
@@ -33,6 +33,7 @@ export default defineConfig(({ command, mode }) => {
 
 		define: {
 			_VERSION_: JSON.stringify(meta.version),
+			_SOFTWARE_: JSON.stringify(meta.name),
 			_LANGS_: JSON.stringify(Object.entries(locales).map(([k, v]) => [k, v._lang_])),
 			_ENV_: JSON.stringify(process.env.NODE_ENV),
 			_DEV_: process.env.NODE_ENV !== 'production',

From affdb4c32e6a7e3b0d72fbfe175ec19ea39d391d Mon Sep 17 00:00:00 2001
From: Chloe Kudryavtsev <code@toast.bunkerlabs.net>
Date: Thu, 25 Aug 2022 17:19:37 -0400
Subject: [PATCH 3/3] client: add changelog for instance-info feature

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abc8ba8fe..3c2a97212 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ For older Misskey versions, see [CHANGELOG-OLD.md](./CHANGELOG-OLD.md).
 
 ## Unreleased
 ### Added
+- Client: Show instance info in ticker
 - Client: Readded group pages
 - Client: add re-collapsing to quoted notes