notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix follow accept rendering

Browse source
This commit is contained in:
Laura Hausmann 2024-01-27 03:44:33 +01:00
parent 7af8840f2d
commit 471516f729
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Iceshrimp.Backend/Core/Federation/ActivityPub/ActivityHandlerService.cs
View file

@ -78,7 +78,9 @@ public class ActivityHandlerService(
return; return;
} }
var acceptActivity = activityRenderer.RenderAccept(followeeActor, requestId); var acceptActivity = activityRenderer.RenderAccept(followeeActor,
activityRenderer.RenderFollow(followerActor,
followeeActor, requestId));
var keypair = await db.UserKeypairs.FirstAsync(p => p.User == followee); var keypair = await db.UserKeypairs.FirstAsync(p => p.User == followee);
var payload = await acceptActivity.SignAndCompact(keypair); var payload = await acceptActivity.SignAndCompact(keypair);
var inboxUri = follower.SharedInbox ?? var inboxUri = follower.SharedInbox ??

17
Iceshrimp.Backend/Core/Federation/ActivityPub/ActivityRenderer.cs
View file

@ -14,16 +14,25 @@ public class ActivityRenderer(IOptions<Config.InstanceSection> config) {
}; };
} }
public ASActivity RenderAccept(ASObject followeeActor, string requestId) { public ASActivity RenderAccept(ASObject actor, ASObject obj) {
return new ASActivity { return new ASActivity {
Id = $"https://{config.Value.WebDomain}/activities/{Guid.NewGuid().ToString().ToLowerInvariant()}", Id = $"https://{config.Value.WebDomain}/activities/{Guid.NewGuid().ToString().ToLowerInvariant()}",
Type = "https://www.w3.org/ns/activitystreams#Accept", Type = "https://www.w3.org/ns/activitystreams#Accept",
Actor = new ASActor { Actor = new ASActor {
Id = followeeActor.Id Id = actor.Id
}, },
Object = new ASObject { Object = obj
Id = requestId };
} }
public ASActivity RenderFollow(ASObject followerActor, ASObject followeeActor, string requestId) {
return new ASActivity {
Id = requestId,
Type = ASActivity.Types.Follow,
Actor = new ASActor {
Id = followerActor.Id
},
Object = followeeActor
}; };
} }
} }