aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/juick/CommandsManager.java16
-rw-r--r--src/main/java/com/juick/service/SubscriptionServiceImpl.java8
-rw-r--r--src/main/java/com/juick/www/api/ApiSocialLogin.java9
-rw-r--r--src/main/java/com/juick/www/api/Service.java2
-rw-r--r--src/main/java/com/juick/www/controllers/SocialLogin.java9
5 files changed, 19 insertions, 25 deletions
diff --git a/src/main/java/com/juick/CommandsManager.java b/src/main/java/com/juick/CommandsManager.java
index f7c37b8b..66a45f9d 100644
--- a/src/main/java/com/juick/CommandsManager.java
+++ b/src/main/java/com/juick/CommandsManager.java
@@ -106,7 +106,7 @@ public class CommandsManager {
}
}
CommandResult commandResult = (CommandResult) getClass().getMethod(cmd.get().getName(), User.class, URI.class, String[].class)
- .invoke(this, user, attachment, groups.toArray(new String[groups.size()]));
+ .invoke(this, user, attachment, groups.toArray(new String[0]));
if (StringUtils.isNotEmpty(commandResult.getText())) {
return commandResult;
}
@@ -196,26 +196,26 @@ public class CommandsManager {
List<User> blusers = userService.getUserBLUsers(user_from.getUid());
List<String> bltags = tagService.getUserBLTags(user_from.getUid());
- String txt = StringUtils.EMPTY;
+ StringBuilder txt = new StringBuilder(StringUtils.EMPTY);
if (bltags.size() > 0) {
for (String bltag : bltags) {
- txt += "*" + bltag + "\n";
+ txt.append("*").append(bltag).append("\n");
}
if (blusers.size() > 0) {
- txt += "\n";
+ txt.append("\n");
}
}
if (blusers.size() > 0) {
for (User bluser : blusers) {
- txt += "@" + bluser.getName() + "\n";
+ txt.append("@").append(bluser.getName()).append("\n");
}
}
- if (txt.isEmpty()) {
- txt = "You don't have any users or tags in your blacklist.";
+ if (txt.length() == 0) {
+ txt = new StringBuilder("You don't have any users or tags in your blacklist.");
}
- return CommandResult.fromString(txt);
+ return CommandResult.fromString(txt.toString());
}
@UserCommand(pattern = "^#\\+$", help = "#+ - Show last Juick messages")
diff --git a/src/main/java/com/juick/service/SubscriptionServiceImpl.java b/src/main/java/com/juick/service/SubscriptionServiceImpl.java
index 977fbec0..83cf682f 100644
--- a/src/main/java/com/juick/service/SubscriptionServiceImpl.java
+++ b/src/main/java/com/juick/service/SubscriptionServiceImpl.java
@@ -63,11 +63,9 @@ public class SubscriptionServiceImpl extends BaseJdbcService implements Subscrip
List<Integer> tags = tagService.getMessageTagsIDs(mid);
List<String> tagsStr = tagService.getMessageTags(mid).stream().map(t -> t.getTag().getName()).collect(Collectors.toList());
- Set<Integer> set = new HashSet<>();
- set.addAll(
- users.stream()
- .map(User::getUid).filter(u -> Collections.disjoint(tagService.getUserBLTags(u), tagsStr))
- .collect(Collectors.toList()));
+ Set<Integer> set = new HashSet<>(users.stream()
+ .map(User::getUid).filter(u -> Collections.disjoint(tagService.getUserBLTags(u), tagsStr))
+ .collect(Collectors.toList()));
if (!tags.isEmpty()) {
diff --git a/src/main/java/com/juick/www/api/ApiSocialLogin.java b/src/main/java/com/juick/www/api/ApiSocialLogin.java
index 101f6b1f..8b331781 100644
--- a/src/main/java/com/juick/www/api/ApiSocialLogin.java
+++ b/src/main/java/com/juick/www/api/ApiSocialLogin.java
@@ -34,13 +34,11 @@ import com.google.api.client.json.JsonFactory;
import com.google.api.client.json.jackson2.JacksonFactory;
import com.juick.model.AuthResponse;
import com.juick.model.ext.facebook.User;
-import com.juick.util.HttpBadRequestException;
+import com.juick.model.ext.vk.UsersResponse;
import com.juick.service.CrosspostService;
import com.juick.service.EmailService;
import com.juick.service.UserService;
-import com.juick.model.ext.vk.UsersResponse;
-import com.nimbusds.jose.JOSEException;
-import com.nimbusds.jose.proc.BadJOSEException;
+import com.juick.util.HttpBadRequestException;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
@@ -60,7 +58,6 @@ import javax.annotation.PostConstruct;
import javax.inject.Inject;
import java.io.IOException;
import java.security.GeneralSecurityException;
-import java.text.ParseException;
import java.util.Collections;
import java.util.Map;
import java.util.UUID;
@@ -291,7 +288,7 @@ public class ApiSocialLogin {
throw new HttpBadRequestException();
}
@PostMapping("/api/_applelogin")
- public String doVerifyAppleResponse(@RequestParam Map<String, String> body) throws InterruptedException, ExecutionException, IOException, ParseException, JOSEException, BadJOSEException {
+ public String doVerifyAppleResponse(@RequestParam Map<String, String> body) throws InterruptedException, ExecutionException, IOException {
OAuth2AccessToken token = appleSignInService.getAccessToken(body.get("code"));
var jsonNode = jsonMapper.readTree(token.getRawResponse());
var idToken = jsonNode.get("id_token").textValue();
diff --git a/src/main/java/com/juick/www/api/Service.java b/src/main/java/com/juick/www/api/Service.java
index 850acb9d..dc001428 100644
--- a/src/main/java/com/juick/www/api/Service.java
+++ b/src/main/java/com/juick/www/api/Service.java
@@ -203,7 +203,7 @@ public class Service {
.forEach(session -> serverManager.getSessions().remove(session));
}
@GetMapping("/api/events")
- public SseEmitter handle(@Visitor User visitor) throws IOException {
+ public SseEmitter handle(@Visitor User visitor) {
logger.info("{} connected", visitor.getName());
if (!visitor.isAnonymous()) {
userService.updateLastSeen(visitor);
diff --git a/src/main/java/com/juick/www/controllers/SocialLogin.java b/src/main/java/com/juick/www/controllers/SocialLogin.java
index ffd785b7..1f99efc1 100644
--- a/src/main/java/com/juick/www/controllers/SocialLogin.java
+++ b/src/main/java/com/juick/www/controllers/SocialLogin.java
@@ -24,15 +24,13 @@ import com.github.scribejava.core.oauth.OAuth10aService;
import com.github.scribejava.core.oauth.OAuth20Service;
import com.juick.model.ext.facebook.User;
import com.juick.model.ext.vk.UsersResponse;
-import com.juick.util.HttpBadRequestException;
import com.juick.service.CrosspostService;
import com.juick.service.EmailService;
import com.juick.service.TelegramService;
import com.juick.service.UserService;
import com.juick.service.security.annotation.Visitor;
+import com.juick.util.HttpBadRequestException;
import com.juick.util.WebUtils;
-import com.nimbusds.jose.JOSEException;
-import com.nimbusds.jose.proc.BadJOSEException;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.codec.digest.HmacAlgorithms;
import org.apache.commons.codec.digest.HmacUtils;
@@ -55,7 +53,6 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.text.ParseException;
import java.util.List;
import java.util.Map;
import java.util.UUID;
@@ -341,7 +338,9 @@ public class SocialLogin {
throw new HttpBadRequestException();
}
@PostMapping("/_apple")
- public String doVerifyAppleResponse(HttpServletRequest request, HttpServletResponse response, @RequestParam Map<String, String> body) throws InterruptedException, ExecutionException, IOException, ParseException, JOSEException, BadJOSEException {
+ public String doVerifyAppleResponse(HttpServletRequest request, HttpServletResponse response,
+ @RequestParam Map<String, String> body)
+ throws InterruptedException, ExecutionException, IOException {
OAuth2AccessToken token = appleSignInService.getAccessToken(body.get("code"));
var jsonNode = jsonMapper.readTree(token.getRawResponse());
var idToken = jsonNode.get("id_token").textValue();
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 13:47:45 +0000