jiazhizhong/OpenIsle
1
0
Fork 0
mirror of https://github.com/nagisa77/OpenIsle.git synced 2026-03-06 20:10:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #173 from nagisa77/9ajlri-codex

Browse Source 
Fix follow action for numeric user ids
This commit is contained in:
Tim
2025-07-10 17:28:31 +08:00
committed by GitHub
parent ad856ba7f1 b57036e3d0
commit a2efc34068
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/openisle/service/SubscriptionService.java
View File

@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Optional;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@@ -54,7 +55,7 @@ public class SubscriptionService {
public void subscribeUser(String username, String targetName) { public void subscribeUser(String username, String targetName) {
if (username.equals(targetName)) return; if (username.equals(targetName)) return;
User subscriber = userRepo.findByUsername(username).orElseThrow(); User subscriber = userRepo.findByUsername(username).orElseThrow();
User target = userRepo.findByUsername(targetName).orElseThrow(); User target = findUser(targetName).orElseThrow();
userSubRepo.findBySubscriberAndTarget(subscriber, target).orElseGet(() -> { userSubRepo.findBySubscriberAndTarget(subscriber, target).orElseGet(() -> {
UserSubscription us = new UserSubscription(); UserSubscription us = new UserSubscription();
us.setSubscriber(subscriber); us.setSubscriber(subscriber);
@@ -65,7 +66,7 @@ public class SubscriptionService {
public void unsubscribeUser(String username, String targetName) { public void unsubscribeUser(String username, String targetName) {
User subscriber = userRepo.findByUsername(username).orElseThrow(); User subscriber = userRepo.findByUsername(username).orElseThrow();
User target = userRepo.findByUsername(targetName).orElseThrow(); User target = findUser(targetName).orElseThrow();
userSubRepo.findBySubscriberAndTarget(subscriber, target).ifPresent(userSubRepo::delete); userSubRepo.findBySubscriberAndTarget(subscriber, target).ifPresent(userSubRepo::delete);
} }
@@ -105,7 +106,14 @@ public class SubscriptionService {
return false; return false;
} }
User subscriber = userRepo.findByUsername(subscriberName).orElseThrow(); User subscriber = userRepo.findByUsername(subscriberName).orElseThrow();
User target = userRepo.findByUsername(targetName).orElseThrow(); User target = findUser(targetName).orElseThrow();
return userSubRepo.findBySubscriberAndTarget(subscriber, target).isPresent(); return userSubRepo.findBySubscriberAndTarget(subscriber, target).isPresent();
} }
private Optional<User> findUser(String identifier) {
if (identifier.matches("\\d+")) {
return userRepo.findById(Long.parseLong(identifier));
}
return userRepo.findByUsername(identifier);
}
} }