puniko/FoundKey
1
0
Fork 0
forked from FoundKeyGang/FoundKey
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove unused user parameter from deliver

Browse source
This commit is contained in:
Johann150 2023-04-18 22:01:11 +02:00
parent 8842a6958c
commit 449a436f3e
Signed by untrusted user: Johann150
GPG key ID: 9EE6577A2A06F8F1
17 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/queue/index.ts
View file

@ -83,7 +83,7 @@ webhookDeliverQueue
.on('error', (job: any, err: Error) => webhookLogger.error(`error ${err}`, { job, e: renderError(err) }))
.on('stalled', (job) => webhookLogger.warn(`stalled ${getJobInfo(job)} to=${job.data.to}`));
export function deliver(user: ThinUser, content: unknown, to: string | null) {
export function deliver(content: unknown, to: string | null) {
if (content == null) return null;
if (to == null) return null;

2
packages/backend/src/remote/activitypub/deliver-manager.ts
View file

@ -156,7 +156,7 @@ export class DeliverManager {
// skip instances as indicated
if (instancesToSkip.includes(new URL(inbox).host)) continue;
deliver(null, this.activity, inbox);
deliver(this.activity, inbox);
}
}
}

4
packages/backend/src/server/api/common/read-messaging-message.ts
View file

@ -141,10 +141,10 @@ export async function deliverReadActivity(user: { id: User['id']; host: null; },
if (contents.length > 1) {
const collection = orderedCollection(null, contents.length, undefined, undefined, contents);
deliver(user, renderActivity(collection), recipient.inbox);
deliver(renderActivity(collection), recipient.inbox);
} else {
for (const content of contents) {
deliver(user, renderActivity(content), recipient.inbox);
deliver(renderActivity(content), recipient.inbox);
}
}
}

2
packages/backend/src/server/api/endpoints/admin/reports/resolve.ts
View file

@ -29,7 +29,7 @@ export default define(meta, paramDef, async (ps, me) => {
const actor = await getInstanceActor();
const targetUser = await Users.findOneByOrFail({ id: report.targetUserId });
deliver(actor, renderActivity(renderFlag(actor, report)), targetUser.inbox);
deliver(renderActivity(renderFlag(actor, report)), targetUser.inbox);
}
await AbuseUserReports.update(report.id, {

2
packages/backend/src/server/api/endpoints/notes/polls/vote.ts
View file

@ -133,7 +133,7 @@ export default define(meta, paramDef, async (ps, user) => {
if (note.userHost != null) {
const pollOwner = await Users.findOneByOrFail({ id: note.userId }) as IRemoteUser;
deliver(user, renderActivity(await renderVote(user, vote, note, poll, pollOwner)), pollOwner.inbox);
deliver(renderActivity(await renderVote(user, vote, note, poll, pollOwner)), pollOwner.inbox);
}
// リモートフォロワーにUpdate配信

8
packages/backend/src/services/blocking/create.ts
View file

@ -34,7 +34,7 @@ export default async function(blocker: User, blockee: User): Promise<void> {
if (Users.isLocalUser(blocker) && Users.isRemoteUser(blockee) && blocker.federateBlocks) {
const content = renderActivity(renderBlock(blocking));
deliver(blocker, content, blockee.inbox);
deliver(content, blockee.inbox);
}
}
@ -78,13 +78,13 @@ async function cancelRequest(follower: User, followee: User): Promise<void> {
// Send Undo Follow if followee is remote
if (Users.isLocalUser(follower) && Users.isRemoteUser(followee)) {
const content = renderActivity(renderUndo(renderFollow(follower, followee), follower));
deliver(follower, content, followee.inbox);
deliver(content, followee.inbox);
}
// Send Reject if follower is remote
if (Users.isRemoteUser(follower) && Users.isLocalUser(followee)) {
const content = renderActivity(renderReject(renderFollow(follower, followee, request.requestId!), followee));
deliver(followee, content, follower.inbox);
deliver(content, follower.inbox);
}
}
@ -125,7 +125,7 @@ async function unFollow(follower: User, followee: User): Promise<void> {
// Send Undo Follow if follower is remote
if (Users.isLocalUser(follower) && Users.isRemoteUser(followee)) {
const content = renderActivity(renderUndo(renderFollow(follower, followee), follower));
deliver(follower, content, followee.inbox);
deliver(content, followee.inbox);
}
}

2
packages/backend/src/services/blocking/delete.ts
View file

@ -29,6 +29,6 @@ export default async function(blocker: CacheableUser, blockee: CacheableUser) {
// deliver if remote bloking
if (Users.isLocalUser(blocker) && Users.isRemoteUser(blockee)) {
const content = renderActivity(renderUndo(renderBlock(blocking), blocker));
deliver(blocker, content, blockee.inbox);
deliver(content, blockee.inbox);
}
}

4
packages/backend/src/services/following/create.ts
View file

@ -146,7 +146,7 @@ export default async function(_follower: { id: User['id'] }, _followee: { id: Us
if (Users.isRemoteUser(follower) && Users.isLocalUser(followee) && blocked) {
// リモートフォローを受けてブロックしていた場合は、エラーにするのではなくRejectを送り返しておしまい。
const content = renderActivity(renderReject(renderFollow(follower, followee, requestId), followee));
deliver(followee , content, follower.inbox);
deliver(content, follower.inbox);
return;
} else if (Users.isRemoteUser(follower) && Users.isLocalUser(followee) && blocking) {
// リモートフォローを受けてブロックされているはずの場合だったら、ブロック解除しておく。
@ -195,6 +195,6 @@ export default async function(_follower: { id: User['id'] }, _followee: { id: Us
if (Users.isRemoteUser(follower) && Users.isLocalUser(followee)) {
const content = renderActivity(renderAccept(renderFollow(follower, followee, requestId), followee));
deliver(followee, content, follower.inbox);
deliver(content, follower.inbox);
}
}

4
packages/backend/src/services/following/delete.ts
View file

@ -52,13 +52,13 @@ export default async function(follower: { id: User['id']; host: User['host']; ur
if (Users.isLocalUser(follower) && Users.isRemoteUser(followee)) {
const content = renderActivity(renderUndo(renderFollow(follower, followee), follower));
deliver(follower, content, followee.inbox);
deliver(content, followee.inbox);
}
if (Users.isLocalUser(followee) && Users.isRemoteUser(follower)) {
// local user has null host
const content = renderActivity(renderReject(renderFollow(follower, followee), followee));
deliver(followee, content, follower.inbox);
deliver(content, follower.inbox);
}
}

2
packages/backend/src/services/following/reject.ts
View file

@ -99,7 +99,7 @@ async function deliverReject(followee: Local, follower: Remote): Promise<void> {
});
const content = renderActivity(renderReject(renderFollow(follower, followee, request?.requestId || undefined), followee));
deliver(followee, content, follower.inbox);
deliver(content, follower.inbox);
}
/**

2
packages/backend/src/services/following/requests/accept.ts
View file

@ -27,7 +27,7 @@ export async function acceptFollowRequest(followee: User, follower: User): Promi
if (Users.isRemoteUser(follower) && Users.isLocalUser(followee)) {
const content = renderActivity(renderAccept(renderFollow(follower, followee, request.requestId!), followee));
deliver(followee, content, follower.inbox);
deliver(content, follower.inbox);
}
Users.pack(followee.id, followee, {

2
packages/backend/src/services/following/requests/cancel.ts
View file

@ -17,7 +17,7 @@ export async function cancelFollowRequest(followee: User, follower: User): Promi
const content = renderActivity(renderUndo(renderFollow(follower, followee), follower));
if (Users.isLocalUser(follower)) {
deliver(follower, content, followee.inbox);
deliver(content, followee.inbox);
}
}

2
packages/backend/src/services/following/requests/create.ts
View file

@ -64,6 +64,6 @@ export async function createFollowRequest(follower: User, followee: User, reques
if (Users.isLocalUser(follower) && Users.isRemoteUser(followee)) {
const content = renderActivity(renderFollow(follower, followee));
deliver(follower, content, followee.inbox);
deliver(content, followee.inbox);
}
}

2
packages/backend/src/services/messages/create.ts
View file

@ -97,7 +97,7 @@ export async function createMessage(user: { id: User['id']; host: User['host'];
const activity = renderActivity(renderCreate(await renderNote(note, false, true), note));
deliver(user, activity, recipientUser.inbox);
deliver(activity, recipientUser.inbox);
}
return messageObj;
}

2
packages/backend/src/services/messages/delete.ts
View file

@ -22,7 +22,7 @@ async function postDeleteMessage(message: MessagingMessage): Promise<void> {
if (Users.isLocalUser(user) && Users.isRemoteUser(recipient)) {
const activity = renderActivity(renderDelete(renderTombstone(`${config.url}/notes/${message.id}`), user));
deliver(user, activity, recipient.inbox);
deliver(activity, recipient.inbox);
}
} else if (message.groupId) {
publishGroupMessagingStream(message.groupId, 'deleted', message.id);

8
packages/backend/src/services/relay.ts
View file

@ -37,7 +37,7 @@ export async function addRelay(inbox: string): Promise<Relay> {
const relayActor = await getRelayActor();
const activity = renderActivity(renderFollowRelay(relay, relayActor));
deliver(relayActor, activity, relay.inbox);
deliver(activity, relay.inbox);
return relay;
}
@ -53,7 +53,7 @@ export async function removeRelay(inbox: string): Promise<void> {
const relayActor = await getRelayActor();
const activity = renderActivity(renderUndo(renderFollowRelay(relay, relayActor), relayActor));
deliver(relayActor, activity, relay.inbox);
deliver(activity, relay.inbox);
await Relays.delete(relay.id);
}
@ -90,7 +90,7 @@ export async function deliverToRelays(user: { id: User['id']; host: null; }, act
const signed = await attachLdSignature(copy, user);
for (const relay of relays) {
deliver(user, signed, relay.inbox);
deliver(signed, relay.inbox);
}
}
@ -108,6 +108,6 @@ export async function deliverMultipleToRelays(user: User, activities: any[]): Pr
}));
for (const relay of relays) {
deliver(user, content, relay.inbox);
deliver(content, relay.inbox);
}
}

2
packages/backend/src/services/unsuspend-user.ts
View file

@ -32,7 +32,7 @@ export async function doPostUnsuspend(user: User): Promise<void> {
}
for (const inbox of queue) {
deliver(user as any, content, inbox);
deliver(content, inbox);
}
}
}