summaryrefslogtreecommitdiff
path: root/packages/backend/src/core
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-10-06 14:24:25 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-10-06 14:24:25 +0900
commitdab205edb87ea9cdaee5b6564aa11dfcea245d7b (patch)
treee29a7874da5395a67a516c2164a82c050071dd2d /packages/backend/src/core
parentchore(backend): response isHibernated in admin/show-user (diff)
downloadsharkey-dab205edb87ea9cdaee5b6564aa11dfcea245d7b.tar.gz
sharkey-dab205edb87ea9cdaee5b6564aa11dfcea245d7b.tar.bz2
sharkey-dab205edb87ea9cdaee5b6564aa11dfcea245d7b.zip
enhance(backend): improve featured system
Diffstat (limited to 'packages/backend/src/core')
-rw-r--r--packages/backend/src/core/CoreModule.ts6
-rw-r--r--packages/backend/src/core/FeaturedService.ts126
-rw-r--r--packages/backend/src/core/NoteCreateService.ts12
-rw-r--r--packages/backend/src/core/NoteDeleteService.ts1
-rw-r--r--packages/backend/src/core/ReactionService.ts18
5 files changed, 158 insertions, 5 deletions
diff --git a/packages/backend/src/core/CoreModule.ts b/packages/backend/src/core/CoreModule.ts
index cd66d1a81c..1984d9e6c2 100644
--- a/packages/backend/src/core/CoreModule.ts
+++ b/packages/backend/src/core/CoreModule.ts
@@ -60,6 +60,7 @@ import { UtilityService } from './UtilityService.js';
import { FileInfoService } from './FileInfoService.js';
import { SearchService } from './SearchService.js';
import { ClipService } from './ClipService.js';
+import { FeaturedService } from './FeaturedService.js';
import { ChartLoggerService } from './chart/ChartLoggerService.js';
import FederationChart from './chart/charts/federation.js';
import NotesChart from './chart/charts/notes.js';
@@ -187,6 +188,7 @@ const $UtilityService: Provider = { provide: 'UtilityService', useExisting: Util
const $FileInfoService: Provider = { provide: 'FileInfoService', useExisting: FileInfoService };
const $SearchService: Provider = { provide: 'SearchService', useExisting: SearchService };
const $ClipService: Provider = { provide: 'ClipService', useExisting: ClipService };
+const $FeaturedService: Provider = { provide: 'FeaturedService', useExisting: FeaturedService };
const $ChartLoggerService: Provider = { provide: 'ChartLoggerService', useExisting: ChartLoggerService };
const $FederationChart: Provider = { provide: 'FederationChart', useExisting: FederationChart };
@@ -318,6 +320,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
FileInfoService,
SearchService,
ClipService,
+ FeaturedService,
ChartLoggerService,
FederationChart,
NotesChart,
@@ -442,6 +445,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
$FileInfoService,
$SearchService,
$ClipService,
+ $FeaturedService,
$ChartLoggerService,
$FederationChart,
$NotesChart,
@@ -567,6 +571,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
FileInfoService,
SearchService,
ClipService,
+ FeaturedService,
FederationChart,
NotesChart,
UsersChart,
@@ -690,6 +695,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
$FileInfoService,
$SearchService,
$ClipService,
+ $FeaturedService,
$FederationChart,
$NotesChart,
$UsersChart,
diff --git a/packages/backend/src/core/FeaturedService.ts b/packages/backend/src/core/FeaturedService.ts
new file mode 100644
index 0000000000..89b86b2e30
--- /dev/null
+++ b/packages/backend/src/core/FeaturedService.ts
@@ -0,0 +1,126 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import * as Redis from 'ioredis';
+import type { MiNote } from '@/models/_.js';
+import { DI } from '@/di-symbols.js';
+import { bindThis } from '@/decorators.js';
+
+@Injectable()
+export class FeaturedService {
+ constructor(
+ @Inject(DI.redis)
+ private redisClient: Redis.Redis,
+ ) {
+ }
+
+ @bindThis
+ private getCurrentPerUserFriendRankingWindow(): number {
+ const passed = new Date().getTime() - new Date(new Date().getFullYear(), 0, 1).getTime();
+ return Math.floor(passed / (1000 * 60 * 60 * 24 * 7)); // 1週間ごと
+ }
+
+ @bindThis
+ private getCurrentGlobalNotesRankingWindow(): number {
+ const passed = new Date().getTime() - new Date(new Date().getFullYear(), 0, 1).getTime();
+ return Math.floor(passed / (1000 * 60 * 60 * 24 * 3)); // 3日ごと
+ }
+
+ @bindThis
+ public async updateGlobalNotesRanking(noteId: MiNote['id'], score = 1): Promise<void> {
+ // TODO: フォロワー数の多い人が常にランキング上位になるのを防ぎたい
+ const currentWindow = this.getCurrentGlobalNotesRankingWindow();
+ const redisTransaction = this.redisClient.multi();
+ redisTransaction.zincrby(
+ `featuredGlobalNotesRanking:${currentWindow}`,
+ score.toString(),
+ noteId);
+ redisTransaction.expire(
+ `featuredGlobalNotesRanking:${currentWindow}`,
+ 60 * 60 * 24 * 9, // 9日間保持
+ 'NX'); // "NX -- Set expiry only when the key has no expiry" = 有効期限がないときだけ設定
+ await redisTransaction.exec();
+ }
+
+ @bindThis
+ public async updateInChannelNotesRanking(noteId: MiNote['id'], channelId: MiNote['channelId'], score = 1): Promise<void> {
+ const currentWindow = this.getCurrentGlobalNotesRankingWindow();
+ const redisTransaction = this.redisClient.multi();
+ redisTransaction.zincrby(
+ `featuredInChannelNotesRanking:${channelId}:${currentWindow}`,
+ score.toString(),
+ noteId);
+ redisTransaction.expire(
+ `featuredInChannelNotesRanking:${channelId}:${currentWindow}`,
+ 60 * 60 * 24 * 9, // 9日間保持
+ 'NX'); // "NX -- Set expiry only when the key has no expiry" = 有効期限がないときだけ設定
+ await redisTransaction.exec();
+ }
+
+ @bindThis
+ public async getGlobalNotesRanking(limit: number): Promise<MiNote['id'][]> {
+ const currentWindow = this.getCurrentGlobalNotesRankingWindow();
+ const previousWindow = currentWindow - 1;
+
+ const [currentRankingResult, previousRankingResult] = await Promise.all([
+ this.redisClient.zrange(
+ `featuredGlobalNotesRanking:${currentWindow}`, 0, limit, 'REV', 'WITHSCORES'),
+ this.redisClient.zrange(
+ `featuredGlobalNotesRanking:${previousWindow}`, 0, limit, 'REV', 'WITHSCORES'),
+ ]);
+
+ const ranking = new Map<MiNote['id'], number>();
+ for (let i = 0; i < currentRankingResult.length; i += 2) {
+ const noteId = currentRankingResult[i];
+ const score = parseInt(currentRankingResult[i + 1], 10);
+ ranking.set(noteId, score);
+ }
+ for (let i = 0; i < previousRankingResult.length; i += 2) {
+ const noteId = previousRankingResult[i];
+ const score = parseInt(previousRankingResult[i + 1], 10);
+ const exist = ranking.get(noteId);
+ if (exist != null) {
+ ranking.set(noteId, (exist + score) / 2);
+ } else {
+ ranking.set(noteId, score);
+ }
+ }
+
+ return Array.from(ranking.keys());
+ }
+
+ @bindThis
+ public async getInChannelNotesRanking(channelId: MiNote['channelId'], limit: number): Promise<MiNote['id'][]> {
+ const currentWindow = this.getCurrentGlobalNotesRankingWindow();
+ const previousWindow = currentWindow - 1;
+
+ const [currentRankingResult, previousRankingResult] = await Promise.all([
+ this.redisClient.zrange(
+ `featuredInChannelNotesRanking:${channelId}:${currentWindow}`, 0, limit, 'REV', 'WITHSCORES'),
+ this.redisClient.zrange(
+ `featuredInChannelNotesRanking:${channelId}:${previousWindow}`, 0, limit, 'REV', 'WITHSCORES'),
+ ]);
+
+ const ranking = new Map<MiNote['id'], number>();
+ for (let i = 0; i < currentRankingResult.length; i += 2) {
+ const noteId = currentRankingResult[i];
+ const score = parseInt(currentRankingResult[i + 1], 10);
+ ranking.set(noteId, score);
+ }
+ for (let i = 0; i < previousRankingResult.length; i += 2) {
+ const noteId = previousRankingResult[i];
+ const score = parseInt(previousRankingResult[i + 1], 10);
+ const exist = ranking.get(noteId);
+ if (exist != null) {
+ ranking.set(noteId, (exist + score) / 2);
+ } else {
+ ranking.set(noteId, score);
+ }
+ }
+
+ return Array.from(ranking.keys());
+ }
+}
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 34d103df77..ca9dbfa642 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -53,6 +53,7 @@ import { DB_MAX_NOTE_TEXT_LENGTH } from '@/const.js';
import { RoleService } from '@/core/RoleService.js';
import { MetaService } from '@/core/MetaService.js';
import { SearchService } from '@/core/SearchService.js';
+import { FeaturedService } from '@/core/FeaturedService.js';
type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
@@ -200,6 +201,7 @@ export class NoteCreateService implements OnApplicationShutdown {
private hashtagService: HashtagService,
private antennaService: AntennaService,
private webhookService: WebhookService,
+ private featuredService: FeaturedService,
private remoteUserResolveService: RemoteUserResolveService,
private apDeliverManagerService: ApDeliverManagerService,
private apRendererService: ApRendererService,
@@ -721,10 +723,18 @@ export class NoteCreateService implements OnApplicationShutdown {
this.notesRepository.createQueryBuilder().update()
.set({
renoteCount: () => '"renoteCount" + 1',
- score: () => '"score" + 1',
})
.where('id = :id', { id: renote.id })
.execute();
+
+ // 30%の確率でハイライト用ランキング更新
+ if (Math.random() < 0.3) {
+ if (renote.channelId != null) {
+ this.featuredService.updateInChannelNotesRanking(renote.id, renote.channelId, 1);
+ } else if (renote.visibility === 'public' && renote.userHost == null) {
+ this.featuredService.updateGlobalNotesRanking(renote.id, 1);
+ }
+ }
}
@bindThis
diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index 87979f22ac..3d443b4a06 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -67,7 +67,6 @@ export class NoteDeleteService {
// この投稿を除く指定したユーザーによる指定したノートのリノートが存在しないとき
if (note.renoteId && (await this.noteEntityService.countSameRenotes(user.id, note.renoteId, note.id)) === 0) {
this.notesRepository.decrement({ id: note.renoteId }, 'renoteCount', 1);
- if (!user.isBot) this.notesRepository.decrement({ id: note.renoteId }, 'score', 1);
}
if (note.replyId) {
diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index 25464b19a8..298a62ffd9 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -4,6 +4,7 @@
*/
import { Inject, Injectable } from '@nestjs/common';
+import * as Redis from 'ioredis';
import { DI } from '@/di-symbols.js';
import type { EmojisRepository, NoteReactionsRepository, UsersRepository, NotesRepository } from '@/models/_.js';
import { IdentifiableError } from '@/misc/identifiable-error.js';
@@ -26,6 +27,7 @@ import { UtilityService } from '@/core/UtilityService.js';
import { UserBlockingService } from '@/core/UserBlockingService.js';
import { CustomEmojiService } from '@/core/CustomEmojiService.js';
import { RoleService } from '@/core/RoleService.js';
+import { FeaturedService } from '@/core/FeaturedService.js';
const FALLBACK = '❤';
@@ -66,6 +68,9 @@ const decodeCustomEmojiRegexp = /^:([\w+-]+)(?:@([\w.-]+))?:$/;
@Injectable()
export class ReactionService {
constructor(
+ @Inject(DI.redis)
+ private redisClient: Redis.Redis,
+
@Inject(DI.usersRepository)
private usersRepository: UsersRepository,
@@ -86,6 +91,7 @@ export class ReactionService {
private noteEntityService: NoteEntityService,
private userBlockingService: UserBlockingService,
private idService: IdService,
+ private featuredService: FeaturedService,
private globalEventService: GlobalEventService,
private apRendererService: ApRendererService,
private apDeliverManagerService: ApDeliverManagerService,
@@ -182,11 +188,19 @@ export class ReactionService {
await this.notesRepository.createQueryBuilder().update()
.set({
reactions: () => sql,
- ... (!user.isBot ? { score: () => '"score" + 1' } : {}),
})
.where('id = :id', { id: note.id })
.execute();
+ // 30%の確率でハイライト用ランキング更新
+ if (Math.random() < 0.3) {
+ if (note.channelId != null) {
+ this.featuredService.updateInChannelNotesRanking(note.id, note.channelId, 1);
+ } else if (note.visibility === 'public' && note.userHost == null) {
+ this.featuredService.updateGlobalNotesRanking(note.id, 1);
+ }
+ }
+
const meta = await this.metaService.fetch();
if (meta.enableChartsForRemoteUser || (user.host == null)) {
@@ -275,8 +289,6 @@ export class ReactionService {
.where('id = :id', { id: note.id })
.execute();
- if (!user.isBot) this.notesRepository.decrement({ id: note.id }, 'score', 1);
-
this.globalEventService.publishNoteStream(note.id, 'unreacted', {
reaction: this.decodeReaction(exist.reaction).reaction,
userId: user.id,