Skip to content

Commit

Permalink
更新チェックでCherrypickの更新情報見てた箇所を修正 (#599)
Browse files Browse the repository at this point in the history
  • Loading branch information
@kozakura913
kozakura913 authored Dec 26, 2024
1 parent 85f8bbc commit 5bce17b
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion packages/frontend-embed/src/boot.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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('yojo-art Embed');

//#region Embedパラメータの取得・パース
const params = new URLSearchParams(location.search);
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/boot/common.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { createMainRouter } from '@/router/definition.js';
import { popup } from '@/os.js';

export async function common(createVue: () => App<Element>) {
console.info(`CherryPick v${version}`);
console.info(`yojo-art v${version}`);

if (_DEV_) {
console.warn('Development mode!!!');
Expand Down
8 changes: 4 additions & 4 deletions packages/frontend/src/pages/admin/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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;
}
});
Expand Down
8 changes: 4 additions & 4 deletions packages/frontend/src/ui/_common_/navbar-for-mobile.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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', {
Expand All @@ -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;
}
});
Expand Down
8 changes: 4 additions & 4 deletions packages/frontend/src/ui/_common_/navbar.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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', {
Expand All @@ -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;
}
});
Expand Down
8 changes: 4 additions & 4 deletions packages/frontend/src/ui/classic.header.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const otherNavItemIndicated = computed<boolean>(() => {
});

const controlPanelIndicated = ref(false);
const releasesCherryPick = ref(null);
const releasesYojoArt = ref(null);

if ($i.isAdmin ?? $i.isModerator) {
misskeyApi('admin/abuse-user-reports', {
Expand All @@ -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;
}
});
Expand Down
8 changes: 4 additions & 4 deletions packages/frontend/src/ui/classic.sidebar.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ const el = shallowRef<HTMLElement>();
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', {
Expand All @@ -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;
}
});
Expand Down
8 changes: 4 additions & 4 deletions packages/frontend/src/ui/friendly/navbar-for-mobile.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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', {
Expand All @@ -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;
}
});
Expand Down
8 changes: 4 additions & 4 deletions packages/frontend/src/ui/friendly/navbar.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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', {
Expand All @@ -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;
}
});
Expand Down
2 changes: 1 addition & 1 deletion packages/sw/src/scripts/create-notification.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ export async function createEmptyNotification(): Promise<void> {
await globalThis.registration.showNotification(
(new URL(origin)).host,
{
body: `CherryPick v${_VERSION_}`,
body: `yojo-art v${_VERSION_}`,
silent: true,
badge: iconUrl('null'),
tag: 'read_notification',
Expand Down

0 comments on commit 5bce17b

Please sign in to comment.