summaryrefslogtreecommitdiff
path: root/packages/backend/src/core/UserFollowingService.ts
diff options
context:
space:
mode:
authorCyberRex <hspwinx86@gmail.com>2023-03-14 19:11:31 +0900
committerGitHub <noreply@github.com>2023-03-14 19:11:31 +0900
commitc05c504c8632591ef18170c2881b0b44b0027ed9 (patch)
tree1f243d829de02f8fae5afb8b15bac8452272de44 /packages/backend/src/core/UserFollowingService.ts
parentfix: クエリキャッシュ無効化時の絵文字操作エラーを解消... (diff)
downloadsharkey-c05c504c8632591ef18170c2881b0b44b0027ed9.tar.gz
sharkey-c05c504c8632591ef18170c2881b0b44b0027ed9.tar.bz2
sharkey-c05c504c8632591ef18170c2881b0b44b0027ed9.zip
Deliverキューに宛先がSharedInboxかどうかのフラグを追加 ( #10298 関係 ) (#10317)
* enhance(backend): 配送先が410 Goneで応答してきた場合配送停止するように * Update CHANGELOG.md * Deliverキューのデータに宛先がSharedInboxかどうかのフラグを追加 * Fix lint * Mapを使用するように * Fix typo
Diffstat (limited to 'packages/backend/src/core/UserFollowingService.ts')
-rw-r--r--packages/backend/src/core/UserFollowingService.ts16
1 files changed, 8 insertions, 8 deletions
diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts
index a612c9eb95..9f09c34d4b 100644
--- a/packages/backend/src/core/UserFollowingService.ts
+++ b/packages/backend/src/core/UserFollowingService.ts
@@ -82,7 +82,7 @@ export class UserFollowingService {
if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee) && blocked) {
// リモートフォローを受けてブロックしていた場合は、エラーにするのではなくRejectを送り返しておしまい。
const content = this.apRendererService.addContext(this.apRendererService.renderReject(this.apRendererService.renderFollow(follower, followee, requestId), followee));
- this.queueService.deliver(followee, content, follower.inbox);
+ this.queueService.deliver(followee, content, follower.inbox, false);
return;
} else if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee) && blocking) {
// リモートフォローを受けてブロックされているはずの場合だったら、ブロック解除しておく。
@@ -131,7 +131,7 @@ export class UserFollowingService {
if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
const content = this.apRendererService.addContext(this.apRendererService.renderAccept(this.apRendererService.renderFollow(follower, followee, requestId), followee));
- this.queueService.deliver(followee, content, follower.inbox);
+ this.queueService.deliver(followee, content, follower.inbox, false);
}
}
@@ -294,13 +294,13 @@ export class UserFollowingService {
if (this.userEntityService.isLocalUser(follower) && this.userEntityService.isRemoteUser(followee)) {
const content = this.apRendererService.addContext(this.apRendererService.renderUndo(this.apRendererService.renderFollow(follower, followee), follower));
- this.queueService.deliver(follower, content, followee.inbox);
+ this.queueService.deliver(follower, content, followee.inbox, false);
}
if (this.userEntityService.isLocalUser(followee) && this.userEntityService.isRemoteUser(follower)) {
// local user has null host
const content = this.apRendererService.addContext(this.apRendererService.renderReject(this.apRendererService.renderFollow(follower, followee), followee));
- this.queueService.deliver(followee, content, follower.inbox);
+ this.queueService.deliver(followee, content, follower.inbox, false);
}
}
@@ -389,7 +389,7 @@ export class UserFollowingService {
if (this.userEntityService.isLocalUser(follower) && this.userEntityService.isRemoteUser(followee)) {
const content = this.apRendererService.addContext(this.apRendererService.renderFollow(follower, followee));
- this.queueService.deliver(follower, content, followee.inbox);
+ this.queueService.deliver(follower, content, followee.inbox, false);
}
}
@@ -406,7 +406,7 @@ export class UserFollowingService {
const content = this.apRendererService.addContext(this.apRendererService.renderUndo(this.apRendererService.renderFollow(follower, followee), follower));
if (this.userEntityService.isLocalUser(follower)) { // 本来このチェックは不要だけどTSに怒られるので
- this.queueService.deliver(follower, content, followee.inbox);
+ this.queueService.deliver(follower, content, followee.inbox, false);
}
}
@@ -449,7 +449,7 @@ export class UserFollowingService {
if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
const content = this.apRendererService.addContext(this.apRendererService.renderAccept(this.apRendererService.renderFollow(follower, followee, request.requestId!), followee));
- this.queueService.deliver(followee, content, follower.inbox);
+ this.queueService.deliver(followee, content, follower.inbox, false);
}
this.userEntityService.pack(followee.id, followee, {
@@ -557,7 +557,7 @@ export class UserFollowingService {
});
const content = this.apRendererService.addContext(this.apRendererService.renderReject(this.apRendererService.renderFollow(follower, followee, request?.requestId ?? undefined), followee));
- this.queueService.deliver(followee, content, follower.inbox);
+ this.queueService.deliver(followee, content, follower.inbox, false);
}
/**