Merge 5437289c4e
into 0e90589290
This commit is contained in:
commit
442ca61d2d
|
@ -20,6 +20,8 @@
|
||||||
### General
|
### General
|
||||||
- Feat: コンテンツの表示にログインを必須にできるように
|
- Feat: コンテンツの表示にログインを必須にできるように
|
||||||
- Feat: 過去のノートを非公開化/フォロワーのみ表示可能にできるように
|
- Feat: 過去のノートを非公開化/フォロワーのみ表示可能にできるように
|
||||||
|
- Feat: チャンネルミュート機能の実装 #10649
|
||||||
|
- チャンネルの概要画面の右上からミュートできます(リンクコピー、共有、設定と同列)
|
||||||
- Enhance: 依存関係の更新
|
- Enhance: 依存関係の更新
|
||||||
- Enhance: l10nの更新
|
- Enhance: l10nの更新
|
||||||
- Fix: お知らせ作成時に画像URL入力欄を空欄に変更できないのを修正 ( #14976 )
|
- Fix: お知らせ作成時に画像URL入力欄を空欄に変更できないのを修正 ( #14976 )
|
||||||
|
|
|
@ -7,6 +7,7 @@ const base = require('./jest.config.cjs')
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
...base,
|
...base,
|
||||||
|
globalSetup: "<rootDir>/test/jest.setup.unit.cjs",
|
||||||
testMatch: [
|
testMatch: [
|
||||||
"<rootDir>/test/unit/**/*.ts",
|
"<rootDir>/test/unit/**/*.ts",
|
||||||
"<rootDir>/src/**/*.test.ts",
|
"<rootDir>/src/**/*.test.ts",
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
export class AddChannelMuting1718015380000 {
|
||||||
|
name = 'AddChannelMuting1718015380000'
|
||||||
|
|
||||||
|
async up(queryRunner) {
|
||||||
|
await queryRunner.query(`
|
||||||
|
CREATE TABLE "channel_muting"
|
||||||
|
(
|
||||||
|
"id" varchar(32) NOT NULL,
|
||||||
|
"userId" varchar(32) NOT NULL,
|
||||||
|
"channelId" varchar(32) NOT NULL,
|
||||||
|
"expiresAt" timestamp with time zone,
|
||||||
|
CONSTRAINT "PK_channel_muting_id" PRIMARY KEY ("id"),
|
||||||
|
CONSTRAINT "FK_channel_muting_userId" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION,
|
||||||
|
CONSTRAINT "FK_channel_muting_channelId" FOREIGN KEY ("channelId") REFERENCES "channel"("id") ON DELETE CASCADE ON UPDATE NO ACTION
|
||||||
|
);
|
||||||
|
CREATE INDEX "IDX_channel_muting_userId" ON "channel_muting" ("userId");
|
||||||
|
CREATE INDEX "IDX_channel_muting_channelId" ON "channel_muting" ("channelId");
|
||||||
|
|
||||||
|
ALTER TABLE note ADD "renoteChannelId" varchar(32);
|
||||||
|
COMMENT ON COLUMN note."renoteChannelId" is '[Denormalized]';
|
||||||
|
`);
|
||||||
|
}
|
||||||
|
|
||||||
|
async down(queryRunner) {
|
||||||
|
await queryRunner.query(`
|
||||||
|
ALTER TABLE note DROP COLUMN "renoteChannelId";
|
||||||
|
|
||||||
|
ALTER TABLE "channel_muting"
|
||||||
|
DROP CONSTRAINT "FK_channel_muting_userId";
|
||||||
|
ALTER TABLE "channel_muting"
|
||||||
|
DROP CONSTRAINT "FK_channel_muting_channelId";
|
||||||
|
DROP INDEX "IDX_channel_muting_userId";
|
||||||
|
DROP INDEX "IDX_channel_muting_channelId";
|
||||||
|
DROP TABLE "channel_muting";
|
||||||
|
`);
|
||||||
|
}
|
||||||
|
}
|
|
@ -6,7 +6,7 @@
|
||||||
import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
|
import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
|
||||||
import Redis from 'ioredis';
|
import Redis from 'ioredis';
|
||||||
import { DI } from '@/di-symbols.js';
|
import { DI } from '@/di-symbols.js';
|
||||||
import type { ChannelFollowingsRepository } from '@/models/_.js';
|
import type { ChannelFollowingsRepository, ChannelsRepository, MiUser } from '@/models/_.js';
|
||||||
import { MiChannel } from '@/models/_.js';
|
import { MiChannel } from '@/models/_.js';
|
||||||
import { IdService } from '@/core/IdService.js';
|
import { IdService } from '@/core/IdService.js';
|
||||||
import { GlobalEvents, GlobalEventService } from '@/core/GlobalEventService.js';
|
import { GlobalEvents, GlobalEventService } from '@/core/GlobalEventService.js';
|
||||||
|
@ -23,6 +23,8 @@ export class ChannelFollowingService implements OnModuleInit {
|
||||||
private redisClient: Redis.Redis,
|
private redisClient: Redis.Redis,
|
||||||
@Inject(DI.redisForSub)
|
@Inject(DI.redisForSub)
|
||||||
private redisForSub: Redis.Redis,
|
private redisForSub: Redis.Redis,
|
||||||
|
@Inject(DI.channelsRepository)
|
||||||
|
private channelsRepository: ChannelsRepository,
|
||||||
@Inject(DI.channelFollowingsRepository)
|
@Inject(DI.channelFollowingsRepository)
|
||||||
private channelFollowingsRepository: ChannelFollowingsRepository,
|
private channelFollowingsRepository: ChannelFollowingsRepository,
|
||||||
private idService: IdService,
|
private idService: IdService,
|
||||||
|
@ -45,6 +47,50 @@ export class ChannelFollowingService implements OnModuleInit {
|
||||||
onModuleInit() {
|
onModuleInit() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* フォローしているチャンネルの一覧を取得する.
|
||||||
|
* @param params
|
||||||
|
* @param [opts]
|
||||||
|
* @param {(boolean|undefined)} [opts.idOnly=false] チャンネルIDのみを取得するかどうか. ID以外のフィールドに値がセットされなくなり、他テーブルとのJOINも一切されなくなるので注意.
|
||||||
|
* @param {(boolean|undefined)} [opts.joinUser=undefined] チャンネルオーナーのユーザ情報をJOINするかどうか(falseまたは省略時はJOINしない).
|
||||||
|
* @param {(boolean|undefined)} [opts.joinBannerFile=undefined] バナー画像のドライブファイルをJOINするかどうか(falseまたは省略時はJOINしない).
|
||||||
|
*/
|
||||||
|
@bindThis
|
||||||
|
public async list(
|
||||||
|
params: {
|
||||||
|
requestUserId: MiUser['id'],
|
||||||
|
},
|
||||||
|
opts?: {
|
||||||
|
idOnly?: boolean;
|
||||||
|
joinUser?: boolean;
|
||||||
|
joinBannerFile?: boolean;
|
||||||
|
},
|
||||||
|
): Promise<MiChannel[]> {
|
||||||
|
if (opts?.idOnly) {
|
||||||
|
const q = this.channelFollowingsRepository.createQueryBuilder('channel_following')
|
||||||
|
.select('channel_following.followeeId')
|
||||||
|
.where('channel_following.followerId = :userId', { userId: params.requestUserId });
|
||||||
|
|
||||||
|
return q
|
||||||
|
.getRawMany<{ channel_following_followeeId: string }>()
|
||||||
|
.then(xs => xs.map(x => ({ id: x.channel_following_followeeId } as MiChannel)));
|
||||||
|
} else {
|
||||||
|
const q = this.channelsRepository.createQueryBuilder('channel')
|
||||||
|
.innerJoin('channel_following', 'channel_following', 'channel_following.followeeId = channel.id')
|
||||||
|
.where('channel_following.followerId = :userId', { userId: params.requestUserId });
|
||||||
|
|
||||||
|
if (opts?.joinUser) {
|
||||||
|
q.innerJoinAndSelect('channel.user', 'user');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (opts?.joinBannerFile) {
|
||||||
|
q.leftJoinAndSelect('channel.banner', 'drive_file');
|
||||||
|
}
|
||||||
|
|
||||||
|
return q.getMany();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@bindThis
|
@bindThis
|
||||||
public async follow(
|
public async follow(
|
||||||
requestUser: MiLocalUser,
|
requestUser: MiLocalUser,
|
||||||
|
|
|
@ -0,0 +1,224 @@
|
||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
|
import Redis from 'ioredis';
|
||||||
|
import { Brackets, In } from 'typeorm';
|
||||||
|
import { DI } from '@/di-symbols.js';
|
||||||
|
import type { ChannelMutingRepository, ChannelsRepository, MiChannel, MiChannelMuting, MiUser } from '@/models/_.js';
|
||||||
|
import { IdService } from '@/core/IdService.js';
|
||||||
|
import { GlobalEvents, GlobalEventService } from '@/core/GlobalEventService.js';
|
||||||
|
import { bindThis } from '@/decorators.js';
|
||||||
|
import { RedisKVCache } from '@/misc/cache.js';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class ChannelMutingService {
|
||||||
|
public mutingChannelsCache: RedisKVCache<Set<string>>;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
@Inject(DI.redis)
|
||||||
|
private redisClient: Redis.Redis,
|
||||||
|
@Inject(DI.redisForSub)
|
||||||
|
private redisForSub: Redis.Redis,
|
||||||
|
@Inject(DI.channelsRepository)
|
||||||
|
private channelsRepository: ChannelsRepository,
|
||||||
|
@Inject(DI.channelMutingRepository)
|
||||||
|
private channelMutingRepository: ChannelMutingRepository,
|
||||||
|
private idService: IdService,
|
||||||
|
private globalEventService: GlobalEventService,
|
||||||
|
) {
|
||||||
|
this.mutingChannelsCache = new RedisKVCache<Set<string>>(this.redisClient, 'channelMutingChannels', {
|
||||||
|
lifetime: 1000 * 60 * 30, // 30m
|
||||||
|
memoryCacheLifetime: 1000 * 60, // 1m
|
||||||
|
fetcher: (userId) => this.channelMutingRepository.find({
|
||||||
|
where: { userId: userId },
|
||||||
|
select: ['channelId'],
|
||||||
|
}).then(xs => new Set(xs.map(x => x.channelId))),
|
||||||
|
toRedisConverter: (value) => JSON.stringify(Array.from(value)),
|
||||||
|
fromRedisConverter: (value) => new Set(JSON.parse(value)),
|
||||||
|
});
|
||||||
|
|
||||||
|
this.redisForSub.on('message', this.onMessage);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ミュートしているチャンネルの一覧を取得する.
|
||||||
|
* @param params
|
||||||
|
* @param [opts]
|
||||||
|
* @param {(boolean|undefined)} [opts.idOnly=false] チャンネルIDのみを取得するかどうか. ID以外のフィールドに値がセットされなくなり、他テーブルとのJOINも一切されなくなるので注意.
|
||||||
|
* @param {(boolean|undefined)} [opts.joinUser=undefined] チャンネルオーナーのユーザ情報をJOINするかどうか(falseまたは省略時はJOINしない).
|
||||||
|
* @param {(boolean|undefined)} [opts.joinBannerFile=undefined] バナー画像のドライブファイルをJOINするかどうか(falseまたは省略時はJOINしない).
|
||||||
|
*/
|
||||||
|
@bindThis
|
||||||
|
public async list(
|
||||||
|
params: {
|
||||||
|
requestUserId: MiUser['id'],
|
||||||
|
},
|
||||||
|
opts?: {
|
||||||
|
idOnly?: boolean;
|
||||||
|
joinUser?: boolean;
|
||||||
|
joinBannerFile?: boolean;
|
||||||
|
},
|
||||||
|
): Promise<MiChannel[]> {
|
||||||
|
if (opts?.idOnly) {
|
||||||
|
const q = this.channelMutingRepository.createQueryBuilder('channel_muting')
|
||||||
|
.select('channel_muting.channelId')
|
||||||
|
.where('channel_muting.userId = :userId', { userId: params.requestUserId })
|
||||||
|
.andWhere(new Brackets(qb => {
|
||||||
|
qb.where('channel_muting.expiresAt IS NULL')
|
||||||
|
.orWhere('channel_muting.expiresAt > :now', { now: new Date() });
|
||||||
|
}));
|
||||||
|
|
||||||
|
return q
|
||||||
|
.getRawMany<{ channel_muting_channelId: string }>()
|
||||||
|
.then(xs => xs.map(x => ({ id: x.channel_muting_channelId } as MiChannel)));
|
||||||
|
} else {
|
||||||
|
const q = this.channelsRepository.createQueryBuilder('channel')
|
||||||
|
.innerJoin('channel_muting', 'channel_muting', 'channel_muting.channelId = channel.id')
|
||||||
|
.where('channel_muting.userId = :userId', { userId: params.requestUserId })
|
||||||
|
.andWhere(new Brackets(qb => {
|
||||||
|
qb.where('channel_muting.expiresAt IS NULL')
|
||||||
|
.orWhere('channel_muting.expiresAt > :now', { now: new Date() });
|
||||||
|
}));
|
||||||
|
|
||||||
|
if (opts?.joinUser) {
|
||||||
|
q.innerJoinAndSelect('channel.user', 'user');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (opts?.joinBannerFile) {
|
||||||
|
q.leftJoinAndSelect('channel.banner', 'drive_file');
|
||||||
|
}
|
||||||
|
|
||||||
|
return q.getMany();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 期限切れのチャンネルミュート情報を取得する.
|
||||||
|
*
|
||||||
|
* @param [opts]
|
||||||
|
* @param {(boolean|undefined)} [opts.joinUser=undefined] チャンネルミュートを設定したユーザ情報をJOINするかどうか(falseまたは省略時はJOINしない).
|
||||||
|
* @param {(boolean|undefined)} [opts.joinChannel=undefined] ミュート先のチャンネル情報をJOINするかどうか(falseまたは省略時はJOINしない).
|
||||||
|
*/
|
||||||
|
public async findExpiredMutings(opts?: {
|
||||||
|
joinUser?: boolean;
|
||||||
|
joinChannel?: boolean;
|
||||||
|
}): Promise<MiChannelMuting[]> {
|
||||||
|
const now = new Date();
|
||||||
|
const q = this.channelMutingRepository.createQueryBuilder('channel_muting')
|
||||||
|
.where('channel_muting.expiresAt < :now', { now });
|
||||||
|
|
||||||
|
if (opts?.joinUser) {
|
||||||
|
q.innerJoinAndSelect('channel_muting.user', 'user');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (opts?.joinChannel) {
|
||||||
|
q.leftJoinAndSelect('channel_muting.channel', 'channel');
|
||||||
|
}
|
||||||
|
|
||||||
|
return q.getMany();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 既にミュートされているかどうかをキャッシュから取得する.
|
||||||
|
* @param params
|
||||||
|
* @param params.requestUserId
|
||||||
|
*/
|
||||||
|
@bindThis
|
||||||
|
public async isMuted(params: {
|
||||||
|
requestUserId: MiUser['id'],
|
||||||
|
targetChannelId: MiChannel['id'],
|
||||||
|
}): Promise<boolean> {
|
||||||
|
const mutedChannels = await this.mutingChannelsCache.get(params.requestUserId);
|
||||||
|
return (mutedChannels?.has(params.targetChannelId) ?? false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* チャンネルをミュートする.
|
||||||
|
* @param params
|
||||||
|
* @param {(Date|null|undefined)} [params.expiresAt] ミュートの有効期限. nullまたは省略時は無期限.
|
||||||
|
*/
|
||||||
|
@bindThis
|
||||||
|
public async mute(params: {
|
||||||
|
requestUserId: MiUser['id'],
|
||||||
|
targetChannelId: MiChannel['id'],
|
||||||
|
expiresAt?: Date | null,
|
||||||
|
}): Promise<void> {
|
||||||
|
await this.channelMutingRepository.insert({
|
||||||
|
id: this.idService.gen(),
|
||||||
|
userId: params.requestUserId,
|
||||||
|
channelId: params.targetChannelId,
|
||||||
|
expiresAt: params.expiresAt,
|
||||||
|
});
|
||||||
|
|
||||||
|
this.globalEventService.publishInternalEvent('muteChannel', {
|
||||||
|
userId: params.requestUserId,
|
||||||
|
channelId: params.targetChannelId,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* チャンネルのミュートを解除する.
|
||||||
|
* @param params
|
||||||
|
*/
|
||||||
|
@bindThis
|
||||||
|
public async unmute(params: {
|
||||||
|
requestUserId: MiUser['id'],
|
||||||
|
targetChannelId: MiChannel['id'],
|
||||||
|
}): Promise<void> {
|
||||||
|
await this.channelMutingRepository.delete({
|
||||||
|
userId: params.requestUserId,
|
||||||
|
channelId: params.targetChannelId,
|
||||||
|
});
|
||||||
|
|
||||||
|
this.globalEventService.publishInternalEvent('unmuteChannel', {
|
||||||
|
userId: params.requestUserId,
|
||||||
|
channelId: params.targetChannelId,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 期限切れのチャンネルミュート情報を削除する.
|
||||||
|
*/
|
||||||
|
@bindThis
|
||||||
|
public async eraseExpiredMutings(): Promise<void> {
|
||||||
|
const expiredMutings = await this.findExpiredMutings();
|
||||||
|
await this.channelMutingRepository.delete({ id: In(expiredMutings.map(x => x.id)) });
|
||||||
|
|
||||||
|
const userIds = [...new Set(expiredMutings.map(x => x.userId))];
|
||||||
|
for (const userId of userIds) {
|
||||||
|
this.mutingChannelsCache.refresh(userId).then();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@bindThis
|
||||||
|
private async onMessage(_: string, data: string): Promise<void> {
|
||||||
|
const obj = JSON.parse(data);
|
||||||
|
|
||||||
|
if (obj.channel === 'internal') {
|
||||||
|
const { type, body } = obj.message as GlobalEvents['internal']['payload'];
|
||||||
|
switch (type) {
|
||||||
|
case 'muteChannel': {
|
||||||
|
this.mutingChannelsCache.refresh(body.userId).then();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case 'unmuteChannel': {
|
||||||
|
this.mutingChannelsCache.delete(body.userId).then();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@bindThis
|
||||||
|
public dispose(): void {
|
||||||
|
this.mutingChannelsCache.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
@bindThis
|
||||||
|
public onApplicationShutdown(signal?: string | undefined): void {
|
||||||
|
this.dispose();
|
||||||
|
}
|
||||||
|
}
|
|
@ -15,6 +15,7 @@ import { SystemWebhookService } from '@/core/SystemWebhookService.js';
|
||||||
import { UserSearchService } from '@/core/UserSearchService.js';
|
import { UserSearchService } from '@/core/UserSearchService.js';
|
||||||
import { WebhookTestService } from '@/core/WebhookTestService.js';
|
import { WebhookTestService } from '@/core/WebhookTestService.js';
|
||||||
import { FlashService } from '@/core/FlashService.js';
|
import { FlashService } from '@/core/FlashService.js';
|
||||||
|
import { ChannelMutingService } from '@/core/ChannelMutingService.js';
|
||||||
import { AccountMoveService } from './AccountMoveService.js';
|
import { AccountMoveService } from './AccountMoveService.js';
|
||||||
import { AccountUpdateService } from './AccountUpdateService.js';
|
import { AccountUpdateService } from './AccountUpdateService.js';
|
||||||
import { AiService } from './AiService.js';
|
import { AiService } from './AiService.js';
|
||||||
|
@ -225,6 +226,7 @@ const $FeaturedService: Provider = { provide: 'FeaturedService', useExisting: Fe
|
||||||
const $FanoutTimelineService: Provider = { provide: 'FanoutTimelineService', useExisting: FanoutTimelineService };
|
const $FanoutTimelineService: Provider = { provide: 'FanoutTimelineService', useExisting: FanoutTimelineService };
|
||||||
const $FanoutTimelineEndpointService: Provider = { provide: 'FanoutTimelineEndpointService', useExisting: FanoutTimelineEndpointService };
|
const $FanoutTimelineEndpointService: Provider = { provide: 'FanoutTimelineEndpointService', useExisting: FanoutTimelineEndpointService };
|
||||||
const $ChannelFollowingService: Provider = { provide: 'ChannelFollowingService', useExisting: ChannelFollowingService };
|
const $ChannelFollowingService: Provider = { provide: 'ChannelFollowingService', useExisting: ChannelFollowingService };
|
||||||
|
const $ChannelMutingService: Provider = { provide: 'ChannelMutingService', useExisting: ChannelMutingService };
|
||||||
const $RegistryApiService: Provider = { provide: 'RegistryApiService', useExisting: RegistryApiService };
|
const $RegistryApiService: Provider = { provide: 'RegistryApiService', useExisting: RegistryApiService };
|
||||||
const $ReversiService: Provider = { provide: 'ReversiService', useExisting: ReversiService };
|
const $ReversiService: Provider = { provide: 'ReversiService', useExisting: ReversiService };
|
||||||
|
|
||||||
|
@ -376,6 +378,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
|
||||||
FanoutTimelineService,
|
FanoutTimelineService,
|
||||||
FanoutTimelineEndpointService,
|
FanoutTimelineEndpointService,
|
||||||
ChannelFollowingService,
|
ChannelFollowingService,
|
||||||
|
ChannelMutingService,
|
||||||
RegistryApiService,
|
RegistryApiService,
|
||||||
ReversiService,
|
ReversiService,
|
||||||
|
|
||||||
|
@ -523,6 +526,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
|
||||||
$FanoutTimelineService,
|
$FanoutTimelineService,
|
||||||
$FanoutTimelineEndpointService,
|
$FanoutTimelineEndpointService,
|
||||||
$ChannelFollowingService,
|
$ChannelFollowingService,
|
||||||
|
$ChannelMutingService,
|
||||||
$RegistryApiService,
|
$RegistryApiService,
|
||||||
$ReversiService,
|
$ReversiService,
|
||||||
|
|
||||||
|
@ -671,6 +675,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
|
||||||
FanoutTimelineService,
|
FanoutTimelineService,
|
||||||
FanoutTimelineEndpointService,
|
FanoutTimelineEndpointService,
|
||||||
ChannelFollowingService,
|
ChannelFollowingService,
|
||||||
|
ChannelMutingService,
|
||||||
RegistryApiService,
|
RegistryApiService,
|
||||||
ReversiService,
|
ReversiService,
|
||||||
|
|
||||||
|
@ -816,6 +821,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
|
||||||
$FanoutTimelineService,
|
$FanoutTimelineService,
|
||||||
$FanoutTimelineEndpointService,
|
$FanoutTimelineEndpointService,
|
||||||
$ChannelFollowingService,
|
$ChannelFollowingService,
|
||||||
|
$ChannelMutingService,
|
||||||
$RegistryApiService,
|
$RegistryApiService,
|
||||||
$ReversiService,
|
$ReversiService,
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,8 @@ import { isQuote, isRenote } from '@/misc/is-renote.js';
|
||||||
import { CacheService } from '@/core/CacheService.js';
|
import { CacheService } from '@/core/CacheService.js';
|
||||||
import { isReply } from '@/misc/is-reply.js';
|
import { isReply } from '@/misc/is-reply.js';
|
||||||
import { isInstanceMuted } from '@/misc/is-instance-muted.js';
|
import { isInstanceMuted } from '@/misc/is-instance-muted.js';
|
||||||
|
import { ChannelMutingService } from '@/core/ChannelMutingService.js';
|
||||||
|
import { isChannelRelated } from '@/misc/is-channel-related.js';
|
||||||
|
|
||||||
type TimelineOptions = {
|
type TimelineOptions = {
|
||||||
untilId: string | null,
|
untilId: string | null,
|
||||||
|
@ -33,6 +35,7 @@ type TimelineOptions = {
|
||||||
excludeNoFiles?: boolean;
|
excludeNoFiles?: boolean;
|
||||||
excludeReplies?: boolean;
|
excludeReplies?: boolean;
|
||||||
excludePureRenotes: boolean;
|
excludePureRenotes: boolean;
|
||||||
|
includeMutedChannels?: boolean;
|
||||||
dbFallback: (untilId: string | null, sinceId: string | null, limit: number) => Promise<MiNote[]>,
|
dbFallback: (untilId: string | null, sinceId: string | null, limit: number) => Promise<MiNote[]>,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -45,6 +48,7 @@ export class FanoutTimelineEndpointService {
|
||||||
private noteEntityService: NoteEntityService,
|
private noteEntityService: NoteEntityService,
|
||||||
private cacheService: CacheService,
|
private cacheService: CacheService,
|
||||||
private fanoutTimelineService: FanoutTimelineService,
|
private fanoutTimelineService: FanoutTimelineService,
|
||||||
|
private channelMutingService: ChannelMutingService,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -101,11 +105,13 @@ export class FanoutTimelineEndpointService {
|
||||||
userIdsWhoMeMutingRenotes,
|
userIdsWhoMeMutingRenotes,
|
||||||
userIdsWhoBlockingMe,
|
userIdsWhoBlockingMe,
|
||||||
userMutedInstances,
|
userMutedInstances,
|
||||||
|
userMutedChannels,
|
||||||
] = await Promise.all([
|
] = await Promise.all([
|
||||||
this.cacheService.userMutingsCache.fetch(ps.me.id),
|
this.cacheService.userMutingsCache.fetch(ps.me.id),
|
||||||
this.cacheService.renoteMutingsCache.fetch(ps.me.id),
|
this.cacheService.renoteMutingsCache.fetch(ps.me.id),
|
||||||
this.cacheService.userBlockedCache.fetch(ps.me.id),
|
this.cacheService.userBlockedCache.fetch(ps.me.id),
|
||||||
this.cacheService.userProfileCache.fetch(me.id).then(p => new Set(p.mutedInstances)),
|
this.cacheService.userProfileCache.fetch(me.id).then(p => new Set(p.mutedInstances)),
|
||||||
|
ps.includeMutedChannels ? Promise.resolve(new Set<string>()) : this.channelMutingService.mutingChannelsCache.fetch(me.id),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const parentFilter = filter;
|
const parentFilter = filter;
|
||||||
|
@ -114,6 +120,7 @@ export class FanoutTimelineEndpointService {
|
||||||
if (isUserRelated(note, userIdsWhoMeMuting, ps.ignoreAuthorFromMute)) return false;
|
if (isUserRelated(note, userIdsWhoMeMuting, ps.ignoreAuthorFromMute)) return false;
|
||||||
if (!ps.ignoreAuthorFromMute && isRenote(note) && !isQuote(note) && userIdsWhoMeMutingRenotes.has(note.userId)) return false;
|
if (!ps.ignoreAuthorFromMute && isRenote(note) && !isQuote(note) && userIdsWhoMeMutingRenotes.has(note.userId)) return false;
|
||||||
if (isInstanceMuted(note, userMutedInstances)) return false;
|
if (isInstanceMuted(note, userMutedInstances)) return false;
|
||||||
|
if (!ps.includeMutedChannels && isChannelRelated(note, userMutedChannels)) return false;
|
||||||
|
|
||||||
return parentFilter(note);
|
return parentFilter(note);
|
||||||
};
|
};
|
||||||
|
|
|
@ -244,6 +244,8 @@ export interface InternalEventTypes {
|
||||||
metaUpdated: { before?: MiMeta; after: MiMeta; };
|
metaUpdated: { before?: MiMeta; after: MiMeta; };
|
||||||
followChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
|
followChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
|
||||||
unfollowChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
|
unfollowChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
|
||||||
|
muteChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
|
||||||
|
unmuteChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
|
||||||
updateUserProfile: MiUserProfile;
|
updateUserProfile: MiUserProfile;
|
||||||
mute: { muterId: MiUser['id']; muteeId: MiUser['id']; };
|
mute: { muterId: MiUser['id']; muteeId: MiUser['id']; };
|
||||||
unmute: { muterId: MiUser['id']; muteeId: MiUser['id']; };
|
unmute: { muterId: MiUser['id']; muteeId: MiUser['id']; };
|
||||||
|
|
|
@ -438,6 +438,7 @@ export class NoteCreateService implements OnApplicationShutdown {
|
||||||
replyUserHost: data.reply ? data.reply.userHost : null,
|
replyUserHost: data.reply ? data.reply.userHost : null,
|
||||||
renoteUserId: data.renote ? data.renote.userId : null,
|
renoteUserId: data.renote ? data.renote.userId : null,
|
||||||
renoteUserHost: data.renote ? data.renote.userHost : null,
|
renoteUserHost: data.renote ? data.renote.userHost : null,
|
||||||
|
renoteChannelId: data.renote ? data.renote.channelId : null,
|
||||||
userHost: user.host,
|
userHost: user.host,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -131,6 +131,7 @@ function generateDummyNote(override?: Partial<MiNote>): MiNote {
|
||||||
replyUserHost: null,
|
replyUserHost: null,
|
||||||
renoteUserId: null,
|
renoteUserId: null,
|
||||||
renoteUserHost: null,
|
renoteUserHost: null,
|
||||||
|
renoteChannelId: null,
|
||||||
...override,
|
...override,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,36 +4,40 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { Inject, Injectable } from '@nestjs/common';
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
|
import { In } from 'typeorm';
|
||||||
import { DI } from '@/di-symbols.js';
|
import { DI } from '@/di-symbols.js';
|
||||||
import type { ChannelFavoritesRepository, ChannelFollowingsRepository, ChannelsRepository, DriveFilesRepository, NotesRepository } from '@/models/_.js';
|
import type {
|
||||||
|
ChannelFavoritesRepository,
|
||||||
|
ChannelFollowingsRepository, ChannelMutingRepository,
|
||||||
|
ChannelsRepository,
|
||||||
|
DriveFilesRepository,
|
||||||
|
MiDriveFile,
|
||||||
|
MiNote,
|
||||||
|
NotesRepository,
|
||||||
|
} from '@/models/_.js';
|
||||||
import type { Packed } from '@/misc/json-schema.js';
|
import type { Packed } from '@/misc/json-schema.js';
|
||||||
import type { } from '@/models/Blocking.js';
|
|
||||||
import type { MiUser } from '@/models/User.js';
|
import type { MiUser } from '@/models/User.js';
|
||||||
import type { MiChannel } from '@/models/Channel.js';
|
import type { MiChannel } from '@/models/Channel.js';
|
||||||
import { bindThis } from '@/decorators.js';
|
import { bindThis } from '@/decorators.js';
|
||||||
import { IdService } from '@/core/IdService.js';
|
import { IdService } from '@/core/IdService.js';
|
||||||
import { DriveFileEntityService } from './DriveFileEntityService.js';
|
import { DriveFileEntityService } from './DriveFileEntityService.js';
|
||||||
import { NoteEntityService } from './NoteEntityService.js';
|
import { NoteEntityService } from './NoteEntityService.js';
|
||||||
import { In } from 'typeorm';
|
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class ChannelEntityService {
|
export class ChannelEntityService {
|
||||||
constructor(
|
constructor(
|
||||||
@Inject(DI.channelsRepository)
|
@Inject(DI.channelsRepository)
|
||||||
private channelsRepository: ChannelsRepository,
|
private channelsRepository: ChannelsRepository,
|
||||||
|
|
||||||
@Inject(DI.channelFollowingsRepository)
|
@Inject(DI.channelFollowingsRepository)
|
||||||
private channelFollowingsRepository: ChannelFollowingsRepository,
|
private channelFollowingsRepository: ChannelFollowingsRepository,
|
||||||
|
|
||||||
@Inject(DI.channelFavoritesRepository)
|
@Inject(DI.channelFavoritesRepository)
|
||||||
private channelFavoritesRepository: ChannelFavoritesRepository,
|
private channelFavoritesRepository: ChannelFavoritesRepository,
|
||||||
|
@Inject(DI.channelMutingRepository)
|
||||||
|
private channelMutingRepository: ChannelMutingRepository,
|
||||||
@Inject(DI.notesRepository)
|
@Inject(DI.notesRepository)
|
||||||
private notesRepository: NotesRepository,
|
private notesRepository: NotesRepository,
|
||||||
|
|
||||||
@Inject(DI.driveFilesRepository)
|
@Inject(DI.driveFilesRepository)
|
||||||
private driveFilesRepository: DriveFilesRepository,
|
private driveFilesRepository: DriveFilesRepository,
|
||||||
|
|
||||||
private noteEntityService: NoteEntityService,
|
private noteEntityService: NoteEntityService,
|
||||||
private driveFileEntityService: DriveFileEntityService,
|
private driveFileEntityService: DriveFileEntityService,
|
||||||
private idService: IdService,
|
private idService: IdService,
|
||||||
|
@ -45,31 +49,59 @@ export class ChannelEntityService {
|
||||||
src: MiChannel['id'] | MiChannel,
|
src: MiChannel['id'] | MiChannel,
|
||||||
me?: { id: MiUser['id'] } | null | undefined,
|
me?: { id: MiUser['id'] } | null | undefined,
|
||||||
detailed?: boolean,
|
detailed?: boolean,
|
||||||
|
opts?: {
|
||||||
|
bannerFiles?: Map<MiDriveFile['id'], MiDriveFile>;
|
||||||
|
followings?: Set<MiChannel['id']>;
|
||||||
|
favorites?: Set<MiChannel['id']>;
|
||||||
|
muting?: Set<MiChannel['id']>;
|
||||||
|
pinnedNotes?: Map<MiNote['id'], MiNote>;
|
||||||
|
},
|
||||||
): Promise<Packed<'Channel'>> {
|
): Promise<Packed<'Channel'>> {
|
||||||
const channel = typeof src === 'object' ? src : await this.channelsRepository.findOneByOrFail({ id: src });
|
const channel = typeof src === 'object' ? src : await this.channelsRepository.findOneByOrFail({ id: src });
|
||||||
const meId = me ? me.id : null;
|
|
||||||
|
|
||||||
const banner = channel.bannerId ? await this.driveFilesRepository.findOneBy({ id: channel.bannerId }) : null;
|
let bannerFile: MiDriveFile | null = null;
|
||||||
|
if (channel.bannerId) {
|
||||||
|
bannerFile = opts?.bannerFiles?.get(channel.bannerId)
|
||||||
|
?? await this.driveFilesRepository.findOneByOrFail({ id: channel.bannerId });
|
||||||
|
}
|
||||||
|
|
||||||
const isFollowing = meId ? await this.channelFollowingsRepository.exists({
|
let isFollowing = false;
|
||||||
|
let isFavorited = false;
|
||||||
|
let isMuting = false;
|
||||||
|
if (me) {
|
||||||
|
isFollowing = opts?.followings?.has(channel.id) ?? await this.channelFollowingsRepository.exists({
|
||||||
where: {
|
where: {
|
||||||
followerId: meId,
|
followerId: me.id,
|
||||||
followeeId: channel.id,
|
followeeId: channel.id,
|
||||||
},
|
},
|
||||||
}) : false;
|
});
|
||||||
|
|
||||||
const isFavorited = meId ? await this.channelFavoritesRepository.exists({
|
isFavorited = opts?.favorites?.has(channel.id) ?? await this.channelFavoritesRepository.exists({
|
||||||
where: {
|
where: {
|
||||||
userId: meId,
|
userId: me.id,
|
||||||
channelId: channel.id,
|
channelId: channel.id,
|
||||||
},
|
},
|
||||||
}) : false;
|
});
|
||||||
|
|
||||||
const pinnedNotes = channel.pinnedNoteIds.length > 0 ? await this.notesRepository.find({
|
isMuting = opts?.muting?.has(channel.id) ?? await this.channelMutingRepository.exists({
|
||||||
where: {
|
where: {
|
||||||
id: In(channel.pinnedNoteIds),
|
userId: me.id,
|
||||||
|
channelId: channel.id,
|
||||||
},
|
},
|
||||||
}) : [];
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const pinnedNotes = Array.of<MiNote>();
|
||||||
|
if (channel.pinnedNoteIds.length > 0) {
|
||||||
|
pinnedNotes.push(
|
||||||
|
...(
|
||||||
|
opts?.pinnedNotes
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
||||||
|
? channel.pinnedNoteIds.map(it => opts.pinnedNotes!.get(it)).filter(it => it != null)
|
||||||
|
: await this.notesRepository.findBy({ id: In(channel.pinnedNoteIds) })
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id: channel.id,
|
id: channel.id,
|
||||||
|
@ -78,7 +110,7 @@ export class ChannelEntityService {
|
||||||
name: channel.name,
|
name: channel.name,
|
||||||
description: channel.description,
|
description: channel.description,
|
||||||
userId: channel.userId,
|
userId: channel.userId,
|
||||||
bannerUrl: banner ? this.driveFileEntityService.getPublicUrl(banner) : null,
|
bannerUrl: bannerFile ? this.driveFileEntityService.getPublicUrl(bannerFile) : null,
|
||||||
pinnedNoteIds: channel.pinnedNoteIds,
|
pinnedNoteIds: channel.pinnedNoteIds,
|
||||||
color: channel.color,
|
color: channel.color,
|
||||||
isArchived: channel.isArchived,
|
isArchived: channel.isArchived,
|
||||||
|
@ -90,6 +122,7 @@ export class ChannelEntityService {
|
||||||
...(me ? {
|
...(me ? {
|
||||||
isFollowing,
|
isFollowing,
|
||||||
isFavorited,
|
isFavorited,
|
||||||
|
isMuting,
|
||||||
hasUnreadNote: false, // 後方互換性のため
|
hasUnreadNote: false, // 後方互換性のため
|
||||||
} : {}),
|
} : {}),
|
||||||
|
|
||||||
|
@ -98,5 +131,72 @@ export class ChannelEntityService {
|
||||||
} : {}),
|
} : {}),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@bindThis
|
||||||
|
public async packMany(
|
||||||
|
src: MiChannel['id'][] | MiChannel[],
|
||||||
|
me?: { id: MiUser['id'] } | null | undefined,
|
||||||
|
detailed?: boolean,
|
||||||
|
): Promise<Packed<'Channel'>[]> {
|
||||||
|
// IDのみの要素がある場合、DBからオブジェクトを取得して補う
|
||||||
|
const channels = src.filter(it => typeof it === 'object') as MiChannel[];
|
||||||
|
channels.push(
|
||||||
|
...(await this.channelsRepository.find({
|
||||||
|
where: {
|
||||||
|
id: In(src.filter(it => typeof it !== 'object') as MiChannel['id'][]),
|
||||||
|
},
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
channels.sort((a, b) => a.id.localeCompare(b.id));
|
||||||
|
|
||||||
|
const bannerFiles = await this.driveFilesRepository
|
||||||
|
.findBy({
|
||||||
|
id: In(channels.map(it => it.bannerId).filter(it => it != null)),
|
||||||
|
})
|
||||||
|
.then(it => new Map(it.map(it => [it.id, it])));
|
||||||
|
|
||||||
|
const followings = me
|
||||||
|
? await this.channelFollowingsRepository
|
||||||
|
.findBy({
|
||||||
|
followerId: me.id,
|
||||||
|
followeeId: In(channels.map(it => it.id)),
|
||||||
|
})
|
||||||
|
.then(it => new Set(it.map(it => it.followeeId)))
|
||||||
|
: new Set<MiChannel['id']>();
|
||||||
|
|
||||||
|
const favorites = me
|
||||||
|
? await this.channelFavoritesRepository
|
||||||
|
.findBy({
|
||||||
|
userId: me.id,
|
||||||
|
channelId: In(channels.map(it => it.id)),
|
||||||
|
})
|
||||||
|
.then(it => new Set(it.map(it => it.channelId)))
|
||||||
|
: new Set<MiChannel['id']>();
|
||||||
|
|
||||||
|
const muting = me
|
||||||
|
? await this.channelMutingRepository
|
||||||
|
.findBy({
|
||||||
|
userId: me.id,
|
||||||
|
channelId: In(channels.map(it => it.id)),
|
||||||
|
})
|
||||||
|
.then(it => new Set(it.map(it => it.channelId)))
|
||||||
|
: new Set<MiChannel['id']>();
|
||||||
|
|
||||||
|
const pinnedNotes = await this.notesRepository
|
||||||
|
.find({
|
||||||
|
where: {
|
||||||
|
id: In(channels.flatMap(it => it.pinnedNoteIds)),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.then(it => new Map(it.map(it => [it.id, it])));
|
||||||
|
|
||||||
|
return Promise.all(channels.map(it => this.pack(it, me, detailed, {
|
||||||
|
bannerFiles,
|
||||||
|
followings,
|
||||||
|
favorites,
|
||||||
|
muting,
|
||||||
|
pinnedNotes,
|
||||||
|
})));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -71,6 +71,7 @@ export const DI = {
|
||||||
channelsRepository: Symbol('channelsRepository'),
|
channelsRepository: Symbol('channelsRepository'),
|
||||||
channelFollowingsRepository: Symbol('channelFollowingsRepository'),
|
channelFollowingsRepository: Symbol('channelFollowingsRepository'),
|
||||||
channelFavoritesRepository: Symbol('channelFavoritesRepository'),
|
channelFavoritesRepository: Symbol('channelFavoritesRepository'),
|
||||||
|
channelMutingRepository: Symbol('channelMutingRepository'),
|
||||||
registryItemsRepository: Symbol('registryItemsRepository'),
|
registryItemsRepository: Symbol('registryItemsRepository'),
|
||||||
webhooksRepository: Symbol('webhooksRepository'),
|
webhooksRepository: Symbol('webhooksRepository'),
|
||||||
systemWebhooksRepository: Symbol('systemWebhooksRepository'),
|
systemWebhooksRepository: Symbol('systemWebhooksRepository'),
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { MiNote } from '@/models/Note.js';
|
||||||
|
import { Packed } from '@/misc/json-schema.js';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@link note}が{@link channelIds}のチャンネルに関連するかどうかを判定し、関連する場合はtrueを返します。
|
||||||
|
* 関連するというのは、{@link channelIds}のチャンネルに向けての投稿であるか、またはそのチャンネルの投稿をリノート・引用リノートした投稿であるかを指します。
|
||||||
|
*
|
||||||
|
* @param note 確認対象のノート
|
||||||
|
* @param channelIds 確認対象のチャンネルID一覧
|
||||||
|
*/
|
||||||
|
export function isChannelRelated(note: MiNote | Packed<'Note'>, channelIds: Set<string>): boolean {
|
||||||
|
if (note.channelId && channelIds.has(note.channelId)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (note.renote != null && note.renote.channelId && channelIds.has(note.renote.channelId)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// NOTE: リプライはchannelIdのチェックだけでOKなはずなので見てない(チャンネルのノートにチャンネル外からのリプライまたはその逆はないはずなので)
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
|
@ -0,0 +1,46 @@
|
||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { Column, Entity, Index, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm';
|
||||||
|
import { id } from './util/id.js';
|
||||||
|
import { MiUser } from './User.js';
|
||||||
|
import { MiChannel } from './Channel.js';
|
||||||
|
|
||||||
|
@Entity('channel_muting')
|
||||||
|
@Index(['userId', 'channelId'], {})
|
||||||
|
export class MiChannelMuting {
|
||||||
|
@PrimaryColumn(id())
|
||||||
|
public id: string;
|
||||||
|
|
||||||
|
@Index()
|
||||||
|
@Column({
|
||||||
|
...id(),
|
||||||
|
})
|
||||||
|
public userId: MiUser['id'];
|
||||||
|
|
||||||
|
@ManyToOne(type => MiUser, {
|
||||||
|
onDelete: 'CASCADE',
|
||||||
|
})
|
||||||
|
@JoinColumn()
|
||||||
|
public user: MiUser | null;
|
||||||
|
|
||||||
|
@Index()
|
||||||
|
@Column({
|
||||||
|
...id(),
|
||||||
|
})
|
||||||
|
public channelId: MiChannel['id'];
|
||||||
|
|
||||||
|
@ManyToOne(type => MiChannel, {
|
||||||
|
onDelete: 'CASCADE',
|
||||||
|
})
|
||||||
|
@JoinColumn()
|
||||||
|
public channel: MiChannel | null;
|
||||||
|
|
||||||
|
@Index()
|
||||||
|
@Column('timestamp with time zone', {
|
||||||
|
nullable: true,
|
||||||
|
})
|
||||||
|
public expiresAt: Date | null;
|
||||||
|
}
|
|
@ -229,6 +229,13 @@ export class MiNote {
|
||||||
comment: '[Denormalized]',
|
comment: '[Denormalized]',
|
||||||
})
|
})
|
||||||
public renoteUserHost: string | null;
|
public renoteUserHost: string | null;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
...id(),
|
||||||
|
nullable: true,
|
||||||
|
comment: '[Denormalized]',
|
||||||
|
})
|
||||||
|
public renoteChannelId: MiChannel['id'] | null;
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
constructor(data: Partial<MiNote>) {
|
constructor(data: Partial<MiNote>) {
|
||||||
|
|
|
@ -22,6 +22,7 @@ import {
|
||||||
MiChannel,
|
MiChannel,
|
||||||
MiChannelFavorite,
|
MiChannelFavorite,
|
||||||
MiChannelFollowing,
|
MiChannelFollowing,
|
||||||
|
MiChannelMuting,
|
||||||
MiClip,
|
MiClip,
|
||||||
MiClipFavorite,
|
MiClipFavorite,
|
||||||
MiClipNote,
|
MiClipNote,
|
||||||
|
@ -417,6 +418,12 @@ const $channelFavoritesRepository: Provider = {
|
||||||
inject: [DI.db],
|
inject: [DI.db],
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const $channelMutingRepository: Provider = {
|
||||||
|
provide: DI.channelMutingRepository,
|
||||||
|
useFactory: (db: DataSource) => db.getRepository(MiChannelMuting).extend(miRepository as MiRepository<MiChannelMuting>),
|
||||||
|
inject: [DI.db],
|
||||||
|
};
|
||||||
|
|
||||||
const $registryItemsRepository: Provider = {
|
const $registryItemsRepository: Provider = {
|
||||||
provide: DI.registryItemsRepository,
|
provide: DI.registryItemsRepository,
|
||||||
useFactory: (db: DataSource) => db.getRepository(MiRegistryItem).extend(miRepository as MiRepository<MiRegistryItem>),
|
useFactory: (db: DataSource) => db.getRepository(MiRegistryItem).extend(miRepository as MiRepository<MiRegistryItem>),
|
||||||
|
@ -554,6 +561,7 @@ const $reversiGamesRepository: Provider = {
|
||||||
$channelsRepository,
|
$channelsRepository,
|
||||||
$channelFollowingsRepository,
|
$channelFollowingsRepository,
|
||||||
$channelFavoritesRepository,
|
$channelFavoritesRepository,
|
||||||
|
$channelMutingRepository,
|
||||||
$registryItemsRepository,
|
$registryItemsRepository,
|
||||||
$webhooksRepository,
|
$webhooksRepository,
|
||||||
$systemWebhooksRepository,
|
$systemWebhooksRepository,
|
||||||
|
@ -625,6 +633,7 @@ const $reversiGamesRepository: Provider = {
|
||||||
$channelsRepository,
|
$channelsRepository,
|
||||||
$channelFollowingsRepository,
|
$channelFollowingsRepository,
|
||||||
$channelFavoritesRepository,
|
$channelFavoritesRepository,
|
||||||
|
$channelMutingRepository,
|
||||||
$registryItemsRepository,
|
$registryItemsRepository,
|
||||||
$webhooksRepository,
|
$webhooksRepository,
|
||||||
$systemWebhooksRepository,
|
$systemWebhooksRepository,
|
||||||
|
|
|
@ -3,13 +3,10 @@
|
||||||
* SPDX-License-Identifier: AGPL-3.0-only
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { FindOneOptions, InsertQueryBuilder, ObjectLiteral, Repository, SelectQueryBuilder, TypeORMError } from 'typeorm';
|
import { FindOneOptions, InsertQueryBuilder, ObjectLiteral, Repository, SelectQueryBuilder } from 'typeorm';
|
||||||
import { DriverUtils } from 'typeorm/driver/DriverUtils.js';
|
|
||||||
import { RelationCountLoader } from 'typeorm/query-builder/relation-count/RelationCountLoader.js';
|
import { RelationCountLoader } from 'typeorm/query-builder/relation-count/RelationCountLoader.js';
|
||||||
import { RelationIdLoader } from 'typeorm/query-builder/relation-id/RelationIdLoader.js';
|
import { RelationIdLoader } from 'typeorm/query-builder/relation-id/RelationIdLoader.js';
|
||||||
import { RawSqlResultsToEntityTransformer } from 'typeorm/query-builder/transformer/RawSqlResultsToEntityTransformer.js';
|
import { RawSqlResultsToEntityTransformer } from 'typeorm/query-builder/transformer/RawSqlResultsToEntityTransformer.js';
|
||||||
import { ObjectUtils } from 'typeorm/util/ObjectUtils.js';
|
|
||||||
import { OrmUtils } from 'typeorm/util/OrmUtils.js';
|
|
||||||
import { MiAbuseUserReport } from '@/models/AbuseUserReport.js';
|
import { MiAbuseUserReport } from '@/models/AbuseUserReport.js';
|
||||||
import { MiAbuseReportNotificationRecipient } from '@/models/AbuseReportNotificationRecipient.js';
|
import { MiAbuseReportNotificationRecipient } from '@/models/AbuseReportNotificationRecipient.js';
|
||||||
import { MiAccessToken } from '@/models/AccessToken.js';
|
import { MiAccessToken } from '@/models/AccessToken.js';
|
||||||
|
@ -23,6 +20,7 @@ import { MiAuthSession } from '@/models/AuthSession.js';
|
||||||
import { MiBlocking } from '@/models/Blocking.js';
|
import { MiBlocking } from '@/models/Blocking.js';
|
||||||
import { MiChannelFollowing } from '@/models/ChannelFollowing.js';
|
import { MiChannelFollowing } from '@/models/ChannelFollowing.js';
|
||||||
import { MiChannelFavorite } from '@/models/ChannelFavorite.js';
|
import { MiChannelFavorite } from '@/models/ChannelFavorite.js';
|
||||||
|
import { MiChannelMuting } from "@/models/ChannelMuting.js";
|
||||||
import { MiClip } from '@/models/Clip.js';
|
import { MiClip } from '@/models/Clip.js';
|
||||||
import { MiClipNote } from '@/models/ClipNote.js';
|
import { MiClipNote } from '@/models/ClipNote.js';
|
||||||
import { MiClipFavorite } from '@/models/ClipFavorite.js';
|
import { MiClipFavorite } from '@/models/ClipFavorite.js';
|
||||||
|
@ -138,6 +136,7 @@ export {
|
||||||
MiBlocking,
|
MiBlocking,
|
||||||
MiChannelFollowing,
|
MiChannelFollowing,
|
||||||
MiChannelFavorite,
|
MiChannelFavorite,
|
||||||
|
MiChannelMuting,
|
||||||
MiClip,
|
MiClip,
|
||||||
MiClipNote,
|
MiClipNote,
|
||||||
MiClipFavorite,
|
MiClipFavorite,
|
||||||
|
@ -209,6 +208,7 @@ export type AuthSessionsRepository = Repository<MiAuthSession> & MiRepository<Mi
|
||||||
export type BlockingsRepository = Repository<MiBlocking> & MiRepository<MiBlocking>;
|
export type BlockingsRepository = Repository<MiBlocking> & MiRepository<MiBlocking>;
|
||||||
export type ChannelFollowingsRepository = Repository<MiChannelFollowing> & MiRepository<MiChannelFollowing>;
|
export type ChannelFollowingsRepository = Repository<MiChannelFollowing> & MiRepository<MiChannelFollowing>;
|
||||||
export type ChannelFavoritesRepository = Repository<MiChannelFavorite> & MiRepository<MiChannelFavorite>;
|
export type ChannelFavoritesRepository = Repository<MiChannelFavorite> & MiRepository<MiChannelFavorite>;
|
||||||
|
export type ChannelMutingRepository = Repository<MiChannelMuting> & MiRepository<MiChannelMuting>;
|
||||||
export type ClipsRepository = Repository<MiClip> & MiRepository<MiClip>;
|
export type ClipsRepository = Repository<MiClip> & MiRepository<MiClip>;
|
||||||
export type ClipNotesRepository = Repository<MiClipNote> & MiRepository<MiClipNote>;
|
export type ClipNotesRepository = Repository<MiClipNote> & MiRepository<MiClipNote>;
|
||||||
export type ClipFavoritesRepository = Repository<MiClipFavorite> & MiRepository<MiClipFavorite>;
|
export type ClipFavoritesRepository = Repository<MiClipFavorite> & MiRepository<MiClipFavorite>;
|
||||||
|
|
|
@ -80,6 +80,10 @@ export const packedChannelSchema = {
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
optional: true, nullable: false,
|
optional: true, nullable: false,
|
||||||
},
|
},
|
||||||
|
isMuting: {
|
||||||
|
type: 'boolean',
|
||||||
|
optional: true, nullable: false,
|
||||||
|
},
|
||||||
pinnedNotes: {
|
pinnedNotes: {
|
||||||
type: 'array',
|
type: 'array',
|
||||||
optional: true, nullable: false,
|
optional: true, nullable: false,
|
||||||
|
|
|
@ -22,6 +22,7 @@ import { MiAuthSession } from '@/models/AuthSession.js';
|
||||||
import { MiBlocking } from '@/models/Blocking.js';
|
import { MiBlocking } from '@/models/Blocking.js';
|
||||||
import { MiChannelFollowing } from '@/models/ChannelFollowing.js';
|
import { MiChannelFollowing } from '@/models/ChannelFollowing.js';
|
||||||
import { MiChannelFavorite } from '@/models/ChannelFavorite.js';
|
import { MiChannelFavorite } from '@/models/ChannelFavorite.js';
|
||||||
|
import { MiChannelMuting } from "@/models/ChannelMuting.js";
|
||||||
import { MiClip } from '@/models/Clip.js';
|
import { MiClip } from '@/models/Clip.js';
|
||||||
import { MiClipNote } from '@/models/ClipNote.js';
|
import { MiClipNote } from '@/models/ClipNote.js';
|
||||||
import { MiClipFavorite } from '@/models/ClipFavorite.js';
|
import { MiClipFavorite } from '@/models/ClipFavorite.js';
|
||||||
|
@ -183,6 +184,7 @@ export const entities = [
|
||||||
MiChannel,
|
MiChannel,
|
||||||
MiChannelFollowing,
|
MiChannelFollowing,
|
||||||
MiChannelFavorite,
|
MiChannelFavorite,
|
||||||
|
MiChannelMuting,
|
||||||
MiRegistryItem,
|
MiRegistryItem,
|
||||||
MiAd,
|
MiAd,
|
||||||
MiPasswordResetRequest,
|
MiPasswordResetRequest,
|
||||||
|
|
|
@ -4,14 +4,13 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { Inject, Injectable } from '@nestjs/common';
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
import { In } from 'typeorm';
|
|
||||||
import { DI } from '@/di-symbols.js';
|
import { DI } from '@/di-symbols.js';
|
||||||
import type { MutingsRepository } from '@/models/_.js';
|
import type { MutingsRepository } from '@/models/_.js';
|
||||||
import type Logger from '@/logger.js';
|
import type Logger from '@/logger.js';
|
||||||
import { bindThis } from '@/decorators.js';
|
import { bindThis } from '@/decorators.js';
|
||||||
import { UserMutingService } from '@/core/UserMutingService.js';
|
import { UserMutingService } from '@/core/UserMutingService.js';
|
||||||
|
import { ChannelMutingService } from '@/core/ChannelMutingService.js';
|
||||||
import { QueueLoggerService } from '../QueueLoggerService.js';
|
import { QueueLoggerService } from '../QueueLoggerService.js';
|
||||||
import type * as Bull from 'bullmq';
|
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class CheckExpiredMutingsProcessorService {
|
export class CheckExpiredMutingsProcessorService {
|
||||||
|
@ -22,6 +21,7 @@ export class CheckExpiredMutingsProcessorService {
|
||||||
private mutingsRepository: MutingsRepository,
|
private mutingsRepository: MutingsRepository,
|
||||||
|
|
||||||
private userMutingService: UserMutingService,
|
private userMutingService: UserMutingService,
|
||||||
|
private channelMutingService: ChannelMutingService,
|
||||||
private queueLoggerService: QueueLoggerService,
|
private queueLoggerService: QueueLoggerService,
|
||||||
) {
|
) {
|
||||||
this.logger = this.queueLoggerService.logger.createSubLogger('check-expired-mutings');
|
this.logger = this.queueLoggerService.logger.createSubLogger('check-expired-mutings');
|
||||||
|
@ -41,6 +41,8 @@ export class CheckExpiredMutingsProcessorService {
|
||||||
await this.userMutingService.unmute(expired);
|
await this.userMutingService.unmute(expired);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await this.channelMutingService.eraseExpiredMutings();
|
||||||
|
|
||||||
this.logger.succ('All expired mutings checked.');
|
this.logger.succ('All expired mutings checked.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -127,6 +127,9 @@ import * as ep___channels_favorite from './endpoints/channels/favorite.js';
|
||||||
import * as ep___channels_unfavorite from './endpoints/channels/unfavorite.js';
|
import * as ep___channels_unfavorite from './endpoints/channels/unfavorite.js';
|
||||||
import * as ep___channels_myFavorites from './endpoints/channels/my-favorites.js';
|
import * as ep___channels_myFavorites from './endpoints/channels/my-favorites.js';
|
||||||
import * as ep___channels_search from './endpoints/channels/search.js';
|
import * as ep___channels_search from './endpoints/channels/search.js';
|
||||||
|
import * as ep___channels_mute_create from './endpoints/channels/mute/create.js';
|
||||||
|
import * as ep___channels_mute_delete from './endpoints/channels/mute/delete.js';
|
||||||
|
import * as ep___channels_mute_list from './endpoints/channels/mute/list.js';
|
||||||
import * as ep___charts_activeUsers from './endpoints/charts/active-users.js';
|
import * as ep___charts_activeUsers from './endpoints/charts/active-users.js';
|
||||||
import * as ep___charts_apRequest from './endpoints/charts/ap-request.js';
|
import * as ep___charts_apRequest from './endpoints/charts/ap-request.js';
|
||||||
import * as ep___charts_drive from './endpoints/charts/drive.js';
|
import * as ep___charts_drive from './endpoints/charts/drive.js';
|
||||||
|
@ -515,6 +518,9 @@ const $channels_favorite: Provider = { provide: 'ep:channels/favorite', useClass
|
||||||
const $channels_unfavorite: Provider = { provide: 'ep:channels/unfavorite', useClass: ep___channels_unfavorite.default };
|
const $channels_unfavorite: Provider = { provide: 'ep:channels/unfavorite', useClass: ep___channels_unfavorite.default };
|
||||||
const $channels_myFavorites: Provider = { provide: 'ep:channels/my-favorites', useClass: ep___channels_myFavorites.default };
|
const $channels_myFavorites: Provider = { provide: 'ep:channels/my-favorites', useClass: ep___channels_myFavorites.default };
|
||||||
const $channels_search: Provider = { provide: 'ep:channels/search', useClass: ep___channels_search.default };
|
const $channels_search: Provider = { provide: 'ep:channels/search', useClass: ep___channels_search.default };
|
||||||
|
const $channels_mute_create: Provider = { provide: 'ep:channels/mute/create', useClass: ep___channels_mute_create.default };
|
||||||
|
const $channels_mute_delete: Provider = { provide: 'ep:channels/mute/delete', useClass: ep___channels_mute_delete.default };
|
||||||
|
const $channels_mute_list: Provider = { provide: 'ep:channels/mute/list', useClass: ep___channels_mute_list.default };
|
||||||
const $charts_activeUsers: Provider = { provide: 'ep:charts/active-users', useClass: ep___charts_activeUsers.default };
|
const $charts_activeUsers: Provider = { provide: 'ep:charts/active-users', useClass: ep___charts_activeUsers.default };
|
||||||
const $charts_apRequest: Provider = { provide: 'ep:charts/ap-request', useClass: ep___charts_apRequest.default };
|
const $charts_apRequest: Provider = { provide: 'ep:charts/ap-request', useClass: ep___charts_apRequest.default };
|
||||||
const $charts_drive: Provider = { provide: 'ep:charts/drive', useClass: ep___charts_drive.default };
|
const $charts_drive: Provider = { provide: 'ep:charts/drive', useClass: ep___charts_drive.default };
|
||||||
|
@ -907,6 +913,9 @@ const $reversi_verify: Provider = { provide: 'ep:reversi/verify', useClass: ep__
|
||||||
$channels_unfavorite,
|
$channels_unfavorite,
|
||||||
$channels_myFavorites,
|
$channels_myFavorites,
|
||||||
$channels_search,
|
$channels_search,
|
||||||
|
$channels_mute_create,
|
||||||
|
$channels_mute_delete,
|
||||||
|
$channels_mute_list,
|
||||||
$charts_activeUsers,
|
$charts_activeUsers,
|
||||||
$charts_apRequest,
|
$charts_apRequest,
|
||||||
$charts_drive,
|
$charts_drive,
|
||||||
|
@ -1293,6 +1302,9 @@ const $reversi_verify: Provider = { provide: 'ep:reversi/verify', useClass: ep__
|
||||||
$channels_unfavorite,
|
$channels_unfavorite,
|
||||||
$channels_myFavorites,
|
$channels_myFavorites,
|
||||||
$channels_search,
|
$channels_search,
|
||||||
|
$channels_mute_create,
|
||||||
|
$channels_mute_delete,
|
||||||
|
$channels_mute_list,
|
||||||
$charts_activeUsers,
|
$charts_activeUsers,
|
||||||
$charts_apRequest,
|
$charts_apRequest,
|
||||||
$charts_drive,
|
$charts_drive,
|
||||||
|
|
|
@ -16,6 +16,7 @@ import { CacheService } from '@/core/CacheService.js';
|
||||||
import { MiLocalUser } from '@/models/User.js';
|
import { MiLocalUser } from '@/models/User.js';
|
||||||
import { UserService } from '@/core/UserService.js';
|
import { UserService } from '@/core/UserService.js';
|
||||||
import { ChannelFollowingService } from '@/core/ChannelFollowingService.js';
|
import { ChannelFollowingService } from '@/core/ChannelFollowingService.js';
|
||||||
|
import { ChannelMutingService } from '@/core/ChannelMutingService.js';
|
||||||
import { AuthenticateService, AuthenticationError } from './AuthenticateService.js';
|
import { AuthenticateService, AuthenticationError } from './AuthenticateService.js';
|
||||||
import MainStreamConnection from './stream/Connection.js';
|
import MainStreamConnection from './stream/Connection.js';
|
||||||
import { ChannelsService } from './stream/ChannelsService.js';
|
import { ChannelsService } from './stream/ChannelsService.js';
|
||||||
|
@ -41,6 +42,7 @@ export class StreamingApiServerService {
|
||||||
private notificationService: NotificationService,
|
private notificationService: NotificationService,
|
||||||
private usersService: UserService,
|
private usersService: UserService,
|
||||||
private channelFollowingService: ChannelFollowingService,
|
private channelFollowingService: ChannelFollowingService,
|
||||||
|
private channelMutingService: ChannelMutingService,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -100,6 +102,7 @@ export class StreamingApiServerService {
|
||||||
this.notificationService,
|
this.notificationService,
|
||||||
this.cacheService,
|
this.cacheService,
|
||||||
this.channelFollowingService,
|
this.channelFollowingService,
|
||||||
|
this.channelMutingService,
|
||||||
user, app,
|
user, app,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -133,6 +133,9 @@ import * as ep___channels_favorite from './endpoints/channels/favorite.js';
|
||||||
import * as ep___channels_unfavorite from './endpoints/channels/unfavorite.js';
|
import * as ep___channels_unfavorite from './endpoints/channels/unfavorite.js';
|
||||||
import * as ep___channels_myFavorites from './endpoints/channels/my-favorites.js';
|
import * as ep___channels_myFavorites from './endpoints/channels/my-favorites.js';
|
||||||
import * as ep___channels_search from './endpoints/channels/search.js';
|
import * as ep___channels_search from './endpoints/channels/search.js';
|
||||||
|
import * as ep___channels_mute_create from './endpoints/channels/mute/create.js';
|
||||||
|
import * as ep___channels_mute_delete from './endpoints/channels/mute/delete.js';
|
||||||
|
import * as ep___channels_mute_list from './endpoints/channels/mute/list.js';
|
||||||
import * as ep___charts_activeUsers from './endpoints/charts/active-users.js';
|
import * as ep___charts_activeUsers from './endpoints/charts/active-users.js';
|
||||||
import * as ep___charts_apRequest from './endpoints/charts/ap-request.js';
|
import * as ep___charts_apRequest from './endpoints/charts/ap-request.js';
|
||||||
import * as ep___charts_drive from './endpoints/charts/drive.js';
|
import * as ep___charts_drive from './endpoints/charts/drive.js';
|
||||||
|
@ -519,6 +522,9 @@ const eps = [
|
||||||
['channels/unfavorite', ep___channels_unfavorite],
|
['channels/unfavorite', ep___channels_unfavorite],
|
||||||
['channels/my-favorites', ep___channels_myFavorites],
|
['channels/my-favorites', ep___channels_myFavorites],
|
||||||
['channels/search', ep___channels_search],
|
['channels/search', ep___channels_search],
|
||||||
|
['channels/mute/create', ep___channels_mute_create],
|
||||||
|
['channels/mute/delete', ep___channels_mute_delete],
|
||||||
|
['channels/mute/list', ep___channels_mute_list],
|
||||||
['charts/active-users', ep___charts_activeUsers],
|
['charts/active-users', ep___charts_activeUsers],
|
||||||
['charts/ap-request', ep___charts_apRequest],
|
['charts/ap-request', ep___charts_apRequest],
|
||||||
['charts/drive', ep___charts_drive],
|
['charts/drive', ep___charts_drive],
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
|
|
||||||
import { Inject, Injectable } from '@nestjs/common';
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
import * as Redis from 'ioredis';
|
import * as Redis from 'ioredis';
|
||||||
|
import { Brackets } from 'typeorm';
|
||||||
import { Endpoint } from '@/server/api/endpoint-base.js';
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
||||||
import type { NotesRepository, AntennasRepository } from '@/models/_.js';
|
import type { NotesRepository, AntennasRepository } from '@/models/_.js';
|
||||||
import { QueryService } from '@/core/QueryService.js';
|
import { QueryService } from '@/core/QueryService.js';
|
||||||
|
@ -15,6 +16,7 @@ import { IdService } from '@/core/IdService.js';
|
||||||
import { FanoutTimelineService } from '@/core/FanoutTimelineService.js';
|
import { FanoutTimelineService } from '@/core/FanoutTimelineService.js';
|
||||||
import { GlobalEventService } from '@/core/GlobalEventService.js';
|
import { GlobalEventService } from '@/core/GlobalEventService.js';
|
||||||
import { trackPromise } from '@/misc/promise-tracker.js';
|
import { trackPromise } from '@/misc/promise-tracker.js';
|
||||||
|
import { ChannelMutingService } from '@/core/ChannelMutingService.js';
|
||||||
import { ApiError } from '../../error.js';
|
import { ApiError } from '../../error.js';
|
||||||
|
|
||||||
export const meta = {
|
export const meta = {
|
||||||
|
@ -74,6 +76,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
private noteReadService: NoteReadService,
|
private noteReadService: NoteReadService,
|
||||||
private fanoutTimelineService: FanoutTimelineService,
|
private fanoutTimelineService: FanoutTimelineService,
|
||||||
private globalEventService: GlobalEventService,
|
private globalEventService: GlobalEventService,
|
||||||
|
private channelMutingService: ChannelMutingService,
|
||||||
) {
|
) {
|
||||||
super(meta, paramDef, async (ps, me) => {
|
super(meta, paramDef, async (ps, me) => {
|
||||||
const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
|
const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
|
||||||
|
@ -113,6 +116,21 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
.leftJoinAndSelect('reply.user', 'replyUser')
|
.leftJoinAndSelect('reply.user', 'replyUser')
|
||||||
.leftJoinAndSelect('renote.user', 'renoteUser');
|
.leftJoinAndSelect('renote.user', 'renoteUser');
|
||||||
|
|
||||||
|
// -- ミュートされたチャンネル対策
|
||||||
|
const mutingChannelIds = await this.channelMutingService
|
||||||
|
.list({ requestUserId: me.id }, { idOnly: true })
|
||||||
|
.then(x => x.map(x => x.id));
|
||||||
|
if (mutingChannelIds.length > 0) {
|
||||||
|
query.andWhere(new Brackets(qb => {
|
||||||
|
qb.orWhere('note.channelId IS NULL');
|
||||||
|
qb.orWhere('note.channelId NOT IN (:...mutingChannelIds)', { mutingChannelIds });
|
||||||
|
}));
|
||||||
|
query.andWhere(new Brackets(qb => {
|
||||||
|
qb.orWhere('note.renoteChannelId IS NULL');
|
||||||
|
qb.orWhere('note.renoteChannelId NOT IN (:...mutingChannelIds)', { mutingChannelIds });
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
this.queryService.generateVisibilityQuery(query, me);
|
this.queryService.generateVisibilityQuery(query, me);
|
||||||
this.queryService.generateMutedUserQuery(query, me);
|
this.queryService.generateMutedUserQuery(query, me);
|
||||||
this.queryService.generateBlockedUserQuery(query, me);
|
this.queryService.generateBlockedUserQuery(query, me);
|
||||||
|
|
|
@ -0,0 +1,90 @@
|
||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
||||||
|
import type { ChannelsRepository } from '@/models/_.js';
|
||||||
|
import { DI } from '@/di-symbols.js';
|
||||||
|
import { ApiError } from '@/server/api/error.js';
|
||||||
|
import { ChannelMutingService } from '@/core/ChannelMutingService.js';
|
||||||
|
|
||||||
|
export const meta = {
|
||||||
|
tags: ['channels', 'mute'],
|
||||||
|
|
||||||
|
requireCredential: true,
|
||||||
|
prohibitMoved: true,
|
||||||
|
|
||||||
|
kind: 'write:channels',
|
||||||
|
|
||||||
|
errors: {
|
||||||
|
noSuchChannel: {
|
||||||
|
message: 'No such Channel.',
|
||||||
|
code: 'NO_SUCH_CHANNEL',
|
||||||
|
id: '7174361e-d58f-31d6-2e7c-6fb830786a3f',
|
||||||
|
},
|
||||||
|
|
||||||
|
alreadyMuting: {
|
||||||
|
message: 'You are already muting that user.',
|
||||||
|
code: 'ALREADY_MUTING_CHANNEL',
|
||||||
|
id: '5a251978-769a-da44-3e89-3931e43bb592',
|
||||||
|
},
|
||||||
|
|
||||||
|
expiresAtIsPast: {
|
||||||
|
message: 'Cannot set past date to "expiresAt".',
|
||||||
|
code: 'EXPIRES_AT_IS_PAST',
|
||||||
|
id: '42b32236-df2c-a45f-fdbf-def67268f749',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
} as const;
|
||||||
|
|
||||||
|
export const paramDef = {
|
||||||
|
type: 'object',
|
||||||
|
properties: {
|
||||||
|
channelId: { type: 'string', format: 'misskey:id' },
|
||||||
|
expiresAt: {
|
||||||
|
type: 'integer',
|
||||||
|
nullable: true,
|
||||||
|
description: 'A Unix Epoch timestamp that must lie in the future. `null` means an indefinite mute.',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
required: ['channelId'],
|
||||||
|
} as const;
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
|
||||||
|
constructor(
|
||||||
|
@Inject(DI.channelsRepository)
|
||||||
|
private channelsRepository: ChannelsRepository,
|
||||||
|
private channelMutingService: ChannelMutingService,
|
||||||
|
) {
|
||||||
|
super(meta, paramDef, async (ps, me) => {
|
||||||
|
// Check if exists the channel
|
||||||
|
const targetChannel = await this.channelsRepository.findOneBy({ id: ps.channelId });
|
||||||
|
if (!targetChannel) {
|
||||||
|
throw new ApiError(meta.errors.noSuchChannel);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if already muting
|
||||||
|
const exist = await this.channelMutingService.isMuted({
|
||||||
|
requestUserId: me.id,
|
||||||
|
targetChannelId: targetChannel.id,
|
||||||
|
});
|
||||||
|
if (exist) {
|
||||||
|
throw new ApiError(meta.errors.alreadyMuting);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if expiresAt is past
|
||||||
|
if (ps.expiresAt && ps.expiresAt <= Date.now()) {
|
||||||
|
throw new ApiError(meta.errors.expiresAtIsPast);
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.channelMutingService.mute({
|
||||||
|
requestUserId: me.id,
|
||||||
|
targetChannelId: targetChannel.id,
|
||||||
|
expiresAt: ps.expiresAt ? new Date(ps.expiresAt) : null,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,73 @@
|
||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
||||||
|
import type { ChannelsRepository } from '@/models/_.js';
|
||||||
|
import { DI } from '@/di-symbols.js';
|
||||||
|
import { ChannelMutingService } from '@/core/ChannelMutingService.js';
|
||||||
|
import { ApiError } from '@/server/api/error.js';
|
||||||
|
|
||||||
|
export const meta = {
|
||||||
|
tags: ['channels', 'mute'],
|
||||||
|
|
||||||
|
requireCredential: true,
|
||||||
|
prohibitMoved: true,
|
||||||
|
|
||||||
|
kind: 'write:channels',
|
||||||
|
|
||||||
|
errors: {
|
||||||
|
noSuchChannel: {
|
||||||
|
message: 'No such Channel.',
|
||||||
|
code: 'NO_SUCH_CHANNEL',
|
||||||
|
id: 'e7998769-6e94-d9c2-6b8f-94a527314aba',
|
||||||
|
},
|
||||||
|
|
||||||
|
notMuting: {
|
||||||
|
message: 'You are not muting that channel.',
|
||||||
|
code: 'NOT_MUTING_CHANNEL',
|
||||||
|
id: '14d55962-6ea8-d990-1333-d6bef78dc2ab',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
} as const;
|
||||||
|
|
||||||
|
export const paramDef = {
|
||||||
|
type: 'object',
|
||||||
|
properties: {
|
||||||
|
channelId: { type: 'string', format: 'misskey:id' },
|
||||||
|
},
|
||||||
|
required: ['channelId'],
|
||||||
|
} as const;
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
|
||||||
|
constructor(
|
||||||
|
@Inject(DI.channelsRepository)
|
||||||
|
private channelsRepository: ChannelsRepository,
|
||||||
|
private channelMutingService: ChannelMutingService,
|
||||||
|
) {
|
||||||
|
super(meta, paramDef, async (ps, me) => {
|
||||||
|
// Check if exists the channel
|
||||||
|
const targetChannel = await this.channelsRepository.findOneBy({ id: ps.channelId });
|
||||||
|
if (!targetChannel) {
|
||||||
|
throw new ApiError(meta.errors.noSuchChannel);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check muting
|
||||||
|
const exist = await this.channelMutingService.isMuted({
|
||||||
|
requestUserId: me.id,
|
||||||
|
targetChannelId: targetChannel.id,
|
||||||
|
});
|
||||||
|
if (!exist) {
|
||||||
|
throw new ApiError(meta.errors.notMuting);
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.channelMutingService.unmute({
|
||||||
|
requestUserId: me.id,
|
||||||
|
targetChannelId: targetChannel.id,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,49 @@
|
||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
||||||
|
import { ChannelMutingService } from '@/core/ChannelMutingService.js';
|
||||||
|
import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js';
|
||||||
|
|
||||||
|
export const meta = {
|
||||||
|
tags: ['channels', 'mute'],
|
||||||
|
|
||||||
|
requireCredential: true,
|
||||||
|
prohibitMoved: true,
|
||||||
|
|
||||||
|
kind: 'read:channels',
|
||||||
|
|
||||||
|
res: {
|
||||||
|
type: 'array',
|
||||||
|
optional: false, nullable: false,
|
||||||
|
items: {
|
||||||
|
type: 'object',
|
||||||
|
optional: false, nullable: false,
|
||||||
|
ref: 'Channel',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
} as const;
|
||||||
|
|
||||||
|
export const paramDef = {
|
||||||
|
type: 'object',
|
||||||
|
properties: {},
|
||||||
|
required: [],
|
||||||
|
} as const;
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
|
||||||
|
constructor(
|
||||||
|
private channelMutingService: ChannelMutingService,
|
||||||
|
private channelEntityService: ChannelEntityService,
|
||||||
|
) {
|
||||||
|
super(meta, paramDef, async (ps, me) => {
|
||||||
|
const mutings = await this.channelMutingService.list({
|
||||||
|
requestUserId: me.id,
|
||||||
|
});
|
||||||
|
return await this.channelEntityService.packMany(mutings, me);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
|
@ -13,6 +13,8 @@ import { DI } from '@/di-symbols.js';
|
||||||
import { IdService } from '@/core/IdService.js';
|
import { IdService } from '@/core/IdService.js';
|
||||||
import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
|
import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
|
||||||
import { MiLocalUser } from '@/models/User.js';
|
import { MiLocalUser } from '@/models/User.js';
|
||||||
|
import { ChannelMutingService } from '@/core/ChannelMutingService.js';
|
||||||
|
import { isChannelRelated } from '@/misc/is-channel-related.js';
|
||||||
import { ApiError } from '../../error.js';
|
import { ApiError } from '../../error.js';
|
||||||
|
|
||||||
export const meta = {
|
export const meta = {
|
||||||
|
@ -70,6 +72,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
private queryService: QueryService,
|
private queryService: QueryService,
|
||||||
private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
|
private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
|
||||||
private activeUsersChart: ActiveUsersChart,
|
private activeUsersChart: ActiveUsersChart,
|
||||||
|
private channelMutingService: ChannelMutingService,
|
||||||
) {
|
) {
|
||||||
super(meta, paramDef, async (ps, me) => {
|
super(meta, paramDef, async (ps, me) => {
|
||||||
const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
|
const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
|
||||||
|
@ -89,6 +92,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
return await this.noteEntityService.packMany(await this.getFromDb({ untilId, sinceId, limit: ps.limit, channelId: channel.id }, me), me);
|
return await this.noteEntityService.packMany(await this.getFromDb({ untilId, sinceId, limit: ps.limit, channelId: channel.id }, me), me);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const mutingChannelIds = me
|
||||||
|
? await this.channelMutingService.mutingChannelsCache.get(me.id) ?? new Set<string>()
|
||||||
|
: new Set<string>();
|
||||||
return await this.fanoutTimelineEndpointService.timeline({
|
return await this.fanoutTimelineEndpointService.timeline({
|
||||||
untilId,
|
untilId,
|
||||||
sinceId,
|
sinceId,
|
||||||
|
@ -98,6 +104,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
useDbFallback: true,
|
useDbFallback: true,
|
||||||
redisTimelines: [`channelTimeline:${channel.id}`],
|
redisTimelines: [`channelTimeline:${channel.id}`],
|
||||||
excludePureRenotes: false,
|
excludePureRenotes: false,
|
||||||
|
includeMutedChannels: true,
|
||||||
|
noteFilter: note => {
|
||||||
|
// 共通機能を使うと見ているチャンネルそのものもミュートしてしまうので閲覧中のチャンネル以外を除く形にする
|
||||||
|
if (note.channelId === channel.id && (note.renoteChannelId === null || note.renoteChannelId === channel.id)) return true;
|
||||||
|
return !isChannelRelated(note, mutingChannelIds);
|
||||||
|
},
|
||||||
dbFallback: async (untilId, sinceId, limit) => {
|
dbFallback: async (untilId, sinceId, limit) => {
|
||||||
return await this.getFromDb({ untilId, sinceId, limit, channelId: channel.id }, me);
|
return await this.getFromDb({ untilId, sinceId, limit, channelId: channel.id }, me);
|
||||||
},
|
},
|
||||||
|
@ -122,6 +134,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
.leftJoinAndSelect('note.channel', 'channel');
|
.leftJoinAndSelect('note.channel', 'channel');
|
||||||
|
|
||||||
if (me) {
|
if (me) {
|
||||||
|
const mutingChannelIds = await this.channelMutingService
|
||||||
|
.list({ requestUserId: me.id }, { idOnly: true })
|
||||||
|
.then(x => x.map(x => x.id).filter(x => x !== ps.channelId));
|
||||||
|
if (mutingChannelIds.length > 0) {
|
||||||
|
query.andWhere('note.channelId NOT IN (:...mutingChannelIds)', { mutingChannelIds });
|
||||||
|
query.andWhere('note.renoteChannelId NOT IN (:...mutingChannelIds)', { mutingChannelIds });
|
||||||
|
}
|
||||||
|
|
||||||
this.queryService.generateMutedUserQuery(query, me);
|
this.queryService.generateMutedUserQuery(query, me);
|
||||||
this.queryService.generateBlockedUserQuery(query, me);
|
this.queryService.generateBlockedUserQuery(query, me);
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,6 +18,8 @@ import { QueryService } from '@/core/QueryService.js';
|
||||||
import { UserFollowingService } from '@/core/UserFollowingService.js';
|
import { UserFollowingService } from '@/core/UserFollowingService.js';
|
||||||
import { MiLocalUser } from '@/models/User.js';
|
import { MiLocalUser } from '@/models/User.js';
|
||||||
import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
|
import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
|
||||||
|
import { ChannelMutingService } from '@/core/ChannelMutingService.js';
|
||||||
|
import { ChannelFollowingService } from '@/core/ChannelFollowingService.js';
|
||||||
import { ApiError } from '../../error.js';
|
import { ApiError } from '../../error.js';
|
||||||
|
|
||||||
export const meta = {
|
export const meta = {
|
||||||
|
@ -46,7 +48,7 @@ export const meta = {
|
||||||
bothWithRepliesAndWithFiles: {
|
bothWithRepliesAndWithFiles: {
|
||||||
message: 'Specifying both withReplies and withFiles is not supported',
|
message: 'Specifying both withReplies and withFiles is not supported',
|
||||||
code: 'BOTH_WITH_REPLIES_AND_WITH_FILES',
|
code: 'BOTH_WITH_REPLIES_AND_WITH_FILES',
|
||||||
id: 'dfaa3eb7-8002-4cb7-bcc4-1095df46656f'
|
id: 'dfaa3eb7-8002-4cb7-bcc4-1095df46656f',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
} as const;
|
} as const;
|
||||||
|
@ -79,9 +81,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
@Inject(DI.notesRepository)
|
@Inject(DI.notesRepository)
|
||||||
private notesRepository: NotesRepository,
|
private notesRepository: NotesRepository,
|
||||||
|
|
||||||
@Inject(DI.channelFollowingsRepository)
|
|
||||||
private channelFollowingsRepository: ChannelFollowingsRepository,
|
|
||||||
|
|
||||||
private noteEntityService: NoteEntityService,
|
private noteEntityService: NoteEntityService,
|
||||||
private roleService: RoleService,
|
private roleService: RoleService,
|
||||||
private activeUsersChart: ActiveUsersChart,
|
private activeUsersChart: ActiveUsersChart,
|
||||||
|
@ -89,6 +88,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
private cacheService: CacheService,
|
private cacheService: CacheService,
|
||||||
private queryService: QueryService,
|
private queryService: QueryService,
|
||||||
private userFollowingService: UserFollowingService,
|
private userFollowingService: UserFollowingService,
|
||||||
|
private channelMutingService: ChannelMutingService,
|
||||||
|
private channelFollowingService: ChannelFollowingService,
|
||||||
private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
|
private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
|
||||||
) {
|
) {
|
||||||
super(meta, paramDef, async (ps, me) => {
|
super(meta, paramDef, async (ps, me) => {
|
||||||
|
@ -196,11 +197,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
withReplies: boolean,
|
withReplies: boolean,
|
||||||
}, me: MiLocalUser) {
|
}, me: MiLocalUser) {
|
||||||
const followees = await this.userFollowingService.getFollowees(me.id);
|
const followees = await this.userFollowingService.getFollowees(me.id);
|
||||||
const followingChannels = await this.channelFollowingsRepository.find({
|
|
||||||
where: {
|
const mutingChannelIds = await this.channelMutingService
|
||||||
followerId: me.id,
|
.list({ requestUserId: me.id }, { idOnly: true })
|
||||||
},
|
.then(x => x.map(x => x.id));
|
||||||
});
|
const followingChannelIds = await this.channelFollowingService
|
||||||
|
.list({ requestUserId: me.id }, { idOnly: true })
|
||||||
|
.then(x => x.map(x => x.id).filter(x => !mutingChannelIds.includes(x)));
|
||||||
|
|
||||||
const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId)
|
const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId)
|
||||||
.andWhere(new Brackets(qb => {
|
.andWhere(new Brackets(qb => {
|
||||||
|
@ -219,9 +222,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
.leftJoinAndSelect('reply.user', 'replyUser')
|
.leftJoinAndSelect('reply.user', 'replyUser')
|
||||||
.leftJoinAndSelect('renote.user', 'renoteUser');
|
.leftJoinAndSelect('renote.user', 'renoteUser');
|
||||||
|
|
||||||
if (followingChannels.length > 0) {
|
if (followingChannelIds.length > 0) {
|
||||||
const followingChannelIds = followingChannels.map(x => x.followeeId);
|
|
||||||
|
|
||||||
query.andWhere(new Brackets(qb => {
|
query.andWhere(new Brackets(qb => {
|
||||||
qb.where('note.channelId IN (:...followingChannelIds)', { followingChannelIds });
|
qb.where('note.channelId IN (:...followingChannelIds)', { followingChannelIds });
|
||||||
qb.orWhere('note.channelId IS NULL');
|
qb.orWhere('note.channelId IS NULL');
|
||||||
|
@ -230,6 +231,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
query.andWhere('note.channelId IS NULL');
|
query.andWhere('note.channelId IS NULL');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (mutingChannelIds.length > 0) {
|
||||||
|
query.andWhere(new Brackets(qb => {
|
||||||
|
qb.orWhere('note.renoteChannelId IS NULL');
|
||||||
|
qb.orWhere('note.renoteChannelId NOT IN (:...mutingChannelIds)', { mutingChannelIds });
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
if (!ps.withReplies) {
|
if (!ps.withReplies) {
|
||||||
query.andWhere(new Brackets(qb => {
|
query.andWhere(new Brackets(qb => {
|
||||||
qb
|
qb
|
||||||
|
|
|
@ -15,6 +15,7 @@ import { IdService } from '@/core/IdService.js';
|
||||||
import { QueryService } from '@/core/QueryService.js';
|
import { QueryService } from '@/core/QueryService.js';
|
||||||
import { MiLocalUser } from '@/models/User.js';
|
import { MiLocalUser } from '@/models/User.js';
|
||||||
import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
|
import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
|
||||||
|
import { ChannelMutingService } from '@/core/ChannelMutingService.js';
|
||||||
import { ApiError } from '../../error.js';
|
import { ApiError } from '../../error.js';
|
||||||
|
|
||||||
export const meta = {
|
export const meta = {
|
||||||
|
@ -76,6 +77,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
private idService: IdService,
|
private idService: IdService,
|
||||||
private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
|
private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
|
||||||
private queryService: QueryService,
|
private queryService: QueryService,
|
||||||
|
private channelMutingService: ChannelMutingService,
|
||||||
) {
|
) {
|
||||||
super(meta, paramDef, async (ps, me) => {
|
super(meta, paramDef, async (ps, me) => {
|
||||||
const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
|
const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
|
||||||
|
@ -156,9 +158,21 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
.leftJoinAndSelect('renote.user', 'renoteUser');
|
.leftJoinAndSelect('renote.user', 'renoteUser');
|
||||||
|
|
||||||
this.queryService.generateVisibilityQuery(query, me);
|
this.queryService.generateVisibilityQuery(query, me);
|
||||||
if (me) this.queryService.generateMutedUserQuery(query, me);
|
if (me) {
|
||||||
if (me) this.queryService.generateBlockedUserQuery(query, me);
|
this.queryService.generateMutedUserQuery(query, me);
|
||||||
if (me) this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
|
this.queryService.generateBlockedUserQuery(query, me);
|
||||||
|
this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
|
||||||
|
|
||||||
|
const mutedChannelIds = await this.channelMutingService
|
||||||
|
.list({ requestUserId: me.id }, { idOnly: true })
|
||||||
|
.then(x => x.map(x => x.id));
|
||||||
|
if (mutedChannelIds.length > 0) {
|
||||||
|
query.andWhere(new Brackets(qb => {
|
||||||
|
qb.orWhere('note.renoteChannelId IS NULL')
|
||||||
|
.orWhere('note.renoteChannelId NOT IN (:...mutedChannelIds)', { mutedChannelIds });
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (ps.withFiles) {
|
if (ps.withFiles) {
|
||||||
query.andWhere('note.fileIds != \'{}\'');
|
query.andWhere('note.fileIds != \'{}\'');
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
import { Brackets } from 'typeorm';
|
import { Brackets } from 'typeorm';
|
||||||
import { Inject, Injectable } from '@nestjs/common';
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
import type { NotesRepository, ChannelFollowingsRepository, MiMeta } from '@/models/_.js';
|
import type { NotesRepository, MiMeta } from '@/models/_.js';
|
||||||
import { Endpoint } from '@/server/api/endpoint-base.js';
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
||||||
import { QueryService } from '@/core/QueryService.js';
|
import { QueryService } from '@/core/QueryService.js';
|
||||||
import ActiveUsersChart from '@/core/chart/charts/active-users.js';
|
import ActiveUsersChart from '@/core/chart/charts/active-users.js';
|
||||||
|
@ -16,6 +16,8 @@ import { CacheService } from '@/core/CacheService.js';
|
||||||
import { UserFollowingService } from '@/core/UserFollowingService.js';
|
import { UserFollowingService } from '@/core/UserFollowingService.js';
|
||||||
import { MiLocalUser } from '@/models/User.js';
|
import { MiLocalUser } from '@/models/User.js';
|
||||||
import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
|
import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
|
||||||
|
import { ChannelMutingService } from '@/core/ChannelMutingService.js';
|
||||||
|
import { ChannelFollowingService } from '@/core/ChannelFollowingService.js';
|
||||||
|
|
||||||
export const meta = {
|
export const meta = {
|
||||||
tags: ['notes'],
|
tags: ['notes'],
|
||||||
|
@ -61,15 +63,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
@Inject(DI.notesRepository)
|
@Inject(DI.notesRepository)
|
||||||
private notesRepository: NotesRepository,
|
private notesRepository: NotesRepository,
|
||||||
|
|
||||||
@Inject(DI.channelFollowingsRepository)
|
|
||||||
private channelFollowingsRepository: ChannelFollowingsRepository,
|
|
||||||
|
|
||||||
private noteEntityService: NoteEntityService,
|
private noteEntityService: NoteEntityService,
|
||||||
private activeUsersChart: ActiveUsersChart,
|
private activeUsersChart: ActiveUsersChart,
|
||||||
private idService: IdService,
|
private idService: IdService,
|
||||||
private cacheService: CacheService,
|
private cacheService: CacheService,
|
||||||
private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
|
private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
|
||||||
private userFollowingService: UserFollowingService,
|
private userFollowingService: UserFollowingService,
|
||||||
|
private channelMutingService: ChannelMutingService,
|
||||||
|
private channelFollowingService: ChannelFollowingService,
|
||||||
private queryService: QueryService,
|
private queryService: QueryService,
|
||||||
) {
|
) {
|
||||||
super(meta, paramDef, async (ps, me) => {
|
super(meta, paramDef, async (ps, me) => {
|
||||||
|
@ -140,11 +141,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
|
|
||||||
private async getFromDb(ps: { untilId: string | null; sinceId: string | null; limit: number; includeMyRenotes: boolean; includeRenotedMyNotes: boolean; includeLocalRenotes: boolean; withFiles: boolean; withRenotes: boolean; }, me: MiLocalUser) {
|
private async getFromDb(ps: { untilId: string | null; sinceId: string | null; limit: number; includeMyRenotes: boolean; includeRenotedMyNotes: boolean; includeLocalRenotes: boolean; withFiles: boolean; withRenotes: boolean; }, me: MiLocalUser) {
|
||||||
const followees = await this.userFollowingService.getFollowees(me.id);
|
const followees = await this.userFollowingService.getFollowees(me.id);
|
||||||
const followingChannels = await this.channelFollowingsRepository.find({
|
|
||||||
where: {
|
const mutingChannelIds = await this.channelMutingService
|
||||||
followerId: me.id,
|
.list({ requestUserId: me.id }, { idOnly: true })
|
||||||
},
|
.then(x => x.map(x => x.id));
|
||||||
});
|
const followingChannelIds = await this.channelFollowingService
|
||||||
|
.list({ requestUserId: me.id }, { idOnly: true })
|
||||||
|
.then(x => x.map(x => x.id).filter(x => !mutingChannelIds.includes(x)));
|
||||||
|
|
||||||
//#region Construct query
|
//#region Construct query
|
||||||
const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId)
|
const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId)
|
||||||
|
@ -154,15 +157,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
.leftJoinAndSelect('reply.user', 'replyUser')
|
.leftJoinAndSelect('reply.user', 'replyUser')
|
||||||
.leftJoinAndSelect('renote.user', 'renoteUser');
|
.leftJoinAndSelect('renote.user', 'renoteUser');
|
||||||
|
|
||||||
if (followees.length > 0 && followingChannels.length > 0) {
|
if (followees.length > 0 && followingChannelIds.length > 0) {
|
||||||
// ユーザー・チャンネルともにフォローあり
|
// ユーザー・チャンネルともにフォローあり
|
||||||
const meOrFolloweeIds = [me.id, ...followees.map(f => f.followeeId)];
|
const meOrFolloweeIds = [me.id, ...followees.map(f => f.followeeId)];
|
||||||
const followingChannelIds = followingChannels.map(x => x.followeeId);
|
|
||||||
query.andWhere(new Brackets(qb => {
|
query.andWhere(new Brackets(qb => {
|
||||||
qb
|
qb
|
||||||
.where(new Brackets(qb2 => {
|
.where(new Brackets(qb2 => {
|
||||||
qb2
|
qb2
|
||||||
.where('note.userId IN (:...meOrFolloweeIds)', { meOrFolloweeIds: meOrFolloweeIds })
|
.andWhere('note.userId IN (:...meOrFolloweeIds)', { meOrFolloweeIds: meOrFolloweeIds })
|
||||||
.andWhere('note.channelId IS NULL');
|
.andWhere('note.channelId IS NULL');
|
||||||
}))
|
}))
|
||||||
.orWhere('note.channelId IN (:...followingChannelIds)', { followingChannelIds });
|
.orWhere('note.channelId IN (:...followingChannelIds)', { followingChannelIds });
|
||||||
|
@ -170,22 +172,32 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
} else if (followees.length > 0) {
|
} else if (followees.length > 0) {
|
||||||
// ユーザーフォローのみ(チャンネルフォローなし)
|
// ユーザーフォローのみ(チャンネルフォローなし)
|
||||||
const meOrFolloweeIds = [me.id, ...followees.map(f => f.followeeId)];
|
const meOrFolloweeIds = [me.id, ...followees.map(f => f.followeeId)];
|
||||||
query
|
|
||||||
.andWhere('note.channelId IS NULL')
|
|
||||||
.andWhere('note.userId IN (:...meOrFolloweeIds)', { meOrFolloweeIds: meOrFolloweeIds });
|
|
||||||
} else if (followingChannels.length > 0) {
|
|
||||||
// チャンネルフォローのみ(ユーザーフォローなし)
|
|
||||||
const followingChannelIds = followingChannels.map(x => x.followeeId);
|
|
||||||
query.andWhere(new Brackets(qb => {
|
query.andWhere(new Brackets(qb => {
|
||||||
qb
|
qb
|
||||||
|
.andWhere('note.channelId IS NULL')
|
||||||
|
.andWhere('note.userId IN (:...meOrFolloweeIds)', { meOrFolloweeIds: meOrFolloweeIds });
|
||||||
|
if (mutingChannelIds.length > 0) {
|
||||||
|
qb.andWhere('note.renoteChannelId NOT IN (:...mutingChannelIds)', { mutingChannelIds });
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
} else if (followingChannelIds.length > 0) {
|
||||||
|
// チャンネルフォローのみ(ユーザーフォローなし)
|
||||||
|
query.andWhere(new Brackets(qb => {
|
||||||
|
qb
|
||||||
|
// renoteChannelIdは見る必要が無い
|
||||||
|
// ・HTLに流れてくるチャンネル=フォローしているチャンネル
|
||||||
|
// ・HTLにフォロー外のチャンネルが流れるのは、フォローしているユーザがそのチャンネル投稿をリノートした場合のみ
|
||||||
|
// つまり、ユーザフォローしてない前提のこのブロックでは見る必要が無い
|
||||||
.where('note.channelId IN (:...followingChannelIds)', { followingChannelIds })
|
.where('note.channelId IN (:...followingChannelIds)', { followingChannelIds })
|
||||||
.orWhere('note.userId = :meId', { meId: me.id });
|
.orWhere('note.userId = :meId', { meId: me.id });
|
||||||
}));
|
}));
|
||||||
} else {
|
} else {
|
||||||
// フォローなし
|
// フォローなし
|
||||||
query
|
query.andWhere(new Brackets(qb => {
|
||||||
|
qb
|
||||||
.andWhere('note.channelId IS NULL')
|
.andWhere('note.channelId IS NULL')
|
||||||
.andWhere('note.userId = :meId', { meId: me.id });
|
.andWhere('note.userId = :meId', { meId: me.id });
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
query.andWhere(new Brackets(qb => {
|
query.andWhere(new Brackets(qb => {
|
||||||
|
|
|
@ -14,6 +14,7 @@ import { IdService } from '@/core/IdService.js';
|
||||||
import { QueryService } from '@/core/QueryService.js';
|
import { QueryService } from '@/core/QueryService.js';
|
||||||
import { MiLocalUser } from '@/models/User.js';
|
import { MiLocalUser } from '@/models/User.js';
|
||||||
import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
|
import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
|
||||||
|
import { ChannelMutingService } from '@/core/ChannelMutingService.js';
|
||||||
import { ApiError } from '../../error.js';
|
import { ApiError } from '../../error.js';
|
||||||
|
|
||||||
export const meta = {
|
export const meta = {
|
||||||
|
@ -84,6 +85,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
private idService: IdService,
|
private idService: IdService,
|
||||||
private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
|
private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
|
||||||
private queryService: QueryService,
|
private queryService: QueryService,
|
||||||
|
private channelMutingService: ChannelMutingService,
|
||||||
) {
|
) {
|
||||||
super(meta, paramDef, async (ps, me) => {
|
super(meta, paramDef, async (ps, me) => {
|
||||||
const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
|
const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
|
||||||
|
@ -188,6 +190,17 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
this.queryService.generateBlockedUserQuery(query, me);
|
this.queryService.generateBlockedUserQuery(query, me);
|
||||||
this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
|
this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
|
||||||
|
|
||||||
|
// -- ミュートされたチャンネルのリノート対策
|
||||||
|
const mutedChannelIds = await this.channelMutingService
|
||||||
|
.list({ requestUserId: me.id }, { idOnly: true })
|
||||||
|
.then(x => x.map(x => x.id));
|
||||||
|
if (mutedChannelIds.length > 0) {
|
||||||
|
query.andWhere(new Brackets(qb => {
|
||||||
|
qb.orWhere('note.renoteChannelId IS NULL')
|
||||||
|
.orWhere('note.renoteChannelId NOT IN (:...mutedChannelIds)', { mutedChannelIds });
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
if (ps.includeMyRenotes === false) {
|
if (ps.includeMyRenotes === false) {
|
||||||
query.andWhere(new Brackets(qb => {
|
query.andWhere(new Brackets(qb => {
|
||||||
qb.orWhere('note.userId != :meId', { meId: me.id });
|
qb.orWhere('note.userId != :meId', { meId: me.id });
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
|
|
||||||
import { Inject, Injectable } from '@nestjs/common';
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
import * as Redis from 'ioredis';
|
import * as Redis from 'ioredis';
|
||||||
|
import { Brackets } from 'typeorm';
|
||||||
import { Endpoint } from '@/server/api/endpoint-base.js';
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
||||||
import type { NotesRepository, RolesRepository } from '@/models/_.js';
|
import type { NotesRepository, RolesRepository } from '@/models/_.js';
|
||||||
import { QueryService } from '@/core/QueryService.js';
|
import { QueryService } from '@/core/QueryService.js';
|
||||||
|
@ -12,6 +13,7 @@ import { DI } from '@/di-symbols.js';
|
||||||
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
|
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
|
||||||
import { IdService } from '@/core/IdService.js';
|
import { IdService } from '@/core/IdService.js';
|
||||||
import { FanoutTimelineService } from '@/core/FanoutTimelineService.js';
|
import { FanoutTimelineService } from '@/core/FanoutTimelineService.js';
|
||||||
|
import { ChannelMutingService } from '@/core/ChannelMutingService.js';
|
||||||
import { ApiError } from '../../error.js';
|
import { ApiError } from '../../error.js';
|
||||||
|
|
||||||
export const meta = {
|
export const meta = {
|
||||||
|
@ -68,6 +70,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
private noteEntityService: NoteEntityService,
|
private noteEntityService: NoteEntityService,
|
||||||
private queryService: QueryService,
|
private queryService: QueryService,
|
||||||
private fanoutTimelineService: FanoutTimelineService,
|
private fanoutTimelineService: FanoutTimelineService,
|
||||||
|
private channelMutingService: ChannelMutingService,
|
||||||
) {
|
) {
|
||||||
super(meta, paramDef, async (ps, me) => {
|
super(meta, paramDef, async (ps, me) => {
|
||||||
const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
|
const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
|
||||||
|
@ -101,6 +104,21 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
.leftJoinAndSelect('reply.user', 'replyUser')
|
.leftJoinAndSelect('reply.user', 'replyUser')
|
||||||
.leftJoinAndSelect('renote.user', 'renoteUser');
|
.leftJoinAndSelect('renote.user', 'renoteUser');
|
||||||
|
|
||||||
|
// -- ミュートされたチャンネル対策
|
||||||
|
const mutingChannelIds = await this.channelMutingService
|
||||||
|
.list({ requestUserId: me.id }, { idOnly: true })
|
||||||
|
.then(x => x.map(x => x.id));
|
||||||
|
if (mutingChannelIds.length > 0) {
|
||||||
|
query.andWhere(new Brackets(qb => {
|
||||||
|
qb.orWhere('note.channelId IS NULL');
|
||||||
|
qb.orWhere('note.channelId NOT IN (:...mutingChannelIds)', { mutingChannelIds });
|
||||||
|
}));
|
||||||
|
query.andWhere(new Brackets(qb => {
|
||||||
|
qb.orWhere('note.renoteChannelId IS NULL');
|
||||||
|
qb.orWhere('note.renoteChannelId NOT IN (:...mutingChannelIds)', { mutingChannelIds });
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
this.queryService.generateVisibilityQuery(query, me);
|
this.queryService.generateVisibilityQuery(query, me);
|
||||||
this.queryService.generateMutedUserQuery(query, me);
|
this.queryService.generateMutedUserQuery(query, me);
|
||||||
this.queryService.generateBlockedUserQuery(query, me);
|
this.queryService.generateBlockedUserQuery(query, me);
|
||||||
|
|
|
@ -16,6 +16,7 @@ import { MiLocalUser } from '@/models/User.js';
|
||||||
import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
|
import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
|
||||||
import { FanoutTimelineName } from '@/core/FanoutTimelineService.js';
|
import { FanoutTimelineName } from '@/core/FanoutTimelineService.js';
|
||||||
import { ApiError } from '@/server/api/error.js';
|
import { ApiError } from '@/server/api/error.js';
|
||||||
|
import { ChannelMutingService } from '@/core/ChannelMutingService.js';
|
||||||
|
|
||||||
export const meta = {
|
export const meta = {
|
||||||
tags: ['users', 'notes'],
|
tags: ['users', 'notes'],
|
||||||
|
@ -77,12 +78,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
|
|
||||||
@Inject(DI.notesRepository)
|
@Inject(DI.notesRepository)
|
||||||
private notesRepository: NotesRepository,
|
private notesRepository: NotesRepository,
|
||||||
|
|
||||||
private noteEntityService: NoteEntityService,
|
private noteEntityService: NoteEntityService,
|
||||||
private queryService: QueryService,
|
private queryService: QueryService,
|
||||||
private cacheService: CacheService,
|
private cacheService: CacheService,
|
||||||
private idService: IdService,
|
private idService: IdService,
|
||||||
private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
|
private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
|
||||||
|
private channelMutingService: ChannelMutingService,
|
||||||
) {
|
) {
|
||||||
super(meta, paramDef, async (ps, me) => {
|
super(meta, paramDef, async (ps, me) => {
|
||||||
const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
|
const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
|
||||||
|
@ -163,6 +164,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
withFiles: boolean,
|
withFiles: boolean,
|
||||||
withRenotes: boolean,
|
withRenotes: boolean,
|
||||||
}, me: MiLocalUser | null) {
|
}, me: MiLocalUser | null) {
|
||||||
|
const mutingChannelIds = me
|
||||||
|
? await this.channelMutingService
|
||||||
|
.list({ requestUserId: me.id }, { idOnly: true })
|
||||||
|
.then(x => x.map(x => x.id))
|
||||||
|
: [];
|
||||||
const isSelf = me && (me.id === ps.userId);
|
const isSelf = me && (me.id === ps.userId);
|
||||||
|
|
||||||
const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId)
|
const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId)
|
||||||
|
@ -175,14 +181,30 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
.leftJoinAndSelect('renote.user', 'renoteUser');
|
.leftJoinAndSelect('renote.user', 'renoteUser');
|
||||||
|
|
||||||
if (ps.withChannelNotes) {
|
if (ps.withChannelNotes) {
|
||||||
if (!isSelf) query.andWhere(new Brackets(qb => {
|
query.andWhere(new Brackets(qb => {
|
||||||
qb.orWhere('note.channelId IS NULL');
|
if (mutingChannelIds.length > 0) {
|
||||||
qb.orWhere('channel.isSensitive = false');
|
qb.andWhere('note.channelId NOT IN (:...mutingChannelIds)', { mutingChannelIds: mutingChannelIds });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isSelf) {
|
||||||
|
qb.andWhere(new Brackets(qb2 => {
|
||||||
|
qb2.orWhere('note.channelId IS NULL');
|
||||||
|
qb2.orWhere('channel.isSensitive = false');
|
||||||
|
}));
|
||||||
|
}
|
||||||
}));
|
}));
|
||||||
} else {
|
} else {
|
||||||
query.andWhere('note.channelId IS NULL');
|
query.andWhere('note.channelId IS NULL');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// -- ミュートされたチャンネルのリノート対策
|
||||||
|
if (mutingChannelIds.length > 0) {
|
||||||
|
query.andWhere(new Brackets(qb => {
|
||||||
|
qb.orWhere('note.renoteChannelId IS NULL');
|
||||||
|
qb.orWhere('note.renoteChannelId NOT IN (:...mutingChannelIds)', { mutingChannelIds });
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
this.queryService.generateVisibilityQuery(query, me);
|
this.queryService.generateVisibilityQuery(query, me);
|
||||||
if (me) {
|
if (me) {
|
||||||
this.queryService.generateMutedUserQuery(query, me, { id: ps.userId });
|
this.queryService.generateMutedUserQuery(query, me, { id: ps.userId });
|
||||||
|
|
|
@ -12,8 +12,9 @@ import type { NotificationService } from '@/core/NotificationService.js';
|
||||||
import { bindThis } from '@/decorators.js';
|
import { bindThis } from '@/decorators.js';
|
||||||
import { CacheService } from '@/core/CacheService.js';
|
import { CacheService } from '@/core/CacheService.js';
|
||||||
import { MiFollowing, MiUserProfile } from '@/models/_.js';
|
import { MiFollowing, MiUserProfile } from '@/models/_.js';
|
||||||
import type { StreamEventEmitter, GlobalEvents } from '@/core/GlobalEventService.js';
|
import type { GlobalEvents, StreamEventEmitter } from '@/core/GlobalEventService.js';
|
||||||
import { ChannelFollowingService } from '@/core/ChannelFollowingService.js';
|
import { ChannelFollowingService } from '@/core/ChannelFollowingService.js';
|
||||||
|
import { ChannelMutingService } from '@/core/ChannelMutingService.js';
|
||||||
import { isJsonObject } from '@/misc/json-value.js';
|
import { isJsonObject } from '@/misc/json-value.js';
|
||||||
import type { JsonObject, JsonValue } from '@/misc/json-value.js';
|
import type { JsonObject, JsonValue } from '@/misc/json-value.js';
|
||||||
import type { ChannelsService } from './ChannelsService.js';
|
import type { ChannelsService } from './ChannelsService.js';
|
||||||
|
@ -37,6 +38,7 @@ export default class Connection {
|
||||||
public userProfile: MiUserProfile | null = null;
|
public userProfile: MiUserProfile | null = null;
|
||||||
public following: Record<string, Pick<MiFollowing, 'withReplies'> | undefined> = {};
|
public following: Record<string, Pick<MiFollowing, 'withReplies'> | undefined> = {};
|
||||||
public followingChannels: Set<string> = new Set();
|
public followingChannels: Set<string> = new Set();
|
||||||
|
public mutingChannels: Set<string> = new Set();
|
||||||
public userIdsWhoMeMuting: Set<string> = new Set();
|
public userIdsWhoMeMuting: Set<string> = new Set();
|
||||||
public userIdsWhoBlockingMe: Set<string> = new Set();
|
public userIdsWhoBlockingMe: Set<string> = new Set();
|
||||||
public userIdsWhoMeMutingRenotes: Set<string> = new Set();
|
public userIdsWhoMeMutingRenotes: Set<string> = new Set();
|
||||||
|
@ -49,7 +51,7 @@ export default class Connection {
|
||||||
private notificationService: NotificationService,
|
private notificationService: NotificationService,
|
||||||
private cacheService: CacheService,
|
private cacheService: CacheService,
|
||||||
private channelFollowingService: ChannelFollowingService,
|
private channelFollowingService: ChannelFollowingService,
|
||||||
|
private channelMutingService: ChannelMutingService,
|
||||||
user: MiUser | null | undefined,
|
user: MiUser | null | undefined,
|
||||||
token: MiAccessToken | null | undefined,
|
token: MiAccessToken | null | undefined,
|
||||||
) {
|
) {
|
||||||
|
@ -60,10 +62,19 @@ export default class Connection {
|
||||||
@bindThis
|
@bindThis
|
||||||
public async fetch() {
|
public async fetch() {
|
||||||
if (this.user == null) return;
|
if (this.user == null) return;
|
||||||
const [userProfile, following, followingChannels, userIdsWhoMeMuting, userIdsWhoBlockingMe, userIdsWhoMeMutingRenotes] = await Promise.all([
|
const [
|
||||||
|
userProfile,
|
||||||
|
following,
|
||||||
|
followingChannels,
|
||||||
|
mutingChannels,
|
||||||
|
userIdsWhoMeMuting,
|
||||||
|
userIdsWhoBlockingMe,
|
||||||
|
userIdsWhoMeMutingRenotes,
|
||||||
|
] = await Promise.all([
|
||||||
this.cacheService.userProfileCache.fetch(this.user.id),
|
this.cacheService.userProfileCache.fetch(this.user.id),
|
||||||
this.cacheService.userFollowingsCache.fetch(this.user.id),
|
this.cacheService.userFollowingsCache.fetch(this.user.id),
|
||||||
this.channelFollowingService.userFollowingChannelsCache.fetch(this.user.id),
|
this.channelFollowingService.userFollowingChannelsCache.fetch(this.user.id),
|
||||||
|
this.channelMutingService.mutingChannelsCache.fetch(this.user.id),
|
||||||
this.cacheService.userMutingsCache.fetch(this.user.id),
|
this.cacheService.userMutingsCache.fetch(this.user.id),
|
||||||
this.cacheService.userBlockedCache.fetch(this.user.id),
|
this.cacheService.userBlockedCache.fetch(this.user.id),
|
||||||
this.cacheService.renoteMutingsCache.fetch(this.user.id),
|
this.cacheService.renoteMutingsCache.fetch(this.user.id),
|
||||||
|
@ -71,6 +82,7 @@ export default class Connection {
|
||||||
this.userProfile = userProfile;
|
this.userProfile = userProfile;
|
||||||
this.following = following;
|
this.following = following;
|
||||||
this.followingChannels = followingChannels;
|
this.followingChannels = followingChannels;
|
||||||
|
this.mutingChannels = mutingChannels;
|
||||||
this.userIdsWhoMeMuting = userIdsWhoMeMuting;
|
this.userIdsWhoMeMuting = userIdsWhoMeMuting;
|
||||||
this.userIdsWhoBlockingMe = userIdsWhoBlockingMe;
|
this.userIdsWhoBlockingMe = userIdsWhoBlockingMe;
|
||||||
this.userIdsWhoMeMutingRenotes = userIdsWhoMeMutingRenotes;
|
this.userIdsWhoMeMutingRenotes = userIdsWhoMeMutingRenotes;
|
||||||
|
|
|
@ -6,7 +6,8 @@
|
||||||
import { bindThis } from '@/decorators.js';
|
import { bindThis } from '@/decorators.js';
|
||||||
import { isInstanceMuted } from '@/misc/is-instance-muted.js';
|
import { isInstanceMuted } from '@/misc/is-instance-muted.js';
|
||||||
import { isUserRelated } from '@/misc/is-user-related.js';
|
import { isUserRelated } from '@/misc/is-user-related.js';
|
||||||
import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
|
import { isQuotePacked, isRenotePacked } from '@/misc/is-renote.js';
|
||||||
|
import { isChannelRelated } from '@/misc/is-channel-related.js';
|
||||||
import type { Packed } from '@/misc/json-schema.js';
|
import type { Packed } from '@/misc/json-schema.js';
|
||||||
import type { JsonObject, JsonValue } from '@/misc/json-value.js';
|
import type { JsonObject, JsonValue } from '@/misc/json-value.js';
|
||||||
import type Connection from './Connection.js';
|
import type Connection from './Connection.js';
|
||||||
|
@ -55,6 +56,10 @@ export default abstract class Channel {
|
||||||
return this.connection.followingChannels;
|
return this.connection.followingChannels;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected get mutingChannels() {
|
||||||
|
return this.connection.mutingChannels;
|
||||||
|
}
|
||||||
|
|
||||||
protected get subscriber() {
|
protected get subscriber() {
|
||||||
return this.connection.subscriber;
|
return this.connection.subscriber;
|
||||||
}
|
}
|
||||||
|
@ -74,6 +79,9 @@ export default abstract class Channel {
|
||||||
// 流れてきたNoteがリノートをミュートしてるユーザが行ったもの
|
// 流れてきたNoteがリノートをミュートしてるユーザが行ったもの
|
||||||
if (isRenotePacked(note) && !isQuotePacked(note) && this.userIdsWhoMeMutingRenotes.has(note.user.id)) return true;
|
if (isRenotePacked(note) && !isQuotePacked(note) && this.userIdsWhoMeMutingRenotes.has(note.user.id)) return true;
|
||||||
|
|
||||||
|
// 流れてきたNoteがミュートしているチャンネルと関わる
|
||||||
|
if (isChannelRelated(note, this.mutingChannels)) return true;
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,8 @@ import type { Packed } from '@/misc/json-schema.js';
|
||||||
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
|
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
|
||||||
import { bindThis } from '@/decorators.js';
|
import { bindThis } from '@/decorators.js';
|
||||||
import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
|
import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
|
||||||
|
import { isInstanceMuted } from '@/misc/is-instance-muted.js';
|
||||||
|
import { isUserRelated } from '@/misc/is-user-related.js';
|
||||||
import type { JsonObject } from '@/misc/json-value.js';
|
import type { JsonObject } from '@/misc/json-value.js';
|
||||||
import Channel, { type MiChannelService } from '../channel.js';
|
import Channel, { type MiChannelService } from '../channel.js';
|
||||||
|
|
||||||
|
@ -19,7 +21,6 @@ class ChannelChannel extends Channel {
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private noteEntityService: NoteEntityService,
|
private noteEntityService: NoteEntityService,
|
||||||
|
|
||||||
id: string,
|
id: string,
|
||||||
connection: Channel['connection'],
|
connection: Channel['connection'],
|
||||||
) {
|
) {
|
||||||
|
@ -54,6 +55,35 @@ class ChannelChannel extends Channel {
|
||||||
this.send('note', note);
|
this.send('note', note);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* ミュートとブロックされてるを処理する
|
||||||
|
*/
|
||||||
|
protected override isNoteMutedOrBlocked(note: Packed<'Note'>): boolean {
|
||||||
|
// 流れてきたNoteがインスタンスミュートしたインスタンスが関わる
|
||||||
|
if (isInstanceMuted(note, new Set<string>(this.userProfile?.mutedInstances ?? []))) return true;
|
||||||
|
|
||||||
|
// 流れてきたNoteがミュートしているユーザーが関わる
|
||||||
|
if (isUserRelated(note, this.userIdsWhoMeMuting)) return true;
|
||||||
|
// 流れてきたNoteがブロックされているユーザーが関わる
|
||||||
|
if (isUserRelated(note, this.userIdsWhoBlockingMe)) return true;
|
||||||
|
|
||||||
|
// 流れてきたNoteがリノートをミュートしてるユーザが行ったもの
|
||||||
|
if (isRenotePacked(note) && !isQuotePacked(note) && this.userIdsWhoMeMutingRenotes.has(note.user.id)) return true;
|
||||||
|
|
||||||
|
// このソケットで見ているチャンネルがミュートされていたとしても、チャンネルを直接見ている以上は流すようにしたい
|
||||||
|
// ただし、他のミュートしているチャンネルは流さないようにもしたい
|
||||||
|
// ノート自体のチャンネルIDはonNoteでチェックしているので、ここではリノートのチャンネルIDをチェックする
|
||||||
|
if (
|
||||||
|
(note.renote) &&
|
||||||
|
(note.renote.channelId !== this.channelId) &&
|
||||||
|
(note.renote.channelId && this.mutingChannels.has(note.renote.channelId))
|
||||||
|
) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
@bindThis
|
@bindThis
|
||||||
public dispose() {
|
public dispose() {
|
||||||
// Unsubscribe events
|
// Unsubscribe events
|
||||||
|
|
|
@ -44,7 +44,10 @@ class HomeTimelineChannel extends Channel {
|
||||||
if (this.withFiles && (note.fileIds == null || note.fileIds.length === 0)) return;
|
if (this.withFiles && (note.fileIds == null || note.fileIds.length === 0)) return;
|
||||||
|
|
||||||
if (note.channelId) {
|
if (note.channelId) {
|
||||||
if (!this.followingChannels.has(note.channelId)) return;
|
// そのチャンネルをフォローしていない
|
||||||
|
if (!this.followingChannels.has(note.channelId)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// その投稿のユーザーをフォローしていなかったら弾く
|
// その投稿のユーザーをフォローしていなかったら弾く
|
||||||
if (!isMe && !Object.hasOwn(this.following, note.userId)) return;
|
if (!isMe && !Object.hasOwn(this.following, note.userId)) return;
|
||||||
|
|
|
@ -53,16 +53,25 @@ class HybridTimelineChannel extends Channel {
|
||||||
|
|
||||||
if (this.withFiles && (note.fileIds == null || note.fileIds.length === 0)) return;
|
if (this.withFiles && (note.fileIds == null || note.fileIds.length === 0)) return;
|
||||||
|
|
||||||
// チャンネルの投稿ではなく、自分自身の投稿 または
|
if (!note.channelId) {
|
||||||
// チャンネルの投稿ではなく、その投稿のユーザーをフォローしている または
|
// 以下の条件に該当するノートのみ後続処理に通す(ので、以下のif文は該当しないノートをすべて弾くようにする)
|
||||||
// チャンネルの投稿ではなく、全体公開のローカルの投稿 または
|
// - 自分自身の投稿
|
||||||
// フォローしているチャンネルの投稿 の場合だけ
|
// - その投稿のユーザーをフォローしている
|
||||||
|
// - 全体公開のローカルの投稿
|
||||||
if (!(
|
if (!(
|
||||||
(note.channelId == null && isMe) ||
|
isMe ||
|
||||||
(note.channelId == null && Object.hasOwn(this.following, note.userId)) ||
|
Object.hasOwn(this.following, note.userId) ||
|
||||||
(note.channelId == null && (note.user.host == null && note.visibility === 'public')) ||
|
(note.user.host == null && note.visibility === 'public')
|
||||||
(note.channelId != null && this.followingChannels.has(note.channelId))
|
)) {
|
||||||
)) return;
|
return;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 以下の条件に該当するノートのみ後続処理に通す(ので、以下のif文は該当しないノートをすべて弾くようにする)
|
||||||
|
// - フォローしているチャンネルの投稿
|
||||||
|
if (!this.followingChannels.has(note.channelId)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (note.visibility === 'followers') {
|
if (note.visibility === 'followers') {
|
||||||
if (!isMe && !Object.hasOwn(this.following, note.userId)) return;
|
if (!isMe && !Object.hasOwn(this.following, note.userId)) return;
|
||||||
|
|
|
@ -69,6 +69,9 @@ describe('アンテナ', () => {
|
||||||
let userMutingAlice: User;
|
let userMutingAlice: User;
|
||||||
let userMutedByAlice: User;
|
let userMutedByAlice: User;
|
||||||
|
|
||||||
|
let testChannel: misskey.entities.Channel;
|
||||||
|
let testMutedChannel: misskey.entities.Channel;
|
||||||
|
|
||||||
beforeAll(async () => {
|
beforeAll(async () => {
|
||||||
root = await signup({ username: 'root' });
|
root = await signup({ username: 'root' });
|
||||||
alice = await signup({ username: 'alice' });
|
alice = await signup({ username: 'alice' });
|
||||||
|
@ -120,6 +123,10 @@ describe('アンテナ', () => {
|
||||||
userMutedByAlice = await signup({ username: 'userMutedByAlice' });
|
userMutedByAlice = await signup({ username: 'userMutedByAlice' });
|
||||||
await post(userMutedByAlice, { text: 'test' });
|
await post(userMutedByAlice, { text: 'test' });
|
||||||
await api('mute/create', { userId: userMutedByAlice.id }, alice);
|
await api('mute/create', { userId: userMutedByAlice.id }, alice);
|
||||||
|
|
||||||
|
testChannel = (await api('channels/create', { name: 'test' }, root)).body;
|
||||||
|
testMutedChannel = (await api('channels/create', { name: 'test-muted' }, root)).body;
|
||||||
|
await api('channels/mute/create', { channelId: testMutedChannel.id }, alice);
|
||||||
}, 1000 * 60 * 10);
|
}, 1000 * 60 * 10);
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
|
@ -593,6 +600,20 @@ describe('アンテナ', () => {
|
||||||
{ note: (): Promise<Note> => post(bob, { text: `${keyword}` }), included: true },
|
{ note: (): Promise<Note> => post(bob, { text: `${keyword}` }), included: true },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: 'チャンネルノートも含む',
|
||||||
|
parameters: () => ({ src: 'all' }),
|
||||||
|
posts: [
|
||||||
|
{ note: (): Promise<Note> => post(bob, { text: `test ${keyword}`, channelId: testChannel.id }), included: true },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'ミュートしてるチャンネルは含まない',
|
||||||
|
parameters: () => ({ src: 'all' }),
|
||||||
|
posts: [
|
||||||
|
{ note: (): Promise<Note> => post(bob, { text: `test ${keyword}`, channelId: testMutedChannel.id }) },
|
||||||
|
],
|
||||||
|
},
|
||||||
])('が取得できること($label)', async ({ parameters, posts }) => {
|
])('が取得できること($label)', async ({ parameters, posts }) => {
|
||||||
const antenna = await successfulApiCall({
|
const antenna = await successfulApiCall({
|
||||||
endpoint: 'antennas/create',
|
endpoint: 'antennas/create',
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,10 @@
|
||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
module.exports = async () => {
|
||||||
|
// DBはUTC(っぽい)ので、テスト側も合わせておく
|
||||||
|
process.env.TZ = 'UTC';
|
||||||
|
process.env.NODE_ENV = 'test';
|
||||||
|
};
|
|
@ -0,0 +1,235 @@
|
||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* eslint-disable */
|
||||||
|
|
||||||
|
import { afterEach, beforeEach, describe, expect } from '@jest/globals';
|
||||||
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
|
import { GlobalModule } from '@/GlobalModule.js';
|
||||||
|
import { CoreModule } from '@/core/CoreModule.js';
|
||||||
|
import { GlobalEventService } from '@/core/GlobalEventService.js';
|
||||||
|
import { IdService } from '@/core/IdService.js';
|
||||||
|
import {
|
||||||
|
type ChannelFollowingsRepository,
|
||||||
|
ChannelsRepository,
|
||||||
|
DriveFilesRepository,
|
||||||
|
MiChannel,
|
||||||
|
MiChannelFollowing,
|
||||||
|
MiDriveFile,
|
||||||
|
MiUser,
|
||||||
|
UserProfilesRepository,
|
||||||
|
UsersRepository,
|
||||||
|
} from '@/models/_.js';
|
||||||
|
import { DI } from '@/di-symbols.js';
|
||||||
|
import { ChannelFollowingService } from "@/core/ChannelFollowingService.js";
|
||||||
|
import { MiLocalUser } from "@/models/User.js";
|
||||||
|
|
||||||
|
describe('ChannelFollowingService', () => {
|
||||||
|
let app: TestingModule;
|
||||||
|
let service: ChannelFollowingService;
|
||||||
|
let channelsRepository: ChannelsRepository;
|
||||||
|
let channelFollowingsRepository: ChannelFollowingsRepository;
|
||||||
|
let usersRepository: UsersRepository;
|
||||||
|
let userProfilesRepository: UserProfilesRepository;
|
||||||
|
let driveFilesRepository: DriveFilesRepository;
|
||||||
|
let idService: IdService;
|
||||||
|
|
||||||
|
let alice: MiLocalUser;
|
||||||
|
let bob: MiLocalUser;
|
||||||
|
let channel1: MiChannel;
|
||||||
|
let channel2: MiChannel;
|
||||||
|
let channel3: MiChannel;
|
||||||
|
let driveFile1: MiDriveFile;
|
||||||
|
let driveFile2: MiDriveFile;
|
||||||
|
|
||||||
|
async function createUser(data: Partial<MiUser> = {}) {
|
||||||
|
const user = await usersRepository
|
||||||
|
.insert({
|
||||||
|
id: idService.gen(),
|
||||||
|
username: 'username',
|
||||||
|
usernameLower: 'username',
|
||||||
|
...data,
|
||||||
|
})
|
||||||
|
.then(x => usersRepository.findOneByOrFail(x.identifiers[0]));
|
||||||
|
|
||||||
|
await userProfilesRepository.insert({
|
||||||
|
userId: user.id,
|
||||||
|
});
|
||||||
|
|
||||||
|
return user;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createChannel(data: Partial<MiChannel> = {}) {
|
||||||
|
return await channelsRepository
|
||||||
|
.insert({
|
||||||
|
id: idService.gen(),
|
||||||
|
...data,
|
||||||
|
})
|
||||||
|
.then(x => channelsRepository.findOneByOrFail(x.identifiers[0]));
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createChannelFollowing(data: Partial<MiChannelFollowing> = {}) {
|
||||||
|
return await channelFollowingsRepository
|
||||||
|
.insert({
|
||||||
|
id: idService.gen(),
|
||||||
|
...data,
|
||||||
|
})
|
||||||
|
.then(x => channelFollowingsRepository.findOneByOrFail(x.identifiers[0]));
|
||||||
|
}
|
||||||
|
|
||||||
|
async function fetchChannelFollowing() {
|
||||||
|
return await channelFollowingsRepository.findBy({});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createDriveFile(data: Partial<MiDriveFile> = {}) {
|
||||||
|
return await driveFilesRepository
|
||||||
|
.insert({
|
||||||
|
id: idService.gen(),
|
||||||
|
md5: 'md5',
|
||||||
|
name: 'name',
|
||||||
|
size: 0,
|
||||||
|
type: 'type',
|
||||||
|
storedInternal: false,
|
||||||
|
url: 'url',
|
||||||
|
...data,
|
||||||
|
})
|
||||||
|
.then(x => driveFilesRepository.findOneByOrFail(x.identifiers[0]));
|
||||||
|
}
|
||||||
|
|
||||||
|
beforeAll(async () => {
|
||||||
|
app = await Test.createTestingModule({
|
||||||
|
imports: [
|
||||||
|
GlobalModule,
|
||||||
|
CoreModule,
|
||||||
|
],
|
||||||
|
providers: [
|
||||||
|
GlobalEventService,
|
||||||
|
IdService,
|
||||||
|
ChannelFollowingService,
|
||||||
|
],
|
||||||
|
}).compile();
|
||||||
|
|
||||||
|
app.enableShutdownHooks();
|
||||||
|
|
||||||
|
service = app.get<ChannelFollowingService>(ChannelFollowingService);
|
||||||
|
idService = app.get<IdService>(IdService);
|
||||||
|
channelsRepository = app.get<ChannelsRepository>(DI.channelsRepository);
|
||||||
|
channelFollowingsRepository = app.get<ChannelFollowingsRepository>(DI.channelFollowingsRepository);
|
||||||
|
usersRepository = app.get<UsersRepository>(DI.usersRepository);
|
||||||
|
userProfilesRepository = app.get<UserProfilesRepository>(DI.userProfilesRepository);
|
||||||
|
driveFilesRepository = app.get<DriveFilesRepository>(DI.driveFilesRepository);
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async () => {
|
||||||
|
await app.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
alice = { ...await createUser({ username: 'alice' }), host: null, uri: null };
|
||||||
|
bob = { ...await createUser({ username: 'bob' }), host: null, uri: null };
|
||||||
|
driveFile1 = await createDriveFile();
|
||||||
|
driveFile2 = await createDriveFile();
|
||||||
|
channel1 = await createChannel({ name: 'channel1', userId: alice.id, bannerId: driveFile1.id });
|
||||||
|
channel2 = await createChannel({ name: 'channel2', userId: alice.id, bannerId: driveFile2.id });
|
||||||
|
channel3 = await createChannel({ name: 'channel3', userId: alice.id, bannerId: driveFile2.id });
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(async () => {
|
||||||
|
await channelFollowingsRepository.delete({});
|
||||||
|
await channelsRepository.delete({});
|
||||||
|
await userProfilesRepository.delete({});
|
||||||
|
await usersRepository.delete({});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('list', () => {
|
||||||
|
test('default', async () => {
|
||||||
|
await createChannelFollowing({ followerId: alice.id, followeeId: channel1.id });
|
||||||
|
await createChannelFollowing({ followerId: alice.id, followeeId: channel2.id });
|
||||||
|
await createChannelFollowing({ followerId: bob.id, followeeId: channel3.id });
|
||||||
|
|
||||||
|
const followings = await service.list({ requestUserId: alice.id });
|
||||||
|
|
||||||
|
expect(followings).toHaveLength(2);
|
||||||
|
expect(followings[0].id).toBe(channel1.id);
|
||||||
|
expect(followings[0].userId).toBe(alice.id);
|
||||||
|
expect(followings[0].user).toBeFalsy();
|
||||||
|
expect(followings[0].bannerId).toBe(driveFile1.id);
|
||||||
|
expect(followings[0].banner).toBeFalsy();
|
||||||
|
expect(followings[1].id).toBe(channel2.id);
|
||||||
|
expect(followings[1].userId).toBe(alice.id);
|
||||||
|
expect(followings[1].user).toBeFalsy();
|
||||||
|
expect(followings[1].bannerId).toBe(driveFile2.id);
|
||||||
|
expect(followings[1].banner).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('idOnly', async () => {
|
||||||
|
await createChannelFollowing({ followerId: alice.id, followeeId: channel1.id });
|
||||||
|
await createChannelFollowing({ followerId: alice.id, followeeId: channel2.id });
|
||||||
|
await createChannelFollowing({ followerId: bob.id, followeeId: channel3.id });
|
||||||
|
|
||||||
|
const followings = await service.list({ requestUserId: alice.id }, { idOnly: true });
|
||||||
|
|
||||||
|
expect(followings).toHaveLength(2);
|
||||||
|
expect(followings[0].id).toBe(channel1.id);
|
||||||
|
expect(followings[1].id).toBe(channel2.id);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('joinUser', async () => {
|
||||||
|
await createChannelFollowing({ followerId: alice.id, followeeId: channel1.id });
|
||||||
|
await createChannelFollowing({ followerId: alice.id, followeeId: channel2.id });
|
||||||
|
await createChannelFollowing({ followerId: bob.id, followeeId: channel3.id });
|
||||||
|
|
||||||
|
const followings = await service.list({ requestUserId: alice.id }, { joinUser: true });
|
||||||
|
|
||||||
|
expect(followings).toHaveLength(2);
|
||||||
|
expect(followings[0].id).toBe(channel1.id);
|
||||||
|
expect(followings[0].user).toEqual(alice);
|
||||||
|
expect(followings[0].banner).toBeFalsy();
|
||||||
|
expect(followings[1].id).toBe(channel2.id);
|
||||||
|
expect(followings[1].user).toEqual(alice);
|
||||||
|
expect(followings[1].banner).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('joinBannerFile', async () => {
|
||||||
|
await createChannelFollowing({ followerId: alice.id, followeeId: channel1.id });
|
||||||
|
await createChannelFollowing({ followerId: alice.id, followeeId: channel2.id });
|
||||||
|
await createChannelFollowing({ followerId: bob.id, followeeId: channel3.id });
|
||||||
|
|
||||||
|
const followings = await service.list({ requestUserId: alice.id }, { joinBannerFile: true });
|
||||||
|
|
||||||
|
expect(followings).toHaveLength(2);
|
||||||
|
expect(followings[0].id).toBe(channel1.id);
|
||||||
|
expect(followings[0].user).toBeFalsy();
|
||||||
|
expect(followings[0].banner).toEqual(driveFile1);
|
||||||
|
expect(followings[1].id).toBe(channel2.id);
|
||||||
|
expect(followings[1].user).toBeFalsy();
|
||||||
|
expect(followings[1].banner).toEqual(driveFile2);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('follow', () => {
|
||||||
|
test('default', async () => {
|
||||||
|
await service.follow(alice, channel1);
|
||||||
|
|
||||||
|
const followings = await fetchChannelFollowing();
|
||||||
|
|
||||||
|
expect(followings).toHaveLength(1);
|
||||||
|
expect(followings[0].followeeId).toBe(channel1.id);
|
||||||
|
expect(followings[0].followerId).toBe(alice.id);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('unfollow', () => {
|
||||||
|
test('default', async () => {
|
||||||
|
await createChannelFollowing({ followerId: alice.id, followeeId: channel1.id });
|
||||||
|
|
||||||
|
await service.unfollow(alice, channel1);
|
||||||
|
|
||||||
|
const followings = await fetchChannelFollowing();
|
||||||
|
|
||||||
|
expect(followings).toHaveLength(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,336 @@
|
||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* eslint-disable */
|
||||||
|
|
||||||
|
import { afterEach, beforeEach, describe, expect } from '@jest/globals';
|
||||||
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
|
import { GlobalModule } from '@/GlobalModule.js';
|
||||||
|
import { CoreModule } from '@/core/CoreModule.js';
|
||||||
|
import { GlobalEventService } from '@/core/GlobalEventService.js';
|
||||||
|
import { IdService } from '@/core/IdService.js';
|
||||||
|
import { ChannelMutingService } from '@/core/ChannelMutingService.js';
|
||||||
|
import {
|
||||||
|
ChannelMutingRepository,
|
||||||
|
ChannelsRepository,
|
||||||
|
DriveFilesRepository,
|
||||||
|
MiChannel,
|
||||||
|
MiChannelMuting,
|
||||||
|
MiDriveFile,
|
||||||
|
MiUser,
|
||||||
|
UserProfilesRepository,
|
||||||
|
UsersRepository,
|
||||||
|
} from '@/models/_.js';
|
||||||
|
import { DI } from '@/di-symbols.js';
|
||||||
|
import { setTimeout } from 'node:timers/promises';
|
||||||
|
|
||||||
|
describe('ChannelMutingService', () => {
|
||||||
|
let app: TestingModule;
|
||||||
|
let service: ChannelMutingService;
|
||||||
|
let channelsRepository: ChannelsRepository;
|
||||||
|
let channelMutingRepository: ChannelMutingRepository;
|
||||||
|
let usersRepository: UsersRepository;
|
||||||
|
let userProfilesRepository: UserProfilesRepository;
|
||||||
|
let driveFilesRepository: DriveFilesRepository;
|
||||||
|
let idService: IdService;
|
||||||
|
|
||||||
|
let alice: MiUser;
|
||||||
|
let bob: MiUser;
|
||||||
|
let channel1: MiChannel;
|
||||||
|
let channel2: MiChannel;
|
||||||
|
let channel3: MiChannel;
|
||||||
|
let driveFile1: MiDriveFile;
|
||||||
|
let driveFile2: MiDriveFile;
|
||||||
|
|
||||||
|
async function createUser(data: Partial<MiUser> = {}) {
|
||||||
|
const user = await usersRepository
|
||||||
|
.insert({
|
||||||
|
id: idService.gen(),
|
||||||
|
username: 'username',
|
||||||
|
usernameLower: 'username',
|
||||||
|
...data,
|
||||||
|
})
|
||||||
|
.then(x => usersRepository.findOneByOrFail(x.identifiers[0]));
|
||||||
|
|
||||||
|
await userProfilesRepository.insert({
|
||||||
|
userId: user.id,
|
||||||
|
});
|
||||||
|
|
||||||
|
return user;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createChannel(data: Partial<MiChannel> = {}) {
|
||||||
|
return await channelsRepository
|
||||||
|
.insert({
|
||||||
|
id: idService.gen(),
|
||||||
|
...data,
|
||||||
|
})
|
||||||
|
.then(x => channelsRepository.findOneByOrFail(x.identifiers[0]));
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createChannelMuting(data: Partial<MiChannelMuting> = {}) {
|
||||||
|
return await channelMutingRepository
|
||||||
|
.insert({
|
||||||
|
id: idService.gen(),
|
||||||
|
...data,
|
||||||
|
})
|
||||||
|
.then(x => channelMutingRepository.findOneByOrFail(x.identifiers[0]));
|
||||||
|
}
|
||||||
|
|
||||||
|
async function fetchChannelMuting() {
|
||||||
|
return await channelMutingRepository.findBy({});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createDriveFile(data: Partial<MiDriveFile> = {}) {
|
||||||
|
return await driveFilesRepository
|
||||||
|
.insert({
|
||||||
|
id: idService.gen(),
|
||||||
|
md5: 'md5',
|
||||||
|
name: 'name',
|
||||||
|
size: 0,
|
||||||
|
type: 'type',
|
||||||
|
storedInternal: false,
|
||||||
|
url: 'url',
|
||||||
|
...data,
|
||||||
|
})
|
||||||
|
.then(x => driveFilesRepository.findOneByOrFail(x.identifiers[0]));
|
||||||
|
}
|
||||||
|
|
||||||
|
beforeAll(async () => {
|
||||||
|
app = await Test.createTestingModule({
|
||||||
|
imports: [
|
||||||
|
GlobalModule,
|
||||||
|
CoreModule,
|
||||||
|
],
|
||||||
|
providers: [
|
||||||
|
GlobalEventService,
|
||||||
|
IdService,
|
||||||
|
ChannelMutingService,
|
||||||
|
],
|
||||||
|
}).compile();
|
||||||
|
|
||||||
|
app.enableShutdownHooks();
|
||||||
|
|
||||||
|
service = app.get<ChannelMutingService>(ChannelMutingService);
|
||||||
|
idService = app.get<IdService>(IdService);
|
||||||
|
channelsRepository = app.get<ChannelsRepository>(DI.channelsRepository);
|
||||||
|
channelMutingRepository = app.get<ChannelMutingRepository>(DI.channelMutingRepository);
|
||||||
|
usersRepository = app.get<UsersRepository>(DI.usersRepository);
|
||||||
|
userProfilesRepository = app.get<UserProfilesRepository>(DI.userProfilesRepository);
|
||||||
|
driveFilesRepository = app.get<DriveFilesRepository>(DI.driveFilesRepository);
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async () => {
|
||||||
|
await app.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
alice = await createUser({ username: 'alice' });
|
||||||
|
bob = await createUser({ username: 'bob' });
|
||||||
|
driveFile1 = await createDriveFile();
|
||||||
|
driveFile2 = await createDriveFile();
|
||||||
|
channel1 = await createChannel({ name: 'channel1', userId: alice.id, bannerId: driveFile1.id });
|
||||||
|
channel2 = await createChannel({ name: 'channel2', userId: alice.id, bannerId: driveFile2.id });
|
||||||
|
channel3 = await createChannel({ name: 'channel3', userId: alice.id, bannerId: driveFile2.id });
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(async () => {
|
||||||
|
await channelMutingRepository.delete({});
|
||||||
|
await channelsRepository.delete({});
|
||||||
|
await userProfilesRepository.delete({});
|
||||||
|
await usersRepository.delete({});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('list', () => {
|
||||||
|
test('default', async () => {
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel1.id });
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel2.id });
|
||||||
|
await createChannelMuting({ userId: bob.id, channelId: channel3.id });
|
||||||
|
|
||||||
|
const mutings = await service.list({ requestUserId: alice.id });
|
||||||
|
|
||||||
|
expect(mutings).toHaveLength(2);
|
||||||
|
expect(mutings[0].id).toBe(channel1.id);
|
||||||
|
expect(mutings[0].userId).toBe(alice.id);
|
||||||
|
expect(mutings[0].user).toBeFalsy();
|
||||||
|
expect(mutings[0].bannerId).toBe(driveFile1.id);
|
||||||
|
expect(mutings[0].banner).toBeFalsy();
|
||||||
|
expect(mutings[1].id).toBe(channel2.id);
|
||||||
|
expect(mutings[1].userId).toBe(alice.id);
|
||||||
|
expect(mutings[1].user).toBeFalsy();
|
||||||
|
expect(mutings[1].bannerId).toBe(driveFile2.id);
|
||||||
|
expect(mutings[1].banner).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('withoutExpires', async () => {
|
||||||
|
const now = new Date();
|
||||||
|
const past = new Date(now);
|
||||||
|
const future = new Date(now);
|
||||||
|
past.setMinutes(past.getMinutes() - 1);
|
||||||
|
future.setMinutes(future.getMinutes() + 1);
|
||||||
|
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel1.id, expiresAt: past });
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel2.id, expiresAt: null });
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel3.id, expiresAt: future });
|
||||||
|
|
||||||
|
const mutings = await service.list({ requestUserId: alice.id });
|
||||||
|
|
||||||
|
expect(mutings).toHaveLength(2);
|
||||||
|
expect(mutings[0].id).toBe(channel2.id);
|
||||||
|
expect(mutings[1].id).toBe(channel3.id);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('idOnly', async () => {
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel1.id });
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel2.id });
|
||||||
|
await createChannelMuting({ userId: bob.id, channelId: channel3.id });
|
||||||
|
|
||||||
|
const mutings = await service.list({ requestUserId: alice.id }, { idOnly: true });
|
||||||
|
|
||||||
|
expect(mutings).toHaveLength(2);
|
||||||
|
expect(mutings[0].id).toBe(channel1.id);
|
||||||
|
expect(mutings[1].id).toBe(channel2.id);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('withoutExpires-idOnly', async () => {
|
||||||
|
const now = new Date();
|
||||||
|
const past = new Date(now);
|
||||||
|
const future = new Date(now);
|
||||||
|
past.setMinutes(past.getMinutes() - 1);
|
||||||
|
future.setMinutes(future.getMinutes() + 1);
|
||||||
|
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel1.id, expiresAt: past });
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel2.id, expiresAt: null });
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel3.id, expiresAt: future });
|
||||||
|
|
||||||
|
const mutings = await service.list({ requestUserId: alice.id }, { idOnly: true });
|
||||||
|
|
||||||
|
expect(mutings).toHaveLength(2);
|
||||||
|
expect(mutings[0].id).toBe(channel2.id);
|
||||||
|
expect(mutings[1].id).toBe(channel3.id);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('joinUser', async () => {
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel1.id });
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel2.id });
|
||||||
|
await createChannelMuting({ userId: bob.id, channelId: channel3.id });
|
||||||
|
|
||||||
|
const mutings = await service.list({ requestUserId: alice.id }, { joinUser: true });
|
||||||
|
|
||||||
|
expect(mutings).toHaveLength(2);
|
||||||
|
expect(mutings[0].id).toBe(channel1.id);
|
||||||
|
expect(mutings[0].user).toEqual(alice);
|
||||||
|
expect(mutings[0].banner).toBeFalsy();
|
||||||
|
expect(mutings[1].id).toBe(channel2.id);
|
||||||
|
expect(mutings[1].user).toEqual(alice);
|
||||||
|
expect(mutings[1].banner).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('joinBannerFile', async () => {
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel1.id });
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel2.id });
|
||||||
|
await createChannelMuting({ userId: bob.id, channelId: channel3.id });
|
||||||
|
|
||||||
|
const mutings = await service.list({ requestUserId: alice.id }, { joinBannerFile: true });
|
||||||
|
|
||||||
|
expect(mutings).toHaveLength(2);
|
||||||
|
expect(mutings[0].id).toBe(channel1.id);
|
||||||
|
expect(mutings[0].user).toBeFalsy();
|
||||||
|
expect(mutings[0].banner).toEqual(driveFile1);
|
||||||
|
expect(mutings[1].id).toBe(channel2.id);
|
||||||
|
expect(mutings[1].user).toBeFalsy();
|
||||||
|
expect(mutings[1].banner).toEqual(driveFile2);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('findExpiredMutings', () => {
|
||||||
|
test('default', async () => {
|
||||||
|
const now = new Date();
|
||||||
|
const future = new Date(now);
|
||||||
|
const past = new Date(now);
|
||||||
|
future.setMinutes(now.getMinutes() + 1);
|
||||||
|
past.setMinutes(now.getMinutes() - 1);
|
||||||
|
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel1.id, expiresAt: past });
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel2.id, expiresAt: future });
|
||||||
|
await createChannelMuting({ userId: bob.id, channelId: channel3.id, expiresAt: past });
|
||||||
|
|
||||||
|
const mutings = await service.findExpiredMutings();
|
||||||
|
|
||||||
|
expect(mutings).toHaveLength(2);
|
||||||
|
expect(mutings[0].channelId).toBe(channel1.id);
|
||||||
|
expect(mutings[1].channelId).toBe(channel3.id);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('isMuted', () => {
|
||||||
|
test('isMuted: true', async () => {
|
||||||
|
// キャッシュを読むのでServiceの機能を使って登録し、キャッシュを作成する
|
||||||
|
await service.mute({ requestUserId: alice.id, targetChannelId: channel1.id });
|
||||||
|
await service.mute({ requestUserId: alice.id, targetChannelId: channel2.id });
|
||||||
|
|
||||||
|
await setTimeout(500);
|
||||||
|
|
||||||
|
const result = await service.isMuted({ requestUserId: alice.id, targetChannelId: channel1.id });
|
||||||
|
|
||||||
|
expect(result).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('isMuted: false', async () => {
|
||||||
|
await service.mute({ requestUserId: alice.id, targetChannelId: channel2.id });
|
||||||
|
|
||||||
|
await setTimeout(500);
|
||||||
|
|
||||||
|
const result = await service.isMuted({ requestUserId: alice.id, targetChannelId: channel1.id });
|
||||||
|
|
||||||
|
expect(result).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('mute', () => {
|
||||||
|
test('default', async () => {
|
||||||
|
await service.mute({ requestUserId: alice.id, targetChannelId: channel1.id });
|
||||||
|
|
||||||
|
const muting = await fetchChannelMuting();
|
||||||
|
expect(muting).toHaveLength(1);
|
||||||
|
expect(muting[0].channelId).toBe(channel1.id);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('unmute', () => {
|
||||||
|
test('default', async () => {
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel1.id });
|
||||||
|
|
||||||
|
let muting = await fetchChannelMuting();
|
||||||
|
expect(muting).toHaveLength(1);
|
||||||
|
expect(muting[0].channelId).toBe(channel1.id);
|
||||||
|
|
||||||
|
await service.unmute({ requestUserId: alice.id, targetChannelId: channel1.id });
|
||||||
|
|
||||||
|
muting = await fetchChannelMuting();
|
||||||
|
expect(muting).toHaveLength(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('eraseExpiredMutings', () => {
|
||||||
|
test('default', async () => {
|
||||||
|
const now = new Date();
|
||||||
|
const future = new Date(now);
|
||||||
|
const past = new Date(now);
|
||||||
|
future.setMinutes(now.getMinutes() + 1);
|
||||||
|
past.setMinutes(now.getMinutes() - 1);
|
||||||
|
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel1.id, expiresAt: past });
|
||||||
|
await createChannelMuting({ userId: alice.id, channelId: channel2.id, expiresAt: future });
|
||||||
|
await createChannelMuting({ userId: bob.id, channelId: channel3.id, expiresAt: past });
|
||||||
|
|
||||||
|
await service.eraseExpiredMutings();
|
||||||
|
|
||||||
|
const mutings = await fetchChannelMuting();
|
||||||
|
expect(mutings).toHaveLength(1);
|
||||||
|
expect(mutings[0].channelId).toBe(channel2.id);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -60,6 +60,7 @@ describe('NoteCreateService', () => {
|
||||||
replyUserHost: null,
|
replyUserHost: null,
|
||||||
renoteUserId: null,
|
renoteUserId: null,
|
||||||
renoteUserHost: null,
|
renoteUserHost: null,
|
||||||
|
renoteChannelId: null,
|
||||||
};
|
};
|
||||||
|
|
||||||
const poll: IPoll = {
|
const poll: IPoll = {
|
||||||
|
|
|
@ -43,6 +43,7 @@ const base: MiNote = {
|
||||||
replyUserHost: null,
|
replyUserHost: null,
|
||||||
renoteUserId: null,
|
renoteUserId: null,
|
||||||
renoteUserHost: null,
|
renoteUserHost: null,
|
||||||
|
renoteChannelId: null,
|
||||||
};
|
};
|
||||||
|
|
||||||
describe('misc:is-renote', () => {
|
describe('misc:is-renote', () => {
|
||||||
|
|
|
@ -119,22 +119,25 @@ const featuredPagination = computed(() => ({
|
||||||
}));
|
}));
|
||||||
|
|
||||||
watch(() => props.channelId, async () => {
|
watch(() => props.channelId, async () => {
|
||||||
channel.value = await misskeyApi('channels/show', {
|
const _channel = await misskeyApi('channels/show', {
|
||||||
channelId: props.channelId,
|
channelId: props.channelId,
|
||||||
});
|
});
|
||||||
favorited.value = channel.value.isFavorited ?? false;
|
|
||||||
if (favorited.value || channel.value.isFollowing) {
|
favorited.value = _channel.isFavorited ?? false;
|
||||||
|
if (favorited.value || _channel.isFollowing) {
|
||||||
tab.value = 'timeline';
|
tab.value = 'timeline';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((favorited.value || channel.value.isFollowing) && channel.value.lastNotedAt) {
|
if ((favorited.value || _channel.isFollowing) && _channel.lastNotedAt) {
|
||||||
const lastReadedAt: number = miLocalStorage.getItemAsJson(`channelLastReadedAt:${channel.value.id}`) ?? 0;
|
const lastReadedAt: number = miLocalStorage.getItemAsJson(`channelLastReadedAt:${_channel.id}`) ?? 0;
|
||||||
const lastNotedAt = Date.parse(channel.value.lastNotedAt);
|
const lastNotedAt = Date.parse(_channel.lastNotedAt);
|
||||||
|
|
||||||
if (lastNotedAt > lastReadedAt) {
|
if (lastNotedAt > lastReadedAt) {
|
||||||
miLocalStorage.setItemAsJson(`channelLastReadedAt:${channel.value.id}`, lastNotedAt);
|
miLocalStorage.setItemAsJson(`channelLastReadedAt:${_channel.id}`, lastNotedAt);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
channel.value = _channel;
|
||||||
}, { immediate: true });
|
}, { immediate: true });
|
||||||
|
|
||||||
function edit() {
|
function edit() {
|
||||||
|
@ -174,6 +177,53 @@ async function unfavorite() {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function mute() {
|
||||||
|
if (!channel.value) return;
|
||||||
|
const _channel = channel.value;
|
||||||
|
|
||||||
|
const { canceled, result: period } = await os.select({
|
||||||
|
title: i18n.ts.mutePeriod,
|
||||||
|
items: [{
|
||||||
|
value: 'indefinitely', text: i18n.ts.indefinitely,
|
||||||
|
}, {
|
||||||
|
value: 'tenMinutes', text: i18n.ts.tenMinutes,
|
||||||
|
}, {
|
||||||
|
value: 'oneHour', text: i18n.ts.oneHour,
|
||||||
|
}, {
|
||||||
|
value: 'oneDay', text: i18n.ts.oneDay,
|
||||||
|
}, {
|
||||||
|
value: 'oneWeek', text: i18n.ts.oneWeek,
|
||||||
|
}],
|
||||||
|
default: 'indefinitely',
|
||||||
|
});
|
||||||
|
if (canceled) return;
|
||||||
|
|
||||||
|
const expiresAt = period === 'indefinitely' ? null
|
||||||
|
: period === 'tenMinutes' ? Date.now() + (1000 * 60 * 10)
|
||||||
|
: period === 'oneHour' ? Date.now() + (1000 * 60 * 60)
|
||||||
|
: period === 'oneDay' ? Date.now() + (1000 * 60 * 60 * 24)
|
||||||
|
: period === 'oneWeek' ? Date.now() + (1000 * 60 * 60 * 24 * 7)
|
||||||
|
: null;
|
||||||
|
|
||||||
|
os.apiWithDialog('channels/mute/create', {
|
||||||
|
channelId: _channel.id,
|
||||||
|
expiresAt,
|
||||||
|
}).then(() => {
|
||||||
|
_channel.isMuting = true;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function unmute() {
|
||||||
|
if (!channel.value) return;
|
||||||
|
const _channel = channel.value;
|
||||||
|
|
||||||
|
os.apiWithDialog('channels/mute/delete', {
|
||||||
|
channelId: _channel.id,
|
||||||
|
}).then(() => {
|
||||||
|
_channel.isMuting = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
async function search() {
|
async function search() {
|
||||||
if (!channel.value) return;
|
if (!channel.value) return;
|
||||||
|
|
||||||
|
@ -229,6 +279,24 @@ const headerActions = computed(() => {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!channel.value.isMuting) {
|
||||||
|
headerItems.push({
|
||||||
|
icon: 'ti ti-volume',
|
||||||
|
text: i18n.ts.mute,
|
||||||
|
handler: async (): Promise<void> => {
|
||||||
|
await mute();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
headerItems.push({
|
||||||
|
icon: 'ti ti-volume-off',
|
||||||
|
text: i18n.ts.unmute,
|
||||||
|
handler: async (): Promise<void> => {
|
||||||
|
await unmute();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
if (($i && $i.id === channel.value.userId) || iAmModerator) {
|
if (($i && $i.id === channel.value.userId) || iAmModerator) {
|
||||||
headerItems.push({
|
headerItems.push({
|
||||||
icon: 'ti ti-settings',
|
icon: 'ti ti-settings',
|
||||||
|
|
|
@ -827,6 +827,15 @@ type ChannelsFollowedResponse = operations['channels___followed']['responses']['
|
||||||
// @public (undocumented)
|
// @public (undocumented)
|
||||||
type ChannelsFollowRequest = operations['channels___follow']['requestBody']['content']['application/json'];
|
type ChannelsFollowRequest = operations['channels___follow']['requestBody']['content']['application/json'];
|
||||||
|
|
||||||
|
// @public (undocumented)
|
||||||
|
type ChannelsMuteCreateRequest = operations['channels___mute___create']['requestBody']['content']['application/json'];
|
||||||
|
|
||||||
|
// @public (undocumented)
|
||||||
|
type ChannelsMuteDeleteRequest = operations['channels___mute___delete']['requestBody']['content']['application/json'];
|
||||||
|
|
||||||
|
// @public (undocumented)
|
||||||
|
type ChannelsMuteListResponse = operations['channels___mute___list']['responses']['200']['content']['application/json'];
|
||||||
|
|
||||||
// @public (undocumented)
|
// @public (undocumented)
|
||||||
type ChannelsMyFavoritesResponse = operations['channels___my-favorites']['responses']['200']['content']['application/json'];
|
type ChannelsMyFavoritesResponse = operations['channels___my-favorites']['responses']['200']['content']['application/json'];
|
||||||
|
|
||||||
|
@ -1401,6 +1410,9 @@ declare namespace entities {
|
||||||
ChannelsMyFavoritesResponse,
|
ChannelsMyFavoritesResponse,
|
||||||
ChannelsSearchRequest,
|
ChannelsSearchRequest,
|
||||||
ChannelsSearchResponse,
|
ChannelsSearchResponse,
|
||||||
|
ChannelsMuteCreateRequest,
|
||||||
|
ChannelsMuteDeleteRequest,
|
||||||
|
ChannelsMuteListResponse,
|
||||||
ChartsActiveUsersRequest,
|
ChartsActiveUsersRequest,
|
||||||
ChartsActiveUsersResponse,
|
ChartsActiveUsersResponse,
|
||||||
ChartsApRequestRequest,
|
ChartsApRequestRequest,
|
||||||
|
|
|
@ -1347,6 +1347,39 @@ declare module '../api.js' {
|
||||||
credential?: string | null,
|
credential?: string | null,
|
||||||
): Promise<SwitchCaseResponseType<E, P>>;
|
): Promise<SwitchCaseResponseType<E, P>>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* No description provided.
|
||||||
|
*
|
||||||
|
* **Credential required**: *Yes* / **Permission**: *write:channels*
|
||||||
|
*/
|
||||||
|
request<E extends 'channels/mute/create', P extends Endpoints[E]['req']>(
|
||||||
|
endpoint: E,
|
||||||
|
params: P,
|
||||||
|
credential?: string | null,
|
||||||
|
): Promise<SwitchCaseResponseType<E, P>>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* No description provided.
|
||||||
|
*
|
||||||
|
* **Credential required**: *Yes* / **Permission**: *write:channels*
|
||||||
|
*/
|
||||||
|
request<E extends 'channels/mute/delete', P extends Endpoints[E]['req']>(
|
||||||
|
endpoint: E,
|
||||||
|
params: P,
|
||||||
|
credential?: string | null,
|
||||||
|
): Promise<SwitchCaseResponseType<E, P>>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* No description provided.
|
||||||
|
*
|
||||||
|
* **Credential required**: *Yes* / **Permission**: *read:channels*
|
||||||
|
*/
|
||||||
|
request<E extends 'channels/mute/list', P extends Endpoints[E]['req']>(
|
||||||
|
endpoint: E,
|
||||||
|
params: P,
|
||||||
|
credential?: string | null,
|
||||||
|
): Promise<SwitchCaseResponseType<E, P>>;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* No description provided.
|
* No description provided.
|
||||||
*
|
*
|
||||||
|
|
|
@ -176,6 +176,9 @@ import type {
|
||||||
ChannelsMyFavoritesResponse,
|
ChannelsMyFavoritesResponse,
|
||||||
ChannelsSearchRequest,
|
ChannelsSearchRequest,
|
||||||
ChannelsSearchResponse,
|
ChannelsSearchResponse,
|
||||||
|
ChannelsMuteCreateRequest,
|
||||||
|
ChannelsMuteDeleteRequest,
|
||||||
|
ChannelsMuteListResponse,
|
||||||
ChartsActiveUsersRequest,
|
ChartsActiveUsersRequest,
|
||||||
ChartsActiveUsersResponse,
|
ChartsActiveUsersResponse,
|
||||||
ChartsApRequestRequest,
|
ChartsApRequestRequest,
|
||||||
|
@ -703,6 +706,9 @@ export type Endpoints = {
|
||||||
'channels/unfavorite': { req: ChannelsUnfavoriteRequest; res: EmptyResponse };
|
'channels/unfavorite': { req: ChannelsUnfavoriteRequest; res: EmptyResponse };
|
||||||
'channels/my-favorites': { req: EmptyRequest; res: ChannelsMyFavoritesResponse };
|
'channels/my-favorites': { req: EmptyRequest; res: ChannelsMyFavoritesResponse };
|
||||||
'channels/search': { req: ChannelsSearchRequest; res: ChannelsSearchResponse };
|
'channels/search': { req: ChannelsSearchRequest; res: ChannelsSearchResponse };
|
||||||
|
'channels/mute/create': { req: ChannelsMuteCreateRequest; res: EmptyResponse };
|
||||||
|
'channels/mute/delete': { req: ChannelsMuteDeleteRequest; res: EmptyResponse };
|
||||||
|
'channels/mute/list': { req: EmptyRequest; res: ChannelsMuteListResponse };
|
||||||
'charts/active-users': { req: ChartsActiveUsersRequest; res: ChartsActiveUsersResponse };
|
'charts/active-users': { req: ChartsActiveUsersRequest; res: ChartsActiveUsersResponse };
|
||||||
'charts/ap-request': { req: ChartsApRequestRequest; res: ChartsApRequestResponse };
|
'charts/ap-request': { req: ChartsApRequestRequest; res: ChartsApRequestResponse };
|
||||||
'charts/drive': { req: ChartsDriveRequest; res: ChartsDriveResponse };
|
'charts/drive': { req: ChartsDriveRequest; res: ChartsDriveResponse };
|
||||||
|
|
|
@ -179,6 +179,9 @@ export type ChannelsUnfavoriteRequest = operations['channels___unfavorite']['req
|
||||||
export type ChannelsMyFavoritesResponse = operations['channels___my-favorites']['responses']['200']['content']['application/json'];
|
export type ChannelsMyFavoritesResponse = operations['channels___my-favorites']['responses']['200']['content']['application/json'];
|
||||||
export type ChannelsSearchRequest = operations['channels___search']['requestBody']['content']['application/json'];
|
export type ChannelsSearchRequest = operations['channels___search']['requestBody']['content']['application/json'];
|
||||||
export type ChannelsSearchResponse = operations['channels___search']['responses']['200']['content']['application/json'];
|
export type ChannelsSearchResponse = operations['channels___search']['responses']['200']['content']['application/json'];
|
||||||
|
export type ChannelsMuteCreateRequest = operations['channels___mute___create']['requestBody']['content']['application/json'];
|
||||||
|
export type ChannelsMuteDeleteRequest = operations['channels___mute___delete']['requestBody']['content']['application/json'];
|
||||||
|
export type ChannelsMuteListResponse = operations['channels___mute___list']['responses']['200']['content']['application/json'];
|
||||||
export type ChartsActiveUsersRequest = operations['charts___active-users']['requestBody']['content']['application/json'];
|
export type ChartsActiveUsersRequest = operations['charts___active-users']['requestBody']['content']['application/json'];
|
||||||
export type ChartsActiveUsersResponse = operations['charts___active-users']['responses']['200']['content']['application/json'];
|
export type ChartsActiveUsersResponse = operations['charts___active-users']['responses']['200']['content']['application/json'];
|
||||||
export type ChartsApRequestRequest = operations['charts___ap-request']['requestBody']['content']['application/json'];
|
export type ChartsApRequestRequest = operations['charts___ap-request']['requestBody']['content']['application/json'];
|
||||||
|
|
|
@ -1114,6 +1114,33 @@ export type paths = {
|
||||||
*/
|
*/
|
||||||
post: operations['channels___search'];
|
post: operations['channels___search'];
|
||||||
};
|
};
|
||||||
|
'/channels/mute/create': {
|
||||||
|
/**
|
||||||
|
* channels/mute/create
|
||||||
|
* @description No description provided.
|
||||||
|
*
|
||||||
|
* **Credential required**: *Yes* / **Permission**: *write:channels*
|
||||||
|
*/
|
||||||
|
post: operations['channels___mute___create'];
|
||||||
|
};
|
||||||
|
'/channels/mute/delete': {
|
||||||
|
/**
|
||||||
|
* channels/mute/delete
|
||||||
|
* @description No description provided.
|
||||||
|
*
|
||||||
|
* **Credential required**: *Yes* / **Permission**: *write:channels*
|
||||||
|
*/
|
||||||
|
post: operations['channels___mute___delete'];
|
||||||
|
};
|
||||||
|
'/channels/mute/list': {
|
||||||
|
/**
|
||||||
|
* channels/mute/list
|
||||||
|
* @description No description provided.
|
||||||
|
*
|
||||||
|
* **Credential required**: *Yes* / **Permission**: *read:channels*
|
||||||
|
*/
|
||||||
|
post: operations['channels___mute___list'];
|
||||||
|
};
|
||||||
'/charts/active-users': {
|
'/charts/active-users': {
|
||||||
/**
|
/**
|
||||||
* charts/active-users
|
* charts/active-users
|
||||||
|
@ -4591,6 +4618,7 @@ export type components = {
|
||||||
allowRenoteToExternal: boolean;
|
allowRenoteToExternal: boolean;
|
||||||
isFollowing?: boolean;
|
isFollowing?: boolean;
|
||||||
isFavorited?: boolean;
|
isFavorited?: boolean;
|
||||||
|
isMuting?: boolean;
|
||||||
pinnedNotes?: components['schemas']['Note'][];
|
pinnedNotes?: components['schemas']['Note'][];
|
||||||
};
|
};
|
||||||
QueueCount: {
|
QueueCount: {
|
||||||
|
@ -12431,6 +12459,158 @@ export type operations = {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
/**
|
||||||
|
* channels/mute/create
|
||||||
|
* @description No description provided.
|
||||||
|
*
|
||||||
|
* **Credential required**: *Yes* / **Permission**: *write:channels*
|
||||||
|
*/
|
||||||
|
channels___mute___create: {
|
||||||
|
requestBody: {
|
||||||
|
content: {
|
||||||
|
'application/json': {
|
||||||
|
/** Format: misskey:id */
|
||||||
|
channelId: string;
|
||||||
|
/** @description A Unix Epoch timestamp that must lie in the future. `null` means an indefinite mute. */
|
||||||
|
expiresAt?: number | null;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
responses: {
|
||||||
|
/** @description OK (without any results) */
|
||||||
|
204: {
|
||||||
|
content: never;
|
||||||
|
};
|
||||||
|
/** @description Client error */
|
||||||
|
400: {
|
||||||
|
content: {
|
||||||
|
'application/json': components['schemas']['Error'];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/** @description Authentication error */
|
||||||
|
401: {
|
||||||
|
content: {
|
||||||
|
'application/json': components['schemas']['Error'];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/** @description Forbidden error */
|
||||||
|
403: {
|
||||||
|
content: {
|
||||||
|
'application/json': components['schemas']['Error'];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/** @description I'm Ai */
|
||||||
|
418: {
|
||||||
|
content: {
|
||||||
|
'application/json': components['schemas']['Error'];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/** @description Internal server error */
|
||||||
|
500: {
|
||||||
|
content: {
|
||||||
|
'application/json': components['schemas']['Error'];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/**
|
||||||
|
* channels/mute/delete
|
||||||
|
* @description No description provided.
|
||||||
|
*
|
||||||
|
* **Credential required**: *Yes* / **Permission**: *write:channels*
|
||||||
|
*/
|
||||||
|
channels___mute___delete: {
|
||||||
|
requestBody: {
|
||||||
|
content: {
|
||||||
|
'application/json': {
|
||||||
|
/** Format: misskey:id */
|
||||||
|
channelId: string;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
responses: {
|
||||||
|
/** @description OK (without any results) */
|
||||||
|
204: {
|
||||||
|
content: never;
|
||||||
|
};
|
||||||
|
/** @description Client error */
|
||||||
|
400: {
|
||||||
|
content: {
|
||||||
|
'application/json': components['schemas']['Error'];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/** @description Authentication error */
|
||||||
|
401: {
|
||||||
|
content: {
|
||||||
|
'application/json': components['schemas']['Error'];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/** @description Forbidden error */
|
||||||
|
403: {
|
||||||
|
content: {
|
||||||
|
'application/json': components['schemas']['Error'];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/** @description I'm Ai */
|
||||||
|
418: {
|
||||||
|
content: {
|
||||||
|
'application/json': components['schemas']['Error'];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/** @description Internal server error */
|
||||||
|
500: {
|
||||||
|
content: {
|
||||||
|
'application/json': components['schemas']['Error'];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/**
|
||||||
|
* channels/mute/list
|
||||||
|
* @description No description provided.
|
||||||
|
*
|
||||||
|
* **Credential required**: *Yes* / **Permission**: *read:channels*
|
||||||
|
*/
|
||||||
|
channels___mute___list: {
|
||||||
|
responses: {
|
||||||
|
/** @description OK (with results) */
|
||||||
|
200: {
|
||||||
|
content: {
|
||||||
|
'application/json': components['schemas']['Channel'][];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/** @description Client error */
|
||||||
|
400: {
|
||||||
|
content: {
|
||||||
|
'application/json': components['schemas']['Error'];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/** @description Authentication error */
|
||||||
|
401: {
|
||||||
|
content: {
|
||||||
|
'application/json': components['schemas']['Error'];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/** @description Forbidden error */
|
||||||
|
403: {
|
||||||
|
content: {
|
||||||
|
'application/json': components['schemas']['Error'];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/** @description I'm Ai */
|
||||||
|
418: {
|
||||||
|
content: {
|
||||||
|
'application/json': components['schemas']['Error'];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/** @description Internal server error */
|
||||||
|
500: {
|
||||||
|
content: {
|
||||||
|
'application/json': components['schemas']['Error'];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
/**
|
/**
|
||||||
* charts/active-users
|
* charts/active-users
|
||||||
* @description No description provided.
|
* @description No description provided.
|
||||||
|
|
Loading…
Reference in New Issue