Merge everything into single Spring Boot application

13 files changed, 0 insertions, 277 deletions

diff --git a/juick-server/src/test/resources/2915104.jpg b/juick-server/src/test/resources/2915104.jpg
deleted file mode 100644
index 7f0fc3baa..000000000
--- a/juick-server/src/test/resources/2915104.jpg
+++ /dev/null
diff --git a/juick-server/src/test/resources/cmyk.jpg b/juick-server/src/test/resources/cmyk.jpg
deleted file mode 100644
index 40af259c2..000000000
--- a/juick-server/src/test/resources/cmyk.jpg
+++ /dev/null
diff --git a/juick-server/src/test/resources/create.json b/juick-server/src/test/resources/create.json
deleted file mode 100644
index 42d20161a..000000000
--- a/juick-server/src/test/resources/create.json
+++ /dev/null
@@ -1 +0,0 @@
-{"type":"Create","id":"https://mastodon.social/users/xwatt/statuses/100850249548292153/activity","published":"2018-10-06T19:04:44Z","to":["https://www.w3.org/ns/activitystreams#Public"],"actor":"https://mastodon.social/users/xwatt","object":{"id":"https://mastodon.social/users/xwatt/statuses/100850249548292153","type":"Note","inReplyTo":"https://juick.com/m/2922602","published":"2018-10-06T19:04:44Z","url":"https://mastodon.social/@xwatt/100850249548292153","attributedTo":"https://mastodon.social/users/xwatt","to":["https://www.w3.org/ns/activitystreams#Public"],"cc":["https://mastodon.social/users/xwatt/followers","https://juick.com/u/TJ"],"sensitive":false,"atomUri":"https://mastodon.social/users/xwatt/statuses/100850249548292153","inReplyToAtomUri":"https://juick.com/m/2922602","conversation":"tag:mastodon.social,2018-10-04:objectId=57333900:objectType=Conversation","content":"<p><span class=\"h-card\"><a href=\"https://juick.com/u/TJ\" class=\"u-url mention\">@<span>TJ</span></a></span> YO</p>","contentMap":{"en":"<p><span class=\"h-card\"><a href=\"https://juick.com/u/TJ\" class=\"u-url mention\">@<span>TJ</span></a></span> YO</p>"},"attachment":[{"type":"Document","mediaType":"image/jpeg","url":"https://files.mastodon.social/media_attachments/files/006/922/030/original/04057122ea7c6570.jpeg"}],"tag":[{"type":"Mention","href":"https://juick.com/u/TJ","name":"@TJ@juick.com"}]},"type":"Create","@context":["https://www.w3.org/ns/activitystreams","https://w3id.org/security/v1",{"manuallyApprovesFollowers":"as:manuallyApprovesFollowers","sensitive":"as:sensitive","movedTo":{"@id":"as:movedTo","@type":"@id"},"Hashtag":"as:Hashtag","ostatus":"http://ostatus.org#","atomUri":"ostatus:atomUri","inReplyToAtomUri":"ostatus:inReplyToAtomUri","conversation":"ostatus:conversation","toot":"http://joinmastodon.org/ns#","Emoji":"toot:Emoji","focalPoint":{"@container":"@list","@id":"toot:focalPoint"},"featured":{"@id":"toot:featured","@type":"@id"},"schema":"http://schema.org#","PropertyValue":"schema:PropertyValue","value":"schema:value"}]}
\ No newline at end of file
diff --git a/juick-server/src/test/resources/data.sql b/juick-server/src/test/resources/data.sql
deleted file mode 100644
index 102b11f45..000000000
--- a/juick-server/src/test/resources/data.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-INSERT INTO tags(tag_id, name) VALUES(2, 'juick');
-INSERT INTO reactions (like_id, description) VALUES (1, 'like');
-INSERT INTO reactions (like_id, description) VALUES (2, 'love');
-INSERT INTO reactions (like_id, description) VALUES (3, 'lol');
-INSERT INTO reactions (like_id, description) VALUES (4, 'hmm');
-INSERT INTO reactions (like_id, description) VALUES (5, 'angry');
-INSERT INTO reactions (like_id, description) VALUES (6, 'uhblya');
-INSERT INTO reactions (like_id, description) VALUES (7, 'ugh');
diff --git a/juick-server/src/test/resources/delete.json b/juick-server/src/test/resources/delete.json
deleted file mode 100644
index 9bd3fdea0..000000000
--- a/juick-server/src/test/resources/delete.json
+++ /dev/null
@@ -1 +0,0 @@
-{"type":"Delete","id":"https://mastodon.social/users/xwatt/statuses/100850777554564322#delete","to":["https://www.w3.org/ns/activitystreams#Public"],"actor":"https://mastodon.social/users/xwatt","object":{"id":"https://mastodon.social/users/xwatt/statuses/100850777554564322","type":"Tombstone","atomUri":"https://mastodon.social/users/xwatt/statuses/100850777554564322"},"type":"Delete","@context":["https://www.w3.org/ns/activitystreams","https://w3id.org/security/v1",{"manuallyApprovesFollowers":"as:manuallyApprovesFollowers","sensitive":"as:sensitive","movedTo":{"@id":"as:movedTo","@type":"@id"},"Hashtag":"as:Hashtag","ostatus":"http://ostatus.org#","atomUri":"ostatus:atomUri","inReplyToAtomUri":"ostatus:inReplyToAtomUri","conversation":"ostatus:conversation","toot":"http://joinmastodon.org/ns#","Emoji":"toot:Emoji","focalPoint":{"@container":"@list","@id":"toot:focalPoint"},"featured":{"@id":"toot:featured","@type":"@id"},"schema":"http://schema.org#","PropertyValue":"schema:PropertyValue","value":"schema:value"}]}
\ No newline at end of file
diff --git a/juick-server/src/test/resources/follow.json b/juick-server/src/test/resources/follow.json
deleted file mode 100644
index 93d46c24e..000000000
--- a/juick-server/src/test/resources/follow.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "@context": [
-    "https://www.w3.org/ns/activitystreams",
-    "https://w3id.org/security/v1",
-    {
-      "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
-      "sensitive": "as:sensitive",
-      "movedTo": {
-        "@id": "as:movedTo",
-        "@type": "@id"
-      },
-      "Hashtag": "as:Hashtag",
-      "ostatus": "http://ostatus.org#",
-      "atomUri": "ostatus:atomUri",
-      "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
-      "conversation": "ostatus:conversation",
-      "toot": "http://joinmastodon.org/ns#",
-      "Emoji": "toot:Emoji",
-      "focalPoint": {
-        "@container": "@list",
-        "@id": "toot:focalPoint"
-      },
-      "featured": {
-        "@id": "toot:featured",
-        "@type": "@id"
-      },
-      "schema": "http://schema.org#",
-      "PropertyValue": "schema:PropertyValue",
-      "value": "schema:value"
-    }
-  ],
-  "id": "https://mastodon.social/970f0d76-9ea7-46cd-a3e9-278e255f082d",
-  "type": "Follow",
-  "actor": "https://mastodon.social/users/xwatt",
-  "object": "https://x.juick.com/u/gegege",
-  "signature": {
-    "type": "RsaSignature2017",
-    "creator": "https://mastodon.social/users/xwatt#main-key",
-    "created": "2018-10-02T09:39:29Z",
-    "signatureValue": "lkxaKueSjT0nxCnT15hR8e1yQ7RsUCF0gBaiSAtXmN0tT3g7OcQPZUzUvCFF2aXB8xGFHMv+7Rp+jegR8rszuNRIghUxsOfYL5da2mD5UrpIlxiW4FxZjbni0klUF9GhRWfBYLIMumUsl9UElZPxtpYjlDQ7kCzYqnwbGgUiI0ehBJrHQJHET0pcyeSdGoRlXwD3I4c59nbr22CT026FBRNSJIxJj865ij5vg0j0q0/2ep+8ztya3x0+aYSrFn8WGO4Y2muCJtKurH2ROv8yyVgaIyFaUx6uvBf6pO3oGfWrm5if0P924LLlReXBItbleZrp0y2jPE7RriZsZmuFbg=="
-  }
-}
\ No newline at end of file
diff --git a/juick-server/src/test/resources/mention.json b/juick-server/src/test/resources/mention.json
deleted file mode 100644
index c51265f14..000000000
--- a/juick-server/src/test/resources/mention.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "@context": [
-    "https://www.w3.org/ns/activitystreams",
-    "https://w3id.org/security/v1",
-    {
-      "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
-      "sensitive": "as:sensitive",
-      "movedTo": {
-        "@id": "as:movedTo",
-        "@type": "@id"
-      },
-      "Hashtag": "as:Hashtag",
-      "ostatus": "http://ostatus.org#",
-      "atomUri": "ostatus:atomUri",
-      "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
-      "conversation": "ostatus:conversation",
-      "toot": "http://joinmastodon.org/ns#",
-      "Emoji": "toot:Emoji",
-      "focalPoint": {
-        "@container": "@list",
-        "@id": "toot:focalPoint"
-      },
-      "featured": {
-        "@id": "toot:featured",
-        "@type": "@id"
-      },
-      "schema": "http://schema.org#",
-      "PropertyValue": "schema:PropertyValue",
-      "value": "schema:value"
-    }
-  ],
-  "id": "https://mastodonsocial.ru/users/inhosin/statuses/100946127454503070",
-  "type": "Note",
-  "summary": null,
-  "inReplyTo": "https://juick.com/n/2923741-40",
-  "published": "2018-10-23T17:27:45Z",
-  "url": "https://mastodonsocial.ru/@inhosin/100946127454503070",
-  "attributedTo": "https://mastodonsocial.ru/users/inhosin",
-  "to": [
-    "https://www.w3.org/ns/activitystreams#Public"
-  ],
-  "cc": [
-    "https://mastodonsocial.ru/users/inhosin/followers",
-    "https://juick.com/u/vt"
-  ],
-  "sensitive": false,
-  "atomUri": "https://mastodonsocial.ru/users/inhosin/statuses/100946127454503070",
-  "inReplyToAtomUri": "https://juick.com/n/2923741-40",
-  "conversation": "tag:mastodonsocial.ru,2018-10-16:objectId=609790:objectType=Conversation",
-  "content": "<p><span class=\"h-card\"><a href=\"https://juick.com/vt/\" class=\"u-url mention\">@<span>vt</span></a></span> а лайки между серверами ходят? И ещё вопрос: нельзя всёже в ответ транслировать ник, чтобы нотификация поступала, а то приходится лопатить ленту что искать ответы. Я сейчас тоже с ActivityPub ковыряюсь.</p>",
-  "contentMap": {
-    "ru": "<p><span class=\"h-card\"><a href=\"https://juick.com/vt/\" class=\"u-url mention\">@<span>vt</span></a></span> а лайки между серверами ходят? И ещё вопрос: нельзя всёже в ответ транслировать ник, чтобы нотификация поступала, а то приходится лопатить ленту что искать ответы. Я сейчас тоже с ActivityPub ковыряюсь.</p>"
-  },
-  "attachment": [],
-  "tag": [
-    {
-      "type": "Mention",
-      "href": "https://juick.com/u/vt",
-      "name": "@vt@juick.com"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/juick-server/src/test/resources/nojfif.jpg b/juick-server/src/test/resources/nojfif.jpg
deleted file mode 100644
index 16ddec1bc..000000000
--- a/juick-server/src/test/resources/nojfif.jpg
+++ /dev/null
diff --git a/juick-server/src/test/resources/person.json b/juick-server/src/test/resources/person.json
deleted file mode 100644
index 67e882578..000000000
--- a/juick-server/src/test/resources/person.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@context": [
-    "https://www.w3.org/ns/activitystreams",
-    "https://w3id.org/security/v1",
-    {
-      "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
-      "sensitive": "as:sensitive",
-      "movedTo": {
-        "@id": "as:movedTo",
-        "@type": "@id"
-      },
-      "Hashtag": "as:Hashtag",
-      "ostatus": "http://ostatus.org#",
-      "atomUri": "ostatus:atomUri",
-      "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
-      "conversation": "ostatus:conversation",
-      "toot": "http://joinmastodon.org/ns#",
-      "Emoji": "toot:Emoji",
-      "focalPoint": {
-        "@container": "@list",
-        "@id": "toot:focalPoint"
-      },
-      "featured": {
-        "@id": "toot:featured",
-        "@type": "@id"
-      },
-      "schema": "http://schema.org#",
-      "PropertyValue": "schema:PropertyValue",
-      "value": "schema:value"
-    }
-  ],
-  "id": "https://mastodon.social/users/xwatt",
-  "type": "Person",
-  "following": "https://mastodon.social/users/xwatt/following",
-  "followers": "https://mastodon.social/users/xwatt/followers",
-  "inbox": "https://mastodon.social/users/xwatt/inbox",
-  "outbox": "https://mastodon.social/users/xwatt/outbox",
-  "featured": "https://mastodon.social/users/xwatt/collections/featured",
-  "preferredUsername": "xwatt",
-  "name": "",
-  "summary": "\u003cp\u003e\u003c/p\u003e",
-  "url": "https://mastodon.social/@xwatt",
-  "manuallyApprovesFollowers": false,
-  "publicKey": {
-    "id": "https://mastodon.social/users/xwatt#main-key",
-    "owner": "https://mastodon.social/users/xwatt",
-    "publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuCYg1WrzerteFgLcbnRC\n1/pL5jFY05iuB4ycRlxxCpwpDihKdcmJ8nVEpFc/CIRtRRA3Oq1a+yF4L5X3Bwi8\nA8ajKHNtiPd4eeGdGvEJidf8cR8Bmfmrzt669Tmja+5Cr1CaFX9mYXhQoY6CqIxR\nDrPAAUb0CHJV+Ta6QkieCaGxYsvdg6Gg+8aw6k60vBswS6fmNsykH9xrovqtBb9M\ncKglyOA2W2FgswYtzRRKT5QQU4x/hfWMYuIEMhnke3U5k2gzb/qnJM2otaR0NzJ0\nkW+Fu7av5E6Ur1sUe1hTHpDxaAmNC+br19wTn6zh4Wt1UJp+Os56hBTSq50WKcfW\nhQIDAQAB\n-----END PUBLIC KEY-----\n"
-  },
-  "tag": [],
-  "attachment": [],
-  "endpoints": {
-    "sharedInbox": "https://mastodon.social/inbox"
-  }
-}
\ No newline at end of file
diff --git a/juick-server/src/test/resources/templates/views/test.html b/juick-server/src/test/resources/templates/views/test.html
deleted file mode 100644
index 7700be6f9..000000000
--- a/juick-server/src/test/resources/templates/views/test.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{% import "views/macros/tags" %}
-{{ tags("ugnich", tagsList)}}
\ No newline at end of file
diff --git a/juick-server/src/test/resources/undo.json b/juick-server/src/test/resources/undo.json
deleted file mode 100644
index 371c6bd6d..000000000
--- a/juick-server/src/test/resources/undo.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "@context": [
-    "https://www.w3.org/ns/activitystreams",
-    "https://w3id.org/security/v1",
-    {
-      "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
-      "sensitive": "as:sensitive",
-      "movedTo": {
-        "@id": "as:movedTo",
-        "@type": "@id"
-      },
-      "Hashtag": "as:Hashtag",
-      "ostatus": "http://ostatus.org#",
-      "atomUri": "ostatus:atomUri",
-      "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
-      "conversation": "ostatus:conversation",
-      "toot": "http://joinmastodon.org/ns#",
-      "Emoji": "toot:Emoji",
-      "focalPoint": {
-        "@container": "@list",
-        "@id": "toot:focalPoint"
-      },
-      "featured": {
-        "@id": "toot:featured",
-        "@type": "@id"
-      },
-      "schema": "http://schema.org#",
-      "PropertyValue": "schema:PropertyValue",
-      "value": "schema:value"
-    }
-  ],
-  "id": "https://mastodon.social/users/xwatt#follows/1553133/undo",
-  "type": "Undo",
-  "actor": "https://mastodon.social/users/xwatt",
-  "object": {
-    "id": "https://mastodon.social/c5cfbc0b-3e4b-423a-aa51-1c38e1202371",
-    "type": "Follow",
-    "actor": "https://mastodon.social/users/xwatt",
-    "object": "https://x.juick.com/u/gegege"
-  },
-  "signature": {
-    "type": "RsaSignature2017",
-    "creator": "https://mastodon.social/users/xwatt#main-key",
-    "created": "2018-10-02T10:27:33Z",
-    "signatureValue": "OOK3WDLgVMo6u1l/I1o4hrcOf12X2ryOa/xAeuYf7ncKQJbzFXohUYCrBtgUKjnOQJLHY/HbhhFE1SBXMCMUbPNF8KeztxWKqWnXtXNSHVv6Shxl+9yxZoGaAgpkYjn9qQGTAm4SXmV0RM49cz84PfLAJI1fUecoVclhVWXJuaSz4yZ/UteySjBMB5h5nPWGDmz4usviZ9EZTihr3xkFfkg+CPYwr5SYWDe5W1MxeKoosEck6Yhwt8OOf/eGB5guN81lp90O76oO6LGhblnYhMKxsOJf4ahF9qeCNajXk/qiwSfl6IwVADYlFB1GGTdIPXUUob5HhjX27Bpyah0lgA=="
-  }
-}
\ No newline at end of file
diff --git a/juick-server/src/test/resources/webfinger.json b/juick-server/src/test/resources/webfinger.json
deleted file mode 100644
index 55f9e4f36..000000000
--- a/juick-server/src/test/resources/webfinger.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "subject": "acct:Gargron@mastodon.social",
-  "aliases": [
-    "https://mastodon.social/@Gargron",
-    "https://mastodon.social/users/Gargron"
-  ],
-  "links": [
-    {
-      "rel": "http://webfinger.net/rel/profile-page",
-      "type": "text/html",
-      "href": "https://mastodon.social/@Gargron"
-    },
-    {
-      "rel": "http://schemas.google.com/g/2010#updates-from",
-      "type": "application/atom+xml",
-      "href": "https://mastodon.social/users/Gargron.atom"
-    },
-    {
-      "rel": "self",
-      "type": "application/activity+json",
-      "href": "https://mastodon.social/users/Gargron"
-    },
-    {
-      "rel": "salmon",
-      "href": "https://mastodon.social/api/salmon/1"
-    },
-    {
-      "rel": "magic-public-key",
-      "href": "data:application/magic-public-key,RSA.vXc4vkECU2_CeuSo1wtnFoim94Ne1jBMYxTZ9wm2YTdJq1oiZKif06I2fOqDzY_4q_S9uccrE9Bkajv1dnkOVm31QjWlhVpSKynVxEWjVBO5Ienue8gND0xvHIuXf87o61poqjEoepvsQFElA5ymovljWGSA_jpj7ozygUZhCXtaS2W5AD5tnBQUpcO0lhItYPYTjnmzcc4y2NbJV8hz2s2G8qKv8fyimE23gY1XrPJg-cRF-g4PqFXujjlJ7MihD9oqtLGxbu7o1cifTn3xBfIdPythWu5b4cujNsB3m3awJjVmx-MHQ9SugkSIYXV0Ina77cTNS0M2PYiH1PFRTw==.AQAB"
-    },
-    {
-      "rel": "http://ostatus.org/schema/1.0/subscribe",
-      "template": "https://mastodon.social/authorize_interaction?uri={uri}"
-    }
-  ]
-}
diff --git a/juick-server/src/test/resources/xnodeinfo2.json b/juick-server/src/test/resources/xnodeinfo2.json
deleted file mode 100644
index 14be6394d..000000000
--- a/juick-server/src/test/resources/xnodeinfo2.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "version": "1.0",
-  "server": {
-    "baseUrl": "https://example.com",
-    "name": "Example diaspora* server",
-    "software": "diaspora",
-    "version": "0.5.0"
-  },
-  "protocols": ["diaspora", "zot"],
-  "services": {
-    "inbound": ["gnusocial"],
-    "outbound": ["facebook", "twitter"]
-  },
-  "openRegistrations": true,
-  "usage": {
-    "users": {
-      "total": 123,
-      "activeHalfyear": 42,
-      "activeMonth": 23
-    },
-    "localPosts": 500,
-    "localComments": 1000
-  }
-}
\ No newline at end of file