1 files changed, 5 insertions, 35 deletions
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");
     }
 }