summaryrefslogtreecommitdiff
path: root/packages/backend/src/queue
diff options
context:
space:
mode:
authoranatawa12 <anatawa12@icloud.com>2025-05-01 17:58:34 +0900
committerGitHub <noreply@github.com>2025-05-01 17:58:34 +0900
commit795b8366b50324a92c39816fb4a3189177175d75 (patch)
treee5869a67a1e89b075105c772d88caf33a97af82c /packages/backend/src/queue
parentExclude suspended users note from most timelines (#15775) (diff)
downloadmisskey-795b8366b50324a92c39816fb4a3189177175d75.tar.gz
misskey-795b8366b50324a92c39816fb4a3189177175d75.tar.bz2
misskey-795b8366b50324a92c39816fb4a3189177175d75.zip
Block deliver by software (#15727)
* feat(backend): suspend instance by software * feat(frontend): suspend instance by software * docs(chaangelog): 連合先のソフトウェア及びバージョン名により配信停止を行えるようになりました * chore: 例で使うバージョン名を変える * fix: broken lockfile * fix: broken lock file * fix broken lock file * update changelog * fix dependencies * Update CHANGELOG.md --------- Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Diffstat (limited to 'packages/backend/src/queue')
-rw-r--r--packages/backend/src/queue/processors/DeliverProcessorService.ts13
1 files changed, 9 insertions, 4 deletions
diff --git a/packages/backend/src/queue/processors/DeliverProcessorService.ts b/packages/backend/src/queue/processors/DeliverProcessorService.ts
index 5a16496011..391ccdac05 100644
--- a/packages/backend/src/queue/processors/DeliverProcessorService.ts
+++ b/packages/backend/src/queue/processors/DeliverProcessorService.ts
@@ -71,6 +71,15 @@ export class DeliverProcessorService {
return 'skip (suspended)';
}
+ const i = await (this.meta.enableStatsForFederatedInstances
+ ? this.federatedInstanceService.fetchOrRegister(host)
+ : this.federatedInstanceService.fetch(host));
+
+ // suspend server by software
+ if (i != null && this.utilityService.isDeliverSuspendedSoftware(i)) {
+ return 'skip (software suspended)';
+ }
+
try {
await this.apRequestService.signedPost(job.data.user, job.data.to, job.data.content, job.data.digest);
@@ -79,10 +88,6 @@ export class DeliverProcessorService {
// Update instance stats
process.nextTick(async () => {
- const i = await (this.meta.enableStatsForFederatedInstances
- ? this.federatedInstanceService.fetchOrRegister(host)
- : this.federatedInstanceService.fetch(host));
-
if (i == null) return;
if (i.isNotResponding) {