merge: upstream changes for 2024.11 (!742)

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/742

Closes #645 and #646

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>

1 files changed, 12 insertions, 15 deletions

diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index 285db9f152..b51a3143c9 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -115,25 +115,22 @@ export class NoteDeleteService {
 				this.perUserNotesChart.update(user, note, false);
 			}
 
-			if (note.renoteId && note.text) {
-				// Decrement notes count (user)
-				this.decNotesCountOfUser(user);
-			} else if (!note.renoteId) {
+			if (note.renoteId && note.text || !note.renoteId) {
 				// Decrement notes count (user)
 				this.decNotesCountOfUser(user);
 			}
 
-			if (this.userEntityService.isRemoteUser(user)) {
-				this.federatedInstanceService.fetch(user.host).then(async i => {
-					if (note.renoteId && note.text) {
-						this.instancesRepository.decrement({ id: i.id }, 'notesCount', 1);
-					} else if (!note.renoteId) {
-						this.instancesRepository.decrement({ id: i.id }, 'notesCount', 1);
-					}
-					if (this.meta.enableChartsForFederatedInstances) {
-						this.instanceChart.updateNote(i.host, note, false);
-					}
-				});
+			if (this.meta.enableStatsForFederatedInstances) {
+				if (this.userEntityService.isRemoteUser(user)) {
+					this.federatedInstanceService.fetchOrRegister(user.host).then(async i => {
+						if (note.renoteId && note.text || !note.renoteId) {
+							this.instancesRepository.decrement({ id: i.id }, 'notesCount', 1);
+						}
+						if (this.meta.enableChartsForFederatedInstances) {
+							this.instanceChart.updateNote(i.host, note, false);
+						}
+					});
+				}
 			}
 		}