12.62.2

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <syuilotan@yahoo.co.jp>",
-	"version": "12.62.1",
+	"version": "12.62.2",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",

src/client/pages/about-misskey.vue

@@ -165,10 +165,6 @@ export default defineComponent({
 			this.easterEggReady = false;
 			this.$refs.icon.vanillaTilt.destroy();
 			this.easterEggEngine = physics(this.$refs.about);
-
-			setTimeout(() => {
-				this.easterEggEngine.stop();
-			}, 1000 * 60 * 3);
 		}
 	}
 });

src/client/pages/instance/user-dialog.vue

@@ -24,7 +24,7 @@
 		</div>
 		<div class="_section">
 			<div class="_content">
-				<MkSwitch v-if="user.host == null && $store.state.i.isAdmin && (this.moderator || !user.isAdmin)" @update:value="toggleModerator" v-model:value="moderator">{{ $t('moderator') }}</MkSwitch>
+				<MkSwitch v-if="user.host == null && $store.state.i.isAdmin && (moderator || !user.isAdmin)" @update:value="toggleModerator" v-model:value="moderator">{{ $t('moderator') }}</MkSwitch>
 				<MkSwitch @update:value="toggleSilence" v-model:value="silenced">{{ $t('silence') }}</MkSwitch>
 				<MkSwitch @update:value="toggleSuspend" v-model:value="suspended">{{ $t('suspend') }}</MkSwitch>
 			</div>

src/client/scripts/physics.ts

@@ -1,4 +1,4 @@
-import Matter from 'matter-js';
+import * as Matter from 'matter-js';
 
 export function physics(container: HTMLElement) {
 	const containerWidth = container.offsetWidth;
@@ -12,8 +12,13 @@ export function physics(container: HTMLElement) {
 	container.style.height = `${containerHeight}px`;
 
 	// create engine
-	const engine    = Matter.Engine.create();
+	const engine = Matter.Engine.create({
-	const world     = engine.world;
+		constraintIterations: 4,
+		positionIterations: 8,
+		velocityIterations: 8,
+	});
+
+	const world = engine.world;
 
 	// create renderer
 	const render = Matter.Render.create({
@@ -24,20 +29,6 @@ export function physics(container: HTMLElement) {
 			height: containerHeight,
 			background: 'transparent', // transparent to hide
 			wireframeBackground: 'transparent', // transparent to hide
-			hasBounds: false,
-			enabled: true,
-			wireframes: false,
-			showSleeping: true,
-			showDebug: false,
-			showBroadphase: false,
-			showBounds: false,
-			showVelocity: false,
-			showCollisions: false,
-			showAxes: false,
-			showPositions: false,
-			showAngleIndicator: false,
-			showIds: false,
-			showShadows: false
 		}
 	});
 
@@ -48,20 +39,13 @@ export function physics(container: HTMLElement) {
 	const runner = Matter.Runner.create();
 	Matter.Runner.run(runner, engine);
 
-	// add walls
+	const groundThickness = 1024;
-	const wallopts = {
+	const ground = Matter.Bodies.rectangle(containerCenterX, containerHeight + (groundThickness / 2), containerWidth, groundThickness, {
-		isStatic:     true,
-		restitution:  0.2,
-		friction:     1
-	};
-	const groundopts = {
 		isStatic:     true,
 		restitution:  0.1,
 		friction:     2
-	};
+	});
 
-	const groundThickness = 100;
-	const ground = Matter.Bodies.rectangle(containerCenterX, containerHeight + (groundThickness / 2), containerWidth, groundThickness, groundopts);
 	//const wallRight = Matter.Bodies.rectangle(window.innerWidth+50, window.innerHeight/2, 100, window.innerHeight, wallopts);
 	//const wallLeft = Matter.Bodies.rectangle(-50, window.innerHeight/2, 100, window.innerHeight, wallopts);
 
@@ -80,13 +64,6 @@ export function physics(container: HTMLElement) {
 				objEl.offsetLeft + (objEl.offsetWidth / 2),
 				objEl.offsetTop + (objEl.offsetHeight / 2),
 				Math.max(objEl.offsetWidth, objEl.offsetHeight) / 2,
-				{
-					restitution:      0.1,
-					friction:         4,
-					frictionAir:      0,
-					frictionStatic:   50,
-					density:          100,
-				}
 			);
 		} else {
 			const style = window.getComputedStyle(objEl);
@@ -96,12 +73,7 @@ export function physics(container: HTMLElement) {
 				objEl.offsetWidth,
 				objEl.offsetHeight,
 				{
-					restitution:      0.1,
+					chamfer: { radius: parseInt(style.borderRadius, 10) },
-					friction:         4,
-					frictionAir:      0,
-					frictionStatic:   50,
-					density:          100,
-					chamfer:          { radius: parseInt(style.borderRadius, 10) },
 				}
 			);
 		}
@@ -117,7 +89,7 @@ export function physics(container: HTMLElement) {
 	const mouseConstraint = Matter.MouseConstraint.create(engine, {
 		mouse: mouse,
 		constraint: {
-			stiffness: 1,
+			stiffness: 0.05,
 			render: {
 				visible: false
 			}
@@ -159,10 +131,18 @@ export function physics(container: HTMLElement) {
 		}
 	}
 
+	// 奈落に落ちたオブジェクトは消す
+	const intervalId = setInterval(() => {
+		for (const obj of objs) {
+			if (obj.position.y > (containerHeight + 1024)) Matter.World.remove(world, obj);
+		}
+	}, 1000 * 10);
+
 	return {
 		stop: () => {
 			stop = true;
 			Matter.Runner.stop(runner);
+			clearInterval(intervalId);
 		}
 	};
 }

src/server/api/endpoints/meta.ts

@@ -142,6 +142,7 @@ export default define(meta, async (ps, me) => {
 		enableServiceWorker: instance.enableServiceWorker,
 
 		...(ps.detail ? {
+			pinnedPages: instance.pinnedPages,
 			pinnedClipId: instance.pinnedClipId,
 			cacheRemoteFiles: instance.cacheRemoteFiles,
 			proxyRemoteFiles: instance.proxyRemoteFiles,