enhance: チャットの閲覧を無効化できるように
This commit is contained in:
		
							parent
							
								
									f9a3db2ac3
								
							
						
					
					
						commit
						0835c46bf1
					
				|  | @ -5382,6 +5382,10 @@ export interface Locale extends ILocale { | |||
|      * 埋め込み | ||||
|      */ | ||||
|     "embed": string; | ||||
|     /** | ||||
|      * 読み取り専用 | ||||
|      */ | ||||
|     "readonly": string; | ||||
|     "_chat": { | ||||
|         /** | ||||
|          * まだメッセージはありません | ||||
|  | @ -7527,7 +7531,7 @@ export interface Locale extends ILocale { | |||
|             /** | ||||
|              * チャットを許可 | ||||
|              */ | ||||
|             "canChat": string; | ||||
|             "chatAvailability": string; | ||||
|         }; | ||||
|         "_condition": { | ||||
|             /** | ||||
|  |  | |||
|  | @ -1341,6 +1341,7 @@ right: "右" | |||
| bottom: "下" | ||||
| top: "上" | ||||
| embed: "埋め込み" | ||||
| readonly: "読み取り専用" | ||||
| 
 | ||||
| _chat: | ||||
|   noMessagesYet: "まだメッセージはありません" | ||||
|  | @ -1949,7 +1950,7 @@ _role: | |||
|     canImportFollowing: "フォローのインポートを許可" | ||||
|     canImportMuting: "ミュートのインポートを許可" | ||||
|     canImportUserLists: "リストのインポートを許可" | ||||
|     canChat: "チャットを許可" | ||||
|     chatAvailability: "チャットを許可" | ||||
|   _condition: | ||||
|     roleAssignedTo: "マニュアルロールにアサイン済み" | ||||
|     isLocal: "ローカルユーザー" | ||||
|  |  | |||
|  | @ -28,6 +28,7 @@ import { CustomEmojiService } from '@/core/CustomEmojiService.js'; | |||
| import { emojiRegex } from '@/misc/emoji-regex.js'; | ||||
| import { NotificationService } from '@/core/NotificationService.js'; | ||||
| import { ModerationLogService } from '@/core/ModerationLogService.js'; | ||||
| import { ApiError } from '@/server/api/error.js'; | ||||
| 
 | ||||
| const MAX_ROOM_MEMBERS = 30; | ||||
| const MAX_REACTIONS_PER_MESSAGE = 100; | ||||
|  | @ -94,6 +95,45 @@ export class ChatService { | |||
| 	) { | ||||
| 	} | ||||
| 
 | ||||
| 	@bindThis | ||||
| 	public async getChatAvailability(userId: MiUser['id']): Promise<{ read: boolean; write: boolean; }> { | ||||
| 		const policies = await this.roleService.getUserPolicies(userId); | ||||
| 
 | ||||
| 		switch (policies.chatAvailability) { | ||||
| 			case 'available': | ||||
| 				return { | ||||
| 					read: true, | ||||
| 					write: true, | ||||
| 				}; | ||||
| 			case 'readonly': | ||||
| 				return { | ||||
| 					read: true, | ||||
| 					write: false, | ||||
| 				}; | ||||
| 			case 'unavailable': | ||||
| 				return { | ||||
| 					read: false, | ||||
| 					write: false, | ||||
| 				}; | ||||
| 			default: | ||||
| 				throw new Error('invalid chat availability (unreachable)'); | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	/** getChatAvailabilityの糖衣。API呼び出し時に走らせて、権限的に問題ない場合はそのまま続行する */ | ||||
| 	@bindThis | ||||
| 	public async checkChatAvailabilityForApi(userId: MiUser['id'], permission: 'read' | 'write') { | ||||
| 		const policy = await this.getChatAvailability(userId); | ||||
| 		if (policy[permission] === false) { | ||||
| 			throw new ApiError({ | ||||
| 				message: 'You are not assigned to a required role.', | ||||
| 				code: 'ROLE_PERMISSION_DENIED', | ||||
| 				kind: 'permission', | ||||
| 				id: '7f86f06f-7e15-4057-8561-f4b6d4ac755a', | ||||
| 			}); | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	@bindThis | ||||
| 	public async createMessageToUser(fromUser: { id: MiUser['id']; host: MiUser['host']; }, toUser: MiUser, params: { | ||||
| 		text?: string | null; | ||||
|  | @ -140,7 +180,7 @@ export class ChatService { | |||
| 			} | ||||
| 		} | ||||
| 
 | ||||
| 		if (!(await this.roleService.getUserPolicies(toUser.id)).canChat) { | ||||
| 		if (!(await this.getChatAvailability(toUser.id)).write) { | ||||
| 			throw new Error('recipient is cannot chat (policy)'); | ||||
| 		} | ||||
| 
 | ||||
|  |  | |||
|  | @ -63,7 +63,7 @@ export type RolePolicies = { | |||
| 	canImportFollowing: boolean; | ||||
| 	canImportMuting: boolean; | ||||
| 	canImportUserLists: boolean; | ||||
| 	canChat: boolean; | ||||
| 	chatAvailability: 'available' | 'readonly' | 'unavailable'; | ||||
| }; | ||||
| 
 | ||||
| export const DEFAULT_POLICIES: RolePolicies = { | ||||
|  | @ -98,7 +98,7 @@ export const DEFAULT_POLICIES: RolePolicies = { | |||
| 	canImportFollowing: true, | ||||
| 	canImportMuting: true, | ||||
| 	canImportUserLists: true, | ||||
| 	canChat: true, | ||||
| 	chatAvailability: 'available', | ||||
| }; | ||||
| 
 | ||||
| @Injectable() | ||||
|  | @ -370,6 +370,12 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit { | |||
| 			return aggregate(policies.map(policy => policy.useDefault ? basePolicies[name] : policy.value)); | ||||
| 		} | ||||
| 
 | ||||
| 		function aggregateChatAvailability(vs: RolePolicies['chatAvailability'][]) { | ||||
| 			if (vs.some(v => v === 'available')) return 'available'; | ||||
| 			if (vs.some(v => v === 'readonly')) return 'readonly'; | ||||
| 			return 'unavailable'; | ||||
| 		} | ||||
| 
 | ||||
| 		return { | ||||
| 			gtlAvailable: calc('gtlAvailable', vs => vs.some(v => v === true)), | ||||
| 			ltlAvailable: calc('ltlAvailable', vs => vs.some(v => v === true)), | ||||
|  | @ -402,7 +408,7 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit { | |||
| 			canImportFollowing: calc('canImportFollowing', vs => vs.some(v => v === true)), | ||||
| 			canImportMuting: calc('canImportMuting', vs => vs.some(v => v === true)), | ||||
| 			canImportUserLists: calc('canImportUserLists', vs => vs.some(v => v === true)), | ||||
| 			canChat: calc('canChat', vs => vs.some(v => v === true)), | ||||
| 			chatAvailability: calc('chatAvailability', aggregateChatAvailability), | ||||
| 		}; | ||||
| 	} | ||||
| 
 | ||||
|  |  | |||
|  | @ -557,7 +557,7 @@ export class UserEntityService implements OnModuleInit { | |||
| 				followersVisibility: profile!.followersVisibility, | ||||
| 				followingVisibility: profile!.followingVisibility, | ||||
| 				chatScope: user.chatScope, | ||||
| 				canChat: this.roleService.getUserPolicies(user.id).then(r => r.canChat), | ||||
| 				canChat: this.roleService.getUserPolicies(user.id).then(r => r.chatAvailability === 'available'), | ||||
| 				roles: this.roleService.getUserRoles(user.id).then(roles => roles.filter(role => role.isPublic).sort((a, b) => b.displayOrder - a.displayOrder).map(role => ({ | ||||
| 					id: role.id, | ||||
| 					name: role.name, | ||||
|  |  | |||
|  | @ -292,9 +292,10 @@ export const packedRolePoliciesSchema = { | |||
| 			type: 'boolean', | ||||
| 			optional: false, nullable: false, | ||||
| 		}, | ||||
| 		canChat: { | ||||
| 			type: 'boolean', | ||||
| 		chatAvailability: { | ||||
| 			type: 'string', | ||||
| 			optional: false, nullable: false, | ||||
| 			enum: ['available', 'readonly', 'unavailable'], | ||||
| 		}, | ||||
| 	}, | ||||
| } as const; | ||||
|  |  | |||
|  | @ -46,6 +46,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatService: ChatService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'read'); | ||||
| 
 | ||||
| 			const history = ps.room ? await this.chatService.roomHistory(me.id, ps.limit) : await this.chatService.userHistory(me.id, ps.limit); | ||||
| 
 | ||||
| 			const packedMessages = await this.chatEntityService.packMessagesDetailed(history, me); | ||||
|  |  | |||
|  | @ -16,7 +16,6 @@ export const meta = { | |||
| 	tags: ['chat'], | ||||
| 
 | ||||
| 	requireCredential: true, | ||||
| 	requiredRolePolicy: 'canChat', | ||||
| 
 | ||||
| 	prohibitMoved: true, | ||||
| 
 | ||||
|  | @ -74,6 +73,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatService: ChatService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'write'); | ||||
| 
 | ||||
| 			const room = await this.chatService.findRoomById(ps.toRoomId); | ||||
| 			if (room == null) { | ||||
| 				throw new ApiError(meta.errors.noSuchRoom); | ||||
|  |  | |||
|  | @ -16,7 +16,6 @@ export const meta = { | |||
| 	tags: ['chat'], | ||||
| 
 | ||||
| 	requireCredential: true, | ||||
| 	requiredRolePolicy: 'canChat', | ||||
| 
 | ||||
| 	prohibitMoved: true, | ||||
| 
 | ||||
|  | @ -86,6 +85,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatService: ChatService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'write'); | ||||
| 
 | ||||
| 			let file = null; | ||||
| 			if (ps.fileId != null) { | ||||
| 				file = await this.driveFilesRepository.findOneBy({ | ||||
|  |  | |||
|  | @ -13,7 +13,6 @@ export const meta = { | |||
| 	tags: ['chat'], | ||||
| 
 | ||||
| 	requireCredential: true, | ||||
| 	requiredRolePolicy: 'canChat', | ||||
| 
 | ||||
| 	kind: 'write:chat', | ||||
| 
 | ||||
|  | @ -43,6 +42,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatService: ChatService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'write'); | ||||
| 
 | ||||
| 			const message = await this.chatService.findMyMessageById(me.id, ps.messageId); | ||||
| 			if (message == null) { | ||||
| 				throw new ApiError(meta.errors.noSuchMessage); | ||||
|  |  | |||
|  | @ -13,7 +13,6 @@ export const meta = { | |||
| 	tags: ['chat'], | ||||
| 
 | ||||
| 	requireCredential: true, | ||||
| 	requiredRolePolicy: 'canChat', | ||||
| 
 | ||||
| 	kind: 'write:chat', | ||||
| 
 | ||||
|  | @ -44,6 +43,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatService: ChatService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'write'); | ||||
| 
 | ||||
| 			await this.chatService.react(ps.messageId, me.id, ps.reaction); | ||||
| 		}); | ||||
| 	} | ||||
|  |  | |||
|  | @ -54,6 +54,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatService: ChatService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'read'); | ||||
| 
 | ||||
| 			const room = await this.chatService.findRoomById(ps.roomId); | ||||
| 			if (room == null) { | ||||
| 				throw new ApiError(meta.errors.noSuchRoom); | ||||
|  |  | |||
|  | @ -54,6 +54,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatService: ChatService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'read'); | ||||
| 
 | ||||
| 			if (ps.roomId != null) { | ||||
| 				const room = await this.chatService.findRoomById(ps.roomId); | ||||
| 				if (room == null) { | ||||
|  |  | |||
|  | @ -50,6 +50,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatEntityService: ChatEntityService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'read'); | ||||
| 
 | ||||
| 			const message = await this.chatService.findMessageById(ps.messageId); | ||||
| 			if (message == null) { | ||||
| 				throw new ApiError(meta.errors.noSuchMessage); | ||||
|  |  | |||
|  | @ -13,7 +13,6 @@ export const meta = { | |||
| 	tags: ['chat'], | ||||
| 
 | ||||
| 	requireCredential: true, | ||||
| 	requiredRolePolicy: 'canChat', | ||||
| 
 | ||||
| 	kind: 'write:chat', | ||||
| 
 | ||||
|  | @ -44,6 +43,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatService: ChatService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'write'); | ||||
| 
 | ||||
| 			await this.chatService.unreact(ps.messageId, me.id, ps.reaction); | ||||
| 		}); | ||||
| 	} | ||||
|  |  | |||
|  | @ -56,6 +56,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private getterService: GetterService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'read'); | ||||
| 
 | ||||
| 			const other = await this.getterService.getUser(ps.userId).catch(err => { | ||||
| 				if (err.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); | ||||
| 				throw err; | ||||
|  |  | |||
|  | @ -15,7 +15,6 @@ export const meta = { | |||
| 	tags: ['chat'], | ||||
| 
 | ||||
| 	requireCredential: true, | ||||
| 	requiredRolePolicy: 'canChat', | ||||
| 
 | ||||
| 	prohibitMoved: true, | ||||
| 
 | ||||
|  | @ -52,6 +51,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatEntityService: ChatEntityService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'write'); | ||||
| 
 | ||||
| 			const room = await this.chatService.createRoom(me, { | ||||
| 				name: ps.name, | ||||
| 				description: ps.description ?? '', | ||||
|  |  | |||
|  | @ -42,6 +42,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatService: ChatService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'write'); | ||||
| 
 | ||||
| 			const room = await this.chatService.findRoomById(ps.roomId); | ||||
| 			if (room == null) { | ||||
| 				throw new ApiError(meta.errors.noSuchRoom); | ||||
|  |  | |||
|  | @ -15,7 +15,6 @@ export const meta = { | |||
| 	tags: ['chat'], | ||||
| 
 | ||||
| 	requireCredential: true, | ||||
| 	requiredRolePolicy: 'canChat', | ||||
| 
 | ||||
| 	prohibitMoved: true, | ||||
| 
 | ||||
|  | @ -57,6 +56,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatEntityService: ChatEntityService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'write'); | ||||
| 
 | ||||
| 			const room = await this.chatService.findMyRoomById(me.id, ps.roomId); | ||||
| 			if (room == null) { | ||||
| 				throw new ApiError(meta.errors.noSuchRoom); | ||||
|  |  | |||
|  | @ -42,6 +42,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatService: ChatService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'write'); | ||||
| 
 | ||||
| 			await this.chatService.ignoreRoomInvitation(me.id, ps.roomId); | ||||
| 		}); | ||||
| 	} | ||||
|  |  | |||
|  | @ -47,6 +47,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatService: ChatService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'read'); | ||||
| 
 | ||||
| 			const invitations = await this.chatService.getReceivedRoomInvitationsWithPagination(me.id, ps.limit, ps.sinceId, ps.untilId); | ||||
| 			return this.chatEntityService.packRoomInvitations(invitations, me); | ||||
| 		}); | ||||
|  |  | |||
|  | @ -55,6 +55,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatEntityService: ChatEntityService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'read'); | ||||
| 
 | ||||
| 			const room = await this.chatService.findMyRoomById(me.id, ps.roomId); | ||||
| 			if (room == null) { | ||||
| 				throw new ApiError(meta.errors.noSuchRoom); | ||||
|  |  | |||
|  | @ -42,6 +42,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatService: ChatService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'write'); | ||||
| 
 | ||||
| 			await this.chatService.joinToRoom(me.id, ps.roomId); | ||||
| 		}); | ||||
| 	} | ||||
|  |  | |||
|  | @ -47,6 +47,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatEntityService: ChatEntityService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'read'); | ||||
| 
 | ||||
| 			const memberships = await this.chatService.getMyMemberships(me.id, ps.limit, ps.sinceId, ps.untilId); | ||||
| 
 | ||||
| 			return this.chatEntityService.packRoomMemberships(memberships, me, { | ||||
|  |  | |||
|  | @ -42,6 +42,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatService: ChatService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'write'); | ||||
| 
 | ||||
| 			await this.chatService.leaveRoom(me.id, ps.roomId); | ||||
| 		}); | ||||
| 	} | ||||
|  |  | |||
|  | @ -54,6 +54,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatEntityService: ChatEntityService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'read'); | ||||
| 
 | ||||
| 			const room = await this.chatService.findRoomById(ps.roomId); | ||||
| 			if (room == null) { | ||||
| 				throw new ApiError(meta.errors.noSuchRoom); | ||||
|  |  | |||
|  | @ -43,6 +43,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatService: ChatService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'write'); | ||||
| 
 | ||||
| 			await this.chatService.muteRoom(me.id, ps.roomId, ps.mute); | ||||
| 		}); | ||||
| 	} | ||||
|  |  | |||
|  | @ -47,6 +47,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatService: ChatService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'read'); | ||||
| 
 | ||||
| 			const rooms = await this.chatService.getOwnedRoomsWithPagination(me.id, ps.limit, ps.sinceId, ps.untilId); | ||||
| 			return this.chatEntityService.packRooms(rooms, me); | ||||
| 		}); | ||||
|  |  | |||
|  | @ -47,6 +47,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatEntityService: ChatEntityService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'read'); | ||||
| 
 | ||||
| 			const room = await this.chatService.findRoomById(ps.roomId); | ||||
| 			if (room == null) { | ||||
| 				throw new ApiError(meta.errors.noSuchRoom); | ||||
|  |  | |||
|  | @ -49,6 +49,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | |||
| 		private chatEntityService: ChatEntityService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			await this.chatService.checkChatAvailabilityForApi(me.id, 'write'); | ||||
| 
 | ||||
| 			const room = await this.chatService.findMyRoomById(me.id, ps.roomId); | ||||
| 			if (room == null) { | ||||
| 				throw new ApiError(meta.errors.noSuchRoom); | ||||
|  |  | |||
|  | @ -108,7 +108,7 @@ export const ROLE_POLICIES = [ | |||
| 	'canImportFollowing', | ||||
| 	'canImportMuting', | ||||
| 	'canImportUserLists', | ||||
| 	'canChat', | ||||
| 	'chatAvailability', | ||||
| ] as const; | ||||
| 
 | ||||
| export const DEFAULT_SERVER_ERROR_IMAGE_URL = 'https://xn--931a.moe/assets/error.jpg'; | ||||
|  |  | |||
|  | @ -114,6 +114,7 @@ export const navbarItemDef = reactive({ | |||
| 		title: i18n.ts.chat, | ||||
| 		icon: 'ti ti-messages', | ||||
| 		to: '/chat', | ||||
| 		show: computed(() => $i != null && $i.policies.chatAvailability !== 'unavailable'), | ||||
| 		indicated: computed(() => $i != null && $i.hasUnreadChatMessages), | ||||
| 	}, | ||||
| 	achievements: { | ||||
|  |  | |||
|  | @ -165,21 +165,24 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| 				</div> | ||||
| 			</MkFolder> | ||||
| 
 | ||||
| 			<MkFolder v-if="matchQuery([i18n.ts._role._options.canChat, 'canChat'])"> | ||||
| 				<template #label>{{ i18n.ts._role._options.canChat }}</template> | ||||
| 			<MkFolder v-if="matchQuery([i18n.ts._role._options.chatAvailability, 'chatAvailability'])"> | ||||
| 				<template #label>{{ i18n.ts._role._options.chatAvailability }}</template> | ||||
| 				<template #suffix> | ||||
| 					<span v-if="role.policies.canChat.useDefault" :class="$style.useDefaultLabel">{{ i18n.ts._role.useBaseValue }}</span> | ||||
| 					<span v-else>{{ role.policies.canChat.value ? i18n.ts.yes : i18n.ts.no }}</span> | ||||
| 					<span :class="$style.priorityIndicator"><i :class="getPriorityIcon(role.policies.canChat)"></i></span> | ||||
| 					<span v-if="role.policies.chatAvailability.useDefault" :class="$style.useDefaultLabel">{{ i18n.ts._role.useBaseValue }}</span> | ||||
| 					<span v-else>{{ policies.chatAvailability === 'available' ? i18n.ts.yes : policies.chatAvailability === 'readonly' ? i18n.ts.readonly : i18n.ts.no }}</span> | ||||
| 					<span :class="$style.priorityIndicator"><i :class="getPriorityIcon(role.policies.chatAvailability)"></i></span> | ||||
| 				</template> | ||||
| 				<div class="_gaps"> | ||||
| 					<MkSwitch v-model="role.policies.canChat.useDefault" :readonly="readonly"> | ||||
| 					<MkSwitch v-model="role.policies.chatAvailability.useDefault" :readonly="readonly"> | ||||
| 						<template #label>{{ i18n.ts._role.useBaseValue }}</template> | ||||
| 					</MkSwitch> | ||||
| 					<MkSwitch v-model="role.policies.canChat.value" :disabled="role.policies.canChat.useDefault" :readonly="readonly"> | ||||
| 					<MkSelect v-model="role.policies.chatAvailability.value" :disabled="role.policies.chatAvailability.useDefault" :readonly="readonly"> | ||||
| 						<template #label>{{ i18n.ts.enable }}</template> | ||||
| 					</MkSwitch> | ||||
| 					<MkRange v-model="role.policies.canChat.priority" :min="0" :max="2" :step="1" easing :textConverter="(v) => v === 0 ? i18n.ts._role._priority.low : v === 1 ? i18n.ts._role._priority.middle : v === 2 ? i18n.ts._role._priority.high : ''"> | ||||
| 						<option value="available">{{ i18n.ts.enabled }}</option> | ||||
| 						<option value="readonly">{{ i18n.ts.readonly }}</option> | ||||
| 						<option value="unavailable">{{ i18n.ts.disabled }}</option> | ||||
| 					</MkSelect> | ||||
| 					<MkRange v-model="role.policies.chatAvailability.priority" :min="0" :max="2" :step="1" easing :textConverter="(v) => v === 0 ? i18n.ts._role._priority.low : v === 1 ? i18n.ts._role._priority.middle : v === 2 ? i18n.ts._role._priority.high : ''"> | ||||
| 						<template #label>{{ i18n.ts._role.priority }}</template> | ||||
| 					</MkRange> | ||||
| 				</div> | ||||
|  |  | |||
|  | @ -51,12 +51,15 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| 							</MkSwitch> | ||||
| 						</MkFolder> | ||||
| 
 | ||||
| 						<MkFolder v-if="matchQuery([i18n.ts._role._options.canChat, 'canChat'])"> | ||||
| 							<template #label>{{ i18n.ts._role._options.canChat }}</template> | ||||
| 							<template #suffix>{{ policies.canChat ? i18n.ts.yes : i18n.ts.no }}</template> | ||||
| 							<MkSwitch v-model="policies.canChat"> | ||||
| 						<MkFolder v-if="matchQuery([i18n.ts._role._options.chatAvailability, 'chatAvailability'])"> | ||||
| 							<template #label>{{ i18n.ts._role._options.chatAvailability }}</template> | ||||
| 							<template #suffix>{{ policies.chatAvailability === 'available' ? i18n.ts.yes : policies.chatAvailability === 'readonly' ? i18n.ts.readonly : i18n.ts.no }}</template> | ||||
| 							<MkSelect v-model="policies.chatAvailability"> | ||||
| 								<template #label>{{ i18n.ts.enable }}</template> | ||||
| 							</MkSwitch> | ||||
| 								<option value="available">{{ i18n.ts.enabled }}</option> | ||||
| 								<option value="readonly">{{ i18n.ts.readonly }}</option> | ||||
| 								<option value="unavailable">{{ i18n.ts.disabled }}</option> | ||||
| 							</MkSelect> | ||||
| 						</MkFolder> | ||||
| 
 | ||||
| 						<MkFolder v-if="matchQuery([i18n.ts._role._options.mentionMax, 'mentionLimit'])"> | ||||
|  | @ -295,6 +298,7 @@ import MkInput from '@/components/MkInput.vue'; | |||
| import MkFolder from '@/components/MkFolder.vue'; | ||||
| import MkSwitch from '@/components/MkSwitch.vue'; | ||||
| import MkButton from '@/components/MkButton.vue'; | ||||
| import MkSelect from '@/components/MkSelect.vue'; | ||||
| import MkRange from '@/components/MkRange.vue'; | ||||
| import MkRolePreview from '@/components/MkRolePreview.vue'; | ||||
| import * as os from '@/os.js'; | ||||
|  |  | |||
|  | @ -85,7 +85,7 @@ const isMe = computed(() => props.message.fromUserId === $i.id); | |||
| const urls = computed(() => props.message.text ? extractUrlFromMfm(mfm.parse(props.message.text)) : []); | ||||
| 
 | ||||
| provide(DI.mfmEmojiReactCallback, (reaction) => { | ||||
| 	if (!$i.policies.canChat) return; | ||||
| 	if (!$i.policies.chatAvailability === 'available') return; | ||||
| 
 | ||||
| 	sound.playMisskeySfx('reaction'); | ||||
| 	misskeyApi('chat/messages/react', { | ||||
|  | @ -95,7 +95,7 @@ provide(DI.mfmEmojiReactCallback, (reaction) => { | |||
| }); | ||||
| 
 | ||||
| function react(ev: MouseEvent) { | ||||
| 	if (!$i.policies.canChat) return; | ||||
| 	if (!$i.policies.chatAvailability === 'available') return; | ||||
| 
 | ||||
| 	const targetEl = getHTMLElementOrNull(ev.currentTarget ?? ev.target); | ||||
| 	if (!targetEl) return; | ||||
|  | @ -110,7 +110,7 @@ function react(ev: MouseEvent) { | |||
| } | ||||
| 
 | ||||
| function onReactionClick(record: Misskey.entities.ChatMessage['reactions'][0]) { | ||||
| 	if (!$i.policies.canChat) return; | ||||
| 	if (!$i.policies.chatAvailability === 'available') return; | ||||
| 
 | ||||
| 	if (record.user.id === $i.id) { | ||||
| 		misskeyApi('chat/messages/unreact', { | ||||
|  | @ -138,7 +138,7 @@ function onContextmenu(ev: MouseEvent) { | |||
| function showMenu(ev: MouseEvent, contextmenu = false) { | ||||
| 	const menu: MenuItem[] = []; | ||||
| 
 | ||||
| 	if (!isMe.value && $i.policies.canChat) { | ||||
| 	if (!isMe.value && $i.policies.chatAvailability === 'available') { | ||||
| 		menu.push({ | ||||
| 			text: i18n.ts.reaction, | ||||
| 			icon: 'ti ti-mood-plus', | ||||
|  | @ -164,7 +164,7 @@ function showMenu(ev: MouseEvent, contextmenu = false) { | |||
| 		type: 'divider', | ||||
| 	}); | ||||
| 
 | ||||
| 	if (isMe.value && $i.policies.canChat) { | ||||
| 	if (isMe.value && $i.policies.chatAvailability === 'available') { | ||||
| 		menu.push({ | ||||
| 			text: i18n.ts.delete, | ||||
| 			icon: 'ti ti-trash', | ||||
|  |  | |||
|  | @ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| 
 | ||||
| <template> | ||||
| <div class="_gaps"> | ||||
| 	<MkButton v-if="$i.policies.canChat" primary gradate rounded :class="$style.start" @click="start"><i class="ti ti-plus"></i> {{ i18n.ts.startChat }}</MkButton> | ||||
| 	<MkButton v-if="$i.policies.chatAvailability === 'available'" primary gradate rounded :class="$style.start" @click="start"><i class="ti ti-plus"></i> {{ i18n.ts.startChat }}</MkButton> | ||||
| 
 | ||||
| 	<MkInfo v-else>{{ i18n.ts._chat.chatNotAvailableForThisAccountOrServer }}</MkInfo> | ||||
| 
 | ||||
|  |  | |||
|  | @ -53,7 +53,7 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| 			<MkInfo warn>{{ i18n.ts._chat.chatNotAvailableInOtherAccount }}</MkInfo> | ||||
| 		</div> | ||||
| 
 | ||||
| 		<MkInfo v-if="!$i.policies.canChat" warn>{{ i18n.ts._chat.chatNotAvailableForThisAccountOrServer }}</MkInfo> | ||||
| 		<MkInfo v-if="!$i.policies.chatAvailability !== 'available'" warn>{{ i18n.ts._chat.chatNotAvailableForThisAccountOrServer }}</MkInfo> | ||||
| 	</MkSpacer> | ||||
| 
 | ||||
| 	<MkSpacer v-else-if="tab === 'search'" :contentMax="700"> | ||||
|  |  | |||
|  | @ -16,6 +16,10 @@ export const page = (loader: AsyncComponentLoader) => defineAsyncComponent({ | |||
| 	errorComponent: MkError, | ||||
| }); | ||||
| 
 | ||||
| function chatPage(...args: Parameters<typeof page>) { | ||||
| 	return $i?.policies.chatAvailability !== 'unavailable' ? page(...args) : page(() => import('@/pages/not-found.vue')); | ||||
| } | ||||
| 
 | ||||
| export const ROUTE_DEF = [{ | ||||
| 	path: '/@:username/pages/:pageName(*)', | ||||
| 	component: page(() => import('@/pages/page.vue')), | ||||
|  | @ -42,19 +46,19 @@ export const ROUTE_DEF = [{ | |||
| 	component: page(() => import('@/pages/clip.vue')), | ||||
| }, { | ||||
| 	path: '/chat', | ||||
| 	component: page(() => import('@/pages/chat/home.vue')), | ||||
| 	component: chatPage(() => import('@/pages/chat/home.vue')), | ||||
| 	loginRequired: true, | ||||
| }, { | ||||
| 	path: '/chat/user/:userId', | ||||
| 	component: page(() => import('@/pages/chat/room.vue')), | ||||
| 	component: chatPage(() => import('@/pages/chat/room.vue')), | ||||
| 	loginRequired: true, | ||||
| }, { | ||||
| 	path: '/chat/room/:roomId', | ||||
| 	component: page(() => import('@/pages/chat/room.vue')), | ||||
| 	component: chatPage(() => import('@/pages/chat/room.vue')), | ||||
| 	loginRequired: true, | ||||
| }, { | ||||
| 	path: '/chat/messages/:messageId', | ||||
| 	component: page(() => import('@/pages/chat/message.vue')), | ||||
| 	component: chatPage(() => import('@/pages/chat/message.vue')), | ||||
| 	loginRequired: true, | ||||
| }, { | ||||
| 	path: '/instance-info/:host', | ||||
|  |  | |||
|  | @ -364,7 +364,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router | |||
| 			}, | ||||
| 		}); | ||||
| 
 | ||||
| 		if ($i.policies.canChat && user.canChat && user.host == null) { | ||||
| 		if ($i.policies.chatAvailability === 'available' && user.canChat && user.host == null) { | ||||
| 			menuItems.push({ | ||||
| 				type: 'link', | ||||
| 				icon: 'ti ti-messages', | ||||
|  |  | |||
|  | @ -5179,7 +5179,8 @@ export type components = { | |||
|       canImportFollowing: boolean; | ||||
|       canImportMuting: boolean; | ||||
|       canImportUserLists: boolean; | ||||
|       canChat: boolean; | ||||
|       /** @enum {string} */ | ||||
|       chatAvailability: 'available' | 'readonly' | 'unavailable'; | ||||
|     }; | ||||
|     ReversiGameLite: { | ||||
|       /** Format: id */ | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue