sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bye room

Browse Source
This commit is contained in:
syuilo
2022-01-07 17:06:47 +09:00
parent f897357b3c
commit faef125b74
160 changed files with 11 additions and 1885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/backend/src/models/entities/user-profile.ts
View File

@ -124,6 +124,7 @@ export class UserProfile {
})
public clientData: Record<string, any>;
// TODO: そのうち消す
@Column('jsonb', {
default: {},
comment: 'The room data of the User.',

160
packages/backend/src/server/api/endpoints/room/show.ts
View File

@ -1,160 +0,0 @@
import $ from 'cafy';
import define from '../../define';
import { ApiError } from '../../error';
import { Users, UserProfiles } from '@/models/index';
import { ID } from '@/misc/cafy-id';
import { toPunyNullable } from '@/misc/convert-host';
export const meta = {
tags: ['room'],
requireCredential: false as const,
params: {
userId: {
validator: $.optional.type(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',
},
},
res: {
type: 'object' as const,
optional: false as const, nullable: false as const,
properties: {
roomType: {
type: 'string' as const,
optional: false as const, nullable: false as const,
enum: ['default', 'washitsu'],
},
furnitures: {
type: 'array' as const,
optional: false as const, nullable: false as const,
items: {
type: 'object' as const,
optional: false as const, nullable: false as const,
properties: {
id: {
type: 'string' as const,
optional: false as const, nullable: false as const,
},
type: {
type: 'string' as const,
optional: false as const, nullable: false as const,
},
props: {
type: 'object' as const,
optional: true as const, nullable: false as const,
},
position: {
type: 'object' as const,
optional: false as const, nullable: false as const,
properties: {
x: {
type: 'number' as const,
optional: false as const, nullable: false as const,
},
y: {
type: 'number' as const,
optional: false as const, nullable: false as const,
},
z: {
type: 'number' as const,
optional: false as const, nullable: false as const,
},
},
},
rotation: {
type: 'object' as const,
optional: false as const, nullable: false as const,
properties: {
x: {
type: 'number' as const,
optional: false as const, nullable: false as const,
},
y: {
type: 'number' as const,
optional: false as const, nullable: false as const,
},
z: {
type: 'number' as const,
optional: false as const, nullable: false as const,
},
},
},
},
},
},
carpetColor: {
type: 'string' as const,
optional: false as const, nullable: false as const,
format: 'hex',
example: '#85CAF0',
},
},
},
};
// eslint-disable-next-line import/no-default-export
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.findOneOrFail(user.id);
if (profile.room.furnitures == null) {
await UserProfiles.update(user.id, {
room: {
furnitures: [],
...profile.room,
},
});
profile.room.furnitures = [];
}
if (profile.room.roomType == null) {
const initialType = 'default';
await UserProfiles.update(user.id, {
room: {
roomType: initialType as any,
...profile.room,
},
});
profile.room.roomType = initialType;
}
if (profile.room.carpetColor == null) {
const initialColor = '#85CAF0';
await UserProfiles.update(user.id, {
room: {
carpetColor: initialColor as any,
...profile.room,
},
});
profile.room.carpetColor = initialColor;
}
return profile.room;
});

52
packages/backend/src/server/api/endpoints/room/update.ts
View File

@ -1,52 +0,0 @@
import $ from 'cafy';
import { publishMainStream } from '@/services/stream';
import define from '../../define';
import { Users, UserProfiles } from '@/models/index';
export const meta = {
tags: ['room'],
requireCredential: true as const,
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,
}),
},
},
};
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
await UserProfiles.update(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);
// TODO: レスポンスがおかしいと思う by YuzuRyo61
return iObj;
});