merge

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

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.0-calc.4.b4",
+	"version": "12.118.0-calc.7.b4",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",

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>
 

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: この処理は必ず↑のクライアント更新時処理より後に来ること(テーマ再構築のため)

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,
+	handler: chooseList,
+}, {
+	icon: 'fas fa-satellite',
+	title: i18n.ts.antennas,
+	iconOnly: true,
+	handler: chooseAntenna,
+}, {
+	icon: 'fas fa-satellite-dish',
+	title: i18n.ts.channel,
+	iconOnly: true,
+	handler: chooseChannel,
+}, {
+	icon: 'fas fa-calendar-alt',
+	title: i18n.ts.jumpToSpecifiedDate,
+	iconOnly: true,
+	handler: 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 ? [{
@@ -172,6 +177,7 @@ definePageMetadata(computed(() => ({
 </script>
 
 <style lang="scss" scoped>
+
 .cmuxhskf {
 	> .new {
 		position: sticky;

yarn.lock

@@ -3001,7 +3001,6 @@ __metadata:
     mime-types: 2.1.35
     misskey-js: 0.0.14
     mocha: 10.0.0
-    ms: 3.0.0-canary.1
     multer: 1.4.4
     nested-property: 4.0.0
     node-fetch: 3.2.9
@@ -3272,7 +3271,7 @@ __metadata:
 "browser-image-resizer@git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.2":
   version: 2.2.1-misskey.2
   resolution: "browser-image-resizer@https://github.com/misskey-dev/browser-image-resizer.git#commit=a58834f5fe2af9f9f31ff115121aef3de6f9d416"
-  checksum: 8ea30705704cc3f81eca23ff6cd0d5bf0d5404cd82612a52de11c0b851be511613022758babf5c202cc92b019483cfb97d7ef48cc18368a8913803fd654ac5d1
+  checksum: 5a29181ee34a407b43069dcd5e3364c3066eb4af3ffdd262ba669ea37273ac232aadebff8204a6ae9ff8d74305429191feedb5d420449acf01e1bbf9759c4847
   languageName: node
   linkType: hard
 
@@ -9976,13 +9975,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ms@npm:3.0.0-canary.1":
-  version: 3.0.0-canary.1
-  resolution: "ms@npm:3.0.0-canary.1"
-  checksum: 5ec76c0932cf83ac3e7f70f1a4c0d4db4dbc91de6ea5f7d336c67b48f513c8cb4c0fce3a07e3d84ee931dbdc9a48f33ed1c485e834279fff8906d385e86684ae
-  languageName: node
-  linkType: hard
-
 "msgpackr-extract@npm:^2.0.2":
   version: 2.0.2
   resolution: "msgpackr-extract@npm:2.0.2"