CHANGELOG.md

@@ -8,11 +8,9 @@
 - Feat: 新しいゲームを追加
 - Enhance: ハッシュタグ入力時に、本文の末尾の行に何も書かれていない場合は新たにスペースを追加しないように
 - Enhance: チャンネルノートのピン留めをノートのメニューからできるように
-- Enhance: 管理者の場合はAPI tokenの発行画面で管理機能に関する権限を付与できるように
 - Fix: ネイティブモードの絵文字がモノクロにならないように
 - Fix: v2023.12.0で追加された「モデレーターがユーザーのアイコンもしくはバナー画像を未設定状態にできる機能」が管理画面上で正しく表示されていない問題を修正
 - Fix: AiScriptの`readline`関数が不正な値を返すことがある問題のv2023.12.0時点での修正がPlay以外に適用されていないのを修正
-- Fix: v2023.12.1で追加された`$[clickable ...]`および`onClickEv`が正しく機能していないのを修正
 
 ### Server
 - Enhance: 連合先のレートリミットに引っかかった際にリトライするようになりました

locales/de-DE.yml

@@ -973,7 +973,6 @@ neverShow: "Nicht wieder anzeigen"
 remindMeLater: "Vielleicht später"
 didYouLikeMisskey: "Gefällt dir Sharkey?"
 pleaseDonate: "Sharkey ist die kostenlose Software, die von {host} verwendet wird. Wir würden uns über Spenden freuen, damit dessen Entwicklung weitergeführt werden kann!"
-pleaseDonateInstance: "Du kannst {host} auch direkt unterstützen, indem du an deine Instanz Administration spendest."
 roles: "Rollen"
 role: "Rolle"
 noRole: "Rolle nicht gefunden"
@@ -1151,8 +1150,6 @@ impressumDescription: "In manchen Ländern, wie Deutschland und dessen Umgebung,
 privacyPolicy: "Datenschutzerklärung"
 privacyPolicyUrl: "Datenschutzerklärungs-URL"
 tosAndPrivacyPolicy: "Nutzungsbedingungen und Datenschutzerklärung"
-donation: "Spenden"
-donationUrl: "Spenden-URL"
 avatarDecorations: "Profilbilddekoration"
 attach: "Anbringen"
 detach: "Entfernen"

locales/en-US.yml

@@ -1014,7 +1014,6 @@ neverShow: "Don't show again"
 remindMeLater: "Maybe later"
 didYouLikeMisskey: "Have you taken a liking to Sharkey?"
 pleaseDonate: "{host} uses the free software, Sharkey. We would highly appreciate your donations so development of Sharkey can continue!"
-pleaseDonateInstance: "You can also support {host} directly by donating to your instance administration."
 roles: "Roles"
 role: "Role"
 noRole: "Role not found"
@@ -1201,8 +1200,6 @@ impressumDescription: "In some countries, like germany, the inclusion of operato
 privacyPolicy: "Privacy Policy"
 privacyPolicyUrl: "Privacy Policy URL"
 tosAndPrivacyPolicy: "Terms of Service and Privacy Policy"
-donation: "Donate"
-donationUrl: "Donation URL"
 avatarDecorations: "Avatar decorations"
 attach: "Attach"
 detach: "Remove"

locales/index.d.ts

@@ -648,7 +648,6 @@ export interface Locale {
     "small": string;
     "generateAccessToken": string;
     "permission": string;
-    "adminPermission": string;
     "enableAll": string;
     "disableAll": string;
     "tokenRequested": string;
@@ -1024,7 +1023,6 @@ export interface Locale {
     "remindMeLater": string;
     "didYouLikeMisskey": string;
     "pleaseDonate": string;
-    "pleaseDonateInstance": string;
     "roles": string;
     "role": string;
     "noRole": string;
@@ -1211,8 +1209,6 @@ export interface Locale {
     "privacyPolicy": string;
     "privacyPolicyUrl": string;
     "tosAndPrivacyPolicy": string;
-    "donation": string;
-    "donationUrl": string;
     "avatarDecorations": string;
     "attach": string;
     "detach": string;
@@ -1239,9 +1235,6 @@ export interface Locale {
     "bubbleGame": string;
     "sfx": string;
     "soundWillBePlayed": string;
-    "showReplay": string;
-    "replay": string;
-    "replaying": string;
     "_announcement": {
         "forExistingUsers": string;
         "forExistingUsersDescription": string;

locales/ja-JP.yml

@@ -645,7 +645,6 @@ medium: "中"
 small: "小"
 generateAccessToken: "アクセストークンの発行"
 permission: "権限"
-adminPermission: "管理者権限"
 enableAll: "全て有効にする"
 disableAll: "全て無効にする"
 tokenRequested: "アカウントへのアクセス許可"
@@ -1021,7 +1020,6 @@ neverShow: "今後表示しない"
 remindMeLater: "また後で"
 didYouLikeMisskey: "Sharkeyを気に入っていただけましたか？"
 pleaseDonate: "Sharkeyは{host}が使用している無料のソフトウェアです。これからも開発を続けられるように、ぜひ寄付をお願いします！"
-pleaseDonateInstance: "インスタンス管理への寄付によって{host}を直接サポートすることもできます。"
 roles: "ロール"
 role: "ロール"
 noRole: "ロールはありません"
@@ -1208,8 +1206,6 @@ impressumDescription: "ドイツなどの一部の国と地域では表示が義
 privacyPolicy: "プライバシーポリシー"
 privacyPolicyUrl: "プライバシーポリシーURL"
 tosAndPrivacyPolicy: "利用規約・プライバシーポリシー"
-donation: "寄付する"
-donationUrl: "寄付URL"
 avatarDecorations: "アイコンデコレーション"
 attach: "付ける"
 detach: "外す"
@@ -1236,9 +1232,6 @@ enableQuickAddMfmFunction: "高度なMFMのピッカーを表示する"
 bubbleGame: "バブルゲーム"
 sfx: "効果音"
 soundWillBePlayed: "サウンドが再生されます"
-showReplay: "リプレイを見る"
-replay: "リプレイ"
-replaying: "リプレイ中"
 
 _announcement:
   forExistingUsers: "既存ユーザーのみ"

packages/backend/migration/1704744370000-add-donation-url.js

@@ -1,10 +0,0 @@
-export class AddDonationUrl1704744370000 {
-    name = 'AddDonationUrl1704744370000'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "donationUrl" character varying(1024)`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "donationUrl"`);
-    }
-}

packages/backend/src/models/Meta.ts

@@ -385,12 +385,6 @@ export class MiMeta {
 	})
 	public privacyPolicyUrl: string | null;
 
-	@Column('varchar', {
-		length: 1024,
-		nullable: true,
-	})
-	public donationUrl: string | null;
-
 	@Column('varchar', {
 		length: 8192,
 		nullable: true,

packages/backend/src/server/NodeinfoServerService.ts

@@ -108,7 +108,6 @@ export class NodeinfoServerService {
 					tosUrl: meta.termsOfServiceUrl,
 					privacyPolicyUrl: meta.privacyPolicyUrl,
 					impressumUrl: meta.impressumUrl,
-					donationUrl: meta.donationUrl,
 					repositoryUrl: meta.repositoryUrl,
 					feedbackUrl: meta.feedbackUrl,
 					disableRegistration: meta.disableRegistration,

packages/backend/src/server/api/endpoints/admin/meta.ts

@@ -415,10 +415,6 @@ export const meta = {
 				type: 'string',
 				optional: false, nullable: true,
 			},
-			donationUrl: {
-				type: 'string',
-				optional: false, nullable: true,
-			},
 			maintainerEmail: {
 				type: 'string',
 				optional: false, nullable: true,
@@ -502,7 +498,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				repositoryUrl: instance.repositoryUrl,
 				feedbackUrl: instance.feedbackUrl,
 				impressumUrl: instance.impressumUrl,
-				donationUrl: instance.donationUrl,
 				privacyPolicyUrl: instance.privacyPolicyUrl,
 				disableRegistration: instance.disableRegistration,
 				emailRequiredForSignup: instance.emailRequiredForSignup,

packages/backend/src/server/api/endpoints/admin/update-meta.ts

@@ -105,7 +105,6 @@ export const paramDef = {
 		repositoryUrl: { type: 'string' },
 		feedbackUrl: { type: 'string' },
 		impressumUrl: { type: 'string', nullable: true },
-		donationUrl: { type: 'string', nullable: true },
 		privacyPolicyUrl: { type: 'string', nullable: true },
 		useObjectStorage: { type: 'boolean' },
 		objectStorageBaseUrl: { type: 'string', nullable: true },
@@ -407,10 +406,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				set.impressumUrl = ps.impressumUrl;
 			}
 
-			if (ps.donationUrl !== undefined) {
-				set.donationUrl = ps.donationUrl;
-			}
-
 			if (ps.privacyPolicyUrl !== undefined) {
 				set.privacyPolicyUrl = ps.privacyPolicyUrl;
 			}

packages/backend/src/server/api/endpoints/meta.ts

@@ -291,10 +291,6 @@ export const meta = {
 				type: 'string',
 				optional: false, nullable: true,
 			},
-			donationUrl: {
-				type: 'string',
-				optional: false, nullable: true,
-			},
 			logoImageUrl: {
 				type: 'string',
 				optional: false, nullable: true,
@@ -369,7 +365,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				repositoryUrl: instance.repositoryUrl,
 				feedbackUrl: instance.feedbackUrl,
 				impressumUrl: instance.impressumUrl,
-				donationUrl: instance.donationUrl,
 				privacyPolicyUrl: instance.privacyPolicyUrl,
 				disableRegistration: instance.disableRegistration,
 				emailRequiredForSignup: instance.emailRequiredForSignup,

packages/frontend/package.json

@@ -59,7 +59,6 @@
 		"rollup": "4.9.1",
 		"sanitize-html": "2.11.0",
 		"sass": "1.69.5",
-		"seedrandom": "^3.0.5",
 		"shiki": "0.14.7",
 		"strict-event-emitter-types": "2.0.0",
 		"textarea-caret": "3.1.0",

packages/frontend/src/components/MkDonation.vue

@@ -26,16 +26,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkLink target="_blank" url="https://ko-fi.com/transfem">{{ i18n.ts.learnMore }}</MkLink>
 			</div>
 		</div>
-		<div v-if="instance.donationUrl" :class="$style.text">
-			<I18n :src="i18n.ts.pleaseDonateInstance" tag="span">
-				<template #host>
-					{{ instance.name ?? host }}
-				</template>
-			</I18n>
-			<div style="margin-top: 0.2em;">
-				<MkLink target="_blank" :url="instance.donationUrl">{{ i18n.ts.learnMore }}</MkLink>
-			</div>
-		</div>
 		<div class="_buttons">
 			<MkButton @click="close">{{ i18n.ts.remindMeLater }}</MkButton>
 			<MkButton @click="neverShow">{{ i18n.ts.neverShow }}</MkButton>

packages/frontend/src/components/MkTokenGenerateWindow.vue

@@ -33,13 +33,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkButton inline @click="enableAll">{{ i18n.ts.enableAll }}</MkButton>
 			</div>
 			<div class="_gaps_s">
-				<MkSwitch v-for="kind in Object.keys(permissionSwitches)" :key="kind" v-model="permissionSwitches[kind]">{{ i18n.t(`_permissions.${kind}`) }}</MkSwitch>
+				<MkSwitch v-for="kind in Object.keys(permissions)" :key="kind" v-model="permissions[kind]">{{ i18n.t(`_permissions.${kind}`) }}</MkSwitch>
-			</div>
-			<div v-if="iAmAdmin" :class="$style.adminPermissions">
-				<div :class="$style.adminPermissionsHeader"><b>{{ i18n.ts.adminPermission }}</b></div>
-				<div class="_gaps_s">
-					<MkSwitch v-for="kind in Object.keys(permissionSwitchesForAdmin)" :key="kind" v-model="permissionSwitchesForAdmin[kind]">{{ i18n.t(`_permissions.${kind}`) }}</MkSwitch>
-				</div>
 			</div>
 		</div>
 	</MkSpacer>
@@ -55,7 +49,6 @@ import MkButton from './MkButton.vue';
 import MkInfo from './MkInfo.vue';
 import MkModalWindow from '@/components/MkModalWindow.vue';
 import { i18n } from '@/i18n.js';
-import { iAmAdmin } from '@/account.js';
 
 const props = withDefaults(defineProps<{
 	title?: string | null;
@@ -75,76 +68,37 @@ const emit = defineEmits<{
 }>();
 
 const defaultPermissions = Misskey.permissions.filter(p => !p.startsWith('read:admin') && !p.startsWith('write:admin'));
-const adminPermissions = Misskey.permissions.filter(p => p.startsWith('read:admin') || p.startsWith('write:admin'));
-
 const dialog = shallowRef<InstanceType<typeof MkModalWindow>>();
 const name = ref(props.initialName);
-const permissionSwitches = ref(<Record<(typeof Misskey.permissions)[number], boolean>>{});
+const permissions = ref(<Record<(typeof Misskey.permissions)[number], boolean>>{});
-const permissionSwitchesForAdmin = ref(<Record<(typeof Misskey.permissions)[number], boolean>>{});
 
 if (props.initialPermissions) {
 	for (const kind of props.initialPermissions) {
-		permissionSwitches.value[kind] = true;
+		permissions.value[kind] = true;
 	}
 } else {
 	for (const kind of defaultPermissions) {
-		permissionSwitches.value[kind] = false;
+		permissions.value[kind] = false;
-	}
-
-	if (iAmAdmin) {
-		for (const kind of adminPermissions) {
-			permissionSwitchesForAdmin.value[kind] = false;
-		}
 	}
 }
 
 function ok(): void {
 	emit('done', {
 		name: name.value,
-		permissions: [
+		permissions: Object.keys(permissions.value).filter(p => permissions.value[p]),
-			...Object.keys(permissionSwitches.value).filter(p => permissionSwitches.value[p]),
-			...(iAmAdmin ? Object.keys(permissionSwitchesForAdmin.value).filter(p => permissionSwitchesForAdmin.value[p]) : []),
-		],
 	});
 	dialog.value?.close();
 }
 
 function disableAll(): void {
-	for (const p in permissionSwitches.value) {
+	for (const p in permissions.value) {
-		permissionSwitches.value[p] = false;
+		permissions.value[p] = false;
-	}
-	if (iAmAdmin) {
-		for (const p in permissionSwitchesForAdmin.value) {
-			permissionSwitchesForAdmin.value[p] = false;
-		}
 	}
 }
 
 function enableAll(): void {
-	for (const p in permissionSwitches.value) {
+	for (const p in permissions.value) {
-		permissionSwitches.value[p] = true;
+		permissions.value[p] = true;
-	}
-	if (iAmAdmin) {
-		for (const p in permissionSwitchesForAdmin.value) {
-			permissionSwitchesForAdmin.value[p] = true;
-		}
 	}
 }
 </script>
-
-<style module lang="scss">
-.adminPermissions {
-	margin: 8px -6px 0;
-	padding: 24px 6px 6px;
-	border: 2px solid var(--error);
-	border-radius: calc(var(--radius) / 2);
-}
-
-.adminPermissionsHeader {
-	margin: -34px 0 6px 12px;
-	padding: 0 4px;
-	width: fit-content;
-	color: var(--error);
-	background: var(--panel);
-}
-</style>

packages/frontend/src/components/MkVisitorDashboard.vue

@@ -123,13 +123,7 @@ function showMenu(ev) {
 		action: () => {
 			window.open(instance.privacyPolicyUrl, '_blank', 'noopener');
 		},
-	} : undefined, (instance.donationUrl) ? {
+	} : undefined, (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl) ? undefined : { type: 'divider' }, {
-		text: i18n.ts.donation,
-		icon: 'ph-hand-coins ph-bold ph-lg',
-		action: () => {
-			window.open(instance.donationUrl, '_blank', 'noopener');
-		},
-	} : undefined, (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl && !instance.donationUrl) ? undefined : { type: 'divider' }, {
 		text: i18n.ts.help,
 		icon: 'ph-question ph-bold ph-lg',
 		action: () => {

packages/frontend/src/pages/about.vue

@@ -57,7 +57,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 						</MkFolder>
 						<FormLink v-if="instance.tosUrl" :to="instance.tosUrl" external>{{ i18n.ts.termsOfService }}</FormLink>
 						<FormLink v-if="instance.privacyPolicyUrl" :to="instance.privacyPolicyUrl" external>{{ i18n.ts.privacyPolicy }}</FormLink>
-						<FormLink v-if="instance.donationUrl" :to="instance.donationUrl" external>{{ i18n.ts.donation }}</FormLink>
 					</div>
 				</div>
 			</FormSection>

packages/frontend/src/pages/admin/settings.vue

@@ -40,11 +40,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<template #caption>{{ i18n.ts.impressumDescription }}</template>
 					</MkInput>
 
-					<MkInput v-model="donationUrl" type="url">
-						<template #label>{{ i18n.ts.donationUrl }}</template>
-						<template #prefix><i class="ph-link ph-bold ph-lg"></i></template>
-					</MkInput>
-
 					<MkTextarea v-model="pinnedUsers">
 						<template #label>{{ i18n.ts.pinnedUsers }}</template>
 						<template #caption>{{ i18n.ts.pinnedUsersDescription }}</template>
@@ -175,7 +170,6 @@ const description = ref<string | null>(null);
 const maintainerName = ref<string | null>(null);
 const maintainerEmail = ref<string | null>(null);
 const impressumUrl = ref<string | null>(null);
-const donationUrl = ref<string | null>(null);
 const pinnedUsers = ref<string>('');
 const cacheRemoteFiles = ref<boolean>(false);
 const cacheRemoteSensitiveFiles = ref<boolean>(false);
@@ -198,7 +192,6 @@ async function init(): Promise<void> {
 	maintainerName.value = meta.maintainerName;
 	maintainerEmail.value = meta.maintainerEmail;
 	impressumUrl.value = meta.impressumUrl;
-	donationUrl.value = meta.donationUrl;
 	pinnedUsers.value = meta.pinnedUsers.join('\n');
 	cacheRemoteFiles.value = meta.cacheRemoteFiles;
 	cacheRemoteSensitiveFiles.value = meta.cacheRemoteSensitiveFiles;
@@ -222,7 +215,6 @@ async function save(): void {
 		maintainerName: maintainerName.value,
 		maintainerEmail: maintainerEmail.value,
 		impressumUrl: impressumUrl.value,
-		donationUrl: donationUrl.value,
 		pinnedUsers: pinnedUsers.value.split('\n'),
 		cacheRemoteFiles: cacheRemoteFiles.value,
 		cacheRemoteSensitiveFiles: cacheRemoteSensitiveFiles.value,

packages/frontend/src/pages/drop-and-fusion.vue

@@ -61,7 +61,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</div>
 				</div>
 			</div>
-			<div ref="containerEl" :class="[$style.gameContainer, { [$style.gameOver]: isGameOver && !replaying }]" @contextmenu.stop.prevent @click.stop.prevent="onClick" @touchmove.stop.prevent="onTouchmove" @touchend="onTouchend" @mousemove="onMousemove">
+			<div ref="containerEl" :class="[$style.gameContainer, { [$style.gameOver]: gameOver }]" @contextmenu.stop.prevent @click.stop.prevent="onClick" @touchmove.stop.prevent="onTouchmove" @touchend="onTouchend" @mousemove="onMousemove">
 				<img v-if="defaultStore.state.darkMode" src="/client-assets/drop-and-fusion/frame-dark.svg" :class="$style.mainFrameImg"/>
 				<img v-else src="/client-assets/drop-and-fusion/frame-light.svg" :class="$style.mainFrameImg"/>
 				<canvas ref="canvasEl" :class="$style.canvas"/>
@@ -74,7 +74,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				>
 					<div v-show="combo > 1" :class="$style.combo" :style="{ fontSize: `${100 + ((comboPrev - 2) * 15)}%` }">{{ comboPrev }} Chain!</div>
 				</Transition>
-				<div v-if="!isGameOver && !replaying" :class="$style.dropperContainer" :style="{ left: dropperX + 'px' }">
+				<div :class="$style.dropperContainer" :style="{ left: dropperX + 'px' }">
 					<!--<img v-if="currentPick" src="/client-assets/drop-and-fusion/dropper.png" :class="$style.dropper" :style="{ left: dropperX + 'px' }"/>-->
 					<Transition
 						:enterActiveClass="$style.transition_picked_enterActive"
@@ -91,29 +91,15 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<div :class="$style.dropGuide"/>
 					</template>
 				</div>
-				<div v-if="isGameOver && !replaying" :class="$style.gameOverLabel">
+				<div v-if="gameOver" :class="$style.gameOverLabel">
 					<div class="_gaps_s">
 						<img src="/client-assets/drop-and-fusion/gameover.png" style="width: 200px; max-width: 100%; display: block; margin: auto; margin-bottom: -5px;"/>
 						<div>SCORE: <MkNumber :value="score"/></div>
 						<div>MAX CHAIN: <MkNumber :value="maxCombo"/></div>
-					</div>
-				</div>
-				<div v-if="replaying" :class="$style.replayIndicator"><span :class="$style.replayIndicatorText"><i class="ti ti-player-play"></i> {{ i18n.ts.replaying }}</span></div>
-			</div>
-			<div v-if="replaying" style="display: flex;">
-				<div :class="$style.frame" style="flex: 1; margin-right: 10px;">
-					<div :class="$style.frameInner">
-						<MkButton @click="endReplay"><i class="ti ti-player-stop"></i> END REPLAY</MkButton>
-					</div>
-				</div>
-			</div>
-			<div v-if="isGameOver" :class="$style.frame">
-				<div :class="$style.frameInner">
 						<div class="_buttonsCenter">
-						<MkButton primary rounded @click="end">{{ i18n.ts.done }}</MkButton>
+							<MkButton primary rounded @click="restart">Restart</MkButton>
-						<MkButton primary rounded @click="replay">{{ i18n.ts.showReplay }}</MkButton>
+							<MkButton primary rounded @click="share">Share</MkButton>
-						<MkButton primary rounded @click="share">{{ i18n.ts.share }}</MkButton>
+						</div>
-						<MkButton rounded @click="exportLog">Copy replay data</MkButton>
 					</div>
 				</div>
 			</div>
@@ -153,7 +139,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 			<div :class="$style.frame">
 				<div :class="$style.frameInner">
-					<MkButton danger @click="surrender">Retry</MkButton>
+					<MkButton @click="restart">Restart</MkButton>
 				</div>
 			</div>
 		</div>
@@ -182,7 +168,6 @@ import { DropAndFusionGame, Mono } from '@/scripts/drop-and-fusion-engine.js';
 import * as sound from '@/scripts/sound.js';
 import MkRange from '@/components/MkRange.vue';
 import MkSwitch from '@/components/MkSwitch.vue';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 
 const NORMAL_BASE_SIZE = 30;
 const NORAML_MONOS: Mono[] = [{
@@ -416,8 +401,6 @@ const GAME_HEIGHT = 600;
 let viewScale = 1;
 let game: DropAndFusionGame;
 let containerElRect: DOMRect | null = null;
-let seed: string;
-let logs: ReturnType<DropAndFusionGame['getLogs']> | null = null;
 
 const containerEl = shallowRef<HTMLElement>();
 const canvasEl = shallowRef<HTMLCanvasElement>();
@@ -431,25 +414,22 @@ const comboPrev = ref(0);
 const maxCombo = ref(0);
 const dropReady = ref(true);
 const gameMode = ref<'normal' | 'square'>('normal');
-const isGameOver = ref(false);
+const gameOver = ref(false);
 const gameStarted = ref(false);
 const highScore = ref<number | null>(null);
 const showConfig = ref(false);
-const replaying = ref(false);
 const mute = ref(false);
 const bgmVolume = ref(defaultStore.state.dropAndFusion.bgmVolume);
 const sfxVolume = ref(defaultStore.state.dropAndFusion.sfxVolume);
 
 function onClick(ev: MouseEvent) {
 	if (!containerElRect) return;
-	if (replaying.value) return;
 	const x = (ev.clientX - containerElRect.left) / viewScale;
 	game.drop(x);
 }
 
 function onTouchend(ev: TouchEvent) {
 	if (!containerElRect) return;
-	if (replaying.value) return;
 	const x = (ev.changedTouches[0].clientX - containerElRect.left) / viewScale;
 	game.drop(x);
 }
@@ -474,18 +454,9 @@ function hold() {
 	game.hold();
 }
 
-async function surrender() {
+function restart() {
-	const { canceled } = await os.confirm({
-		type: 'warning',
-		text: i18n.ts.areYouSure,
-	});
-	if (canceled) return;
-	game.surrender();
-}
-
-function end() {
 	game.dispose();
-	isGameOver.value = false;
+	gameOver.value = false;
 	currentPick.value = null;
 	dropReady.value = true;
 	stock.value = [];
@@ -496,45 +467,6 @@ function end() {
 	gameStarted.value = false;
 }
 
-function replay() {
-	replaying.value = true;
-	game.dispose();
-	game = new DropAndFusionGame({
-		width: GAME_WIDTH,
-		height: GAME_HEIGHT,
-		canvas: canvasEl.value!,
-		seed: seed,
-		sfxVolume: mute.value ? 0 : sfxVolume.value,
-		...(
-			gameMode.value === 'normal' ? {
-				monoDefinitions: NORAML_MONOS,
-			} : {
-				monoDefinitions: SQUARE_MONOS,
-			}
-		),
-	});
-	attachGameEvents();
-	os.promiseDialog(game.load(), async () => {
-		game.start(logs!);
-	});
-}
-
-function endReplay() {
-	replaying.value = false;
-	game.dispose();
-}
-
-function exportLog() {
-	if (!logs) return;
-	const data = JSON.stringify({
-		seed: seed,
-		date: new Date().toISOString(),
-		logs: logs,
-	});
-	copyToClipboard(data);
-	os.success();
-}
-
 function attachGameEvents() {
 	game.addListener('changeScore', value => {
 		score.value = value;
@@ -560,11 +492,9 @@ function attachGameEvents() {
 	});
 
 	game.addListener('dropped', () => {
-		if (replaying.value) return;
-
 		dropReady.value = false;
 		window.setTimeout(() => {
-			if (!isGameOver.value) {
+			if (!gameOver.value) {
 				dropReady.value = true;
 			}
 		}, game.DROP_INTERVAL);
@@ -581,8 +511,6 @@ function attachGameEvents() {
 	});
 
 	game.addListener('monoAdded', (mono) => {
-		if (replaying.value) return;
-
 		// 実績関連
 		if (mono.level === 10) {
 			claimAchievement('bubbleGameExplodingHead');
@@ -595,15 +523,9 @@ function attachGameEvents() {
 	});
 
 	game.addListener('gameOver', () => {
-		if (replaying.value) {
-			endReplay();
-			return;
-		}
-
-		logs = game.getLogs();
 		currentPick.value = null;
 		dropReady.value = false;
-		isGameOver.value = true;
+		gameOver.value = true;
 
 		if (score.value > (highScore.value ?? 0)) {
 			highScore.value = score.value;
@@ -629,13 +551,10 @@ async function start() {
 		highScore.value = null;
 	}
 
-	seed = Date.now().toString();
-
 	game = new DropAndFusionGame({
 		width: GAME_WIDTH,
 		height: GAME_HEIGHT,
 		canvas: canvasEl.value!,
-		seed: seed,
 		sfxVolume: mute.value ? 0 : sfxVolume.value,
 		...(
 			gameMode.value === 'normal' ? {
@@ -771,7 +690,7 @@ useInterval(() => {
 }, 1000, { immediate: false, afterMounted: true });
 
 onDeactivated(() => {
-	end();
+	restart();
 });
 
 definePageMetadata({
@@ -1003,28 +922,6 @@ definePageMetadata({
 	}
 }
 
-.replayIndicator {
-	position: absolute;
-	z-index: 10;
-	left: 10px;
-	bottom: 10px;
-	padding: 6px 8px;
-	color: #f00;
-	background: #0008;
-	border-radius: 6px;
-	pointer-events: none;
-}
-
-.replayIndicatorText {
-	animation: replayIndicator-blink 2s infinite;
-}
-
-@keyframes replayIndicator-blink {
-	0% { opacity: 1; }
-	50% { opacity: 0; }
-	100% { opacity: 1; }
-}
-
 @keyframes currentMonoArrow {
 	0% { transform: translateY(0); }
 	25% { transform: translateY(-8px); }

packages/frontend/src/scripts/drop-and-fusion-engine.ts

@@ -5,7 +5,6 @@
 
 import { EventEmitter } from 'eventemitter3';
 import * as Matter from 'matter-js';
-import seedrandom from 'seedrandom';
 import * as sound from '@/scripts/sound.js';
 
 export type Mono = {
@@ -21,18 +20,6 @@ export type Mono = {
 	spriteScale: number;
 };
 
-type Log = {
-	frame: number;
-	operation: 'drop';
-	x: number;
-} | {
-	frame: number;
-	operation: 'hold';
-} | {
-	frame: number;
-	operation: 'surrender';
-};
-
 export class DropAndFusionGame extends EventEmitter<{
 	changeScore: (newScore: number) => void;
 	changeCombo: (newCombo: number) => void;
@@ -48,23 +35,18 @@ export class DropAndFusionGame extends EventEmitter<{
 	public readonly DROP_INTERVAL = 500;
 	public readonly PLAYAREA_MARGIN = 25;
 	private STOCK_MAX = 4;
-	private TICK_DELTA = 1000 / 60; // 60fps
 	private loaded = false;
-	private frame = 0;
 	private engine: Matter.Engine;
 	private render: Matter.Render;
-	private tickRaf: ReturnType<typeof requestAnimationFrame> | null = null;
+	private runner: Matter.Runner;
-	private tickCallbackQueue: { frame: number; callback: () => void; }[] = [];
 	private overflowCollider: Matter.Body;
 	private isGameOver = false;
+
 	private gameWidth: number;
 	private gameHeight: number;
 	private monoDefinitions: Mono[] = [];
 	private monoTextures: Record<string, Blob> = {};
 	private monoTextureUrls: Record<string, string> = {};
-	private rng: () => number;
-	private logs: Log[] = [];
-	private replaying = false;
 
 	private sfxVolume = 1;
 
@@ -105,17 +87,13 @@ export class DropAndFusionGame extends EventEmitter<{
 		width: number;
 		height: number;
 		monoDefinitions: Mono[];
-		seed: string;
 		sfxVolume?: number;
 	}) {
 		super();
 
-		this.tick = this.tick.bind(this);
-
 		this.gameWidth = opts.width;
 		this.gameHeight = opts.height;
 		this.monoDefinitions = opts.monoDefinitions;
-		this.rng = seedrandom(opts.seed);
 
 		if (opts.sfxVolume) {
 			this.sfxVolume = opts.sfxVolume;
@@ -151,6 +129,9 @@ export class DropAndFusionGame extends EventEmitter<{
 
 		Matter.Render.run(this.render);
 
+		this.runner = Matter.Runner.create();
+		Matter.Runner.run(this.runner, this.engine);
+
 		this.engine.world.bodies = [];
 
 		//#region walls
@@ -242,12 +223,9 @@ export class DropAndFusionGame extends EventEmitter<{
 			Matter.Composite.add(this.engine.world, body);
 
 			// 連鎖してfusionした場合の分かりやすさのため少し間を置いてからfusion対象になるようにする
-			this.tickCallbackQueue.push({
+			window.setTimeout(() => {
-				frame: this.frame + 6,
-				callback: () => {
 				this.activeBodyIds.push(body.id);
-				},
+			}, 100);
-			});
 
 			const comboBonus = 1 + ((this.combo - 1) / 5);
 			const additionalScore = Math.round(currentMono.score * comboBonus);
@@ -266,7 +244,7 @@ export class DropAndFusionGame extends EventEmitter<{
 		} else {
 			//const VELOCITY = 30;
 			//for (let i = 0; i < 10; i++) {
-			//	const body = createBody(FRUITS.find(x => x.level === (1 + Math.floor(this.rng() * 3)))!, x + ((this.rng() * VELOCITY) - (VELOCITY / 2)), y + ((this.rng() * VELOCITY) - (VELOCITY / 2)));
+			//	const body = createBody(FRUITS.find(x => x.level === (1 + Math.floor(Math.random() * 3)))!, x + ((Math.random() * VELOCITY) - (VELOCITY / 2)), y + ((Math.random() * VELOCITY) - (VELOCITY / 2)));
 			//	Matter.Composite.add(world, body);
 			//	bodies.push(body);
 			//}
@@ -277,25 +255,10 @@ export class DropAndFusionGame extends EventEmitter<{
 		}
 	}
 
-	public surrender() {
-		this.logs.push({
-			frame: this.frame,
-			operation: 'surrender',
-		});
-
-		this.gameOver();
-	}
-
 	private gameOver() {
 		this.isGameOver = true;
-		if (this.tickRaf) window.cancelAnimationFrame(this.tickRaf);
+		Matter.Runner.stop(this.runner);
-		this.tickRaf = null;
 		this.emit('gameOver');
-
-		// TODO: 効果音再生はコンポーネント側の責務なので移動する
-		sound.playUrl('/client-assets/drop-and-fusion/gameover.mp3', {
-			volume: this.sfxVolume,
-		});
 	}
 
 	/** テクスチャをすべてキャッシュする */
@@ -329,14 +292,13 @@ export class DropAndFusionGame extends EventEmitter<{
 		return Promise.all(this.monoDefinitions.map(x => loadSingleMonoTexture(x, this)));
 	}
 
-	public start(logs?: Log[]) {
+	public start() {
 		if (!this.loaded) throw new Error('game is not loaded yet');
-		if (logs) this.replaying = true;
 
 		for (let i = 0; i < this.STOCK_MAX; i++) {
 			this.stock.push({
-				id: this.rng().toString(),
+				id: Math.random().toString(),
-				mono: this.monoDefinitions.filter(x => x.dropCandidate)[Math.floor(this.rng() * this.monoDefinitions.filter(x => x.dropCandidate).length)],
+				mono: this.monoDefinitions.filter(x => x.dropCandidate)[Math.floor(Math.random() * this.monoDefinitions.filter(x => x.dropCandidate).length)],
 			});
 		}
 		this.emit('changeStock', this.stock);
@@ -365,13 +327,10 @@ export class DropAndFusionGame extends EventEmitter<{
 						this.fusion(bodyA, bodyB);
 					} else {
 						fusionReservedPairs.push({ bodyA, bodyB });
-						this.tickCallbackQueue.push({
+						window.setTimeout(() => {
-							frame: this.frame + 6,
-							callback: () => {
 							fusionReservedPairs = fusionReservedPairs.filter(x => x.bodyA.id !== bodyA.id && x.bodyB.id !== bodyB.id);
 							this.fusion(bodyA, bodyB);
-							},
+						}, 100);
-						});
 					}
 				} else {
 					const energy = pairs.collision.depth;
@@ -395,69 +354,6 @@ export class DropAndFusionGame extends EventEmitter<{
 				this.combo = 0;
 			}
 		}, 500);
-
-		if (logs) {
-			const playTick = () => {
-				this.frame++;
-				const log = logs.find(x => x.frame === this.frame - 1);
-				if (log) {
-					switch (log.operation) {
-						case 'drop': {
-							this.drop(log.x);
-							break;
-						}
-						case 'hold': {
-							this.hold();
-							break;
-						}
-						case 'surrender': {
-							this.surrender();
-							break;
-						}
-						default:
-							break;
-					}
-				}
-				this.tickCallbackQueue = this.tickCallbackQueue.filter(x => {
-					if (x.frame === this.frame) {
-						x.callback();
-						return false;
-					} else {
-						return true;
-					}
-				});
-
-				Matter.Engine.update(this.engine, this.TICK_DELTA);
-
-				if (!this.isGameOver) {
-					this.tickRaf = window.requestAnimationFrame(playTick);
-				}
-			};
-
-			playTick();
-		} else {
-			this.tick();
-		}
-	}
-
-	public getLogs() {
-		return this.logs;
-	}
-
-	private tick() {
-		this.frame++;
-		this.tickCallbackQueue = this.tickCallbackQueue.filter(x => {
-			if (x.frame === this.frame) {
-				x.callback();
-				return false;
-			} else {
-				return true;
-			}
-		});
-		Matter.Engine.update(this.engine, this.TICK_DELTA);
-		if (!this.isGameOver) {
-			this.tickRaf = window.requestAnimationFrame(this.tick);
-		}
 	}
 
 	public async load() {
@@ -491,23 +387,17 @@ export class DropAndFusionGame extends EventEmitter<{
 
 	public drop(_x: number) {
 		if (this.isGameOver) return;
-		if (!this.replaying && (Date.now() - this.latestDroppedAt < this.DROP_INTERVAL)) return;
+		if (Date.now() - this.latestDroppedAt < this.DROP_INTERVAL) return;
 
 		const head = this.stock.shift()!;
 		this.stock.push({
-			id: this.rng().toString(),
+			id: Math.random().toString(),
-			mono: this.monoDefinitions.filter(x => x.dropCandidate)[Math.floor(this.rng() * this.monoDefinitions.filter(x => x.dropCandidate).length)],
+			mono: this.monoDefinitions.filter(x => x.dropCandidate)[Math.floor(Math.random() * this.monoDefinitions.filter(x => x.dropCandidate).length)],
 		});
 		this.emit('changeStock', this.stock);
 
-		const inputX = Math.round(_x);
+		const x = Math.min(this.gameWidth - this.PLAYAREA_MARGIN - (head.mono.size / 2), Math.max(this.PLAYAREA_MARGIN + (head.mono.size / 2), _x));
-		const x = Math.min(this.gameWidth - this.PLAYAREA_MARGIN - (head.mono.size / 2), Math.max(this.PLAYAREA_MARGIN + (head.mono.size / 2), inputX));
 		const body = this.createBody(head.mono, x, 50 + head.mono.size / 2);
-		this.logs.push({
-			frame: this.frame,
-			operation: 'drop',
-			x: inputX,
-		});
 		Matter.Composite.add(this.engine.world, body);
 		this.activeBodyIds.push(body.id);
 		this.latestDroppedBodyId = body.id;
@@ -526,11 +416,6 @@ export class DropAndFusionGame extends EventEmitter<{
 	public hold() {
 		if (this.isGameOver) return;
 
-		this.logs.push({
-			frame: this.frame,
-			operation: 'hold',
-		});
-
 		if (this.holding) {
 			const head = this.stock.shift()!;
 			this.stock.unshift(this.holding);
@@ -541,8 +426,8 @@ export class DropAndFusionGame extends EventEmitter<{
 			const head = this.stock.shift()!;
 			this.holding = head;
 			this.stock.push({
-				id: this.rng().toString(),
+				id: Math.random().toString(),
-				mono: this.monoDefinitions.filter(x => x.dropCandidate)[Math.floor(this.rng() * this.monoDefinitions.filter(x => x.dropCandidate).length)],
+				mono: this.monoDefinitions.filter(x => x.dropCandidate)[Math.floor(Math.random() * this.monoDefinitions.filter(x => x.dropCandidate).length)],
 			});
 			this.emit('changeHolding', this.holding);
 			this.emit('changeStock', this.stock);
@@ -555,9 +440,8 @@ export class DropAndFusionGame extends EventEmitter<{
 
 	public dispose() {
 		if (this.comboIntervalId) window.clearInterval(this.comboIntervalId);
-		if (this.tickRaf) window.cancelAnimationFrame(this.tickRaf);
-		this.tickRaf = null;
 		Matter.Render.stop(this.render);
+		Matter.Runner.stop(this.runner);
 		Matter.World.clear(this.engine.world, false);
 		Matter.Engine.clear(this.engine);
 	}

packages/frontend/src/ui/_common_/common.ts

@@ -102,13 +102,7 @@ export function openInstanceMenu(ev: MouseEvent) {
 		action: () => {
 			window.open(instance.privacyPolicyUrl, '_blank', 'noopener');
 		},
-	} : undefined, (instance.donationUrl) ? {
+	} : undefined, (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl) ? undefined : { type: 'divider' }, {
-		text: i18n.ts.donation,
-		icon: 'ph-hand-coins ph-bold ph-lg',
-		action: () => {
-			window.open(instance.donationUrl, '_blank', 'noopener');
-		},
-	} : undefined, (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl && !instance.donationUrl) ? undefined : { type: 'divider' }, {
 		text: i18n.ts.help,
 		icon: 'ph-question ph-bold ph-lg',
 		action: () => {

packages/misskey-js/src/autogen/types.ts

@@ -4631,7 +4631,6 @@ export type operations = {
             description: string | null;
             disableRegistration: boolean;
             impressumUrl: string | null;
-            donationUrl: string | null;
             maintainerEmail: string | null;
             maintainerName: string | null;
             name: string | null;
@@ -8651,7 +8650,6 @@ export type operations = {
           repositoryUrl?: string;
           feedbackUrl?: string;
           impressumUrl?: string | null;
-          donationUrl?: string | null;
           privacyPolicyUrl?: string | null;
           useObjectStorage?: boolean;
           objectStorageBaseUrl?: string | null;
@@ -19402,7 +19400,6 @@ export type operations = {
             };
             backgroundImageUrl: string | null;
             impressumUrl: string | null;
-            donationUrl: string | null;
             logoImageUrl: string | null;
             privacyPolicyUrl: string | null;
             serverRules: string[];

pnpm-lock.yaml

@@ -795,9 +795,6 @@ importers:
       sass:
         specifier: 1.69.5
         version: 1.69.5
-      seedrandom:
-        specifier: ^3.0.5
-        version: 3.0.5
       shiki:
         specifier: 0.14.7
         version: 0.14.7