mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-05-02 05:05:54 +02:00
* add channel_muting table and entities
* add channel_muting services
* タイムライン取得処理への組み込み
* misskey-jsの型とインターフェース生成
* Channelスキーマにミュート情報を追加
* フロントエンドの実装
* 条件が逆だったのを修正
* 期限切れミュートを掃除する機能を実装
* TLの抽出条件調節
* 名前の変更と変更不要の差分をロールバック
* 修正漏れ
* isChannelRelatedの条件に誤りがあった
* [wip] テスト追加
* テストの追加と検出した不備の修正
* fix test
* fix CHANGELOG.md
* 通常はFTTにしておく
* 実装忘れ対応
* fix merge
* fix merge
* add channel tl test
* fix CHANGELOG.md
* remove unused import
* fix lint
* fix test
* fix favorite -> favorited
* exclude -> include
* fix CHANGELOG.md
* fix CHANGELOG.md
* maintenance
* fix CHANGELOG.md
* fix
* fix ci
* regenerate
* fix
* Revert "fix"
This reverts commit 699d50c6ec.
* fixed
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
146 lines
4.7 KiB
TypeScript
146 lines
4.7 KiB
TypeScript
/*
|
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
*/
|
|
|
|
import { Inject, Injectable } from '@nestjs/common';
|
|
import * as Redis from 'ioredis';
|
|
import { Brackets } from 'typeorm';
|
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
|
import type { NotesRepository, AntennasRepository } from '@/models/_.js';
|
|
import { QueryService } from '@/core/QueryService.js';
|
|
import { DI } from '@/di-symbols.js';
|
|
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
|
|
import { IdService } from '@/core/IdService.js';
|
|
import { FanoutTimelineService } from '@/core/FanoutTimelineService.js';
|
|
import { GlobalEventService } from '@/core/GlobalEventService.js';
|
|
import { trackPromise } from '@/misc/promise-tracker.js';
|
|
import { ChannelMutingService } from '@/core/ChannelMutingService.js';
|
|
import { ApiError } from '../../error.js';
|
|
|
|
export const meta = {
|
|
tags: ['antennas', 'account', 'notes'],
|
|
|
|
requireCredential: true,
|
|
|
|
kind: 'read:account',
|
|
|
|
errors: {
|
|
noSuchAntenna: {
|
|
message: 'No such antenna.',
|
|
code: 'NO_SUCH_ANTENNA',
|
|
id: '850926e0-fd3b-49b6-b69a-b28a5dbd82fe',
|
|
},
|
|
},
|
|
|
|
res: {
|
|
type: 'array',
|
|
optional: false, nullable: false,
|
|
items: {
|
|
type: 'object',
|
|
optional: false, nullable: false,
|
|
ref: 'Note',
|
|
},
|
|
},
|
|
} as const;
|
|
|
|
export const paramDef = {
|
|
type: 'object',
|
|
properties: {
|
|
antennaId: { type: 'string', format: 'misskey:id' },
|
|
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
|
|
sinceId: { type: 'string', format: 'misskey:id' },
|
|
untilId: { type: 'string', format: 'misskey:id' },
|
|
sinceDate: { type: 'integer' },
|
|
untilDate: { type: 'integer' },
|
|
},
|
|
required: ['antennaId'],
|
|
} as const;
|
|
|
|
@Injectable()
|
|
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
|
|
constructor(
|
|
@Inject(DI.notesRepository)
|
|
private notesRepository: NotesRepository,
|
|
|
|
@Inject(DI.antennasRepository)
|
|
private antennasRepository: AntennasRepository,
|
|
|
|
private idService: IdService,
|
|
private noteEntityService: NoteEntityService,
|
|
private queryService: QueryService,
|
|
private fanoutTimelineService: FanoutTimelineService,
|
|
private globalEventService: GlobalEventService,
|
|
private channelMutingService: ChannelMutingService,
|
|
) {
|
|
super(meta, paramDef, async (ps, me) => {
|
|
const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
|
|
const sinceId = ps.sinceId ?? (ps.sinceDate ? this.idService.gen(ps.sinceDate!) : null);
|
|
|
|
const antenna = await this.antennasRepository.findOneBy({
|
|
id: ps.antennaId,
|
|
userId: me.id,
|
|
});
|
|
|
|
if (antenna == null) {
|
|
throw new ApiError(meta.errors.noSuchAntenna);
|
|
}
|
|
|
|
// falseだった場合はアンテナの配信先が増えたことを通知したい
|
|
const needPublishEvent = !antenna.isActive;
|
|
|
|
antenna.isActive = true;
|
|
antenna.lastUsedAt = new Date();
|
|
trackPromise(this.antennasRepository.update(antenna.id, antenna));
|
|
|
|
if (needPublishEvent) {
|
|
this.globalEventService.publishInternalEvent('antennaUpdated', antenna);
|
|
}
|
|
|
|
let noteIds = await this.fanoutTimelineService.get(`antennaTimeline:${antenna.id}`, untilId, sinceId);
|
|
noteIds = noteIds.slice(0, ps.limit);
|
|
if (noteIds.length === 0) {
|
|
return [];
|
|
}
|
|
|
|
const query = this.notesRepository.createQueryBuilder('note')
|
|
.where('note.id IN (:...noteIds)', { noteIds: noteIds })
|
|
.innerJoinAndSelect('note.user', 'user')
|
|
.leftJoinAndSelect('note.reply', 'reply')
|
|
.leftJoinAndSelect('note.renote', 'renote')
|
|
.leftJoinAndSelect('reply.user', 'replyUser')
|
|
.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 });
|
|
}));
|
|
}
|
|
|
|
// NOTE: センシティブ除外の設定はこのエンドポイントでは無視する。
|
|
// https://github.com/misskey-dev/misskey/pull/15346#discussion_r1929950255
|
|
|
|
this.queryService.generateVisibilityQuery(query, me);
|
|
this.queryService.generateBaseNoteFilteringQuery(query, me);
|
|
|
|
const notes = await query.getMany();
|
|
if (sinceId != null && untilId == null) {
|
|
notes.sort((a, b) => a.id < b.id ? -1 : 1);
|
|
} else {
|
|
notes.sort((a, b) => a.id > b.id ? -1 : 1);
|
|
}
|
|
|
|
return await this.noteEntityService.packMany(notes, me);
|
|
});
|
|
}
|
|
}
|