mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2025-01-24 02:34:00 +09:00
Code

enhance(frontend): CherryPick 클라이언트 업데이트 확인 방식 변경

Browse Source 
- `compare-versions` 라이브러리 이용
This commit is contained in:
NoriDev 2025-01-20 00:38:29 +09:00
parent a6d8a20b50
commit 4edca7bd32
8 changed files with 8 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/frontend/src/pages/admin/index.vue
View File

@ -34,6 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { onActivated, onMounted, onUnmounted, provide, watch, ref, computed } from 'vue';
import { version } from '@@/js/config.js';
import { compareVersions } from 'compare-versions';
import { i18n } from '@/i18n.js';
import MkSuperMenu from '@/components/MkSuperMenu.vue';
import MkInfo from '@/components/MkInfo.vue';
@ -290,20 +291,6 @@ provideMetadataReceiver((metadataGetter) => {
});
provideReactiveMetadata(INFO);
function compareVersions(v1: string, v2: string): number {
const v1Parts = v1.split('.').map(Number);
const v2Parts = v2.split('.').map(Number);
for (let i = 0; i < Math.max(v1Parts.length, v2Parts.length); i++) {
const part1 = v1Parts[i] || 0;
const part2 = v2Parts[i] || 0;
if (part1 < part2) return -1;
if (part1 > part2) return 1;
}
return 0;
}
function invite() {
misskeyApi('admin/invite/create').then(x => {
os.alert({

48
packages/frontend/src/pages/admin/update.vue
View File

@ -70,6 +70,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { computed, ref } from 'vue';
import { version, instanceName, basedMisskeyVersion } from '@@/js/config.js';
import { compareVersions } from 'compare-versions';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import FormInfo from '@/components/MkInfo.vue';
@ -121,53 +122,6 @@ async function init() {
}
}
function compareVersions(v1: string, v2: string): number {
const parseVersion = (version: string) => {
const [main, pre] = version.split('-');
const parts = main.split('.').map(num => parseInt(num, 10));
return { parts, pre: pre || null };
};
const compareArrays = (a: number[], b: number[]) => {
const maxLength = Math.max(a.length, b.length);
for (let i = 0; i < maxLength; i++) {
const part1 = a[i] || 0;
const part2 = b[i] || 0;
if (part1 > part2) return 1;
if (part1 < part2) return -1;
}
return 0;
};
const v1Parsed = parseVersion(v1);
const v2Parsed = parseVersion(v2);
const mainComparison = compareArrays(v1Parsed.parts, v2Parsed.parts);
if (mainComparison !== 0) {
return mainComparison;
}
if (v1Parsed.pre && !v2Parsed.pre) return -1;
if (!v1Parsed.pre && v2Parsed.pre) return 1;
if (v1Parsed.pre && v2Parsed.pre) {
const preOrder = ['alpha', 'beta', 'rc'];
const [pre1] = v1Parsed.pre.split('.');
const [pre2] = v2Parsed.pre.split('.');
const index1 = preOrder.indexOf(pre1);
const index2 = preOrder.indexOf(pre2);
if (index1 !== index2) {
return index1 - index2;
}
return v1Parsed.pre.localeCompare(v2Parsed.pre);
}
return 0;
}
function save() {
os.apiWithDialog('admin/update-meta', {
enableReceivePrerelease: enableReceivePrerelease.value,

15
packages/frontend/src/ui/_common_/navbar-for-mobile.vue
View File

@ -56,6 +56,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { computed, defineAsyncComponent, ref, toRef, watch } from 'vue';
import { version } from '@@/js/config.js';
import { compareVersions } from 'compare-versions';
import { openInstanceMenu } from './common.js';
import * as os from '@/os.js';
import { navbarItemDef } from '@/navbar.js';
@ -109,20 +110,6 @@ function toggleBannerDisplay() {
bannerDisplay.value = defaultStore.state.bannerDisplay;
}
function compareVersions(v1: string, v2: string): number {
const v1Parts = v1.split('.').map(Number);
const v2Parts = v2.split('.').map(Number);
for (let i = 0; i < Math.max(v1Parts.length, v2Parts.length); i++) {
const part1 = v1Parts[i] || 0;
const part2 = v2Parts[i] || 0;
if (part1 < part2) return -1;
if (part1 > part2) return 1;
}
return 0;
}
function openAccountMenu(ev: MouseEvent) {
openAccountMenu_({
withExtraOperation: true,

15
packages/frontend/src/ui/_common_/navbar.vue
View File

@ -81,6 +81,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { computed, defineAsyncComponent, ref, watch } from 'vue';
import { version } from '@@/js/config.js';
import { compareVersions } from 'compare-versions';
import { openInstanceMenu } from './common.js';
import * as os from '@/os.js';
import { navbarItemDef } from '@/navbar.js';
@ -154,20 +155,6 @@ function toggleBannerDisplay() {
bannerDisplay.value = defaultStore.state.bannerDisplay;
}
function compareVersions(v1: string, v2: string): number {
const v1Parts = v1.split('.').map(Number);
const v2Parts = v2.split('.').map(Number);
for (let i = 0; i < Math.max(v1Parts.length, v2Parts.length); i++) {
const part1 = v1Parts[i] || 0;
const part2 = v2Parts[i] || 0;
if (part1 < part2) return -1;
if (part1 > part2) return 1;
}
return 0;
}
function openAccountMenu(ev: MouseEvent) {
openAccountMenu_({
withExtraOperation: true,

15
packages/frontend/src/ui/classic.header.vue
View File

@ -50,6 +50,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { computed, defineAsyncComponent, onMounted, ref } from 'vue';
import { version } from '@@/js/config.js';
import { compareVersions } from 'compare-versions';
import { openInstanceMenu } from './_common_/common.js';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
@ -100,20 +101,6 @@ if ($i && ($i.isAdmin ?? $i.isModerator)) {
});
}
function compareVersions(v1: string, v2: string): number {
const v1Parts = v1.split('.').map(Number);
const v2Parts = v2.split('.').map(Number);
for (let i = 0; i < Math.max(v1Parts.length, v2Parts.length); i++) {
const part1 = v1Parts[i] || 0;
const part2 = v2Parts[i] || 0;
if (part1 < part2) return -1;
if (part1 > part2) return 1;
}
return 0;
}
function more(ev: MouseEvent) {
const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
src: ev.currentTarget ?? ev.target,

15
packages/frontend/src/ui/classic.sidebar.vue
View File

@ -52,6 +52,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { defineAsyncComponent, computed, watch, ref, shallowRef } from 'vue';
import { version } from '@@/js/config.js';
import { compareVersions } from 'compare-versions';
import { openInstanceMenu } from './_common_/common.js';
// import { host } from '@@/js/config.js';
import * as os from '@/os.js';
@ -109,20 +110,6 @@ if ($i && ($i.isAdmin ?? $i.isModerator)) {
});
}
function compareVersions(v1: string, v2: string): number {
const v1Parts = v1.split('.').map(Number);
const v2Parts = v2.split('.').map(Number);
for (let i = 0; i < Math.max(v1Parts.length, v2Parts.length); i++) {
const part1 = v1Parts[i] || 0;
const part2 = v2Parts[i] || 0;
if (part1 < part2) return -1;
if (part1 > part2) return 1;
}
return 0;
}
function calcViewState() {
iconOnly.value = (window.innerWidth <= WINDOW_THRESHOLD) || (menuDisplay.value === 'sideIcon');
settingsWindowed.value = (window.innerWidth > WINDOW_THRESHOLD);

15
packages/frontend/src/ui/friendly/navbar-for-mobile.vue
View File

@ -57,6 +57,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { computed, defineAsyncComponent, ref, toRef, watch } from 'vue';
import { version } from '@@/js/config.js';
import { compareVersions } from 'compare-versions';
import { openInstanceMenu } from '@/ui/_common_/common.js';
import * as os from '@/os.js';
import { navbarItemDef } from '@/navbar.js';
@ -111,20 +112,6 @@ function toggleBannerDisplay() {
bannerDisplay.value = defaultStore.state.bannerDisplay;
}
function compareVersions(v1: string, v2: string): number {
const v1Parts = v1.split('.').map(Number);
const v2Parts = v2.split('.').map(Number);
for (let i = 0; i < Math.max(v1Parts.length, v2Parts.length); i++) {
const part1 = v1Parts[i] || 0;
const part2 = v2Parts[i] || 0;
if (part1 < part2) return -1;
if (part1 > part2) return 1;
}
return 0;
}
function openAccountMenu(ev: MouseEvent) {
openAccountMenu_({
withExtraOperation: true,

15
packages/frontend/src/ui/friendly/navbar.vue
View File

@ -87,6 +87,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { computed, defineAsyncComponent, ref, watch } from 'vue';
import { version } from '@@/js/config.js';
import { compareVersions } from 'compare-versions';
import { openInstanceMenu } from '@/ui/_common_/common.js';
import * as os from '@/os.js';
import { navbarItemDef } from '@/navbar.js';
@ -161,20 +162,6 @@ function toggleBannerDisplay() {
bannerDisplay.value = defaultStore.state.bannerDisplay;
}
function compareVersions(v1: string, v2: string): number {
const v1Parts = v1.split('.').map(Number);
const v2Parts = v2.split('.').map(Number);
for (let i = 0; i < Math.max(v1Parts.length, v2Parts.length); i++) {
const part1 = v1Parts[i] || 0;
const part2 = v2Parts[i] || 0;
if (part1 < part2) return -1;
if (part1 > part2) return 1;
}
return 0;
}
function openAccountMenu(ev: MouseEvent) {
openAccountMenu_({
withExtraOperation: true,