aboutsummaryrefslogtreecommitdiff
path: root/juick-common
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-08-29 15:10:51 +0300
committerGravatar Vitaly Takmazov2018-08-29 15:10:51 +0300
commit61a28570ca25ae789cca09736ddc427e172ac213 (patch)
treeb1f490597d5f2999121310ae479b38e33eb5fb71 /juick-common
parent22514aa83e418770c8f60ea1b5ce943daa2383ef (diff)
getUserByName is non nullable
Diffstat (limited to 'juick-common')
-rw-r--r--juick-common/src/main/java/com/juick/server/CommandsManager.java4
-rw-r--r--juick-common/src/main/java/com/juick/service/UserService.java2
-rw-r--r--juick-common/src/main/java/com/juick/service/security/JuickUserDetailsService.java2
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 58c07255..50cdb202 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 ef49a8ab..cfeaaa51 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 adb0ab44..59425fab 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);
}