McPringle/fitpub
1
0
Fork 0
Code Issues 24 Pull requests 6 Projects Releases Packages Wiki Activity Actions

Fix federated follow counts

Browse source
This commit is contained in:
Tim Zöller 2026-01-03 20:25:17 +01:00
parent 3b18e30cee
commit c9b982890a
2 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/main/java/org/operaton/fitpub/controller/ActivityPubController.java
View file

@ -34,6 +34,7 @@ public class ActivityPubController {
private final ActivityRepository activityRepository;
private final ActivityImageService activityImageService;
private final org.operaton.fitpub.service.InboxProcessor inboxProcessor;
private final org.operaton.fitpub.repository.FollowRepository followRepository;
@Value("${fitpub.base-url}")
private String baseUrl;
@ -145,10 +146,19 @@ public class ActivityPubController {
return ResponseEntity.notFound().build();
}
User user = userOpt.get();
String followersUrl = baseUrl + "/users/" + username + "/followers";
String actorUri = user.getActorUri(baseUrl);
// TODO: Fetch actual followers from database
OrderedCollection collection = OrderedCollection.empty(followersUrl);
// Get actual follower count from database
long followerCount = followRepository.countAcceptedFollowersByActorUri(actorUri);
OrderedCollection collection = OrderedCollection.builder()
.context("https://www.w3.org/ns/activitystreams")
.type("OrderedCollection")
.id(followersUrl)
.totalItems((int) followerCount)
.build();
return ResponseEntity.ok(collection);
}
@ -172,10 +182,18 @@ public class ActivityPubController {
return ResponseEntity.notFound().build();
}
User user = userOpt.get();
String followingUrl = baseUrl + "/users/" + username + "/following";
// TODO: Fetch actual following from database
OrderedCollection collection = OrderedCollection.empty(followingUrl);
// Get actual following count from database
long followingCount = followRepository.countAcceptedFollowingByUserId(user.getId());
OrderedCollection collection = OrderedCollection.builder()
.context("https://www.w3.org/ns/activitystreams")
.type("OrderedCollection")
.id(followingUrl)
.totalItems((int) followingCount)
.build();
return ResponseEntity.ok(collection);
}

9
src/main/java/org/operaton/fitpub/repository/FollowRepository.java
View file

@ -60,6 +60,15 @@ public interface FollowRepository extends JpaRepository<Follow, UUID> {
@Query("SELECT f FROM Follow f WHERE f.followerId = :followerId AND f.status = 'ACCEPTED'")
List<Follow> findAcceptedFollowingByUserId(@Param("followerId") UUID followerId);
/**
* Count accepted following relationships for a user.
*
* @param followerId the follower's user ID
* @return count of accepted following relationships
*/
@Query("SELECT COUNT(f) FROM Follow f WHERE f.followerId = :followerId AND f.status = 'ACCEPTED'")
long countAcceptedFollowingByUserId(@Param("followerId") UUID followerId);
/**
* Find a follow by its Activity ID.
*