From 43f78993a9a458e0a7131cf1af730f9ebfdce137 Mon Sep 17 00:00:00 2001 From: kozakura913 <98575220+kozakura913@users.noreply.github.com> Date: Thu, 26 Dec 2024 19:43:25 +0900 Subject: [PATCH 1/3] repos/yojo-art/cherrypick --- packages/frontend/src/pages/admin/index.vue | 8 ++++---- packages/frontend/src/ui/_common_/navbar-for-mobile.vue | 8 ++++---- packages/frontend/src/ui/_common_/navbar.vue | 8 ++++---- packages/frontend/src/ui/classic.header.vue | 8 ++++---- packages/frontend/src/ui/classic.sidebar.vue | 8 ++++---- packages/frontend/src/ui/friendly/navbar-for-mobile.vue | 8 ++++---- packages/frontend/src/ui/friendly/navbar.vue | 8 ++++---- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/frontend/src/pages/admin/index.vue b/packages/frontend/src/pages/admin/index.vue index ed88e10534..cf7415514f 100644 --- a/packages/frontend/src/pages/admin/index.vue +++ b/packages/frontend/src/pages/admin/index.vue @@ -70,7 +70,7 @@ const noInquiryUrl = computed(() => isEmpty(instance.inquiryUrl)); const thereIsUnresolvedAbuseReport = ref(false); const currentPage = computed(() => router.currentRef.value.child); const updateAvailable = ref(false); -const releasesCherryPick = ref(null); +const releasesYojoArt = ref(null); misskeyApi('admin/abuse-user-reports', { state: 'unresolved', @@ -81,11 +81,11 @@ misskeyApi('admin/abuse-user-reports', { misskeyApi('admin/meta') .then(meta => { - return fetch('https://api.github.com/repos/kokonect-link/cherrypick/releases') + return fetch('https://api.github.com/repos/yojo-art/cherrypick/releases') .then(res => res.json()) .then(cherryPickData => { - releasesCherryPick.value = meta.enableReceivePrerelease ? cherryPickData : cherryPickData.filter(x => !x.prerelease); - if ((compareVersions(version, releasesCherryPick.value[0].tag_name) < 0) && (compareVersions(meta.skipCherryPickVersion, releasesCherryPick.value[0].tag_name) < 0)) { + releasesYojoArt.value = meta.enableReceivePrerelease ? cherryPickData : cherryPickData.filter(x => !x.prerelease); + if ((compareVersions(version, releasesYojoArt.value[0].tag_name) < 0) && (compareVersions(meta.skipCherryPickVersion, releasesYojoArt.value[0].tag_name) < 0)) { updateAvailable.value = true; } }); diff --git a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue index c2083be1ba..9a80a8a106 100644 --- a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue +++ b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue @@ -74,7 +74,7 @@ const otherMenuItemIndicated = computed(() => { return false; }); const controlPanelIndicated = ref(false); -const releasesCherryPick = ref(null); +const releasesYojoArt = ref(null); if ($i.isAdmin ?? $i.isModerator) { misskeyApi('admin/abuse-user-reports', { @@ -86,11 +86,11 @@ if ($i.isAdmin ?? $i.isModerator) { misskeyApi('admin/meta') .then(meta => { - return fetch('https://api.github.com/repos/kokonect-link/cherrypick/releases') + return fetch('https://api.github.com/repos/yojo-art/cherrypick/releases') .then(res => res.json()) .then(cherryPickData => { - releasesCherryPick.value = meta.enableReceivePrerelease ? cherryPickData : cherryPickData.filter(x => !x.prerelease); - if ((compareVersions(version, releasesCherryPick.value[0].tag_name) < 0) && (compareVersions(meta.skipCherryPickVersion, releasesCherryPick.value[0].tag_name) < 0)) { + releasesYojoArt.value = meta.enableReceivePrerelease ? cherryPickData : cherryPickData.filter(x => !x.prerelease); + if ((compareVersions(version, releasesYojoArt.value[0].tag_name) < 0) && (compareVersions(meta.skipCherryPickVersion, releasesYojoArt.value[0].tag_name) < 0)) { controlPanelIndicated.value = true; } }); diff --git a/packages/frontend/src/ui/_common_/navbar.vue b/packages/frontend/src/ui/_common_/navbar.vue index b0a2349b5a..26220c4199 100644 --- a/packages/frontend/src/ui/_common_/navbar.vue +++ b/packages/frontend/src/ui/_common_/navbar.vue @@ -86,7 +86,7 @@ const otherMenuItemIndicated = computed(() => { return false; }); const controlPanelIndicated = ref(false); -const releasesCherryPick = ref(null); +const releasesYojoArt = ref(null); if ($i.isAdmin ?? $i.isModerator) { misskeyApi('admin/abuse-user-reports', { @@ -98,11 +98,11 @@ if ($i.isAdmin ?? $i.isModerator) { misskeyApi('admin/meta') .then(meta => { - return fetch('https://api.github.com/repos/kokonect-link/cherrypick/releases') + return fetch('https://api.github.com/repos/yojo-art/cherrypick/releases') .then(res => res.json()) .then(cherryPickData => { - releasesCherryPick.value = meta.enableReceivePrerelease ? cherryPickData : cherryPickData.filter(x => !x.prerelease); - if ((compareVersions(version, releasesCherryPick.value[0].tag_name) < 0) && (compareVersions(meta.skipCherryPickVersion, releasesCherryPick.value[0].tag_name) < 0)) { + releasesYojoArt.value = meta.enableReceivePrerelease ? cherryPickData : cherryPickData.filter(x => !x.prerelease); + if ((compareVersions(version, releasesYojoArt.value[0].tag_name) < 0) && (compareVersions(meta.skipCherryPickVersion, releasesYojoArt.value[0].tag_name) < 0)) { controlPanelIndicated.value = true; } }); diff --git a/packages/frontend/src/ui/classic.header.vue b/packages/frontend/src/ui/classic.header.vue index 5dad914202..cc05d194b0 100644 --- a/packages/frontend/src/ui/classic.header.vue +++ b/packages/frontend/src/ui/classic.header.vue @@ -74,7 +74,7 @@ const otherNavItemIndicated = computed(() => { }); const controlPanelIndicated = ref(false); -const releasesCherryPick = ref(null); +const releasesYojoArt = ref(null); if ($i.isAdmin ?? $i.isModerator) { misskeyApi('admin/abuse-user-reports', { @@ -86,11 +86,11 @@ if ($i.isAdmin ?? $i.isModerator) { misskeyApi('admin/meta') .then(meta => { - return fetch('https://api.github.com/repos/kokonect-link/cherrypick/releases') + return fetch('https://api.github.com/repos/yojo-art/cherrypick/releases') .then(res => res.json()) .then(cherryPickData => { - releasesCherryPick.value = meta.enableReceivePrerelease ? cherryPickData : cherryPickData.filter(x => !x.prerelease); - if ((compareVersions(version, releasesCherryPick.value[0].tag_name) < 0) && (compareVersions(meta.skipCherryPickVersion, releasesCherryPick.value[0].tag_name) < 0)) { + releasesYojoArt.value = meta.enableReceivePrerelease ? cherryPickData : cherryPickData.filter(x => !x.prerelease); + if ((compareVersions(version, releasesYojoArt.value[0].tag_name) < 0) && (compareVersions(meta.skipCherryPickVersion, releasesYojoArt.value[0].tag_name) < 0)) { controlPanelIndicated.value = true; } }); diff --git a/packages/frontend/src/ui/classic.sidebar.vue b/packages/frontend/src/ui/classic.sidebar.vue index 0f9f304816..9382f186d1 100644 --- a/packages/frontend/src/ui/classic.sidebar.vue +++ b/packages/frontend/src/ui/classic.sidebar.vue @@ -83,7 +83,7 @@ const el = shallowRef(); const iconOnly = ref(false); const settingsWindowed = ref(false); const controlPanelIndicated = ref(false); -const releasesCherryPick = ref(null); +const releasesYojoArt = ref(null); if ($i.isAdmin ?? $i.isModerator) { misskeyApi('admin/abuse-user-reports', { @@ -95,11 +95,11 @@ if ($i.isAdmin ?? $i.isModerator) { misskeyApi('admin/meta') .then(meta => { - return fetch('https://api.github.com/repos/kokonect-link/cherrypick/releases') + return fetch('https://api.github.com/repos/yojo-art/cherrypick/releases') .then(res => res.json()) .then(cherryPickData => { - releasesCherryPick.value = meta.enableReceivePrerelease ? cherryPickData : cherryPickData.filter(x => !x.prerelease); - if ((compareVersions(version, releasesCherryPick.value[0].tag_name) < 0) && (compareVersions(meta.skipCherryPickVersion, releasesCherryPick.value[0].tag_name) < 0)) { + releasesYojoArt.value = meta.enableReceivePrerelease ? cherryPickData : cherryPickData.filter(x => !x.prerelease); + if ((compareVersions(version, releasesYojoArt.value[0].tag_name) < 0) && (compareVersions(meta.skipCherryPickVersion, releasesYojoArt.value[0].tag_name) < 0)) { controlPanelIndicated.value = true; } }); diff --git a/packages/frontend/src/ui/friendly/navbar-for-mobile.vue b/packages/frontend/src/ui/friendly/navbar-for-mobile.vue index 9abe38054e..ada3323ec8 100644 --- a/packages/frontend/src/ui/friendly/navbar-for-mobile.vue +++ b/packages/frontend/src/ui/friendly/navbar-for-mobile.vue @@ -76,7 +76,7 @@ const otherMenuItemIndicated = computed(() => { return false; }); const controlPanelIndicated = ref(false); -const releasesCherryPick = ref(null); +const releasesYojoArt = ref(null); if ($i.isAdmin ?? $i.isModerator) { misskeyApi('admin/abuse-user-reports', { @@ -88,11 +88,11 @@ if ($i.isAdmin ?? $i.isModerator) { misskeyApi('admin/meta') .then(meta => { - return fetch('https://api.github.com/repos/kokonect-link/cherrypick/releases') + return fetch('https://api.github.com/repos/yojo-art/cherrypick/releases') .then(res => res.json()) .then(cherryPickData => { - releasesCherryPick.value = meta.enableReceivePrerelease ? cherryPickData : cherryPickData.filter(x => !x.prerelease); - if ((compareVersions(version, releasesCherryPick.value[0].tag_name) < 0) && (compareVersions(meta.skipCherryPickVersion, releasesCherryPick.value[0].tag_name) < 0)) { + releasesYojoArt.value = meta.enableReceivePrerelease ? cherryPickData : cherryPickData.filter(x => !x.prerelease); + if ((compareVersions(version, releasesYojoArt.value[0].tag_name) < 0) && (compareVersions(meta.skipCherryPickVersion, releasesYojoArt.value[0].tag_name) < 0)) { controlPanelIndicated.value = true; } }); diff --git a/packages/frontend/src/ui/friendly/navbar.vue b/packages/frontend/src/ui/friendly/navbar.vue index 53b0f91682..1d7ef12723 100644 --- a/packages/frontend/src/ui/friendly/navbar.vue +++ b/packages/frontend/src/ui/friendly/navbar.vue @@ -93,7 +93,7 @@ const otherMenuItemIndicated = computed(() => { return false; }); const controlPanelIndicated = ref(false); -const releasesCherryPick = ref(null); +const releasesYojoArt = ref(null); if ($i.isAdmin ?? $i.isModerator) { misskeyApi('admin/abuse-user-reports', { @@ -105,11 +105,11 @@ if ($i.isAdmin ?? $i.isModerator) { misskeyApi('admin/meta') .then(meta => { - return fetch('https://api.github.com/repos/kokonect-link/cherrypick/releases') + return fetch('https://api.github.com/repos/yojo-art/cherrypick/releases') .then(res => res.json()) .then(cherryPickData => { - releasesCherryPick.value = meta.enableReceivePrerelease ? cherryPickData : cherryPickData.filter(x => !x.prerelease); - if ((compareVersions(version, releasesCherryPick.value[0].tag_name) < 0) && (compareVersions(meta.skipCherryPickVersion, releasesCherryPick.value[0].tag_name) < 0)) { + releasesYojoArt.value = meta.enableReceivePrerelease ? cherryPickData : cherryPickData.filter(x => !x.prerelease); + if ((compareVersions(version, releasesYojoArt.value[0].tag_name) < 0) && (compareVersions(meta.skipCherryPickVersion, releasesYojoArt.value[0].tag_name) < 0)) { controlPanelIndicated.value = true; } }); From 3d06f6553d39c0273233c4acc1ff54f75691cf89 Mon Sep 17 00:00:00 2001 From: kozakura913 <98575220+kozakura913@users.noreply.github.com> Date: Thu, 26 Dec 2024 19:54:41 +0900 Subject: [PATCH 2/3] rename --- packages/frontend-embed/src/boot.ts | 2 +- packages/frontend/src/boot/common.ts | 2 +- packages/sw/src/scripts/create-notification.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/frontend-embed/src/boot.ts b/packages/frontend-embed/src/boot.ts index 3421f43c3c..eaf1ce39da 100644 --- a/packages/frontend-embed/src/boot.ts +++ b/packages/frontend-embed/src/boot.ts @@ -23,7 +23,7 @@ import { serverMetadata } from '@/server-metadata.js'; import { postMessageToParentWindow, setIframeId } from '@/post-message.js'; import { serverContext } from '@/server-context.js'; -console.log('CherryPick Embed'); +console.log('YojoArt Embed'); //#region Embedパラメータの取得・パース const params = new URLSearchParams(location.search); diff --git a/packages/frontend/src/boot/common.ts b/packages/frontend/src/boot/common.ts index 432cb1080a..74ab4eef2c 100644 --- a/packages/frontend/src/boot/common.ts +++ b/packages/frontend/src/boot/common.ts @@ -27,7 +27,7 @@ import { createMainRouter } from '@/router/definition.js'; import { popup } from '@/os.js'; export async function common(createVue: () => App) { - console.info(`CherryPick v${version}`); + console.info(`YojoArt v${version}`); if (_DEV_) { console.warn('Development mode!!!'); diff --git a/packages/sw/src/scripts/create-notification.ts b/packages/sw/src/scripts/create-notification.ts index b9300bb9de..5f52c69262 100644 --- a/packages/sw/src/scripts/create-notification.ts +++ b/packages/sw/src/scripts/create-notification.ts @@ -323,7 +323,7 @@ export async function createEmptyNotification(): Promise { await globalThis.registration.showNotification( (new URL(origin)).host, { - body: `CherryPick v${_VERSION_}`, + body: `YojoArt v${_VERSION_}`, silent: true, badge: iconUrl('null'), tag: 'read_notification', From 6e70d8c9fdb4dff54760f8733fdd563e168201c1 Mon Sep 17 00:00:00 2001 From: kozakura913 <98575220+kozakura913@users.noreply.github.com> Date: Thu, 26 Dec 2024 19:58:07 +0900 Subject: [PATCH 3/3] rename --- packages/frontend-embed/src/boot.ts | 2 +- packages/frontend/src/boot/common.ts | 2 +- packages/sw/src/scripts/create-notification.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/frontend-embed/src/boot.ts b/packages/frontend-embed/src/boot.ts index eaf1ce39da..0c6ab28159 100644 --- a/packages/frontend-embed/src/boot.ts +++ b/packages/frontend-embed/src/boot.ts @@ -23,7 +23,7 @@ import { serverMetadata } from '@/server-metadata.js'; import { postMessageToParentWindow, setIframeId } from '@/post-message.js'; import { serverContext } from '@/server-context.js'; -console.log('YojoArt Embed'); +console.log('yojo-art Embed'); //#region Embedパラメータの取得・パース const params = new URLSearchParams(location.search); diff --git a/packages/frontend/src/boot/common.ts b/packages/frontend/src/boot/common.ts index 74ab4eef2c..58ee3b77e5 100644 --- a/packages/frontend/src/boot/common.ts +++ b/packages/frontend/src/boot/common.ts @@ -27,7 +27,7 @@ import { createMainRouter } from '@/router/definition.js'; import { popup } from '@/os.js'; export async function common(createVue: () => App) { - console.info(`YojoArt v${version}`); + console.info(`yojo-art v${version}`); if (_DEV_) { console.warn('Development mode!!!'); diff --git a/packages/sw/src/scripts/create-notification.ts b/packages/sw/src/scripts/create-notification.ts index 5f52c69262..aabb387dfa 100644 --- a/packages/sw/src/scripts/create-notification.ts +++ b/packages/sw/src/scripts/create-notification.ts @@ -323,7 +323,7 @@ export async function createEmptyNotification(): Promise { await globalThis.registration.showNotification( (new URL(origin)).host, { - body: `YojoArt v${_VERSION_}`, + body: `yojo-art v${_VERSION_}`, silent: true, badge: iconUrl('null'), tag: 'read_notification',