diff options
Diffstat (limited to 'juick-common/src/main')
3 files changed, 4 insertions, 4 deletions
diff --git a/juick-common/src/main/java/com/juick/server/CommandsManager.java b/juick-common/src/main/java/com/juick/server/CommandsManager.java index 58c07255a..50cdb2029 100644 --- a/juick-common/src/main/java/com/juick/server/CommandsManager.java +++ b/juick-common/src/main/java/com/juick/server/CommandsManager.java @@ -229,7 +229,7 @@ public class CommandsManager { help = "BL @username - add @username to your blacklist") public CommandResult blacklistUser(User user_from, URI attachment, String... arguments) { User blUser = userService.getUserByName(arguments[0]); - if (blUser != null) { + if (!blUser.isAnonymous()) { PrivacyQueriesService.PrivacyResult result = privacyQueriesService.blacklistUser(user_from, blUser); if (result == PrivacyQueriesService.PrivacyResult.Added) { return CommandResult.fromString("User added to your blacklist"); @@ -243,7 +243,7 @@ public class CommandsManager { help = "BL *tag - add *tag to your blacklist") public CommandResult blacklistTag(User user_from, URI attachment, String... arguments) { User blUser = userService.getUserByName(arguments[0]); - if (blUser != null) { + if (!blUser.isAnonymous()) { Tag tag = tagService.getTag(arguments[0], false); if (tag != null) { PrivacyQueriesService.PrivacyResult result = privacyQueriesService.blacklistTag(user_from, tag); diff --git a/juick-common/src/main/java/com/juick/service/UserService.java b/juick-common/src/main/java/com/juick/service/UserService.java index ef49a8ab9..cfeaaa516 100644 --- a/juick-common/src/main/java/com/juick/service/UserService.java +++ b/juick-common/src/main/java/com/juick/service/UserService.java @@ -44,7 +44,7 @@ public interface UserService { Optional<User> getUserByUID(int uid); - User getUserByName(String username); + @Nonnull User getUserByName(String username); User getUserByEmail(String email); diff --git a/juick-common/src/main/java/com/juick/service/security/JuickUserDetailsService.java b/juick-common/src/main/java/com/juick/service/security/JuickUserDetailsService.java index adb0ab44a..59425fab9 100644 --- a/juick-common/src/main/java/com/juick/service/security/JuickUserDetailsService.java +++ b/juick-common/src/main/java/com/juick/service/security/JuickUserDetailsService.java @@ -43,7 +43,7 @@ public class JuickUserDetailsService implements UserDetailsService { com.juick.User user = userService.getUserByName(username); - if (user != null) { + if (!user.isAnonymous()) { user.setAuthHash(userService.getHashByUID(user.getUid())); return new JuickUser(user); } |