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

Handle follow requests properly

Browse source
This commit is contained in:
Laura Hausmann 2024-01-27 02:58:02 +01:00
parent a8bd625ce1
commit a3d2e3c0d3
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,7 +34,8 @@ public class ActivityHandlerService(
if (activity.Object is { } obj) return Follow(obj, activity.Actor, activity.Id); if (activity.Object is { } obj) return Follow(obj, activity.Actor, activity.Id);
throw GracefulException.UnprocessableEntity("Follow activity object is invalid"); throw GracefulException.UnprocessableEntity("Follow activity object is invalid");
} }
case ASActivity.Types.Unfollow: { case ASActivity.Types.Unfollow:
case ASActivity.Types.Undo: {
if (activity.Object is { } obj) return Unfollow(obj, activity.Actor, activity.Id); if (activity.Object is { } obj) return Unfollow(obj, activity.Actor, activity.Id);
throw GracefulException.UnprocessableEntity("Unfollow activity object is invalid"); throw GracefulException.UnprocessableEntity("Unfollow activity object is invalid");
} }
@ -50,7 +51,25 @@ public class ActivityHandlerService(
if (followee.Host != null) throw new Exception("Cannot process follow for remote followee"); if (followee.Host != null) throw new Exception("Cannot process follow for remote followee");
//TODO: handle follow requests if (followee.IsLocked) {
var followRequest = new FollowRequest {
Id = IdHelpers.GenerateSlowflakeId(),
CreatedAt = DateTime.UtcNow,
Followee = followee,
Follower = follower,
FolloweeHost = followee.Host,
FollowerHost = follower.Host,
FolloweeInbox = followee.Inbox,
FollowerInbox = follower.Inbox,
FolloweeSharedInbox = followee.SharedInbox,
FollowerSharedInbox = follower.SharedInbox,
RequestId = requestId
};
await db.AddAsync(followRequest);
await db.SaveChangesAsync();
return;
}
var acceptActivity = activityRenderer.RenderAccept(followeeActor, requestId); var acceptActivity = activityRenderer.RenderAccept(followeeActor, requestId);
var keypair = await db.UserKeypairs.FirstAsync(p => p.User == followee); var keypair = await db.UserKeypairs.FirstAsync(p => p.User == followee);
@ -84,7 +103,7 @@ public class ActivityHandlerService(
var follower = await userResolver.Resolve(followerActor.Id); var follower = await userResolver.Resolve(followerActor.Id);
var followee = await userResolver.Resolve(followeeActor.Id); var followee = await userResolver.Resolve(followeeActor.Id);
await db.FollowRequests.Where(p => p.Follower == follower && p.Followee == followee).ExecuteDeleteAsync();
await db.Followings.Where(p => p.Follower == follower && p.Followee == followee).ExecuteDeleteAsync(); await db.Followings.Where(p => p.Follower == follower && p.Followee == followee).ExecuteDeleteAsync();
//TODO: also check (or handle at all) follow requests
} }
} }