From df184a672568bfa333216e8fd706108b81b67289 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 25 Jul 2022 21:21:40 -0700
Subject: [PATCH 1/8] hide federation from public local instance info if not
 mod

---
 package.json                        |  2 +-
 packages/client/src/pages/about.vue | 21 +++++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index dde83503d..4e1f12b1c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.0-calc.3.b4",
+	"version": "12.118.0-calc.4.b4",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue
index 07f01a20a..0a067d7b7 100644
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@@ -94,6 +94,7 @@ import * as os from '@/os';
 import number from '@/filters/number';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
+import { iAmModerator } from '@/account';
 
 const props = withDefaults(defineProps<{
 	initialTab?: string;
@@ -111,22 +112,30 @@ const initStats = () => os.api('stats', {
 
 const headerActions = $computed(() => []);
 
-const headerTabs = $computed(() => [{
+let theTabs = [{
 	key: 'overview',
 	title: i18n.ts.overview,
 }, {
 	key: 'emojis',
 	title: i18n.ts.customEmojis,
 	icon: 'fas fa-laugh',
-}, {
-	key: 'federation',
-	title: i18n.ts.federation,
-	icon: 'fas fa-globe',
 }, {
 	key: 'charts',
 	title: i18n.ts.charts,
 	icon: 'fas fa-chart-simple',
-}]);
+}];
+
+if (iAmModerator) {
+	theTabs.push(
+		{
+			key: 'federation',
+			title: i18n.ts.federation,
+			icon: 'fas fa-globe',
+		},
+	);
+}
+
+let headerTabs = $computed(() => theTabs);
 
 definePageMetadata(computed(() => ({
 	title: i18n.ts.instanceInfo,

From 5072c7de9e0b773c1ca4c27b853f6f762b3da502 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 26 Jul 2022 12:21:12 -0700
Subject: [PATCH 2/8] headerbar

---
 package.json                           | 2 +-
 packages/client/src/pages/timeline.vue | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 4e1f12b1c..2c081d62b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.0-calc.4.b4",
+	"version": "12.118.0-calc.5.b4",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 5810b745b..8d23b03bf 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -133,7 +133,7 @@ const headerTabs = $computed(() => [{
 	title: i18n.ts._timelines.global,
 	icon: 'fas fa-globe',
 	iconOnly: true,
-}] : []), /* {
+}] : []), {
 	icon: 'fas fa-list-ul',
 	title: i18n.ts.lists,
 	iconOnly: true,
@@ -148,7 +148,7 @@ const headerTabs = $computed(() => [{
 	title: i18n.ts.channel,
 	iconOnly: true,
 	onClick: chooseChannel,
-}*/]);
+}]);
 
 const headerTabsWhenNotLogin = $computed(() => [
 	...(isLocalTimelineAvailable ? [{
@@ -172,6 +172,11 @@ definePageMetadata(computed(() => ({
 </script>
 
 <style lang="scss" scoped>
+.icon > .fa-list-ul, .fa-satellite, .fa-satellite-dish {
+	padding-left: 0.5rem;
+	font-size: 0.8em;
+}
+
 .cmuxhskf {
 	> .new {
 		position: sticky;

From 8ede97275c7531e23ce0e37d34a794873773be57 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 26 Jul 2022 12:21:39 -0700
Subject: [PATCH 3/8] berry docker

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 81dc72637..0863f6827 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,7 @@ COPY . ./
 RUN apt-get update
 RUN apt-get install -y build-essential
 RUN git submodule update --init
+RUN yarn set version berry
 RUN yarn install
 RUN yarn build
 RUN rm -rf .git

From c82e8c9b31f2b985eaf98291e20242cd2128f8fd Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 26 Jul 2022 12:29:37 -0700
Subject: [PATCH 4/8] test

---
 packages/client/src/pages/timeline.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 8d23b03bf..0f304564f 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -172,11 +172,15 @@ definePageMetadata(computed(() => ({
 </script>
 
 <style lang="scss" scoped>
-.icon > .fa-list-ul, .fa-satellite, .fa-satellite-dish {
+.icon.fa-list-ul {
 	padding-left: 0.5rem;
 	font-size: 0.8em;
 }
 
+.icon.fa-satellite, .icon.fa-satellite-dish {
+	font-size: 0.8em;
+}
+
 .cmuxhskf {
 	> .new {
 		position: sticky;

From be0bb66f6944b6c0004f9436a36167be96c27176 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 26 Jul 2022 13:16:49 -0700
Subject: [PATCH 5/8] revert

---
 packages/client/src/pages/timeline.vue | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 0f304564f..8829b2dd7 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -172,14 +172,6 @@ definePageMetadata(computed(() => ({
 </script>
 
 <style lang="scss" scoped>
-.icon.fa-list-ul {
-	padding-left: 0.5rem;
-	font-size: 0.8em;
-}
-
-.icon.fa-satellite, .icon.fa-satellite-dish {
-	font-size: 0.8em;
-}
 
 .cmuxhskf {
 	> .new {

From 9522b42dd2caa79ce147cff25d1f1328f456e7b1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 26 Jul 2022 14:29:52 -0700
Subject: [PATCH 6/8] Misc timeline actions as headerActions

---
 package.json                           |  2 +-
 packages/client/src/pages/timeline.vue | 39 +++++++++++++++-----------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 2c081d62b..043ad1846 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.0-calc.5.b4",
+	"version": "12.118.0-calc.6.b4",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 8829b2dd7..0b2b42481 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -111,7 +111,27 @@ function focus(): void {
 	tlComponent.focus();
 }
 
-const headerActions = $computed(() => []);
+const headerActions = $computed(() => [{
+	icon: 'fas fa-list-ul',
+	title: i18n.ts.lists,
+	iconOnly: true,
+	onClick: chooseList,
+}, {
+	icon: 'fas fa-satellite',
+	title: i18n.ts.antennas,
+	iconOnly: true,
+	onClick: chooseAntenna,
+}, {
+	icon: 'fas fa-satellite-dish',
+	title: i18n.ts.channel,
+	iconOnly: true,
+	onClick: chooseChannel,
+}, {
+	icon: 'fas fa-calendar-alt',
+	title: i18n.ts.jumpToSpecifiedDate,
+	iconOnly: true,
+	onClick: timetravel,
+}]);
 
 const headerTabs = $computed(() => [{
 	key: 'home',
@@ -133,22 +153,7 @@ const headerTabs = $computed(() => [{
 	title: i18n.ts._timelines.global,
 	icon: 'fas fa-globe',
 	iconOnly: true,
-}] : []), {
-	icon: 'fas fa-list-ul',
-	title: i18n.ts.lists,
-	iconOnly: true,
-	onClick: chooseList,
-}, {
-	icon: 'fas fa-satellite',
-	title: i18n.ts.antennas,
-	iconOnly: true,
-	onClick: chooseAntenna,
-}, {
-	icon: 'fas fa-satellite-dish',
-	title: i18n.ts.channel,
-	iconOnly: true,
-	onClick: chooseChannel,
-}]);
+}] : [])]);
 
 const headerTabsWhenNotLogin = $computed(() => [
 	...(isLocalTimelineAvailable ? [{

From 8127cc765764982e5b4c10a3b49811b7874aab12 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 26 Jul 2022 14:31:46 -0700
Subject: [PATCH 7/8] Remove updated.vue for now

---
 packages/client/src/components/updated.vue | 2 +-
 packages/client/src/init.ts                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/updated.vue b/packages/client/src/components/updated.vue
index 1c1e5f4ae..0dd440640 100644
--- a/packages/client/src/components/updated.vue
+++ b/packages/client/src/components/updated.vue
@@ -21,7 +21,7 @@ const modal = ref<InstanceType<typeof MkModal>>();
 
 const whatIsNew = () => {
 	modal.value.close();
-	window.open(`https://misskey-hub.net/docs/releases.html#_${version.replace(/\./g, '-')}`, '_blank');
+	window.open('https://codeberg.org/thatonecalculator/calckey/releases', '_blank');
 };
 </script>
 
diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index 94e7f9f6b..896dfe295 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -237,6 +237,7 @@ import { getAccountFromId } from '@/scripts/get-account-from-id';
 		// テーマリビルドするため
 		localStorage.removeItem('theme');
 
+		/*
 		try { // 変なバージョン文字列来るとcompareVersionsでエラーになるため
 			if (lastVersion != null && compareVersions(version, lastVersion) === 1) {
 				// ログインしてる場合だけ
@@ -246,6 +247,7 @@ import { getAccountFromId } from '@/scripts/get-account-from-id';
 			}
 		} catch (err) {
 		}
+		*/
 	}
 
 	// NOTE: この処理は必ず↑のクライアント更新時処理より後に来ること(テーマ再構築のため)

From 2e23f554aaf320a74cfbf7619db1d4d7c61680b9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 26 Jul 2022 14:35:12 -0700
Subject: [PATCH 8/8] onClick -> handler

---
 package.json                           | 2 +-
 packages/client/src/pages/timeline.vue | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 043ad1846..ae2439a73 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.0-calc.6.b4",
+	"version": "12.118.0-calc.7.b4",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 0b2b42481..fc1edb2e3 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -115,22 +115,22 @@ const headerActions = $computed(() => [{
 	icon: 'fas fa-list-ul',
 	title: i18n.ts.lists,
 	iconOnly: true,
-	onClick: chooseList,
+	handler: chooseList,
 }, {
 	icon: 'fas fa-satellite',
 	title: i18n.ts.antennas,
 	iconOnly: true,
-	onClick: chooseAntenna,
+	handler: chooseAntenna,
 }, {
 	icon: 'fas fa-satellite-dish',
 	title: i18n.ts.channel,
 	iconOnly: true,
-	onClick: chooseChannel,
+	handler: chooseChannel,
 }, {
 	icon: 'fas fa-calendar-alt',
 	title: i18n.ts.jumpToSpecifiedDate,
 	iconOnly: true,
-	onClick: timetravel,
+	handler: timetravel,
 }]);
 
 const headerTabs = $computed(() => [{