diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts index 97339aec9..d1f988b34 100644 --- a/packages/backend/src/remote/activitypub/models/person.ts +++ b/packages/backend/src/remote/activitypub/models/person.ts @@ -240,7 +240,7 @@ export async function createPerson( .map((tag) => normalizeForSearch(tag)) .splice(0, 32); - const isBot = getApType(object) !== "Person"; + const isBot = getApType(object) === "Service"; const bday = person["vcard:bday"]?.match(/^\d{4}-\d{2}-\d{2}/); @@ -552,7 +552,7 @@ export async function updatePerson( emojis: emojiNames, name: truncate(person.name, nameLength), tags, - isBot: getApType(object) !== "Person", + isBot: getApType(object) === "Service", isCat: (person as any).isCat === true, isLocked: !!person.manuallyApprovesFollowers, movedToUri: person.movedTo || null, diff --git a/packages/backend/src/services/chart/charts/notes.ts b/packages/backend/src/services/chart/charts/notes.ts index 42db60d0c..9ec347b47 100644 --- a/packages/backend/src/services/chart/charts/notes.ts +++ b/packages/backend/src/services/chart/charts/notes.ts @@ -30,11 +30,7 @@ export default class NotesChart extends Chart { return {}; } - public async update( - note: Note, - isAdditional: boolean, - byBot = false, - ): Promise { + public async update(note: Note, isAdditional: boolean): Promise { const prefix = note.userHost === null ? "local" : "remote"; await this.commit({ @@ -48,7 +44,7 @@ export default class NotesChart extends Chart { : -1 : 0, [`${prefix}.diffs.renote`]: - note.renoteId != null && !byBot ? (isAdditional ? 1 : -1) : 0, + note.renoteId != null ? (isAdditional ? 1 : -1) : 0, [`${prefix}.diffs.reply`]: note.replyId != null ? (isAdditional ? 1 : -1) : 0, [`${prefix}.diffs.withFile`]: diff --git a/packages/backend/src/services/chart/charts/per-user-notes.ts b/packages/backend/src/services/chart/charts/per-user-notes.ts index 22f3fddb7..d0190cefd 100644 --- a/packages/backend/src/services/chart/charts/per-user-notes.ts +++ b/packages/backend/src/services/chart/charts/per-user-notes.ts @@ -32,7 +32,6 @@ export default class PerUserNotesChart extends Chart { user: { id: User["id"] }, note: Note, isAdditional: boolean, - byBot = false, ): Promise { await this.commit( { @@ -45,8 +44,7 @@ export default class PerUserNotesChart extends Chart { ? 1 : -1 : 0, - "diffs.renote": - note.renoteId != null && !byBot ? (isAdditional ? 1 : -1) : 0, + "diffs.renote": note.renoteId != null ? (isAdditional ? 1 : -1) : 0, "diffs.reply": note.replyId != null ? (isAdditional ? 1 : -1) : 0, "diffs.withFile": note.fileIds.length > 0 ? (isAdditional ? 1 : -1) : 0, }, diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts index 933103dcf..0aa0dabd0 100644 --- a/packages/backend/src/services/note/create.ts +++ b/packages/backend/src/services/note/create.ts @@ -163,7 +163,6 @@ export default async ( host: User["host"]; isSilenced: User["isSilenced"]; createdAt: User["createdAt"]; - isBot: User["isBot"]; inbox?: User["inbox"]; }, data: Option, @@ -334,8 +333,8 @@ export default async ( res(note); // 統計を更新 - notesChart.update(note, true, user.isBot); - perUserNotesChart.update(user, note, true, user.isBot); + notesChart.update(note, true); + perUserNotesChart.update(user, note, true); // Register host if (Users.isRemoteUser(user)) { @@ -410,7 +409,6 @@ export default async ( // この投稿を除く指定したユーザーによる指定したノートのリノートが存在しないとき if ( data.renote && - !user.isBot && (await countSameRenotes(user.id, data.renote.id, note.id)) === 0 ) { incRenoteCount(data.renote);