Reorganize layout and code cleanup

6 files changed, 0 insertions, 416 deletions

diff --git a/src/main/java/com/juick/server/api/xnodeinfo2/Info.java b/src/main/java/com/juick/server/api/xnodeinfo2/Info.java
deleted file mode 100644
index fe12ee30..00000000
--- a/src/main/java/com/juick/server/api/xnodeinfo2/Info.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2008-2019, 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.server.api.xnodeinfo2;
-
-import com.cliqset.xrd.Link;
-import com.cliqset.xrd.XRD;
-import com.fasterxml.jackson.annotation.JsonView;
-import com.juick.server.api.xnodeinfo2.model.*;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.MediaType;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import javax.inject.Inject;
-import java.net.URI;
-import java.time.ZonedDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-@RestController
-public class Info {
-    @Value("${ap_base_uri:http://localhost:8080/}")
-    private String baseUri;
-    @Inject
-    private JdbcTemplate jdbcTemplate;
-
-    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",
-                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");
-    }
-
-    @GetMapping(value = "/.well-known/nodeinfo", produces = MediaType.APPLICATION_JSON_VALUE)
-    public XRD getNodeInfoLinks() {
-        Link nodeinfo = new Link();
-        nodeinfo.setRel(URI.create("http://nodeinfo.diaspora.software/ns/schema/2.0"));
-        UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromUriString(baseUri);
-        uriComponentsBuilder.replacePath("/api/nodeinfo/2.0");
-        nodeinfo.setHref(uriComponentsBuilder.build().toUri());
-        XRD xrd = new XRD();
-        xrd.setLinks(Collections.singletonList(nodeinfo));
-        return xrd;
-    }
-
-    @GetMapping(value = "/api/nodeinfo/2.0", produces = MediaType.APPLICATION_JSON_VALUE)
-    @JsonView(NodeInfo.NodeInfoView.class)
-    public NodeInfo showNodeInfo() {
-        return getCurrentNodeInfo("2.0");
-    }
-}
diff --git a/src/main/java/com/juick/server/api/xnodeinfo2/model/NodeInfo.java b/src/main/java/com/juick/server/api/xnodeinfo2/model/NodeInfo.java
deleted file mode 100644
index 33fb9e95..00000000
--- a/src/main/java/com/juick/server/api/xnodeinfo2/model/NodeInfo.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2008-2019, 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.server.api.xnodeinfo2.model;
-
-import com.fasterxml.jackson.annotation.JsonView;
-
-import java.util.List;
-import java.util.Map;
-
-public class NodeInfo {
-
-    private String version;
-
-    private Server server;
-
-    private List<String> protocols;
-
-    private ServiceInfo services;
-
-    private Map<String, String> metadata;
-
-    @JsonView({XNodeInfoView.class, NodeInfoView.class})
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    @JsonView(XNodeInfoView.class)
-    public Server getServer() {
-        return server;
-    }
-    @JsonView(NodeInfoView.class)
-    public Server getSoftware() {
-        return server;
-    }
-
-    public void setServer(Server server) {
-        this.server = server;
-    }
-
-    @JsonView({XNodeInfoView.class, NodeInfoView.class})
-    public List<String> getProtocols() {
-        return protocols;
-    }
-
-    public void setProtocols(List<String> protocols) {
-        this.protocols = protocols;
-    }
-
-    @JsonView({XNodeInfoView.class, NodeInfoView.class})
-    public ServiceInfo getServices() {
-        return services;
-    }
-
-    public void setServices(ServiceInfo services) {
-        this.services = services;
-    }
-
-    @JsonView({XNodeInfoView.class, NodeInfoView.class})
-    public boolean getOpenRegistrations() {
-        return true;
-    }
-
-    private Usage usage;
-
-    @JsonView({XNodeInfoView.class, NodeInfoView.class})
-    public Usage getUsage() {
-        return usage;
-    }
-
-    public void setUsage(Usage usage) {
-        this.usage = usage;
-    }
-
-    @JsonView(NodeInfoView.class)
-    public Map<String, String> getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Map<String, String> metadata) {
-        this.metadata = metadata;
-    }
-
-    public interface NodeInfoView {}
-    public interface XNodeInfoView {}
-}
diff --git a/src/main/java/com/juick/server/api/xnodeinfo2/model/Server.java b/src/main/java/com/juick/server/api/xnodeinfo2/model/Server.java
deleted file mode 100644
index 77c5d54a..00000000
--- a/src/main/java/com/juick/server/api/xnodeinfo2/model/Server.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2008-2019, 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.server.api.xnodeinfo2.model;
-
-import com.fasterxml.jackson.annotation.JsonView;
-
-public class Server {
-    private String baseUrl;
-    private String name;
-    private String software;
-    private String version;
-
-    @JsonView(NodeInfo.XNodeInfoView.class)
-    public String getBaseUrl() {
-        return baseUrl;
-    }
-
-    public void setBaseUrl(String baseUrl) {
-        this.baseUrl = baseUrl;
-    }
-
-    @JsonView({NodeInfo.NodeInfoView.class, NodeInfo.XNodeInfoView.class})
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonView(NodeInfo.XNodeInfoView.class)
-    public String getSoftware() {
-        return software;
-    }
-
-    public void setSoftware(String software) {
-        this.software = software;
-    }
-
-    @JsonView({NodeInfo.NodeInfoView.class, NodeInfo.XNodeInfoView.class})
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-}
diff --git a/src/main/java/com/juick/server/api/xnodeinfo2/model/ServiceInfo.java b/src/main/java/com/juick/server/api/xnodeinfo2/model/ServiceInfo.java
deleted file mode 100644
index 9f8bdec3..00000000
--- a/src/main/java/com/juick/server/api/xnodeinfo2/model/ServiceInfo.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2008-2019, 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.server.api.xnodeinfo2.model;
-
-import com.fasterxml.jackson.annotation.JsonView;
-
-import java.util.List;
-
-@JsonView({NodeInfo.NodeInfoView.class, NodeInfo.XNodeInfoView.class})
-public class ServiceInfo {
-    private List<String> inbound;
-    private List<String> outbound;
-
-    public List<String> getInbound() {
-        return inbound;
-    }
-
-    public void setInbound(List<String> inbound) {
-        this.inbound = inbound;
-    }
-
-    public List<String> getOutbound() {
-        return outbound;
-    }
-
-    public void setOutbound(List<String> outbound) {
-        this.outbound = outbound;
-    }
-}
diff --git a/src/main/java/com/juick/server/api/xnodeinfo2/model/Usage.java b/src/main/java/com/juick/server/api/xnodeinfo2/model/Usage.java
deleted file mode 100644
index 7bd4337c..00000000
--- a/src/main/java/com/juick/server/api/xnodeinfo2/model/Usage.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2008-2019, 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.server.api.xnodeinfo2.model;
-
-import com.fasterxml.jackson.annotation.JsonView;
-
-@JsonView({NodeInfo.NodeInfoView.class, NodeInfo.XNodeInfoView.class})
-public class Usage {
-    private UserStats users;
-    private int localPosts;
-    private int localComments;
-
-    public UserStats getUsers() {
-        return users;
-    }
-
-    public void setUsers(UserStats users) {
-        this.users = users;
-    }
-
-    public int getLocalPosts() {
-        return localPosts;
-    }
-
-    public void setLocalPosts(int localPosts) {
-        this.localPosts = localPosts;
-    }
-
-    public int getLocalComments() {
-        return localComments;
-    }
-
-    public void setLocalComments(int localComments) {
-        this.localComments = localComments;
-    }
-}
diff --git a/src/main/java/com/juick/server/api/xnodeinfo2/model/UserStats.java b/src/main/java/com/juick/server/api/xnodeinfo2/model/UserStats.java
deleted file mode 100644
index f8388b5f..00000000
--- a/src/main/java/com/juick/server/api/xnodeinfo2/model/UserStats.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2008-2019, 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.server.api.xnodeinfo2.model;
-
-import com.fasterxml.jackson.annotation.JsonView;
-
-@JsonView({NodeInfo.NodeInfoView.class, NodeInfo.XNodeInfoView.class})
-public class UserStats {
-    private int total;
-    private int activeHalfyear;
-    private int activeMonth;
-
-    public int getTotal() {
-        return total;
-    }
-
-    public void setTotal(int total) {
-        this.total = total;
-    }
-
-    public int getActiveHalfyear() {
-        return activeHalfyear;
-    }
-
-    public void setActiveHalfyear(int activeHalfyear) {
-        this.activeHalfyear = activeHalfyear;
-    }
-
-    public int getActiveMonth() {
-        return activeMonth;
-    }
-
-    public void setActiveMonth(int activeMonth) {
-        this.activeMonth = activeMonth;
-    }
-}