aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/juick/service/InfoService.java74
-rw-r--r--src/main/java/com/juick/service/MessagesService.java10
-rw-r--r--src/main/java/com/juick/service/UserService.java2
-rw-r--r--src/main/java/com/juick/www/api/xnodeinfo2/Info.java40
-rw-r--r--src/main/java/com/juick/www/api/xnodeinfo2/model/NodeInfo.java3
-rw-r--r--src/main/java/com/juick/www/api/xnodeinfo2/model/Server.java4
-rw-r--r--src/main/java/com/juick/www/api/xnodeinfo2/model/ServiceInfo.java3
-rw-r--r--src/main/java/com/juick/www/api/xnodeinfo2/model/Usage.java4
-rw-r--r--src/main/java/com/juick/www/api/xnodeinfo2/model/UserStats.java4
9 files changed, 98 insertions, 46 deletions
diff --git a/src/main/java/com/juick/service/InfoService.java b/src/main/java/com/juick/service/InfoService.java
new file mode 100644
index 00000000..fbf75b86
--- /dev/null
+++ b/src/main/java/com/juick/service/InfoService.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2008-2023, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.juick.service;
+
+import com.juick.www.api.xnodeinfo2.model.*;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.inject.Inject;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class InfoService {
+ @Value("${ap_base_uri:http://localhost:8080/}")
+ private String baseUri;
+ @Inject
+ JdbcTemplate jdbcTemplate;
+
+ @Cacheable("stats")
+ public NodeInfo getCurrentNodeInfo(String version) {
+ NodeInfo nodeInfo = new NodeInfo();
+ nodeInfo.setVersion(version);
+ Server server = new Server();
+ server.setBaseUrl(baseUri);
+ server.setName("Juick");
+ server.setSoftware("Juick");
+ server.setVersion("2.x");
+ nodeInfo.setServer(server);
+ nodeInfo.setProtocols(Arrays.asList("xmpp", "activitypub", "smtp"));
+ Map<String, String> metadata = new HashMap<>();
+ metadata.put("email", "support@juick.com");
+ nodeInfo.setMetadata(metadata);
+ ServiceInfo serviceInfo = new ServiceInfo();
+ serviceInfo.setInbound(Arrays.asList("jabber", "mastodon", "email", "telegram"));
+ serviceInfo.setOutbound(Arrays.asList("jabber", "mastodon", "telegram", "twitter", "email", "rss"));
+ nodeInfo.setServices(serviceInfo);
+ UserStats userStats = new UserStats();
+ userStats.setTotal(jdbcTemplate.queryForObject("SELECT COUNT(*) FROM users WHERE banned=0", Integer.class));
+ userStats.setActiveMonth(jdbcTemplate.queryForObject("SELECT COUNT(*) FROM users WHERE banned=0 AND last_seen > ?",
+ Integer.class, ZonedDateTime.now().minus(1, ChronoUnit.MONTHS).toLocalDateTime()));
+ userStats.setActiveHalfyear(jdbcTemplate.queryForObject("SELECT COUNT(*) FROM users WHERE banned=0 AND last_seen > ?",
+ Integer.class, ZonedDateTime.now().minus(6, ChronoUnit.MONTHS).toLocalDateTime()));
+ Usage usage = new Usage();
+ usage.setUsers(userStats);
+ usage.setLocalPosts(jdbcTemplate.queryForObject("SELECT COUNT(*) FROM messages",
+ Integer.class));
+ usage.setLocalComments(jdbcTemplate.queryForObject("SELECT COUNT(*) FROM replies WHERE reply_uri IS NULL",
+ Integer.class));
+ nodeInfo.setUsage(usage);
+ return nodeInfo;
+ }
+
+}
diff --git a/src/main/java/com/juick/service/MessagesService.java b/src/main/java/com/juick/service/MessagesService.java
index 91788a3c..5574dbbf 100644
--- a/src/main/java/com/juick/service/MessagesService.java
+++ b/src/main/java/com/juick/service/MessagesService.java
@@ -34,10 +34,10 @@ import java.util.*;
* Created by aalexeev on 11/13/16.
*/
public interface MessagesService {
- @CacheEvict(value = { "discover", "discussions", "messages", "replies" }, allEntries = true)
+ @CacheEvict(value = { "discover", "discussions", "messages", "replies", "stats" }, allEntries = true)
int createMessage(int uid, String txt, String attachment, @NonNull Set<Tag> tags);
- @CacheEvict(value = { "discover", "discussions", "messages", "replies" }, allEntries = true)
+ @CacheEvict(value = { "discover", "discussions", "messages", "replies", "stats" }, allEntries = true)
int createReply(int mid, int rid, User user, String txt, String attachment);
enum RecommendStatus {
Error,
@@ -127,10 +127,10 @@ public interface MessagesService {
boolean setMessagePrivacy(int mid);
- @CacheEvict(value = { "discover", "discussions", "messages", "replies" }, allEntries = true)
+ @CacheEvict(value = { "discover", "discussions", "messages", "replies", "stats" }, allEntries = true)
boolean deleteMessage(int uid, int mid);
- @CacheEvict(value = { "discover", "discussions", "messages", "replies" }, allEntries = true)
+ @CacheEvict(value = { "discover", "discussions", "messages", "replies", "stats" }, allEntries = true)
boolean deleteReply(int uid, int mid, int rid);
List<Integer> getLastMessages(int hours);
@@ -155,7 +155,7 @@ public interface MessagesService {
boolean replyExists(URI replyUri);
- @CacheEvict(value = { "discover", "discussions", "messages", "replies" }, allEntries = true)
+ @CacheEvict(value = { "discover", "discussions", "messages", "replies", "stats" }, allEntries = true)
boolean deleteReply(URI userUri, URI replyUri);
String getMessageProperty(Integer mid, Integer rid, String key);
diff --git a/src/main/java/com/juick/service/UserService.java b/src/main/java/com/juick/service/UserService.java
index 31822b01..9313bba9 100644
--- a/src/main/java/com/juick/service/UserService.java
+++ b/src/main/java/com/juick/service/UserService.java
@@ -46,7 +46,7 @@ public interface UserService {
String getSignUpHashByTelegramID(Long telegramId, String username);
- @CacheEvict(value = { "usernames", "users_by_name" }, allEntries = true)
+ @CacheEvict(value = { "usernames", "users_by_name", "stats" }, allEntries = true)
Optional<User> createUser(String username, String password) throws UsernameTakenException;
Optional<User> getUserByUID(int uid);
diff --git a/src/main/java/com/juick/www/api/xnodeinfo2/Info.java b/src/main/java/com/juick/www/api/xnodeinfo2/Info.java
index 9811cc4c..2af252ed 100644
--- a/src/main/java/com/juick/www/api/xnodeinfo2/Info.java
+++ b/src/main/java/com/juick/www/api/xnodeinfo2/Info.java
@@ -20,8 +20,10 @@ package com.juick.www.api.xnodeinfo2;
import com.cliqset.xrd.Link;
import com.cliqset.xrd.XRD;
import com.fasterxml.jackson.annotation.JsonView;
+import com.juick.service.InfoService;
import com.juick.www.api.xnodeinfo2.model.*;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cache.annotation.Cacheable;
import org.springframework.http.MediaType;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.web.bind.annotation.GetMapping;
@@ -42,45 +44,13 @@ public class Info {
@Value("${ap_base_uri:http://localhost:8080/}")
private String baseUri;
@Inject
- private JdbcTemplate jdbcTemplate;
+ InfoService infoService;
- private NodeInfo getCurrentNodeInfo(String version) {
- NodeInfo nodeInfo = new NodeInfo();
- nodeInfo.setVersion(version);
- Server server = new Server();
- server.setBaseUrl(baseUri);
- server.setName("Juick");
- server.setSoftware("Juick");
- server.setVersion("2.x");
- nodeInfo.setServer(server);
- nodeInfo.setProtocols(Arrays.asList("xmpp", "activitypub", "smtp"));
- Map<String, String> metadata = new HashMap<>();
- metadata.put("email", "support@juick.com");
- nodeInfo.setMetadata(metadata);
- ServiceInfo serviceInfo = new ServiceInfo();
- serviceInfo.setInbound(Arrays.asList("jabber", "mastodon", "email", "telegram"));
- serviceInfo.setOutbound(Arrays.asList("jabber", "mastodon", "telegram", "twitter", "email", "rss"));
- nodeInfo.setServices(serviceInfo);
- UserStats userStats = new UserStats();
- userStats.setTotal(jdbcTemplate.queryForObject("SELECT COUNT(*) FROM users WHERE banned=0", Integer.class));
- userStats.setActiveMonth(jdbcTemplate.queryForObject("SELECT COUNT(*) FROM users WHERE banned=0 AND last_seen > ?",
- Integer.class, ZonedDateTime.now().minus(1, ChronoUnit.MONTHS).toLocalDateTime()));
- userStats.setActiveHalfyear(jdbcTemplate.queryForObject("SELECT COUNT(*) FROM users WHERE banned=0 AND last_seen > ?",
- Integer.class, ZonedDateTime.now().minus(6, ChronoUnit.MONTHS).toLocalDateTime()));
- Usage usage = new Usage();
- usage.setUsers(userStats);
- usage.setLocalPosts(jdbcTemplate.queryForObject("SELECT COUNT(*) FROM messages",
- Integer.class));
- usage.setLocalComments(jdbcTemplate.queryForObject("SELECT COUNT(*) FROM replies WHERE reply_uri IS NULL",
- Integer.class));
- nodeInfo.setUsage(usage);
- return nodeInfo;
- }
@GetMapping(value = "/.well-known/x-nodeinfo2", produces = MediaType.APPLICATION_JSON_VALUE)
@JsonView(NodeInfo.XNodeInfoView.class)
public NodeInfo showXNodeInfo() {
- return getCurrentNodeInfo("1.0");
+ return infoService.getCurrentNodeInfo("1.0");
}
@GetMapping(value = "/.well-known/nodeinfo", produces = MediaType.APPLICATION_JSON_VALUE)
@@ -98,6 +68,6 @@ public class Info {
@GetMapping(value = "/api/nodeinfo/2.0", produces = MediaType.APPLICATION_JSON_VALUE)
@JsonView(NodeInfo.NodeInfoView.class)
public NodeInfo showNodeInfo() {
- return getCurrentNodeInfo("2.0");
+ return infoService.getCurrentNodeInfo("2.0");
}
}
diff --git a/src/main/java/com/juick/www/api/xnodeinfo2/model/NodeInfo.java b/src/main/java/com/juick/www/api/xnodeinfo2/model/NodeInfo.java
index 8a48ed93..4c4705de 100644
--- a/src/main/java/com/juick/www/api/xnodeinfo2/model/NodeInfo.java
+++ b/src/main/java/com/juick/www/api/xnodeinfo2/model/NodeInfo.java
@@ -19,10 +19,11 @@ package com.juick.www.api.xnodeinfo2.model;
import com.fasterxml.jackson.annotation.JsonView;
+import java.io.Serializable;
import java.util.List;
import java.util.Map;
-public class NodeInfo {
+public class NodeInfo implements Serializable {
private String version;
diff --git a/src/main/java/com/juick/www/api/xnodeinfo2/model/Server.java b/src/main/java/com/juick/www/api/xnodeinfo2/model/Server.java
index cc8d9e7d..6251d6ef 100644
--- a/src/main/java/com/juick/www/api/xnodeinfo2/model/Server.java
+++ b/src/main/java/com/juick/www/api/xnodeinfo2/model/Server.java
@@ -19,7 +19,9 @@ package com.juick.www.api.xnodeinfo2.model;
import com.fasterxml.jackson.annotation.JsonView;
-public class Server {
+import java.io.Serializable;
+
+public class Server implements Serializable {
private String baseUrl;
private String name;
private String software;
diff --git a/src/main/java/com/juick/www/api/xnodeinfo2/model/ServiceInfo.java b/src/main/java/com/juick/www/api/xnodeinfo2/model/ServiceInfo.java
index 65927928..fe2b196d 100644
--- a/src/main/java/com/juick/www/api/xnodeinfo2/model/ServiceInfo.java
+++ b/src/main/java/com/juick/www/api/xnodeinfo2/model/ServiceInfo.java
@@ -19,10 +19,11 @@ package com.juick.www.api.xnodeinfo2.model;
import com.fasterxml.jackson.annotation.JsonView;
+import java.io.Serializable;
import java.util.List;
@JsonView({NodeInfo.NodeInfoView.class, NodeInfo.XNodeInfoView.class})
-public class ServiceInfo {
+public class ServiceInfo implements Serializable {
private List<String> inbound;
private List<String> outbound;
diff --git a/src/main/java/com/juick/www/api/xnodeinfo2/model/Usage.java b/src/main/java/com/juick/www/api/xnodeinfo2/model/Usage.java
index ccb86a05..1c4f4c35 100644
--- a/src/main/java/com/juick/www/api/xnodeinfo2/model/Usage.java
+++ b/src/main/java/com/juick/www/api/xnodeinfo2/model/Usage.java
@@ -19,8 +19,10 @@ package com.juick.www.api.xnodeinfo2.model;
import com.fasterxml.jackson.annotation.JsonView;
+import java.io.Serializable;
+
@JsonView({NodeInfo.NodeInfoView.class, NodeInfo.XNodeInfoView.class})
-public class Usage {
+public class Usage implements Serializable {
private UserStats users;
private int localPosts;
private int localComments;
diff --git a/src/main/java/com/juick/www/api/xnodeinfo2/model/UserStats.java b/src/main/java/com/juick/www/api/xnodeinfo2/model/UserStats.java
index c07a39cc..0f399d49 100644
--- a/src/main/java/com/juick/www/api/xnodeinfo2/model/UserStats.java
+++ b/src/main/java/com/juick/www/api/xnodeinfo2/model/UserStats.java
@@ -19,8 +19,10 @@ package com.juick.www.api.xnodeinfo2.model;
import com.fasterxml.jackson.annotation.JsonView;
+import java.io.Serializable;
+
@JsonView({NodeInfo.NodeInfoView.class, NodeInfo.XNodeInfoView.class})
-public class UserStats {
+public class UserStats implements Serializable {
private int total;
private int activeHalfyear;
private int activeMonth;