chore: remove hashtag from featured immediately (#12668)
* chore: remove hashtag from featured immediately * docs(changelog): ハッシュタグのトレンド除外設定が即時に効果を持つように修正 --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
This commit is contained in:
		@@ -77,6 +77,17 @@ export class FeaturedService {
 | 
			
		||||
		return Array.from(ranking.keys());
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	@bindThis
 | 
			
		||||
	private async removeFromRanking(name: string, windowRange: number, element: string): Promise<void> {
 | 
			
		||||
		const currentWindow = this.getCurrentWindow(windowRange);
 | 
			
		||||
		const previousWindow = currentWindow - 1;
 | 
			
		||||
 | 
			
		||||
		const redisPipeline = this.redisClient.pipeline();
 | 
			
		||||
		redisPipeline.zrem(`${name}:${currentWindow}`, element);
 | 
			
		||||
		redisPipeline.zrem(`${name}:${previousWindow}`, element);
 | 
			
		||||
		await redisPipeline.exec();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	@bindThis
 | 
			
		||||
	public updateGlobalNotesRanking(noteId: MiNote['id'], score = 1): Promise<void> {
 | 
			
		||||
		return this.updateRankingOf('featuredGlobalNotesRanking', GLOBAL_NOTES_RANKING_WINDOW, noteId, score);
 | 
			
		||||
@@ -126,4 +137,9 @@ export class FeaturedService {
 | 
			
		||||
	public getHashtagsRanking(threshold: number): Promise<string[]> {
 | 
			
		||||
		return this.getRankingOf('featuredHashtagsRanking', HASHTAG_RANKING_WINDOW, threshold);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	@bindThis
 | 
			
		||||
	public removeHashtagsFromRanking(hashtag: string): Promise<void> {
 | 
			
		||||
		return this.removeFromRanking('featuredHashtagsRanking', HASHTAG_RANKING_WINDOW, hashtag);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -11,6 +11,7 @@ import { MiMeta } from '@/models/Meta.js';
 | 
			
		||||
import { GlobalEventService } from '@/core/GlobalEventService.js';
 | 
			
		||||
import { bindThis } from '@/decorators.js';
 | 
			
		||||
import type { GlobalEvents } from '@/core/GlobalEventService.js';
 | 
			
		||||
import { FeaturedService } from '@/core/FeaturedService.js';
 | 
			
		||||
import type { OnApplicationShutdown } from '@nestjs/common';
 | 
			
		||||
 | 
			
		||||
@Injectable()
 | 
			
		||||
@@ -25,6 +26,7 @@ export class MetaService implements OnApplicationShutdown {
 | 
			
		||||
		@Inject(DI.db)
 | 
			
		||||
		private db: DataSource,
 | 
			
		||||
 | 
			
		||||
		private featuredService: FeaturedService,
 | 
			
		||||
		private globalEventService: GlobalEventService,
 | 
			
		||||
	) {
 | 
			
		||||
		//this.onMessage = this.onMessage.bind(this);
 | 
			
		||||
@@ -95,6 +97,8 @@ export class MetaService implements OnApplicationShutdown {
 | 
			
		||||
 | 
			
		||||
	@bindThis
 | 
			
		||||
	public async update(data: Partial<MiMeta>): Promise<MiMeta> {
 | 
			
		||||
		let before: MiMeta | undefined;
 | 
			
		||||
 | 
			
		||||
		const updated = await this.db.transaction(async transactionalEntityManager => {
 | 
			
		||||
			const metas = await transactionalEntityManager.find(MiMeta, {
 | 
			
		||||
				order: {
 | 
			
		||||
@@ -102,10 +106,10 @@ export class MetaService implements OnApplicationShutdown {
 | 
			
		||||
				},
 | 
			
		||||
			});
 | 
			
		||||
 | 
			
		||||
			const meta = metas[0];
 | 
			
		||||
			before = metas[0];
 | 
			
		||||
 | 
			
		||||
			if (meta) {
 | 
			
		||||
				await transactionalEntityManager.update(MiMeta, meta.id, data);
 | 
			
		||||
			if (before) {
 | 
			
		||||
				await transactionalEntityManager.update(MiMeta, before.id, data);
 | 
			
		||||
 | 
			
		||||
				const metas = await transactionalEntityManager.find(MiMeta, {
 | 
			
		||||
					order: {
 | 
			
		||||
@@ -119,6 +123,21 @@ export class MetaService implements OnApplicationShutdown {
 | 
			
		||||
			}
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		if (data.hiddenTags) {
 | 
			
		||||
			process.nextTick(() => {
 | 
			
		||||
				const hiddenTags = new Set<string>(data.hiddenTags);
 | 
			
		||||
				if (before) {
 | 
			
		||||
					for (const previousHiddenTag of before.hiddenTags) {
 | 
			
		||||
						hiddenTags.delete(previousHiddenTag);
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
				for (const hiddenTag of hiddenTags) {
 | 
			
		||||
					this.featuredService.removeHashtagsFromRanking(hiddenTag);
 | 
			
		||||
				}
 | 
			
		||||
			});
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		this.globalEventService.publishInternalEvent('metaUpdated', updated);
 | 
			
		||||
 | 
			
		||||
		return updated;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user