HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

同じノートを何回リノートしても一回として数えるように (#6086)

Browse source 
* 同じノートを何回リノートしても一回として数えるように

* Update count-same-renotes.ts

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
This commit is contained in:
Oni-Men 2020-02-26 07:54:35 +09:00 committed by GitHub
parent 241769d6fc
commit f6c376f20d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/services/count-same-renotes.ts Normal file
View file

@ -0,0 +1,15 @@
import { Notes } from '../models';
export default async function(userId: string, renoteId: string, excludeNoteId: string | undefined): Promise<number> {
// 指定したユーザーの指定したノートのリノートがいくつあるか数える
const query = Notes.createQueryBuilder('note')
.where('note.userId = :userId', { userId })
.andWhere('note.renoteId = :renoteId', { renoteId })
// 指定した投稿を除く
if (excludeNoteId) {
query.andWhere('note.id != :excludeNoteId', { excludeNoteId })
}
return await query.getCount();
}

4
src/services/note/create.ts
View file

@ -30,6 +30,7 @@ import { isDuplicateKeyValueError } from '../../misc/is-duplicate-key-value-erro
import { ensure } from '../../prelude/ensure';
import { checkHitAntenna } from '../../misc/check-hit-antenna';
import { addNoteToAntenna } from '../add-note-to-antenna';
import countSameRenotes from '../count-same-renotes';
type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
@ -236,7 +237,8 @@ export default async (user: User, data: Option, silent = false) => new Promise<N
saveReply(data.reply, note);
}
if (data.renote) {
//この投稿を除く指定したユーザーによる指定したノートのリノートが存在しないとき
if (data.renote && (await countSameRenotes(user.id, data.renote.id, note.id) === 0)) {
incRenoteCount(data.renote);
}

4
src/services/note/delete.ts
View file

@ -11,6 +11,7 @@ import { Note } from '../../models/entities/note';
import { Notes, Users, Instances } from '../../models';
import { notesChart, perUserNotesChart, instanceChart } from '../chart';
import { deliverToFollowers } from '../../remote/activitypub/deliver-manager';
import countSameRenotes from '../count-same-renotes';
/**
* 投稿を削除します。
@ -20,7 +21,8 @@ import { deliverToFollowers } from '../../remote/activitypub/deliver-manager';
export default async function(user: User, note: Note, quiet = false) {
const deletedAt = new Date();
if (note.renoteId) {
//この投稿を除く指定したユーザーによる指定したノートのリノートが存在しないとき
if (note.renoteId && (await countSameRenotes(user.id, note.renoteId, note.id)) === 0) {
Notes.decrement({ id: note.renoteId }, 'renoteCount', 1);
Notes.decrement({ id: note.renoteId }, 'score', 1);
}