MisskeyRoom (#5267)

* wip * Add pemcil * Fix bug * Update .gitattributes * Add 🍮 * Better 🍮 * Add color boxes * Add pc * Add keyboard * Add 📦 * Add more 📦 * ✌️ * carpet * Add plant * ✌️ * ✌️ * Update room.vue * Add plant * ✌️ * ✌️ * ✌️ * ✌️ * ✌️ * 段ボール箱がてかりすぎているのを修正 * Update room.ts * Render username * ✌️ * Add new 📦 * Update room.ts * Remove blender backup files * Refactor * Improve performance * Update room.ts * Update .gitattributes * Update room.ts * Better fan * Better tissue rendering * Add 🐧 * Create photoframe2.glb * chairs * Add 📖 * fix: HiDPi環境でオブジェクトを選択できない (#5268) * Better monitor * ✌️ * Add corkboard * Add missing blend * mousepad * Add missing blend * Add cube * 額縁やモニターなどに任意の画像を表示できるように * Update MisskeyRoom section of CONTRIBUTING.md (#5272) * Update MisskeyRoom section of CONTRIBUTING.md * Update CONTRIBUTING.md * Update CONTRIBUTING.md * Refactor * カスタムテクスチャがずれないように * Remove debug code * Update furnitures.json5 * 一部の家具の色を自由に変えられるように * Update ja-JP.yml * Type annotation * 家具の色やテクスチャをすぐ反映するように * Update room.vue * Update furnitures.json5 * Add 📺 * Update ja-JP.yml * 床の色を変えられるように * 和室にできるように * Update washitsu * Use MeshLambertMaterial to improve performance * Use MeshLambertMaterial * Fix bug * Refactor * Update room.ts * Fix washitsu * Update room.vue * Update washistu * Use MeshLambertMaterial * Update room.ts * Set current property value * Disable reactivity to improve performance a bit * Fix bug * Set current carpet color * Update ja-JP.yml * Add rubik-cube (#5278) * Update ja-JP.yml (#5279) * Update UI * ルームの設定を追加 * Add room link * 家具をドラッグで移動や回転できるように * esnextにする (#5286) * Fix moduleResolution * Use uuid v4 * Fix bug * マットの色を変えられるように * ✌️ * 異方性フィルタリングするように * グラフィックの品質をフィルタリングに反映 * Add bloom effect when ultra graphics * Add posters * 🎨
2019-08-18 14:41:33 +09:00
parent 7ecfc007a9
commit 45b972c059
143 changed files with 1667 additions and 4 deletions
--- a/src/server/api/endpoints/room/show.ts
+++ b/src/server/api/endpoints/room/show.ts
@ -0,0 +1,92 @@
+import $ from 'cafy';
+import define from '../../define';
+import { ApiError } from '../../error';
+import { Users, UserProfiles } from '../../../../models';
+import { ID } from '../../../../misc/cafy-id';
+import { ensure } from '../../../../prelude/ensure';
+import { toPunyNullable } from '../../../../misc/convert-host';
+
+export const meta = {
+	desc: {
+		'ja-JP': '指定した部屋の情報を取得します。',
+	},
+
+	tags: ['room'],
+
+	requireCredential: false,
+
+	params: {
+		userId: {
+			validator: $.optional.type(ID),
+			desc: {
+				'ja-JP': '対象のユーザーのID',
+				'en-US': 'Target user ID'
+			}
+		},
+
+		username: {
+			validator: $.optional.str
+		},
+
+		host: {
+			validator: $.optional.nullable.str
+		},
+	},
+
+	errors: {
+		noSuchUser: {
+			message: 'No such user.',
+			code: 'NO_SUCH_USER',
+			id: '7ad3fa3e-5e12-42f0-b23a-f3d13f10ee4b'
+		}
+	}
+};
+
+export default define(meta, async (ps, me) => {
+	const user = await Users.findOne(ps.userId != null
+		? { id: ps.userId }
+		: { usernameLower: ps.username!.toLowerCase(), host: toPunyNullable(ps.host) });
+
+	if (user == null) {
+		throw new ApiError(meta.errors.noSuchUser);
+	}
+
+	const profile = await UserProfiles.findOne(user.id).then(ensure);
+
+	if (profile.room.furnitures == null) {
+		await UserProfiles.update({ userId: user.id }, {
+			room: {
+				furnitures: [],
+				...profile.room
+			}
+		});
+
+		profile.room.furnitures = [];
+	}
+
+	if (profile.room.roomType == null) {
+		const initialType = 'default';
+		await UserProfiles.update({ userId: user.id }, {
+			room: {
+				roomType: initialType as any,
+				...profile.room
+			}
+		});
+
+		profile.room.roomType = initialType;
+	}
+
+	if (profile.room.carpetColor == null) {
+		const initialColor = '#85CAF0';
+		await UserProfiles.update({ userId: user.id }, {
+			room: {
+				carpetColor: initialColor as any,
+				...profile.room
+			}
+		});
+
+		profile.room.carpetColor = initialColor;
+	}
+
+	return profile.room;
+});
--- a/src/server/api/endpoints/room/update.ts
+++ b/src/server/api/endpoints/room/update.ts
@ -0,0 +1,48 @@
+import $ from 'cafy';
+import { publishMainStream } from '../../../../services/stream';
+import define from '../../define';
+import { Users, UserProfiles } from '../../../../models';
+
+export const meta = {
+	requireCredential: true,
+
+	params: {
+		room: {
+			validator: $.obj({
+				furnitures: $.arr($.obj({
+					id: $.str,
+					type: $.str,
+					position: $.obj({
+						x: $.num,
+						y: $.num,
+						z: $.num,
+					}),
+					rotation: $.obj({
+						x: $.num,
+						y: $.num,
+						z: $.num,
+					}),
+					props: $.optional.nullable.obj(),
+				})),
+				roomType: $.str,
+				carpetColor: $.str
+			})
+		},
+	},
+};
+
+export default define(meta, async (ps, user) => {
+	await UserProfiles.update({ userId: user.id }, {
+		room: ps.room as any
+	});
+
+	const iObj = await Users.pack(user.id, user, {
+		detail: true,
+		includeSecrets: true
+	});
+
+	// Publish meUpdated event
+	publishMainStream(user.id, 'meUpdated', iObj);
+
+	return iObj;
+});