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 diff --git a/package.json b/package.json index dde83503d..ae2439a73 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.7.b4", "codename": "indigo", "repository": { "type": "git", 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>(); 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'); }; 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: この処理は必ず↑のクライアント更新時処理より後に来ること(テーマ再構築のため) 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, diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue index 5810b745b..fc1edb2e3 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, + 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(() => ({