aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.browserslistrc (renamed from juick-server/.browserslistrc)0
-rw-r--r--.eslintrc (renamed from juick-server/.eslintrc)0
-rw-r--r--.gitignore8
-rw-r--r--.gitmodules2
-rw-r--r--.stylelintrc.json (renamed from juick-server/.stylelintrc.json)0
-rw-r--r--README.md4
-rw-r--r--build.gradle191
-rw-r--r--juick-common/build.gradle20
-rw-r--r--juick-server/build.gradle125
-rw-r--r--package.json (renamed from juick-server/package.json)0
-rw-r--r--settings.gradle2
-rw-r--r--src/docs/index.adoc (renamed from juick-server/src/docs/index.adoc)0
-rw-r--r--src/main/assets/embed.js (renamed from juick-server/src/main/assets/embed.js)0
-rw-r--r--src/main/assets/logo.png (renamed from juick-server/src/main/assets/logo.png)bin2447 -> 2447 bytes
-rw-r--r--src/main/assets/logo@2x.png (renamed from juick-server/src/main/assets/logo@2x.png)bin4822 -> 4822 bytes
-rw-r--r--src/main/assets/scripts.js (renamed from juick-server/src/main/assets/scripts.js)0
-rw-r--r--src/main/assets/style.css (renamed from juick-server/src/main/assets/style.css)0
-rw-r--r--src/main/java/com/cliqset/xrd/Alias.java (renamed from juick-server/src/main/java/com/cliqset/xrd/Alias.java)0
-rw-r--r--src/main/java/com/cliqset/xrd/Expires.java (renamed from juick-server/src/main/java/com/cliqset/xrd/Expires.java)0
-rw-r--r--src/main/java/com/cliqset/xrd/Link.java (renamed from juick-server/src/main/java/com/cliqset/xrd/Link.java)0
-rw-r--r--src/main/java/com/cliqset/xrd/Property.java (renamed from juick-server/src/main/java/com/cliqset/xrd/Property.java)0
-rw-r--r--src/main/java/com/cliqset/xrd/Signature.java (renamed from juick-server/src/main/java/com/cliqset/xrd/Signature.java)0
-rw-r--r--src/main/java/com/cliqset/xrd/Subject.java (renamed from juick-server/src/main/java/com/cliqset/xrd/Subject.java)0
-rw-r--r--src/main/java/com/cliqset/xrd/Title.java (renamed from juick-server/src/main/java/com/cliqset/xrd/Title.java)0
-rw-r--r--src/main/java/com/cliqset/xrd/XRD.java (renamed from juick-server/src/main/java/com/cliqset/xrd/XRD.java)0
-rw-r--r--src/main/java/com/cliqset/xrd/XRDConstants.java (renamed from juick-server/src/main/java/com/cliqset/xrd/XRDConstants.java)0
-rw-r--r--src/main/java/com/cliqset/xrd/XRDException.java (renamed from juick-server/src/main/java/com/cliqset/xrd/XRDException.java)0
-rw-r--r--src/main/java/com/cliqset/xrd/package-info.java (renamed from juick-server/src/main/java/com/cliqset/xrd/package-info.java)0
-rw-r--r--src/main/java/com/juick/ApiServer.java (renamed from juick-server/src/main/java/com/juick/ApiServer.java)0
-rw-r--r--src/main/java/com/juick/Attachment.java (renamed from juick-common/src/main/java/com/juick/Attachment.java)0
-rw-r--r--src/main/java/com/juick/Chat.java (renamed from juick-common/src/main/java/com/juick/Chat.java)0
-rw-r--r--src/main/java/com/juick/ExternalToken.java (renamed from juick-common/src/main/java/com/juick/ExternalToken.java)0
-rw-r--r--src/main/java/com/juick/Message.java (renamed from juick-common/src/main/java/com/juick/Message.java)0
-rw-r--r--src/main/java/com/juick/Photo.java (renamed from juick-common/src/main/java/com/juick/Photo.java)0
-rw-r--r--src/main/java/com/juick/Reaction.java (renamed from juick-common/src/main/java/com/juick/Reaction.java)0
-rw-r--r--src/main/java/com/juick/Status.java (renamed from juick-common/src/main/java/com/juick/Status.java)0
-rw-r--r--src/main/java/com/juick/Tag.java (renamed from juick-common/src/main/java/com/juick/Tag.java)0
-rw-r--r--src/main/java/com/juick/User.java (renamed from juick-common/src/main/java/com/juick/User.java)0
-rw-r--r--src/main/java/com/juick/adapters/SimpleDateAdapter.java (renamed from juick-common/src/main/java/com/juick/adapters/SimpleDateAdapter.java)0
-rw-r--r--src/main/java/com/juick/formatters/PlainTextFormatter.java (renamed from juick-common/src/main/java/com/juick/formatters/PlainTextFormatter.java)0
-rw-r--r--src/main/java/com/juick/model/AnonymousUser.java (renamed from juick-common/src/main/java/com/juick/model/AnonymousUser.java)0
-rw-r--r--src/main/java/com/juick/model/ApplicationStatus.java (renamed from juick-common/src/main/java/com/juick/model/ApplicationStatus.java)0
-rw-r--r--src/main/java/com/juick/model/Auth.java (renamed from juick-common/src/main/java/com/juick/model/Auth.java)0
-rw-r--r--src/main/java/com/juick/model/CommandResult.java (renamed from juick-common/src/main/java/com/juick/model/CommandResult.java)0
-rw-r--r--src/main/java/com/juick/model/NotifyOpts.java (renamed from juick-common/src/main/java/com/juick/model/NotifyOpts.java)0
-rw-r--r--src/main/java/com/juick/model/PrivacyOpts.java (renamed from juick-common/src/main/java/com/juick/model/PrivacyOpts.java)0
-rw-r--r--src/main/java/com/juick/model/PrivateChats.java (renamed from juick-common/src/main/java/com/juick/model/PrivateChats.java)0
-rw-r--r--src/main/java/com/juick/model/ResponseReply.java (renamed from juick-common/src/main/java/com/juick/model/ResponseReply.java)0
-rw-r--r--src/main/java/com/juick/model/TagStats.java (renamed from juick-common/src/main/java/com/juick/model/TagStats.java)0
-rw-r--r--src/main/java/com/juick/model/UserInfo.java (renamed from juick-common/src/main/java/com/juick/model/UserInfo.java)0
-rw-r--r--src/main/java/com/juick/model/facebook/User.java (renamed from juick-common/src/main/java/com/juick/model/facebook/User.java)0
-rw-r--r--src/main/java/com/juick/model/twitter/User.java (renamed from juick-common/src/main/java/com/juick/model/twitter/User.java)0
-rw-r--r--src/main/java/com/juick/model/vk/Token.java (renamed from juick-common/src/main/java/com/juick/model/vk/Token.java)0
-rw-r--r--src/main/java/com/juick/model/vk/User.java (renamed from juick-common/src/main/java/com/juick/model/vk/User.java)0
-rw-r--r--src/main/java/com/juick/model/vk/UsersResponse.java (renamed from juick-common/src/main/java/com/juick/model/vk/UsersResponse.java)0
-rw-r--r--src/main/java/com/juick/package-info.java (renamed from juick-common/src/main/java/com/juick/package-info.java)0
-rw-r--r--src/main/java/com/juick/server/ActivityPubManager.java (renamed from juick-server/src/main/java/com/juick/server/ActivityPubManager.java)0
-rw-r--r--src/main/java/com/juick/server/CommandsManager.java (renamed from juick-server/src/main/java/com/juick/server/CommandsManager.java)0
-rw-r--r--src/main/java/com/juick/server/EmailManager.java (renamed from juick-server/src/main/java/com/juick/server/EmailManager.java)0
-rw-r--r--src/main/java/com/juick/server/KeystoreManager.java (renamed from juick-server/src/main/java/com/juick/server/KeystoreManager.java)0
-rw-r--r--src/main/java/com/juick/server/ServerManager.java (renamed from juick-server/src/main/java/com/juick/server/ServerManager.java)0
-rw-r--r--src/main/java/com/juick/server/SignatureManager.java (renamed from juick-server/src/main/java/com/juick/server/SignatureManager.java)0
-rw-r--r--src/main/java/com/juick/server/TelegramBotManager.java (renamed from juick-server/src/main/java/com/juick/server/TelegramBotManager.java)0
-rw-r--r--src/main/java/com/juick/server/TopManager.java (renamed from juick-server/src/main/java/com/juick/server/TopManager.java)0
-rw-r--r--src/main/java/com/juick/server/TwitterManager.java (renamed from juick-server/src/main/java/com/juick/server/TwitterManager.java)0
-rw-r--r--src/main/java/com/juick/server/Utils.java (renamed from juick-server/src/main/java/com/juick/server/Utils.java)0
-rw-r--r--src/main/java/com/juick/server/WebsocketManager.java (renamed from juick-server/src/main/java/com/juick/server/WebsocketManager.java)0
-rw-r--r--src/main/java/com/juick/server/XMPPConnection.java (renamed from juick-server/src/main/java/com/juick/server/XMPPConnection.java)0
-rw-r--r--src/main/java/com/juick/server/XMPPServer.java (renamed from juick-server/src/main/java/com/juick/server/XMPPServer.java)0
-rw-r--r--src/main/java/com/juick/server/api/ApiSocialLogin.java (renamed from juick-server/src/main/java/com/juick/server/api/ApiSocialLogin.java)0
-rw-r--r--src/main/java/com/juick/server/api/Index.java (renamed from juick-server/src/main/java/com/juick/server/api/Index.java)0
-rw-r--r--src/main/java/com/juick/server/api/Messages.java (renamed from juick-server/src/main/java/com/juick/server/api/Messages.java)0
-rw-r--r--src/main/java/com/juick/server/api/Notifications.java (renamed from juick-server/src/main/java/com/juick/server/api/Notifications.java)0
-rw-r--r--src/main/java/com/juick/server/api/PM.java (renamed from juick-server/src/main/java/com/juick/server/api/PM.java)0
-rw-r--r--src/main/java/com/juick/server/api/Post.java (renamed from juick-server/src/main/java/com/juick/server/api/Post.java)0
-rw-r--r--src/main/java/com/juick/server/api/Service.java (renamed from juick-server/src/main/java/com/juick/server/api/Service.java)0
-rw-r--r--src/main/java/com/juick/server/api/Tags.java (renamed from juick-server/src/main/java/com/juick/server/api/Tags.java)0
-rw-r--r--src/main/java/com/juick/server/api/Users.java (renamed from juick-server/src/main/java/com/juick/server/api/Users.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/Profile.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/Profile.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/Activity.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/Activity.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/Context.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/Context.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/activities/Accept.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/activities/Accept.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/activities/Announce.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/activities/Announce.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/activities/Block.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/activities/Block.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/activities/Create.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/activities/Create.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/activities/Delete.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/activities/Delete.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/activities/Follow.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/activities/Follow.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/activities/Like.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/activities/Like.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/activities/Undo.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/activities/Undo.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/objects/Hashtag.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/objects/Hashtag.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/objects/Image.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/objects/Image.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/objects/Key.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/objects/Key.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/objects/Link.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/objects/Link.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/objects/Mention.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/objects/Mention.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/objects/Note.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/objects/Note.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/objects/OrderedCollection.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/objects/OrderedCollection.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/objects/OrderedCollectionPage.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/objects/OrderedCollectionPage.java)0
-rw-r--r--src/main/java/com/juick/server/api/activity/model/objects/Person.java (renamed from juick-server/src/main/java/com/juick/server/api/activity/model/objects/Person.java)0
-rw-r--r--src/main/java/com/juick/server/api/apple/AppSiteAssociation.java (renamed from juick-server/src/main/java/com/juick/server/api/apple/AppSiteAssociation.java)0
-rw-r--r--src/main/java/com/juick/server/api/hostmeta/HostMeta.java (renamed from juick-server/src/main/java/com/juick/server/api/hostmeta/HostMeta.java)0
-rw-r--r--src/main/java/com/juick/server/api/rss/Feeds.java (renamed from juick-server/src/main/java/com/juick/server/api/rss/Feeds.java)0
-rw-r--r--src/main/java/com/juick/server/api/rss/MessagesView.java (renamed from juick-server/src/main/java/com/juick/server/api/rss/MessagesView.java)0
-rw-r--r--src/main/java/com/juick/server/api/rss/RepliesView.java (renamed from juick-server/src/main/java/com/juick/server/api/rss/RepliesView.java)0
-rw-r--r--src/main/java/com/juick/server/api/rss/extension/JuickModule.java (renamed from juick-server/src/main/java/com/juick/server/api/rss/extension/JuickModule.java)0
-rw-r--r--src/main/java/com/juick/server/api/rss/extension/JuickModuleGenerator.java (renamed from juick-server/src/main/java/com/juick/server/api/rss/extension/JuickModuleGenerator.java)0
-rw-r--r--src/main/java/com/juick/server/api/rss/extension/JuickModuleImpl.java (renamed from juick-server/src/main/java/com/juick/server/api/rss/extension/JuickModuleImpl.java)0
-rw-r--r--src/main/java/com/juick/server/api/rss/extension/JuickModuleParser.java (renamed from juick-server/src/main/java/com/juick/server/api/rss/extension/JuickModuleParser.java)0
-rw-r--r--src/main/java/com/juick/server/api/webfinger/Resource.java (renamed from juick-server/src/main/java/com/juick/server/api/webfinger/Resource.java)0
-rw-r--r--src/main/java/com/juick/server/api/webfinger/model/Account.java (renamed from juick-server/src/main/java/com/juick/server/api/webfinger/model/Account.java)0
-rw-r--r--src/main/java/com/juick/server/api/webfinger/model/Link.java (renamed from juick-server/src/main/java/com/juick/server/api/webfinger/model/Link.java)0
-rw-r--r--src/main/java/com/juick/server/api/webhooks/TelegramWebhook.java (renamed from juick-server/src/main/java/com/juick/server/api/webhooks/TelegramWebhook.java)0
-rw-r--r--src/main/java/com/juick/server/api/xnodeinfo2/Info.java (renamed from juick-server/src/main/java/com/juick/server/api/xnodeinfo2/Info.java)0
-rw-r--r--src/main/java/com/juick/server/api/xnodeinfo2/model/NodeInfo.java (renamed from juick-server/src/main/java/com/juick/server/api/xnodeinfo2/model/NodeInfo.java)0
-rw-r--r--src/main/java/com/juick/server/api/xnodeinfo2/model/Server.java (renamed from juick-server/src/main/java/com/juick/server/api/xnodeinfo2/model/Server.java)0
-rw-r--r--src/main/java/com/juick/server/api/xnodeinfo2/model/ServiceInfo.java (renamed from juick-server/src/main/java/com/juick/server/api/xnodeinfo2/model/ServiceInfo.java)0
-rw-r--r--src/main/java/com/juick/server/api/xnodeinfo2/model/Usage.java (renamed from juick-server/src/main/java/com/juick/server/api/xnodeinfo2/model/Usage.java)0
-rw-r--r--src/main/java/com/juick/server/api/xnodeinfo2/model/UserStats.java (renamed from juick-server/src/main/java/com/juick/server/api/xnodeinfo2/model/UserStats.java)0
-rw-r--r--src/main/java/com/juick/server/configuration/ActivityPubClientConfig.java (renamed from juick-server/src/main/java/com/juick/server/configuration/ActivityPubClientConfig.java)0
-rw-r--r--src/main/java/com/juick/server/configuration/ActivityPubClientErrorHandler.java (renamed from juick-server/src/main/java/com/juick/server/configuration/ActivityPubClientErrorHandler.java)0
-rw-r--r--src/main/java/com/juick/server/configuration/ApiAppConfiguration.java (renamed from juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java)0
-rw-r--r--src/main/java/com/juick/server/configuration/BaseWebConfiguration.java (renamed from juick-server/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java)0
-rw-r--r--src/main/java/com/juick/server/configuration/SapeConfiguration.java (renamed from juick-server/src/main/java/com/juick/server/configuration/SapeConfiguration.java)0
-rw-r--r--src/main/java/com/juick/server/configuration/SecurityConfig.java (renamed from juick-server/src/main/java/com/juick/server/configuration/SecurityConfig.java)0
-rw-r--r--src/main/java/com/juick/server/configuration/StorageConfiguration.java (renamed from juick-server/src/main/java/com/juick/server/configuration/StorageConfiguration.java)0
-rw-r--r--src/main/java/com/juick/server/configuration/TelegramConfig.java (renamed from juick-server/src/main/java/com/juick/server/configuration/TelegramConfig.java)0
-rw-r--r--src/main/java/com/juick/server/configuration/WwwAppConfiguration.java (renamed from juick-server/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java)0
-rw-r--r--src/main/java/com/juick/server/configuration/XMPPConfig.java (renamed from juick-server/src/main/java/com/juick/server/configuration/XMPPConfig.java)0
-rw-r--r--src/main/java/com/juick/server/helpers/annotation/UserCommand.java (renamed from juick-server/src/main/java/com/juick/server/helpers/annotation/UserCommand.java)0
-rw-r--r--src/main/java/com/juick/server/util/HttpBadRequestException.java (renamed from juick-server/src/main/java/com/juick/server/util/HttpBadRequestException.java)0
-rw-r--r--src/main/java/com/juick/server/util/HttpForbiddenException.java (renamed from juick-server/src/main/java/com/juick/server/util/HttpForbiddenException.java)0
-rw-r--r--src/main/java/com/juick/server/util/HttpNotFoundException.java (renamed from juick-server/src/main/java/com/juick/server/util/HttpNotFoundException.java)0
-rw-r--r--src/main/java/com/juick/server/util/HttpUtils.java (renamed from juick-server/src/main/java/com/juick/server/util/HttpUtils.java)0
-rw-r--r--src/main/java/com/juick/server/util/ImageUtils.java (renamed from juick-server/src/main/java/com/juick/server/util/ImageUtils.java)0
-rw-r--r--src/main/java/com/juick/server/util/TagUtils.java (renamed from juick-server/src/main/java/com/juick/server/util/TagUtils.java)0
-rw-r--r--src/main/java/com/juick/server/util/UserUtils.java (renamed from juick-server/src/main/java/com/juick/server/util/UserUtils.java)0
-rw-r--r--src/main/java/com/juick/server/util/WebUtils.java (renamed from juick-server/src/main/java/com/juick/server/util/WebUtils.java)0
-rw-r--r--src/main/java/com/juick/server/www/HelpService.java (renamed from juick-server/src/main/java/com/juick/server/www/HelpService.java)0
-rw-r--r--src/main/java/com/juick/server/www/WebApp.java (renamed from juick-server/src/main/java/com/juick/server/www/WebApp.java)0
-rw-r--r--src/main/java/com/juick/server/www/controllers/AnythingFilter.java (renamed from juick-server/src/main/java/com/juick/server/www/controllers/AnythingFilter.java)0
-rw-r--r--src/main/java/com/juick/server/www/controllers/Help.java (renamed from juick-server/src/main/java/com/juick/server/www/controllers/Help.java)0
-rw-r--r--src/main/java/com/juick/server/www/controllers/Login.java (renamed from juick-server/src/main/java/com/juick/server/www/controllers/Login.java)0
-rw-r--r--src/main/java/com/juick/server/www/controllers/MessagesWWW.java (renamed from juick-server/src/main/java/com/juick/server/www/controllers/MessagesWWW.java)0
-rw-r--r--src/main/java/com/juick/server/www/controllers/NewMessage.java (renamed from juick-server/src/main/java/com/juick/server/www/controllers/NewMessage.java)0
-rw-r--r--src/main/java/com/juick/server/www/controllers/Settings.java (renamed from juick-server/src/main/java/com/juick/server/www/controllers/Settings.java)0
-rw-r--r--src/main/java/com/juick/server/www/controllers/SignUp.java (renamed from juick-server/src/main/java/com/juick/server/www/controllers/SignUp.java)0
-rw-r--r--src/main/java/com/juick/server/www/controllers/SocialLogin.java (renamed from juick-server/src/main/java/com/juick/server/www/controllers/SocialLogin.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/JidConverter.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/JidConverter.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/XMPPStatusPage.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/XMPPStatusPage.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/helpers/XMPPStatus.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/helpers/XMPPStatus.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/iq/MessageQuery.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/iq/MessageQuery.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/iq/package-info.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/iq/package-info.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/router/Handshake.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/router/Handshake.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/router/Stream.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/router/Stream.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/router/StreamComponentServer.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/router/StreamComponentServer.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/router/StreamError.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/router/StreamError.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/router/StreamFeatures.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/router/StreamFeatures.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/router/StreamHandler.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/router/StreamHandler.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/router/StreamNamespaces.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/router/StreamNamespaces.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/router/XMPPError.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/router/XMPPError.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/router/XMPPRouter.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/router/XMPPRouter.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/router/XmlUtils.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/router/XmlUtils.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/s2s/CacheEntry.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/s2s/CacheEntry.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/s2s/Connection.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/s2s/Connection.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/s2s/ConnectionIn.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionIn.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/s2s/ConnectionListener.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionListener.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/s2s/ConnectionOut.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionOut.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/s2s/DNSQueries.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/s2s/DNSQueries.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/s2s/StanzaListener.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/s2s/StanzaListener.java)0
-rw-r--r--src/main/java/com/juick/server/xmpp/s2s/util/DialbackUtils.java (renamed from juick-server/src/main/java/com/juick/server/xmpp/s2s/util/DialbackUtils.java)0
-rw-r--r--src/main/java/com/juick/service/ActivityPubService.java (renamed from juick-server/src/main/java/com/juick/service/ActivityPubService.java)0
-rw-r--r--src/main/java/com/juick/service/BaseJdbcService.java (renamed from juick-server/src/main/java/com/juick/service/BaseJdbcService.java)0
-rw-r--r--src/main/java/com/juick/service/CrosspostService.java (renamed from juick-common/src/main/java/com/juick/service/CrosspostService.java)0
-rw-r--r--src/main/java/com/juick/service/CrosspostServiceImpl.java (renamed from juick-server/src/main/java/com/juick/service/CrosspostServiceImpl.java)0
-rw-r--r--src/main/java/com/juick/service/EmailService.java (renamed from juick-common/src/main/java/com/juick/service/EmailService.java)0
-rw-r--r--src/main/java/com/juick/service/EmailServiceImpl.java (renamed from juick-server/src/main/java/com/juick/service/EmailServiceImpl.java)0
-rw-r--r--src/main/java/com/juick/service/ImagesService.java (renamed from juick-common/src/main/java/com/juick/service/ImagesService.java)0
-rw-r--r--src/main/java/com/juick/service/ImagesServiceImpl.java (renamed from juick-server/src/main/java/com/juick/service/ImagesServiceImpl.java)0
-rw-r--r--src/main/java/com/juick/service/MessagesService.java (renamed from juick-common/src/main/java/com/juick/service/MessagesService.java)0
-rw-r--r--src/main/java/com/juick/service/MessagesServiceImpl.java (renamed from juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java)0
-rw-r--r--src/main/java/com/juick/service/MessengerService.java (renamed from juick-common/src/main/java/com/juick/service/MessengerService.java)0
-rw-r--r--src/main/java/com/juick/service/MessengerServiceImpl.java (renamed from juick-server/src/main/java/com/juick/service/MessengerServiceImpl.java)0
-rw-r--r--src/main/java/com/juick/service/PMQueriesService.java (renamed from juick-common/src/main/java/com/juick/service/PMQueriesService.java)0
-rw-r--r--src/main/java/com/juick/service/PMQueriesServiceImpl.java (renamed from juick-server/src/main/java/com/juick/service/PMQueriesServiceImpl.java)0
-rw-r--r--src/main/java/com/juick/service/PrivacyQueriesService.java (renamed from juick-common/src/main/java/com/juick/service/PrivacyQueriesService.java)0
-rw-r--r--src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java (renamed from juick-server/src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java)0
-rw-r--r--src/main/java/com/juick/service/PushQueriesService.java (renamed from juick-common/src/main/java/com/juick/service/PushQueriesService.java)0
-rw-r--r--src/main/java/com/juick/service/PushQueriesServiceImpl.java (renamed from juick-server/src/main/java/com/juick/service/PushQueriesServiceImpl.java)0
-rw-r--r--src/main/java/com/juick/service/SearchService.java (renamed from juick-common/src/main/java/com/juick/service/SearchService.java)0
-rw-r--r--src/main/java/com/juick/service/ShowQueriesService.java (renamed from juick-common/src/main/java/com/juick/service/ShowQueriesService.java)0
-rw-r--r--src/main/java/com/juick/service/ShowQueriesServiceImpl.java (renamed from juick-server/src/main/java/com/juick/service/ShowQueriesServiceImpl.java)0
-rw-r--r--src/main/java/com/juick/service/SocialService.java (renamed from juick-common/src/main/java/com/juick/service/SocialService.java)0
-rw-r--r--src/main/java/com/juick/service/SphinxSearchService.java (renamed from juick-server/src/main/java/com/juick/service/SphinxSearchService.java)0
-rw-r--r--src/main/java/com/juick/service/SubscriptionService.java (renamed from juick-common/src/main/java/com/juick/service/SubscriptionService.java)0
-rw-r--r--src/main/java/com/juick/service/SubscriptionServiceImpl.java (renamed from juick-server/src/main/java/com/juick/service/SubscriptionServiceImpl.java)0
-rw-r--r--src/main/java/com/juick/service/TagService.java (renamed from juick-common/src/main/java/com/juick/service/TagService.java)0
-rw-r--r--src/main/java/com/juick/service/TagServiceImpl.java (renamed from juick-server/src/main/java/com/juick/service/TagServiceImpl.java)0
-rw-r--r--src/main/java/com/juick/service/TelegramService.java (renamed from juick-common/src/main/java/com/juick/service/TelegramService.java)0
-rw-r--r--src/main/java/com/juick/service/TelegramServiceImpl.java (renamed from juick-server/src/main/java/com/juick/service/TelegramServiceImpl.java)0
-rw-r--r--src/main/java/com/juick/service/UserService.java (renamed from juick-common/src/main/java/com/juick/service/UserService.java)0
-rw-r--r--src/main/java/com/juick/service/UserServiceImpl.java (renamed from juick-server/src/main/java/com/juick/service/UserServiceImpl.java)0
-rw-r--r--src/main/java/com/juick/service/activities/ActivityListener.java (renamed from juick-server/src/main/java/com/juick/service/activities/ActivityListener.java)0
-rw-r--r--src/main/java/com/juick/service/activities/DeleteMessageEvent.java (renamed from juick-server/src/main/java/com/juick/service/activities/DeleteMessageEvent.java)0
-rw-r--r--src/main/java/com/juick/service/activities/DeleteUserEvent.java (renamed from juick-server/src/main/java/com/juick/service/activities/DeleteUserEvent.java)0
-rw-r--r--src/main/java/com/juick/service/activities/FollowEvent.java (renamed from juick-server/src/main/java/com/juick/service/activities/FollowEvent.java)0
-rw-r--r--src/main/java/com/juick/service/activities/UndoFollowEvent.java (renamed from juick-server/src/main/java/com/juick/service/activities/UndoFollowEvent.java)0
-rw-r--r--src/main/java/com/juick/service/component/DisconnectedEvent.java (renamed from juick-common/src/main/java/com/juick/service/component/DisconnectedEvent.java)0
-rw-r--r--src/main/java/com/juick/service/component/LikeEvent.java (renamed from juick-common/src/main/java/com/juick/service/component/LikeEvent.java)0
-rw-r--r--src/main/java/com/juick/service/component/MessageEvent.java (renamed from juick-common/src/main/java/com/juick/service/component/MessageEvent.java)0
-rw-r--r--src/main/java/com/juick/service/component/MessageReadEvent.java (renamed from juick-common/src/main/java/com/juick/service/component/MessageReadEvent.java)0
-rw-r--r--src/main/java/com/juick/service/component/NotificationListener.java (renamed from juick-common/src/main/java/com/juick/service/component/NotificationListener.java)0
-rw-r--r--src/main/java/com/juick/service/component/PingEvent.java (renamed from juick-common/src/main/java/com/juick/service/component/PingEvent.java)0
-rw-r--r--src/main/java/com/juick/service/component/SubscribeEvent.java (renamed from juick-common/src/main/java/com/juick/service/component/SubscribeEvent.java)0
-rw-r--r--src/main/java/com/juick/service/component/TopEvent.java (renamed from juick-common/src/main/java/com/juick/service/component/TopEvent.java)0
-rw-r--r--src/main/java/com/juick/service/component/UserUpdatedEvent.java (renamed from juick-common/src/main/java/com/juick/service/component/UserUpdatedEvent.java)0
-rw-r--r--src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java (renamed from juick-server/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java)0
-rw-r--r--src/main/java/com/juick/service/security/JuickUserDetailsService.java (renamed from juick-server/src/main/java/com/juick/service/security/JuickUserDetailsService.java)0
-rw-r--r--src/main/java/com/juick/service/security/NullUserDetailsService.java (renamed from juick-server/src/main/java/com/juick/service/security/NullUserDetailsService.java)0
-rw-r--r--src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java (renamed from juick-server/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java)0
-rw-r--r--src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java (renamed from juick-server/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java)0
-rw-r--r--src/main/java/com/juick/service/security/entities/JuickUser.java (renamed from juick-server/src/main/java/com/juick/service/security/entities/JuickUser.java)0
-rw-r--r--src/main/java/com/juick/util/DateFormatter.java (renamed from juick-common/src/main/java/com/juick/util/DateFormatter.java)0
-rw-r--r--src/main/java/com/juick/util/DateFormattersHolder.java (renamed from juick-common/src/main/java/com/juick/util/DateFormattersHolder.java)0
-rw-r--r--src/main/java/com/juick/util/MessageUtils.java (renamed from juick-common/src/main/java/com/juick/util/MessageUtils.java)0
-rw-r--r--src/main/java/com/juick/util/PrettyTimeFormatter.java (renamed from juick-common/src/main/java/com/juick/util/PrettyTimeFormatter.java)0
-rw-r--r--src/main/java/com/juick/util/StreamUtils.java (renamed from juick-common/src/main/java/com/juick/util/StreamUtils.java)0
-rw-r--r--src/main/java/com/mitchellbosecke/pebble/extension/FormatterExtension.java (renamed from juick-server/src/main/java/com/mitchellbosecke/pebble/extension/FormatterExtension.java)0
-rw-r--r--src/main/java/com/mitchellbosecke/pebble/extension/filters/FormatMessageFilter.java (renamed from juick-server/src/main/java/com/mitchellbosecke/pebble/extension/filters/FormatMessageFilter.java)0
-rw-r--r--src/main/java/com/mitchellbosecke/pebble/extension/filters/PrettyTimeFilter.java (renamed from juick-server/src/main/java/com/mitchellbosecke/pebble/extension/filters/PrettyTimeFilter.java)0
-rw-r--r--src/main/java/com/mitchellbosecke/pebble/extension/filters/TagsListFilter.java (renamed from juick-server/src/main/java/com/mitchellbosecke/pebble/extension/filters/TagsListFilter.java)0
-rw-r--r--src/main/java/com/mitchellbosecke/pebble/extension/filters/TimestampFilter.java (renamed from juick-server/src/main/java/com/mitchellbosecke/pebble/extension/filters/TimestampFilter.java)0
-rw-r--r--src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java (renamed from juick-server/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java)0
-rw-r--r--src/main/java/ru/sape/Sape.java (renamed from juick-server/src/main/java/ru/sape/Sape.java)0
-rw-r--r--src/main/java/ru/sape/SapeConnection.java (renamed from juick-server/src/main/java/ru/sape/SapeConnection.java)0
-rw-r--r--src/main/java/ru/sape/SapePageLinks.java (renamed from juick-server/src/main/java/ru/sape/SapePageLinks.java)0
-rw-r--r--src/main/resources/1x1.png (renamed from juick-server/src/main/resources/1x1.png)bin95 -> 95 bytes
-rw-r--r--src/main/resources/Transparent.gif (renamed from juick-server/src/main/resources/Transparent.gif)bin42 -> 42 bytes
-rw-r--r--src/main/resources/db/migration/V1.10__favorites_user_uri.sql (renamed from juick-server/src/main/resources/db/migration/V1.10__favorites_user_uri.sql)0
-rw-r--r--src/main/resources/db/migration/V1.11__increase pm timestamp precision.sql (renamed from juick-server/src/main/resources/db/migration/V1.11__increase pm timestamp precision.sql)0
-rw-r--r--src/main/resources/db/migration/V1.12__drop unused tables.sql (renamed from juick-server/src/main/resources/db/migration/V1.12__drop unused tables.sql)0
-rw-r--r--src/main/resources/db/migration/V1.13__drop unused tables.sql (renamed from juick-server/src/main/resources/db/migration/V1.13__drop unused tables.sql)0
-rw-r--r--src/main/resources/db/migration/V1.14__drop broken pm_streams.sql (renamed from juick-server/src/main/resources/db/migration/V1.14__drop broken pm_streams.sql)0
-rw-r--r--src/main/resources/db/migration/V1.15__drop unused columns add ts for some tables.sql (renamed from juick-server/src/main/resources/db/migration/V1.15__drop unused columns add ts for some tables.sql)0
-rw-r--r--src/main/resources/db/migration/V1.16__last seen.sql (renamed from juick-server/src/main/resources/db/migration/V1.16__last seen.sql)0
-rw-r--r--src/main/resources/db/migration/V1.1__Add updated_at field.sql (renamed from juick-server/src/main/resources/db/migration/V1.1__Add updated_at field.sql)0
-rw-r--r--src/main/resources/db/migration/V1.2__Drop telegram_chats.sql (renamed from juick-server/src/main/resources/db/migration/V1.2__Drop telegram_chats.sql)0
-rw-r--r--src/main/resources/db/migration/V1.3__Nullable user_id column in auth table.sql (renamed from juick-server/src/main/resources/db/migration/V1.3__Nullable user_id column in auth table.sql)0
-rw-r--r--src/main/resources/db/migration/V1.4__ActivityPub followers.sql (renamed from juick-server/src/main/resources/db/migration/V1.4__ActivityPub followers.sql)0
-rw-r--r--src/main/resources/db/migration/V1.5__Drop acct index.sql (renamed from juick-server/src/main/resources/db/migration/V1.5__Drop acct index.sql)0
-rw-r--r--src/main/resources/db/migration/V1.6__user_uri.sql (renamed from juick-server/src/main/resources/db/migration/V1.6__user_uri.sql)0
-rw-r--r--src/main/resources/db/migration/V1.7__reply_uri.sql (renamed from juick-server/src/main/resources/db/migration/V1.7__reply_uri.sql)0
-rw-r--r--src/main/resources/db/migration/V1.8__html reply.sql (renamed from juick-server/src/main/resources/db/migration/V1.8__html reply.sql)0
-rw-r--r--src/main/resources/db/migration/V1.9__reply_uri_index.sql (renamed from juick-server/src/main/resources/db/migration/V1.9__reply_uri_index.sql)0
-rw-r--r--src/main/resources/errors.properties (renamed from juick-server/src/main/resources/errors.properties)0
-rw-r--r--src/main/resources/errors_ru.properties (renamed from juick-server/src/main/resources/errors_ru.properties)0
m---------src/main/resources/help (renamed from juick-server/src/main/resources/help)0
-rw-r--r--src/main/resources/juick.png (renamed from juick-server/src/main/resources/juick.png)bin4298 -> 4298 bytes
-rw-r--r--src/main/resources/juick.sql (renamed from juick-server/src/main/resources/juick.sql)0
-rw-r--r--src/main/resources/messages.properties (renamed from juick-server/src/main/resources/messages.properties)0
-rw-r--r--src/main/resources/messages_ru.properties (renamed from juick-server/src/main/resources/messages_ru.properties)0
-rw-r--r--src/main/resources/pg_schema_wip (renamed from juick-server/src/main/resources/pg_schema_wip)0
-rw-r--r--src/main/resources/rome.properties (renamed from juick-server/src/main/resources/rome.properties)0
-rw-r--r--src/main/resources/schema.sql (renamed from juick-server/src/main/resources/schema.sql)0
-rw-r--r--src/main/resources/static/favicon.png (renamed from juick-server/src/main/resources/static/favicon.png)bin244 -> 244 bytes
-rw-r--r--src/main/resources/static/logo.png (renamed from juick-server/src/main/resources/static/logo.png)bin1184 -> 1184 bytes
-rw-r--r--src/main/resources/static/tagscloud.png (renamed from juick-server/src/main/resources/static/tagscloud.png)bin42316 -> 42316 bytes
-rw-r--r--src/main/resources/templates/layouts/content.html (renamed from juick-server/src/main/resources/templates/layouts/content.html)0
-rw-r--r--src/main/resources/templates/layouts/default.html (renamed from juick-server/src/main/resources/templates/layouts/default.html)0
-rw-r--r--src/main/resources/templates/layouts/minimal.html (renamed from juick-server/src/main/resources/templates/layouts/minimal.html)0
-rw-r--r--src/main/resources/templates/layouts/note.html (renamed from juick-server/src/main/resources/templates/layouts/note.html)0
-rw-r--r--src/main/resources/templates/views/404.html (renamed from juick-server/src/main/resources/templates/views/404.html)0
-rw-r--r--src/main/resources/templates/views/blog.html (renamed from juick-server/src/main/resources/templates/views/blog.html)0
-rw-r--r--src/main/resources/templates/views/blog_tags.html (renamed from juick-server/src/main/resources/templates/views/blog_tags.html)0
-rw-r--r--src/main/resources/templates/views/help.html (renamed from juick-server/src/main/resources/templates/views/help.html)0
-rw-r--r--src/main/resources/templates/views/index.html (renamed from juick-server/src/main/resources/templates/views/index.html)0
-rw-r--r--src/main/resources/templates/views/login.html (renamed from juick-server/src/main/resources/templates/views/login.html)0
-rw-r--r--src/main/resources/templates/views/login_success.html (renamed from juick-server/src/main/resources/templates/views/login_success.html)0
-rw-r--r--src/main/resources/templates/views/macros/tags.html (renamed from juick-server/src/main/resources/templates/views/macros/tags.html)0
-rw-r--r--src/main/resources/templates/views/partial/footer.html (renamed from juick-server/src/main/resources/templates/views/partial/footer.html)0
-rw-r--r--src/main/resources/templates/views/partial/homecolumn.html (renamed from juick-server/src/main/resources/templates/views/partial/homecolumn.html)0
-rw-r--r--src/main/resources/templates/views/partial/message.html (renamed from juick-server/src/main/resources/templates/views/partial/message.html)0
-rw-r--r--src/main/resources/templates/views/partial/navigation.html (renamed from juick-server/src/main/resources/templates/views/partial/navigation.html)0
-rw-r--r--src/main/resources/templates/views/partial/settings_tabs.html (renamed from juick-server/src/main/resources/templates/views/partial/settings_tabs.html)0
-rw-r--r--src/main/resources/templates/views/partial/tagcolumn.html (renamed from juick-server/src/main/resources/templates/views/partial/tagcolumn.html)0
-rw-r--r--src/main/resources/templates/views/partial/tags.html (renamed from juick-server/src/main/resources/templates/views/partial/tags.html)0
-rw-r--r--src/main/resources/templates/views/partial/usercolumn.html (renamed from juick-server/src/main/resources/templates/views/partial/usercolumn.html)0
-rw-r--r--src/main/resources/templates/views/partial/usertags.html (renamed from juick-server/src/main/resources/templates/views/partial/usertags.html)0
-rw-r--r--src/main/resources/templates/views/pm_inbox.html (renamed from juick-server/src/main/resources/templates/views/pm_inbox.html)0
-rw-r--r--src/main/resources/templates/views/pm_sent.html (renamed from juick-server/src/main/resources/templates/views/pm_sent.html)0
-rw-r--r--src/main/resources/templates/views/post.html (renamed from juick-server/src/main/resources/templates/views/post.html)0
-rw-r--r--src/main/resources/templates/views/post_success.html (renamed from juick-server/src/main/resources/templates/views/post_success.html)0
-rw-r--r--src/main/resources/templates/views/settings_about.html (renamed from juick-server/src/main/resources/templates/views/settings_about.html)0
-rw-r--r--src/main/resources/templates/views/settings_auth-email.html (renamed from juick-server/src/main/resources/templates/views/settings_auth-email.html)0
-rw-r--r--src/main/resources/templates/views/settings_main.html (renamed from juick-server/src/main/resources/templates/views/settings_main.html)0
-rw-r--r--src/main/resources/templates/views/settings_password.html (renamed from juick-server/src/main/resources/templates/views/settings_password.html)0
-rw-r--r--src/main/resources/templates/views/settings_privacy.html (renamed from juick-server/src/main/resources/templates/views/settings_privacy.html)0
-rw-r--r--src/main/resources/templates/views/settings_result.html (renamed from juick-server/src/main/resources/templates/views/settings_result.html)0
-rw-r--r--src/main/resources/templates/views/signup.html (renamed from juick-server/src/main/resources/templates/views/signup.html)0
-rw-r--r--src/main/resources/templates/views/thread.html (renamed from juick-server/src/main/resources/templates/views/thread.html)0
-rw-r--r--src/main/resources/templates/views/users.html (renamed from juick-server/src/main/resources/templates/views/users.html)0
-rw-r--r--src/test/java/com/juick/FormatterTest.java (renamed from juick-common/src/test/java/com/juick/FormatterTest.java)0
-rw-r--r--src/test/java/com/juick/MessageTest.java (renamed from juick-common/src/test/java/com/juick/MessageTest.java)0
-rw-r--r--src/test/java/com/juick/UserTest.java (renamed from juick-common/src/test/java/com/juick/UserTest.java)0
-rw-r--r--src/test/java/com/juick/server/configuration/SwaggerConfiguration.java (renamed from juick-server/src/test/java/com/juick/server/configuration/SwaggerConfiguration.java)0
-rw-r--r--src/test/java/com/juick/server/tests/ServerTests.java (renamed from juick-server/src/test/java/com/juick/server/tests/ServerTests.java)0
-rw-r--r--src/test/java/com/juick/test/util/MockUtils.java (renamed from juick-common/src/test/java/com/juick/test/util/MockUtils.java)0
-rw-r--r--src/test/resources/2915104.jpg (renamed from juick-server/src/test/resources/2915104.jpg)bin227253 -> 227253 bytes
-rw-r--r--src/test/resources/cmyk.jpg (renamed from juick-server/src/test/resources/cmyk.jpg)bin3945732 -> 3945732 bytes
-rw-r--r--src/test/resources/create.json (renamed from juick-server/src/test/resources/create.json)0
-rw-r--r--src/test/resources/data.sql (renamed from juick-server/src/test/resources/data.sql)0
-rw-r--r--src/test/resources/delete.json (renamed from juick-server/src/test/resources/delete.json)0
-rw-r--r--src/test/resources/follow.json (renamed from juick-server/src/test/resources/follow.json)0
-rw-r--r--src/test/resources/mention.json (renamed from juick-server/src/test/resources/mention.json)0
-rw-r--r--src/test/resources/nojfif.jpg (renamed from juick-server/src/test/resources/nojfif.jpg)bin417629 -> 417629 bytes
-rw-r--r--src/test/resources/person.json (renamed from juick-server/src/test/resources/person.json)0
-rw-r--r--src/test/resources/templates/views/test.html (renamed from juick-server/src/test/resources/templates/views/test.html)0
-rw-r--r--src/test/resources/undo.json (renamed from juick-server/src/test/resources/undo.json)0
-rw-r--r--src/test/resources/webfinger.json (renamed from juick-server/src/test/resources/webfinger.json)0
-rw-r--r--src/test/resources/xnodeinfo2.json (renamed from juick-server/src/test/resources/xnodeinfo2.json)0
-rw-r--r--webpack.config.js (renamed from juick-server/webpack.config.js)0
-rw-r--r--yarn.lock (renamed from juick-server/yarn.lock)0
321 files changed, 173 insertions, 179 deletions
diff --git a/juick-server/.browserslistrc b/.browserslistrc
index 8a747d5e..8a747d5e 100644
--- a/juick-server/.browserslistrc
+++ b/.browserslistrc
diff --git a/juick-server/.eslintrc b/.eslintrc
index e1b73925..e1b73925 100644
--- a/juick-server/.eslintrc
+++ b/.eslintrc
diff --git a/.gitignore b/.gitignore
index 1fcd4143..8b7c458d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-deps/*
.idea/*
*.iml
**/application.properties
@@ -16,7 +15,8 @@ deps/*
**/bin/**
**/.DS_Store
**/out/**
-juick-server/src/main/resources/static/*.js
-juick-server/src/main/resources/static/*.css
-juick-server/src/main/resources/static/*.map
+src/main/resources/static/*.js
+src/main/resources/static/*.css
+src/main/resources/static/*.map
+src/main/resources/static/*.LICENSE
juick.p12
diff --git a/.gitmodules b/.gitmodules
index dea9a34a..1933cb69 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "juick-server/src/main/resources/help"]
- path = juick-server/src/main/resources/help
+ path = src/main/resources/help
url = git@github.com:juick/help.git
diff --git a/juick-server/.stylelintrc.json b/.stylelintrc.json
index e1c32ef0..e1c32ef0 100644
--- a/juick-server/.stylelintrc.json
+++ b/.stylelintrc.json
diff --git a/README.md b/README.md
index c2cc277e..7d55f59c 100644
--- a/README.md
+++ b/README.md
@@ -10,9 +10,9 @@ git submodule update --init
cd juick
-echo "spring.h2.console.enabled=true" > juick-server/src/main/resources/application.properties
+echo "spring.h2.console.enabled=true" > src/main/resources/application.properties
-./gradlew :juick-server:bootRun
+./gradlew bootRun
```
diff --git a/build.gradle b/build.gradle
index cd9b4946..f64af2ca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,42 +14,183 @@ plugins {
id("org.asciidoctor.convert") version "1.5.9.2" apply false
}
-allprojects {
- repositories {
- mavenCentral()
- jcenter()
- maven { url "https://jitpack.io" }
- maven { url "https://repository.apache.org/content/repositories/snapshots/" }
- maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+repositories {
+ mavenCentral()
+ jcenter()
+ maven { url "https://jitpack.io" }
+ maven { url "https://repository.apache.org/content/repositories/snapshots/" }
+ maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+}
+apply plugin: 'io.spring.dependency-management'
+dependencyManagement {
+ imports {
+ mavenBom org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES
}
- apply plugin: 'io.spring.dependency-management'
- dependencyManagement {
- imports {
- mavenBom org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES
+ applyMavenExclusions = false
+}
+
+apply plugin: 'com.github.ben-manes.versions'
+dependencyUpdates.resolutionStrategy = {
+ componentSelection { rules ->
+ rules.all { ComponentSelection selection ->
+ boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm', 'pr', 'b'].any { qualifier ->
+ selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/
+ }
+ if (rejected) {
+ selection.reject('Release candidate')
+ }
}
- applyMavenExclusions = false
}
+}
+apply plugin: 'java'
+apply plugin: 'org.springframework.boot'
+apply plugin: 'com.moowork.node'
+apply plugin: 'io.github.swagger2markup'
+apply plugin: 'org.asciidoctor.convert'
- apply plugin: 'com.github.ben-manes.versions'
- dependencyUpdates.resolutionStrategy = {
- componentSelection { rules ->
- rules.all { ComponentSelection selection ->
- boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm', 'pr', 'b'].any { qualifier ->
- selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/
- }
- if (rejected) {
- selection.reject('Release candidate')
- }
- }
- }
+task compileFrontend(type: YarnTask) {
+ inputs.files(fileTree('node_modules'))
+ inputs.files(fileTree('src'))
+ inputs.file('package.json')
+ inputs.file('webpack.config.js')
+ outputs.dir('src/main/resources/static')
+ args = ['run', 'compile']
+}
+
+ext {
+ swaggerOutputDir = file("${buildDir}/swagger")
+ docsOutputDir = file("${buildDir}/docs")
+}
+
+test {
+ systemProperty 'io.springfox.staticdocs.outputDir', swaggerOutputDir
+ outputs.dir swaggerOutputDir
+}
+
+convertSwagger2markup {
+ dependsOn test
+ swaggerInput "${swaggerOutputDir}/swagger.json"
+ outputDir swaggerOutputDir
+ config = [
+ 'swagger2markup.markupLanguage': 'ASCIIDOC',
+ 'swagger2markup.pathsGroupedBy': 'TAGS'
+ ]
+}
+task asciidocIndex(type: Copy) {
+ from 'src/docs'
+ into swaggerOutputDir
+ include '*.adoc'
+}
+asciidoctor {
+ dependsOn convertSwagger2markup
+ dependsOn asciidocIndex
+ sourceDir = swaggerOutputDir
+ sources {
+ include 'index.adoc', 'overview.adoc', 'definitions.adoc', 'paths.adoc'
}
+ attributes = [
+ doctype : 'book',
+ toc : 'left',
+ toclevels : '3',
+ numbered : '',
+ sectlinks : '',
+ sectanchors: '',
+ hardbreaks : '',
+ src : swaggerOutputDir,
+ generated : docsOutputDir
+ ]
+ outputDir = docsOutputDir
+}
+
+configurations {
+ compile.exclude module: 'spring-boot-starter-tomcat'
}
+
+dependencies {
+ compile ('org.springframework.boot:spring-boot-starter-cache')
+ compile ('org.springframework.boot:spring-boot-starter-security')
+ compile ('org.springframework.boot:spring-boot-starter-jdbc')
+ compile ("org.springframework.boot:spring-boot-starter-security")
+ compile ("org.springframework.boot:spring-boot-starter-web")
+ compile ("org.springframework.boot:spring-boot-starter-undertow")
+ compile ("org.springframework.boot:spring-boot-starter-websocket")
+ compile ("org.springframework.boot:spring-boot-starter-json")
+ compile ('org.springframework.boot:spring-boot-devtools')
+
+ compile "org.apache.commons:commons-lang3:3.8.1"
+ compile "org.apache.commons:commons-collections4:4.2"
+ compile 'org.apache.commons:commons-text:1.6'
+ compile "commons-codec:commons-codec:1.11"
+ compile "commons-io:commons-io:2.6"
+
+ compile 'com.google.code.findbugs:jsr305:3.0.2'
+ compile 'org.ocpsoft.prettytime:prettytime:4.0.2.Final'
+ compile 'org.imgscalr:imgscalr-lib:4.2'
+ compile "org.apache.commons:commons-imaging:1.0-SNAPSHOT"
+ runtime "commons-fileupload:commons-fileupload:1.3.3"
+ compile 'com.github.ben-manes.caffeine:caffeine:2.6.2'
+
+ compile "javax.inject:javax.inject:1"
+ compile "javax.xml.bind:jaxb-api:2.3.1"
+ compile 'org.glassfish.jaxb:jaxb-runtime:2.3.1'
+
+ compileOnly 'io.springfox:springfox-core:2.9.2'
+
+ compile 'org.apache.commons:commons-email:1.5'
+ compile 'com.github.scribejava:scribejava-apis:6.0.0'
+ compile 'com.github.pengrad:java-telegram-bot-api:4.1.0'
+ compile 'com.twelvemonkeys.imageio:imageio-jpeg:3.4.1'
+ compile 'org.imgscalr:imgscalr-lib:4.2'
+ compile 'org.twitter4j:twitter4j-core:4.0.7'
+
+ compile 'xpp3:xpp3:1.1.4c'
+
+ compile 'rocks.xmpp:xmpp-core-client:0.8.1-SNAPSHOT'
+ compile 'rocks.xmpp:xmpp-extensions-client:0.8.1-SNAPSHOT'
+
+ compile "javax.inject:javax.inject:1"
+
+ compile 'com.rometools:rome:1.11.1'
+ compile 'com.rometools:rome-modules:1.11.1'
+
+ compile 'org.flywaydb:flyway-core:5.2.1'
+
+ runtime 'org.mariadb.jdbc:mariadb-java-client:2.3.0'
+ runtime 'com.h2database:h2:1.4.196'
+ runtime "commons-fileupload:commons-fileupload:1.3.3"
+
+ compile 'com.github.ooxi:serialized-php-parser:0.5.0'
+ compile 'io.pebbletemplates:pebble-spring5:3.0.5'
+ compile 'com.atlassian.commonmark:commonmark:0.11.0'
+ compile 'com.atlassian.commonmark:commonmark-ext-autolink:0.11.0'
+ compile 'org.tomitribe:tomitribe-http-signatures:1.1'
+
+ testCompile("org.springframework.boot:spring-boot-starter-test")
+ testCompile('net.sourceforge.htmlunit:htmlunit:2.33')
+ testCompile('org.springframework.security:spring-security-test')
+
+ testCompile 'io.springfox:springfox-swagger2:2.9.2'
+}
+
+bootJar {
+ launchScript()
+}
+
+bootRun {
+ sourceResources sourceSets.main
+}
+
+bootRun.dependsOn ':generateDebugKey'
+compileFrontend.dependsOn 'yarn'
+processResources.dependsOn 'compileFrontend'
+
class GenKey extends DefaultTask {
@OutputFile
String keystore
+
@TaskAction
def generate() {
- ant.genkey(alias:"1", keystore:keystore.toString(), storetype:"PKCS12", keyalg:"RSA", storepass:"secret", dname:"CN=localhost", keysize:2048)
+ ant.genkey(alias: "1", keystore: keystore.toString(), storetype: "PKCS12", keyalg: "RSA", storepass: "secret", dname: "CN=localhost", keysize: 2048)
}
}
diff --git a/juick-common/build.gradle b/juick-common/build.gradle
deleted file mode 100644
index 8b26a887..00000000
--- a/juick-common/build.gradle
+++ /dev/null
@@ -1,20 +0,0 @@
-apply plugin: 'java'
-
-dependencies {
- compile("org.springframework.boot:spring-boot-starter-json")
- compile "org.apache.commons:commons-lang3:3.8.1"
- compile "org.apache.commons:commons-collections4:4.2"
- compile 'org.apache.commons:commons-text:1.6'
- compile "commons-codec:commons-codec:1.11"
- compile "commons-io:commons-io:2.6"
- compile 'com.google.code.findbugs:jsr305:3.0.2'
- compile 'org.ocpsoft.prettytime:prettytime:4.0.2.Final'
- compile 'org.imgscalr:imgscalr-lib:4.2'
- compile "org.apache.commons:commons-imaging:1.0-SNAPSHOT"
- runtime "commons-fileupload:commons-fileupload:1.3.3"
-
- compile "javax.inject:javax.inject:1"
- compile "javax.xml.bind:jaxb-api:2.3.1"
- compile 'org.glassfish.jaxb:jaxb-runtime:2.3.1'
- testCompile("org.springframework.boot:spring-boot-starter-test")
-}
diff --git a/juick-server/build.gradle b/juick-server/build.gradle
deleted file mode 100644
index 69c1f51e..00000000
--- a/juick-server/build.gradle
+++ /dev/null
@@ -1,125 +0,0 @@
-apply plugin: 'java'
-apply plugin: 'org.springframework.boot'
-apply plugin: 'com.moowork.node'
-apply plugin: 'io.github.swagger2markup'
-apply plugin: 'org.asciidoctor.convert'
-
-task compileFrontend(type: YarnTask) {
- inputs.files(fileTree('node_modules'))
- inputs.files(fileTree('src'))
- inputs.file('package.json')
- inputs.file('webpack.config.js')
- outputs.dir('src/main/resources/static')
- args = ['run', 'compile']
-}
-
-ext {
- swaggerOutputDir = file("${buildDir}/swagger")
- docsOutputDir = file("${buildDir}/docs")
-}
-
-test {
- systemProperty 'io.springfox.staticdocs.outputDir', swaggerOutputDir
- outputs.dir swaggerOutputDir
-}
-
-convertSwagger2markup {
- dependsOn test
- swaggerInput "${swaggerOutputDir}/swagger.json"
- outputDir swaggerOutputDir
- config = [
- 'swagger2markup.markupLanguage' : 'ASCIIDOC',
- 'swagger2markup.pathsGroupedBy' : 'TAGS'
- ]
-}
-task asciidocIndex (type: Copy) {
- from 'src/docs'
- into swaggerOutputDir
- include '*.adoc'
-}
-asciidoctor {
- dependsOn convertSwagger2markup
- dependsOn asciidocIndex
- sourceDir = swaggerOutputDir
- sources {
- include 'index.adoc', 'overview.adoc', 'definitions.adoc', 'paths.adoc'
- }
- attributes = [
- doctype: 'book',
- toc: 'left',
- toclevels: '3',
- numbered: '',
- sectlinks: '',
- sectanchors: '',
- hardbreaks: '',
- src: swaggerOutputDir,
- generated: docsOutputDir
- ]
- outputDir = docsOutputDir
-}
-
-configurations {
- compile.exclude module: 'spring-boot-starter-tomcat'
-}
-
-dependencies {
- compile project(':juick-common')
- compile 'com.github.ben-manes.caffeine:caffeine:2.6.2'
- compile("org.springframework.boot:spring-boot-starter-cache")
- compile ('org.springframework.boot:spring-boot-starter-security')
- compile ('org.springframework.boot:spring-boot-starter-jdbc')
- compile("org.springframework.boot:spring-boot-starter-security")
- compile("org.springframework.boot:spring-boot-starter-web")
- compile("org.springframework.boot:spring-boot-starter-undertow")
- compile("org.springframework.boot:spring-boot-starter-websocket")
- compile 'org.springframework.boot:spring-boot-devtools'
-
- compileOnly 'io.springfox:springfox-core:2.9.2'
-
- compile 'org.apache.commons:commons-email:1.5'
- compile 'com.github.scribejava:scribejava-apis:6.0.0'
- compile 'com.github.pengrad:java-telegram-bot-api:4.1.0'
- compile 'com.twelvemonkeys.imageio:imageio-jpeg:3.4.1'
- compile 'org.imgscalr:imgscalr-lib:4.2'
- compile 'org.twitter4j:twitter4j-core:4.0.7'
-
- compile 'xpp3:xpp3:1.1.4c'
-
- compile 'rocks.xmpp:xmpp-core-client:0.8.1-SNAPSHOT'
- compile 'rocks.xmpp:xmpp-extensions-client:0.8.1-SNAPSHOT'
-
- compile "javax.inject:javax.inject:1"
-
- compile 'com.rometools:rome:1.11.1'
- compile 'com.rometools:rome-modules:1.11.1'
-
- compile 'org.flywaydb:flyway-core:5.2.1'
-
- runtime 'org.mariadb.jdbc:mariadb-java-client:2.3.0'
- runtime 'com.h2database:h2:1.4.196'
- runtime "commons-fileupload:commons-fileupload:1.3.3"
-
- compile 'com.github.ooxi:serialized-php-parser:0.5.0'
- compile 'io.pebbletemplates:pebble-spring5:3.0.5'
- compile 'com.atlassian.commonmark:commonmark:0.11.0'
- compile 'com.atlassian.commonmark:commonmark-ext-autolink:0.11.0'
- compile 'org.tomitribe:tomitribe-http-signatures:1.1'
-
- testCompile ("org.springframework.boot:spring-boot-starter-test")
- testCompile ('net.sourceforge.htmlunit:htmlunit:2.33')
- testCompile ('org.springframework.security:spring-security-test')
-
- testCompile 'io.springfox:springfox-swagger2:2.9.2'
-}
-
-bootJar {
- launchScript()
-}
-
-bootRun {
- sourceResources sourceSets.main
-}
-
-bootRun.dependsOn ':generateDebugKey'
-compileFrontend.dependsOn 'yarn'
-processResources.dependsOn 'compileFrontend'
diff --git a/juick-server/package.json b/package.json
index 4681bb7c..4681bb7c 100644
--- a/juick-server/package.json
+++ b/package.json
diff --git a/settings.gradle b/settings.gradle
index 214e89fe..f1953cd6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,2 @@
rootProject.name = "Juick"
-include ':juick-common', ':juick-server'
-
diff --git a/juick-server/src/docs/index.adoc b/src/docs/index.adoc
index 4d492510..4d492510 100644
--- a/juick-server/src/docs/index.adoc
+++ b/src/docs/index.adoc
diff --git a/juick-server/src/main/assets/embed.js b/src/main/assets/embed.js
index d4cbab8e..d4cbab8e 100644
--- a/juick-server/src/main/assets/embed.js
+++ b/src/main/assets/embed.js
diff --git a/juick-server/src/main/assets/logo.png b/src/main/assets/logo.png
index 4e0f6d56..4e0f6d56 100644
--- a/juick-server/src/main/assets/logo.png
+++ b/src/main/assets/logo.png
Binary files differ
diff --git a/juick-server/src/main/assets/logo@2x.png b/src/main/assets/logo@2x.png
index 6febeaf9..6febeaf9 100644
--- a/juick-server/src/main/assets/logo@2x.png
+++ b/src/main/assets/logo@2x.png
Binary files differ
diff --git a/juick-server/src/main/assets/scripts.js b/src/main/assets/scripts.js
index 9ee0639e..9ee0639e 100644
--- a/juick-server/src/main/assets/scripts.js
+++ b/src/main/assets/scripts.js
diff --git a/juick-server/src/main/assets/style.css b/src/main/assets/style.css
index 02c59aad..02c59aad 100644
--- a/juick-server/src/main/assets/style.css
+++ b/src/main/assets/style.css
diff --git a/juick-server/src/main/java/com/cliqset/xrd/Alias.java b/src/main/java/com/cliqset/xrd/Alias.java
index 49e4052b..49e4052b 100644
--- a/juick-server/src/main/java/com/cliqset/xrd/Alias.java
+++ b/src/main/java/com/cliqset/xrd/Alias.java
diff --git a/juick-server/src/main/java/com/cliqset/xrd/Expires.java b/src/main/java/com/cliqset/xrd/Expires.java
index b4bcdd24..b4bcdd24 100644
--- a/juick-server/src/main/java/com/cliqset/xrd/Expires.java
+++ b/src/main/java/com/cliqset/xrd/Expires.java
diff --git a/juick-server/src/main/java/com/cliqset/xrd/Link.java b/src/main/java/com/cliqset/xrd/Link.java
index ec8522f0..ec8522f0 100644
--- a/juick-server/src/main/java/com/cliqset/xrd/Link.java
+++ b/src/main/java/com/cliqset/xrd/Link.java
diff --git a/juick-server/src/main/java/com/cliqset/xrd/Property.java b/src/main/java/com/cliqset/xrd/Property.java
index 35c7d0cc..35c7d0cc 100644
--- a/juick-server/src/main/java/com/cliqset/xrd/Property.java
+++ b/src/main/java/com/cliqset/xrd/Property.java
diff --git a/juick-server/src/main/java/com/cliqset/xrd/Signature.java b/src/main/java/com/cliqset/xrd/Signature.java
index f52f9218..f52f9218 100644
--- a/juick-server/src/main/java/com/cliqset/xrd/Signature.java
+++ b/src/main/java/com/cliqset/xrd/Signature.java
diff --git a/juick-server/src/main/java/com/cliqset/xrd/Subject.java b/src/main/java/com/cliqset/xrd/Subject.java
index f6815317..f6815317 100644
--- a/juick-server/src/main/java/com/cliqset/xrd/Subject.java
+++ b/src/main/java/com/cliqset/xrd/Subject.java
diff --git a/juick-server/src/main/java/com/cliqset/xrd/Title.java b/src/main/java/com/cliqset/xrd/Title.java
index 7d6597bd..7d6597bd 100644
--- a/juick-server/src/main/java/com/cliqset/xrd/Title.java
+++ b/src/main/java/com/cliqset/xrd/Title.java
diff --git a/juick-server/src/main/java/com/cliqset/xrd/XRD.java b/src/main/java/com/cliqset/xrd/XRD.java
index 393e977b..393e977b 100644
--- a/juick-server/src/main/java/com/cliqset/xrd/XRD.java
+++ b/src/main/java/com/cliqset/xrd/XRD.java
diff --git a/juick-server/src/main/java/com/cliqset/xrd/XRDConstants.java b/src/main/java/com/cliqset/xrd/XRDConstants.java
index 39e3c584..39e3c584 100644
--- a/juick-server/src/main/java/com/cliqset/xrd/XRDConstants.java
+++ b/src/main/java/com/cliqset/xrd/XRDConstants.java
diff --git a/juick-server/src/main/java/com/cliqset/xrd/XRDException.java b/src/main/java/com/cliqset/xrd/XRDException.java
index da1e6849..da1e6849 100644
--- a/juick-server/src/main/java/com/cliqset/xrd/XRDException.java
+++ b/src/main/java/com/cliqset/xrd/XRDException.java
diff --git a/juick-server/src/main/java/com/cliqset/xrd/package-info.java b/src/main/java/com/cliqset/xrd/package-info.java
index bd8f0146..bd8f0146 100644
--- a/juick-server/src/main/java/com/cliqset/xrd/package-info.java
+++ b/src/main/java/com/cliqset/xrd/package-info.java
diff --git a/juick-server/src/main/java/com/juick/ApiServer.java b/src/main/java/com/juick/ApiServer.java
index fb2d9701..fb2d9701 100644
--- a/juick-server/src/main/java/com/juick/ApiServer.java
+++ b/src/main/java/com/juick/ApiServer.java
diff --git a/juick-common/src/main/java/com/juick/Attachment.java b/src/main/java/com/juick/Attachment.java
index 76f2995a..76f2995a 100644
--- a/juick-common/src/main/java/com/juick/Attachment.java
+++ b/src/main/java/com/juick/Attachment.java
diff --git a/juick-common/src/main/java/com/juick/Chat.java b/src/main/java/com/juick/Chat.java
index 59c0a2dc..59c0a2dc 100644
--- a/juick-common/src/main/java/com/juick/Chat.java
+++ b/src/main/java/com/juick/Chat.java
diff --git a/juick-common/src/main/java/com/juick/ExternalToken.java b/src/main/java/com/juick/ExternalToken.java
index f6094478..f6094478 100644
--- a/juick-common/src/main/java/com/juick/ExternalToken.java
+++ b/src/main/java/com/juick/ExternalToken.java
diff --git a/juick-common/src/main/java/com/juick/Message.java b/src/main/java/com/juick/Message.java
index bd2c91b5..bd2c91b5 100644
--- a/juick-common/src/main/java/com/juick/Message.java
+++ b/src/main/java/com/juick/Message.java
diff --git a/juick-common/src/main/java/com/juick/Photo.java b/src/main/java/com/juick/Photo.java
index 06299610..06299610 100644
--- a/juick-common/src/main/java/com/juick/Photo.java
+++ b/src/main/java/com/juick/Photo.java
diff --git a/juick-common/src/main/java/com/juick/Reaction.java b/src/main/java/com/juick/Reaction.java
index 536ac241..536ac241 100644
--- a/juick-common/src/main/java/com/juick/Reaction.java
+++ b/src/main/java/com/juick/Reaction.java
diff --git a/juick-common/src/main/java/com/juick/Status.java b/src/main/java/com/juick/Status.java
index d7983536..d7983536 100644
--- a/juick-common/src/main/java/com/juick/Status.java
+++ b/src/main/java/com/juick/Status.java
diff --git a/juick-common/src/main/java/com/juick/Tag.java b/src/main/java/com/juick/Tag.java
index b93d0e76..b93d0e76 100644
--- a/juick-common/src/main/java/com/juick/Tag.java
+++ b/src/main/java/com/juick/Tag.java
diff --git a/juick-common/src/main/java/com/juick/User.java b/src/main/java/com/juick/User.java
index e2e45122..e2e45122 100644
--- a/juick-common/src/main/java/com/juick/User.java
+++ b/src/main/java/com/juick/User.java
diff --git a/juick-common/src/main/java/com/juick/adapters/SimpleDateAdapter.java b/src/main/java/com/juick/adapters/SimpleDateAdapter.java
index b8e08599..b8e08599 100644
--- a/juick-common/src/main/java/com/juick/adapters/SimpleDateAdapter.java
+++ b/src/main/java/com/juick/adapters/SimpleDateAdapter.java
diff --git a/juick-common/src/main/java/com/juick/formatters/PlainTextFormatter.java b/src/main/java/com/juick/formatters/PlainTextFormatter.java
index 378a523f..378a523f 100644
--- a/juick-common/src/main/java/com/juick/formatters/PlainTextFormatter.java
+++ b/src/main/java/com/juick/formatters/PlainTextFormatter.java
diff --git a/juick-common/src/main/java/com/juick/model/AnonymousUser.java b/src/main/java/com/juick/model/AnonymousUser.java
index f4511194..f4511194 100644
--- a/juick-common/src/main/java/com/juick/model/AnonymousUser.java
+++ b/src/main/java/com/juick/model/AnonymousUser.java
diff --git a/juick-common/src/main/java/com/juick/model/ApplicationStatus.java b/src/main/java/com/juick/model/ApplicationStatus.java
index b18e12bf..b18e12bf 100644
--- a/juick-common/src/main/java/com/juick/model/ApplicationStatus.java
+++ b/src/main/java/com/juick/model/ApplicationStatus.java
diff --git a/juick-common/src/main/java/com/juick/model/Auth.java b/src/main/java/com/juick/model/Auth.java
index 66125567..66125567 100644
--- a/juick-common/src/main/java/com/juick/model/Auth.java
+++ b/src/main/java/com/juick/model/Auth.java
diff --git a/juick-common/src/main/java/com/juick/model/CommandResult.java b/src/main/java/com/juick/model/CommandResult.java
index c310756c..c310756c 100644
--- a/juick-common/src/main/java/com/juick/model/CommandResult.java
+++ b/src/main/java/com/juick/model/CommandResult.java
diff --git a/juick-common/src/main/java/com/juick/model/NotifyOpts.java b/src/main/java/com/juick/model/NotifyOpts.java
index 1c0e0aac..1c0e0aac 100644
--- a/juick-common/src/main/java/com/juick/model/NotifyOpts.java
+++ b/src/main/java/com/juick/model/NotifyOpts.java
diff --git a/juick-common/src/main/java/com/juick/model/PrivacyOpts.java b/src/main/java/com/juick/model/PrivacyOpts.java
index 52cbe588..52cbe588 100644
--- a/juick-common/src/main/java/com/juick/model/PrivacyOpts.java
+++ b/src/main/java/com/juick/model/PrivacyOpts.java
diff --git a/juick-common/src/main/java/com/juick/model/PrivateChats.java b/src/main/java/com/juick/model/PrivateChats.java
index b6bb48ab..b6bb48ab 100644
--- a/juick-common/src/main/java/com/juick/model/PrivateChats.java
+++ b/src/main/java/com/juick/model/PrivateChats.java
diff --git a/juick-common/src/main/java/com/juick/model/ResponseReply.java b/src/main/java/com/juick/model/ResponseReply.java
index 183c6f72..183c6f72 100644
--- a/juick-common/src/main/java/com/juick/model/ResponseReply.java
+++ b/src/main/java/com/juick/model/ResponseReply.java
diff --git a/juick-common/src/main/java/com/juick/model/TagStats.java b/src/main/java/com/juick/model/TagStats.java
index da2f3f92..da2f3f92 100644
--- a/juick-common/src/main/java/com/juick/model/TagStats.java
+++ b/src/main/java/com/juick/model/TagStats.java
diff --git a/juick-common/src/main/java/com/juick/model/UserInfo.java b/src/main/java/com/juick/model/UserInfo.java
index ca5d75e0..ca5d75e0 100644
--- a/juick-common/src/main/java/com/juick/model/UserInfo.java
+++ b/src/main/java/com/juick/model/UserInfo.java
diff --git a/juick-common/src/main/java/com/juick/model/facebook/User.java b/src/main/java/com/juick/model/facebook/User.java
index 80838de6..80838de6 100644
--- a/juick-common/src/main/java/com/juick/model/facebook/User.java
+++ b/src/main/java/com/juick/model/facebook/User.java
diff --git a/juick-common/src/main/java/com/juick/model/twitter/User.java b/src/main/java/com/juick/model/twitter/User.java
index 3c80eff4..3c80eff4 100644
--- a/juick-common/src/main/java/com/juick/model/twitter/User.java
+++ b/src/main/java/com/juick/model/twitter/User.java
diff --git a/juick-common/src/main/java/com/juick/model/vk/Token.java b/src/main/java/com/juick/model/vk/Token.java
index ed93a3ab..ed93a3ab 100644
--- a/juick-common/src/main/java/com/juick/model/vk/Token.java
+++ b/src/main/java/com/juick/model/vk/Token.java
diff --git a/juick-common/src/main/java/com/juick/model/vk/User.java b/src/main/java/com/juick/model/vk/User.java
index aeb18285..aeb18285 100644
--- a/juick-common/src/main/java/com/juick/model/vk/User.java
+++ b/src/main/java/com/juick/model/vk/User.java
diff --git a/juick-common/src/main/java/com/juick/model/vk/UsersResponse.java b/src/main/java/com/juick/model/vk/UsersResponse.java
index 67505703..67505703 100644
--- a/juick-common/src/main/java/com/juick/model/vk/UsersResponse.java
+++ b/src/main/java/com/juick/model/vk/UsersResponse.java
diff --git a/juick-common/src/main/java/com/juick/package-info.java b/src/main/java/com/juick/package-info.java
index c9023417..c9023417 100644
--- a/juick-common/src/main/java/com/juick/package-info.java
+++ b/src/main/java/com/juick/package-info.java
diff --git a/juick-server/src/main/java/com/juick/server/ActivityPubManager.java b/src/main/java/com/juick/server/ActivityPubManager.java
index 4601f7d1..4601f7d1 100644
--- a/juick-server/src/main/java/com/juick/server/ActivityPubManager.java
+++ b/src/main/java/com/juick/server/ActivityPubManager.java
diff --git a/juick-server/src/main/java/com/juick/server/CommandsManager.java b/src/main/java/com/juick/server/CommandsManager.java
index 82143482..82143482 100644
--- a/juick-server/src/main/java/com/juick/server/CommandsManager.java
+++ b/src/main/java/com/juick/server/CommandsManager.java
diff --git a/juick-server/src/main/java/com/juick/server/EmailManager.java b/src/main/java/com/juick/server/EmailManager.java
index 1cdafac6..1cdafac6 100644
--- a/juick-server/src/main/java/com/juick/server/EmailManager.java
+++ b/src/main/java/com/juick/server/EmailManager.java
diff --git a/juick-server/src/main/java/com/juick/server/KeystoreManager.java b/src/main/java/com/juick/server/KeystoreManager.java
index 97c3a224..97c3a224 100644
--- a/juick-server/src/main/java/com/juick/server/KeystoreManager.java
+++ b/src/main/java/com/juick/server/KeystoreManager.java
diff --git a/juick-server/src/main/java/com/juick/server/ServerManager.java b/src/main/java/com/juick/server/ServerManager.java
index ef848526..ef848526 100644
--- a/juick-server/src/main/java/com/juick/server/ServerManager.java
+++ b/src/main/java/com/juick/server/ServerManager.java
diff --git a/juick-server/src/main/java/com/juick/server/SignatureManager.java b/src/main/java/com/juick/server/SignatureManager.java
index b3b7a301..b3b7a301 100644
--- a/juick-server/src/main/java/com/juick/server/SignatureManager.java
+++ b/src/main/java/com/juick/server/SignatureManager.java
diff --git a/juick-server/src/main/java/com/juick/server/TelegramBotManager.java b/src/main/java/com/juick/server/TelegramBotManager.java
index 8e8d0104..8e8d0104 100644
--- a/juick-server/src/main/java/com/juick/server/TelegramBotManager.java
+++ b/src/main/java/com/juick/server/TelegramBotManager.java
diff --git a/juick-server/src/main/java/com/juick/server/TopManager.java b/src/main/java/com/juick/server/TopManager.java
index e5c00242..e5c00242 100644
--- a/juick-server/src/main/java/com/juick/server/TopManager.java
+++ b/src/main/java/com/juick/server/TopManager.java
diff --git a/juick-server/src/main/java/com/juick/server/TwitterManager.java b/src/main/java/com/juick/server/TwitterManager.java
index 613594e6..613594e6 100644
--- a/juick-server/src/main/java/com/juick/server/TwitterManager.java
+++ b/src/main/java/com/juick/server/TwitterManager.java
diff --git a/juick-server/src/main/java/com/juick/server/Utils.java b/src/main/java/com/juick/server/Utils.java
index 23768ed2..23768ed2 100644
--- a/juick-server/src/main/java/com/juick/server/Utils.java
+++ b/src/main/java/com/juick/server/Utils.java
diff --git a/juick-server/src/main/java/com/juick/server/WebsocketManager.java b/src/main/java/com/juick/server/WebsocketManager.java
index 1b62b984..1b62b984 100644
--- a/juick-server/src/main/java/com/juick/server/WebsocketManager.java
+++ b/src/main/java/com/juick/server/WebsocketManager.java
diff --git a/juick-server/src/main/java/com/juick/server/XMPPConnection.java b/src/main/java/com/juick/server/XMPPConnection.java
index 9c0c09e1..9c0c09e1 100644
--- a/juick-server/src/main/java/com/juick/server/XMPPConnection.java
+++ b/src/main/java/com/juick/server/XMPPConnection.java
diff --git a/juick-server/src/main/java/com/juick/server/XMPPServer.java b/src/main/java/com/juick/server/XMPPServer.java
index 86ab6a78..86ab6a78 100644
--- a/juick-server/src/main/java/com/juick/server/XMPPServer.java
+++ b/src/main/java/com/juick/server/XMPPServer.java
diff --git a/juick-server/src/main/java/com/juick/server/api/ApiSocialLogin.java b/src/main/java/com/juick/server/api/ApiSocialLogin.java
index 8d9f9402..8d9f9402 100644
--- a/juick-server/src/main/java/com/juick/server/api/ApiSocialLogin.java
+++ b/src/main/java/com/juick/server/api/ApiSocialLogin.java
diff --git a/juick-server/src/main/java/com/juick/server/api/Index.java b/src/main/java/com/juick/server/api/Index.java
index 56f01370..56f01370 100644
--- a/juick-server/src/main/java/com/juick/server/api/Index.java
+++ b/src/main/java/com/juick/server/api/Index.java
diff --git a/juick-server/src/main/java/com/juick/server/api/Messages.java b/src/main/java/com/juick/server/api/Messages.java
index 4f0009dd..4f0009dd 100644
--- a/juick-server/src/main/java/com/juick/server/api/Messages.java
+++ b/src/main/java/com/juick/server/api/Messages.java
diff --git a/juick-server/src/main/java/com/juick/server/api/Notifications.java b/src/main/java/com/juick/server/api/Notifications.java
index 62275f5a..62275f5a 100644
--- a/juick-server/src/main/java/com/juick/server/api/Notifications.java
+++ b/src/main/java/com/juick/server/api/Notifications.java
diff --git a/juick-server/src/main/java/com/juick/server/api/PM.java b/src/main/java/com/juick/server/api/PM.java
index 0c36fe00..0c36fe00 100644
--- a/juick-server/src/main/java/com/juick/server/api/PM.java
+++ b/src/main/java/com/juick/server/api/PM.java
diff --git a/juick-server/src/main/java/com/juick/server/api/Post.java b/src/main/java/com/juick/server/api/Post.java
index 303ff109..303ff109 100644
--- a/juick-server/src/main/java/com/juick/server/api/Post.java
+++ b/src/main/java/com/juick/server/api/Post.java
diff --git a/juick-server/src/main/java/com/juick/server/api/Service.java b/src/main/java/com/juick/server/api/Service.java
index ed62886f..ed62886f 100644
--- a/juick-server/src/main/java/com/juick/server/api/Service.java
+++ b/src/main/java/com/juick/server/api/Service.java
diff --git a/juick-server/src/main/java/com/juick/server/api/Tags.java b/src/main/java/com/juick/server/api/Tags.java
index 7a8e572a..7a8e572a 100644
--- a/juick-server/src/main/java/com/juick/server/api/Tags.java
+++ b/src/main/java/com/juick/server/api/Tags.java
diff --git a/juick-server/src/main/java/com/juick/server/api/Users.java b/src/main/java/com/juick/server/api/Users.java
index 7686d722..7686d722 100644
--- a/juick-server/src/main/java/com/juick/server/api/Users.java
+++ b/src/main/java/com/juick/server/api/Users.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/Profile.java b/src/main/java/com/juick/server/api/activity/Profile.java
index 10390ea1..10390ea1 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/Profile.java
+++ b/src/main/java/com/juick/server/api/activity/Profile.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/Activity.java b/src/main/java/com/juick/server/api/activity/model/Activity.java
index ec126b88..ec126b88 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/Activity.java
+++ b/src/main/java/com/juick/server/api/activity/model/Activity.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/Context.java b/src/main/java/com/juick/server/api/activity/model/Context.java
index 0df8f8c7..0df8f8c7 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/Context.java
+++ b/src/main/java/com/juick/server/api/activity/model/Context.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/activities/Accept.java b/src/main/java/com/juick/server/api/activity/model/activities/Accept.java
index 1e0a9968..1e0a9968 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/activities/Accept.java
+++ b/src/main/java/com/juick/server/api/activity/model/activities/Accept.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/activities/Announce.java b/src/main/java/com/juick/server/api/activity/model/activities/Announce.java
index f2859404..f2859404 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/activities/Announce.java
+++ b/src/main/java/com/juick/server/api/activity/model/activities/Announce.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/activities/Block.java b/src/main/java/com/juick/server/api/activity/model/activities/Block.java
index 0e5a02d4..0e5a02d4 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/activities/Block.java
+++ b/src/main/java/com/juick/server/api/activity/model/activities/Block.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/activities/Create.java b/src/main/java/com/juick/server/api/activity/model/activities/Create.java
index 52507373..52507373 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/activities/Create.java
+++ b/src/main/java/com/juick/server/api/activity/model/activities/Create.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/activities/Delete.java b/src/main/java/com/juick/server/api/activity/model/activities/Delete.java
index f4392020..f4392020 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/activities/Delete.java
+++ b/src/main/java/com/juick/server/api/activity/model/activities/Delete.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/activities/Follow.java b/src/main/java/com/juick/server/api/activity/model/activities/Follow.java
index 573ecc6e..573ecc6e 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/activities/Follow.java
+++ b/src/main/java/com/juick/server/api/activity/model/activities/Follow.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/activities/Like.java b/src/main/java/com/juick/server/api/activity/model/activities/Like.java
index 3670293d..3670293d 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/activities/Like.java
+++ b/src/main/java/com/juick/server/api/activity/model/activities/Like.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/activities/Undo.java b/src/main/java/com/juick/server/api/activity/model/activities/Undo.java
index 4e87e9d0..4e87e9d0 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/activities/Undo.java
+++ b/src/main/java/com/juick/server/api/activity/model/activities/Undo.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/objects/Hashtag.java b/src/main/java/com/juick/server/api/activity/model/objects/Hashtag.java
index 34e73be6..34e73be6 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/objects/Hashtag.java
+++ b/src/main/java/com/juick/server/api/activity/model/objects/Hashtag.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/objects/Image.java b/src/main/java/com/juick/server/api/activity/model/objects/Image.java
index e067f729..e067f729 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/objects/Image.java
+++ b/src/main/java/com/juick/server/api/activity/model/objects/Image.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/objects/Key.java b/src/main/java/com/juick/server/api/activity/model/objects/Key.java
index 075c51dd..075c51dd 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/objects/Key.java
+++ b/src/main/java/com/juick/server/api/activity/model/objects/Key.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/objects/Link.java b/src/main/java/com/juick/server/api/activity/model/objects/Link.java
index 0c4f26dc..0c4f26dc 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/objects/Link.java
+++ b/src/main/java/com/juick/server/api/activity/model/objects/Link.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/objects/Mention.java b/src/main/java/com/juick/server/api/activity/model/objects/Mention.java
index bcb52d37..bcb52d37 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/objects/Mention.java
+++ b/src/main/java/com/juick/server/api/activity/model/objects/Mention.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/objects/Note.java b/src/main/java/com/juick/server/api/activity/model/objects/Note.java
index baad2d3b..baad2d3b 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/objects/Note.java
+++ b/src/main/java/com/juick/server/api/activity/model/objects/Note.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/objects/OrderedCollection.java b/src/main/java/com/juick/server/api/activity/model/objects/OrderedCollection.java
index 426cf331..426cf331 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/objects/OrderedCollection.java
+++ b/src/main/java/com/juick/server/api/activity/model/objects/OrderedCollection.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/objects/OrderedCollectionPage.java b/src/main/java/com/juick/server/api/activity/model/objects/OrderedCollectionPage.java
index 601919ba..601919ba 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/objects/OrderedCollectionPage.java
+++ b/src/main/java/com/juick/server/api/activity/model/objects/OrderedCollectionPage.java
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/objects/Person.java b/src/main/java/com/juick/server/api/activity/model/objects/Person.java
index 2d3a45d7..2d3a45d7 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/objects/Person.java
+++ b/src/main/java/com/juick/server/api/activity/model/objects/Person.java
diff --git a/juick-server/src/main/java/com/juick/server/api/apple/AppSiteAssociation.java b/src/main/java/com/juick/server/api/apple/AppSiteAssociation.java
index 81ab6960..81ab6960 100644
--- a/juick-server/src/main/java/com/juick/server/api/apple/AppSiteAssociation.java
+++ b/src/main/java/com/juick/server/api/apple/AppSiteAssociation.java
diff --git a/juick-server/src/main/java/com/juick/server/api/hostmeta/HostMeta.java b/src/main/java/com/juick/server/api/hostmeta/HostMeta.java
index fa4d2a3f..fa4d2a3f 100644
--- a/juick-server/src/main/java/com/juick/server/api/hostmeta/HostMeta.java
+++ b/src/main/java/com/juick/server/api/hostmeta/HostMeta.java
diff --git a/juick-server/src/main/java/com/juick/server/api/rss/Feeds.java b/src/main/java/com/juick/server/api/rss/Feeds.java
index c72f3a5e..c72f3a5e 100644
--- a/juick-server/src/main/java/com/juick/server/api/rss/Feeds.java
+++ b/src/main/java/com/juick/server/api/rss/Feeds.java
diff --git a/juick-server/src/main/java/com/juick/server/api/rss/MessagesView.java b/src/main/java/com/juick/server/api/rss/MessagesView.java
index c0ae4a97..c0ae4a97 100644
--- a/juick-server/src/main/java/com/juick/server/api/rss/MessagesView.java
+++ b/src/main/java/com/juick/server/api/rss/MessagesView.java
diff --git a/juick-server/src/main/java/com/juick/server/api/rss/RepliesView.java b/src/main/java/com/juick/server/api/rss/RepliesView.java
index a0ab801e..a0ab801e 100644
--- a/juick-server/src/main/java/com/juick/server/api/rss/RepliesView.java
+++ b/src/main/java/com/juick/server/api/rss/RepliesView.java
diff --git a/juick-server/src/main/java/com/juick/server/api/rss/extension/JuickModule.java b/src/main/java/com/juick/server/api/rss/extension/JuickModule.java
index a4198518..a4198518 100644
--- a/juick-server/src/main/java/com/juick/server/api/rss/extension/JuickModule.java
+++ b/src/main/java/com/juick/server/api/rss/extension/JuickModule.java
diff --git a/juick-server/src/main/java/com/juick/server/api/rss/extension/JuickModuleGenerator.java b/src/main/java/com/juick/server/api/rss/extension/JuickModuleGenerator.java
index 90dec35f..90dec35f 100644
--- a/juick-server/src/main/java/com/juick/server/api/rss/extension/JuickModuleGenerator.java
+++ b/src/main/java/com/juick/server/api/rss/extension/JuickModuleGenerator.java
diff --git a/juick-server/src/main/java/com/juick/server/api/rss/extension/JuickModuleImpl.java b/src/main/java/com/juick/server/api/rss/extension/JuickModuleImpl.java
index dbdd8c85..dbdd8c85 100644
--- a/juick-server/src/main/java/com/juick/server/api/rss/extension/JuickModuleImpl.java
+++ b/src/main/java/com/juick/server/api/rss/extension/JuickModuleImpl.java
diff --git a/juick-server/src/main/java/com/juick/server/api/rss/extension/JuickModuleParser.java b/src/main/java/com/juick/server/api/rss/extension/JuickModuleParser.java
index a3d0e175..a3d0e175 100644
--- a/juick-server/src/main/java/com/juick/server/api/rss/extension/JuickModuleParser.java
+++ b/src/main/java/com/juick/server/api/rss/extension/JuickModuleParser.java
diff --git a/juick-server/src/main/java/com/juick/server/api/webfinger/Resource.java b/src/main/java/com/juick/server/api/webfinger/Resource.java
index 71a0ca31..71a0ca31 100644
--- a/juick-server/src/main/java/com/juick/server/api/webfinger/Resource.java
+++ b/src/main/java/com/juick/server/api/webfinger/Resource.java
diff --git a/juick-server/src/main/java/com/juick/server/api/webfinger/model/Account.java b/src/main/java/com/juick/server/api/webfinger/model/Account.java
index 892fa303..892fa303 100644
--- a/juick-server/src/main/java/com/juick/server/api/webfinger/model/Account.java
+++ b/src/main/java/com/juick/server/api/webfinger/model/Account.java
diff --git a/juick-server/src/main/java/com/juick/server/api/webfinger/model/Link.java b/src/main/java/com/juick/server/api/webfinger/model/Link.java
index 48e7ab67..48e7ab67 100644
--- a/juick-server/src/main/java/com/juick/server/api/webfinger/model/Link.java
+++ b/src/main/java/com/juick/server/api/webfinger/model/Link.java
diff --git a/juick-server/src/main/java/com/juick/server/api/webhooks/TelegramWebhook.java b/src/main/java/com/juick/server/api/webhooks/TelegramWebhook.java
index 7a5cebda..7a5cebda 100644
--- a/juick-server/src/main/java/com/juick/server/api/webhooks/TelegramWebhook.java
+++ b/src/main/java/com/juick/server/api/webhooks/TelegramWebhook.java
diff --git a/juick-server/src/main/java/com/juick/server/api/xnodeinfo2/Info.java b/src/main/java/com/juick/server/api/xnodeinfo2/Info.java
index c12df55f..c12df55f 100644
--- a/juick-server/src/main/java/com/juick/server/api/xnodeinfo2/Info.java
+++ b/src/main/java/com/juick/server/api/xnodeinfo2/Info.java
diff --git a/juick-server/src/main/java/com/juick/server/api/xnodeinfo2/model/NodeInfo.java b/src/main/java/com/juick/server/api/xnodeinfo2/model/NodeInfo.java
index 06fe354f..06fe354f 100644
--- a/juick-server/src/main/java/com/juick/server/api/xnodeinfo2/model/NodeInfo.java
+++ b/src/main/java/com/juick/server/api/xnodeinfo2/model/NodeInfo.java
diff --git a/juick-server/src/main/java/com/juick/server/api/xnodeinfo2/model/Server.java b/src/main/java/com/juick/server/api/xnodeinfo2/model/Server.java
index a772d268..a772d268 100644
--- a/juick-server/src/main/java/com/juick/server/api/xnodeinfo2/model/Server.java
+++ b/src/main/java/com/juick/server/api/xnodeinfo2/model/Server.java
diff --git a/juick-server/src/main/java/com/juick/server/api/xnodeinfo2/model/ServiceInfo.java b/src/main/java/com/juick/server/api/xnodeinfo2/model/ServiceInfo.java
index 5b6d2baa..5b6d2baa 100644
--- a/juick-server/src/main/java/com/juick/server/api/xnodeinfo2/model/ServiceInfo.java
+++ b/src/main/java/com/juick/server/api/xnodeinfo2/model/ServiceInfo.java
diff --git a/juick-server/src/main/java/com/juick/server/api/xnodeinfo2/model/Usage.java b/src/main/java/com/juick/server/api/xnodeinfo2/model/Usage.java
index e04ea48b..e04ea48b 100644
--- a/juick-server/src/main/java/com/juick/server/api/xnodeinfo2/model/Usage.java
+++ b/src/main/java/com/juick/server/api/xnodeinfo2/model/Usage.java
diff --git a/juick-server/src/main/java/com/juick/server/api/xnodeinfo2/model/UserStats.java b/src/main/java/com/juick/server/api/xnodeinfo2/model/UserStats.java
index 515661e3..515661e3 100644
--- a/juick-server/src/main/java/com/juick/server/api/xnodeinfo2/model/UserStats.java
+++ b/src/main/java/com/juick/server/api/xnodeinfo2/model/UserStats.java
diff --git a/juick-server/src/main/java/com/juick/server/configuration/ActivityPubClientConfig.java b/src/main/java/com/juick/server/configuration/ActivityPubClientConfig.java
index 9bc1b656..9bc1b656 100644
--- a/juick-server/src/main/java/com/juick/server/configuration/ActivityPubClientConfig.java
+++ b/src/main/java/com/juick/server/configuration/ActivityPubClientConfig.java
diff --git a/juick-server/src/main/java/com/juick/server/configuration/ActivityPubClientErrorHandler.java b/src/main/java/com/juick/server/configuration/ActivityPubClientErrorHandler.java
index e535b3e5..e535b3e5 100644
--- a/juick-server/src/main/java/com/juick/server/configuration/ActivityPubClientErrorHandler.java
+++ b/src/main/java/com/juick/server/configuration/ActivityPubClientErrorHandler.java
diff --git a/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java b/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java
index 5a5d2c7b..5a5d2c7b 100644
--- a/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java
+++ b/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java
diff --git a/juick-server/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java b/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
index 23a35384..23a35384 100644
--- a/juick-server/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
+++ b/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
diff --git a/juick-server/src/main/java/com/juick/server/configuration/SapeConfiguration.java b/src/main/java/com/juick/server/configuration/SapeConfiguration.java
index 9727fbb1..9727fbb1 100644
--- a/juick-server/src/main/java/com/juick/server/configuration/SapeConfiguration.java
+++ b/src/main/java/com/juick/server/configuration/SapeConfiguration.java
diff --git a/juick-server/src/main/java/com/juick/server/configuration/SecurityConfig.java b/src/main/java/com/juick/server/configuration/SecurityConfig.java
index f02083d5..f02083d5 100644
--- a/juick-server/src/main/java/com/juick/server/configuration/SecurityConfig.java
+++ b/src/main/java/com/juick/server/configuration/SecurityConfig.java
diff --git a/juick-server/src/main/java/com/juick/server/configuration/StorageConfiguration.java b/src/main/java/com/juick/server/configuration/StorageConfiguration.java
index 4101f37d..4101f37d 100644
--- a/juick-server/src/main/java/com/juick/server/configuration/StorageConfiguration.java
+++ b/src/main/java/com/juick/server/configuration/StorageConfiguration.java
diff --git a/juick-server/src/main/java/com/juick/server/configuration/TelegramConfig.java b/src/main/java/com/juick/server/configuration/TelegramConfig.java
index ebd1fd15..ebd1fd15 100644
--- a/juick-server/src/main/java/com/juick/server/configuration/TelegramConfig.java
+++ b/src/main/java/com/juick/server/configuration/TelegramConfig.java
diff --git a/juick-server/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java b/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java
index 72889f96..72889f96 100644
--- a/juick-server/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java
+++ b/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java
diff --git a/juick-server/src/main/java/com/juick/server/configuration/XMPPConfig.java b/src/main/java/com/juick/server/configuration/XMPPConfig.java
index 2feef286..2feef286 100644
--- a/juick-server/src/main/java/com/juick/server/configuration/XMPPConfig.java
+++ b/src/main/java/com/juick/server/configuration/XMPPConfig.java
diff --git a/juick-server/src/main/java/com/juick/server/helpers/annotation/UserCommand.java b/src/main/java/com/juick/server/helpers/annotation/UserCommand.java
index 4f07001c..4f07001c 100644
--- a/juick-server/src/main/java/com/juick/server/helpers/annotation/UserCommand.java
+++ b/src/main/java/com/juick/server/helpers/annotation/UserCommand.java
diff --git a/juick-server/src/main/java/com/juick/server/util/HttpBadRequestException.java b/src/main/java/com/juick/server/util/HttpBadRequestException.java
index 242f2b09..242f2b09 100644
--- a/juick-server/src/main/java/com/juick/server/util/HttpBadRequestException.java
+++ b/src/main/java/com/juick/server/util/HttpBadRequestException.java
diff --git a/juick-server/src/main/java/com/juick/server/util/HttpForbiddenException.java b/src/main/java/com/juick/server/util/HttpForbiddenException.java
index 3251ca38..3251ca38 100644
--- a/juick-server/src/main/java/com/juick/server/util/HttpForbiddenException.java
+++ b/src/main/java/com/juick/server/util/HttpForbiddenException.java
diff --git a/juick-server/src/main/java/com/juick/server/util/HttpNotFoundException.java b/src/main/java/com/juick/server/util/HttpNotFoundException.java
index f66ece8b..f66ece8b 100644
--- a/juick-server/src/main/java/com/juick/server/util/HttpNotFoundException.java
+++ b/src/main/java/com/juick/server/util/HttpNotFoundException.java
diff --git a/juick-server/src/main/java/com/juick/server/util/HttpUtils.java b/src/main/java/com/juick/server/util/HttpUtils.java
index b70eb3ad..b70eb3ad 100644
--- a/juick-server/src/main/java/com/juick/server/util/HttpUtils.java
+++ b/src/main/java/com/juick/server/util/HttpUtils.java
diff --git a/juick-server/src/main/java/com/juick/server/util/ImageUtils.java b/src/main/java/com/juick/server/util/ImageUtils.java
index d16faf8f..d16faf8f 100644
--- a/juick-server/src/main/java/com/juick/server/util/ImageUtils.java
+++ b/src/main/java/com/juick/server/util/ImageUtils.java
diff --git a/juick-server/src/main/java/com/juick/server/util/TagUtils.java b/src/main/java/com/juick/server/util/TagUtils.java
index cb828933..cb828933 100644
--- a/juick-server/src/main/java/com/juick/server/util/TagUtils.java
+++ b/src/main/java/com/juick/server/util/TagUtils.java
diff --git a/juick-server/src/main/java/com/juick/server/util/UserUtils.java b/src/main/java/com/juick/server/util/UserUtils.java
index 1adc85ab..1adc85ab 100644
--- a/juick-server/src/main/java/com/juick/server/util/UserUtils.java
+++ b/src/main/java/com/juick/server/util/UserUtils.java
diff --git a/juick-server/src/main/java/com/juick/server/util/WebUtils.java b/src/main/java/com/juick/server/util/WebUtils.java
index 9dd628ee..9dd628ee 100644
--- a/juick-server/src/main/java/com/juick/server/util/WebUtils.java
+++ b/src/main/java/com/juick/server/util/WebUtils.java
diff --git a/juick-server/src/main/java/com/juick/server/www/HelpService.java b/src/main/java/com/juick/server/www/HelpService.java
index 25727962..25727962 100644
--- a/juick-server/src/main/java/com/juick/server/www/HelpService.java
+++ b/src/main/java/com/juick/server/www/HelpService.java
diff --git a/juick-server/src/main/java/com/juick/server/www/WebApp.java b/src/main/java/com/juick/server/www/WebApp.java
index 98327a5d..98327a5d 100644
--- a/juick-server/src/main/java/com/juick/server/www/WebApp.java
+++ b/src/main/java/com/juick/server/www/WebApp.java
diff --git a/juick-server/src/main/java/com/juick/server/www/controllers/AnythingFilter.java b/src/main/java/com/juick/server/www/controllers/AnythingFilter.java
index cdbeafc0..cdbeafc0 100644
--- a/juick-server/src/main/java/com/juick/server/www/controllers/AnythingFilter.java
+++ b/src/main/java/com/juick/server/www/controllers/AnythingFilter.java
diff --git a/juick-server/src/main/java/com/juick/server/www/controllers/Help.java b/src/main/java/com/juick/server/www/controllers/Help.java
index 61b58a9d..61b58a9d 100644
--- a/juick-server/src/main/java/com/juick/server/www/controllers/Help.java
+++ b/src/main/java/com/juick/server/www/controllers/Help.java
diff --git a/juick-server/src/main/java/com/juick/server/www/controllers/Login.java b/src/main/java/com/juick/server/www/controllers/Login.java
index d933934e..d933934e 100644
--- a/juick-server/src/main/java/com/juick/server/www/controllers/Login.java
+++ b/src/main/java/com/juick/server/www/controllers/Login.java
diff --git a/juick-server/src/main/java/com/juick/server/www/controllers/MessagesWWW.java b/src/main/java/com/juick/server/www/controllers/MessagesWWW.java
index 0708e27f..0708e27f 100644
--- a/juick-server/src/main/java/com/juick/server/www/controllers/MessagesWWW.java
+++ b/src/main/java/com/juick/server/www/controllers/MessagesWWW.java
diff --git a/juick-server/src/main/java/com/juick/server/www/controllers/NewMessage.java b/src/main/java/com/juick/server/www/controllers/NewMessage.java
index 6b5938a5..6b5938a5 100644
--- a/juick-server/src/main/java/com/juick/server/www/controllers/NewMessage.java
+++ b/src/main/java/com/juick/server/www/controllers/NewMessage.java
diff --git a/juick-server/src/main/java/com/juick/server/www/controllers/Settings.java b/src/main/java/com/juick/server/www/controllers/Settings.java
index cc8f43eb..cc8f43eb 100644
--- a/juick-server/src/main/java/com/juick/server/www/controllers/Settings.java
+++ b/src/main/java/com/juick/server/www/controllers/Settings.java
diff --git a/juick-server/src/main/java/com/juick/server/www/controllers/SignUp.java b/src/main/java/com/juick/server/www/controllers/SignUp.java
index 6a4fe063..6a4fe063 100644
--- a/juick-server/src/main/java/com/juick/server/www/controllers/SignUp.java
+++ b/src/main/java/com/juick/server/www/controllers/SignUp.java
diff --git a/juick-server/src/main/java/com/juick/server/www/controllers/SocialLogin.java b/src/main/java/com/juick/server/www/controllers/SocialLogin.java
index bc631a1a..bc631a1a 100644
--- a/juick-server/src/main/java/com/juick/server/www/controllers/SocialLogin.java
+++ b/src/main/java/com/juick/server/www/controllers/SocialLogin.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/JidConverter.java b/src/main/java/com/juick/server/xmpp/JidConverter.java
index e9a9707e..e9a9707e 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/JidConverter.java
+++ b/src/main/java/com/juick/server/xmpp/JidConverter.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/XMPPStatusPage.java b/src/main/java/com/juick/server/xmpp/XMPPStatusPage.java
index 231696ec..231696ec 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/XMPPStatusPage.java
+++ b/src/main/java/com/juick/server/xmpp/XMPPStatusPage.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/helpers/XMPPStatus.java b/src/main/java/com/juick/server/xmpp/helpers/XMPPStatus.java
index 99d89866..99d89866 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/helpers/XMPPStatus.java
+++ b/src/main/java/com/juick/server/xmpp/helpers/XMPPStatus.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/iq/MessageQuery.java b/src/main/java/com/juick/server/xmpp/iq/MessageQuery.java
index 7500cbf8..7500cbf8 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/iq/MessageQuery.java
+++ b/src/main/java/com/juick/server/xmpp/iq/MessageQuery.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/iq/package-info.java b/src/main/java/com/juick/server/xmpp/iq/package-info.java
index dada8289..dada8289 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/iq/package-info.java
+++ b/src/main/java/com/juick/server/xmpp/iq/package-info.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/router/Handshake.java b/src/main/java/com/juick/server/xmpp/router/Handshake.java
index 0bc501dd..0bc501dd 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/router/Handshake.java
+++ b/src/main/java/com/juick/server/xmpp/router/Handshake.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/router/Stream.java b/src/main/java/com/juick/server/xmpp/router/Stream.java
index 2154edf6..2154edf6 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/router/Stream.java
+++ b/src/main/java/com/juick/server/xmpp/router/Stream.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/router/StreamComponentServer.java b/src/main/java/com/juick/server/xmpp/router/StreamComponentServer.java
index a58adfc5..a58adfc5 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/router/StreamComponentServer.java
+++ b/src/main/java/com/juick/server/xmpp/router/StreamComponentServer.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/router/StreamError.java b/src/main/java/com/juick/server/xmpp/router/StreamError.java
index f731f039..f731f039 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/router/StreamError.java
+++ b/src/main/java/com/juick/server/xmpp/router/StreamError.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/router/StreamFeatures.java b/src/main/java/com/juick/server/xmpp/router/StreamFeatures.java
index e8fc324f..e8fc324f 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/router/StreamFeatures.java
+++ b/src/main/java/com/juick/server/xmpp/router/StreamFeatures.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/router/StreamHandler.java b/src/main/java/com/juick/server/xmpp/router/StreamHandler.java
index 048c61ec..048c61ec 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/router/StreamHandler.java
+++ b/src/main/java/com/juick/server/xmpp/router/StreamHandler.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/router/StreamNamespaces.java b/src/main/java/com/juick/server/xmpp/router/StreamNamespaces.java
index 1b9b1965..1b9b1965 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/router/StreamNamespaces.java
+++ b/src/main/java/com/juick/server/xmpp/router/StreamNamespaces.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/router/XMPPError.java b/src/main/java/com/juick/server/xmpp/router/XMPPError.java
index 0cf9a3bc..0cf9a3bc 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/router/XMPPError.java
+++ b/src/main/java/com/juick/server/xmpp/router/XMPPError.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/router/XMPPRouter.java b/src/main/java/com/juick/server/xmpp/router/XMPPRouter.java
index 6d67fa9c..6d67fa9c 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/router/XMPPRouter.java
+++ b/src/main/java/com/juick/server/xmpp/router/XMPPRouter.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/router/XmlUtils.java b/src/main/java/com/juick/server/xmpp/router/XmlUtils.java
index 7579489f..7579489f 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/router/XmlUtils.java
+++ b/src/main/java/com/juick/server/xmpp/router/XmlUtils.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java b/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java
index ae28f827..ae28f827 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java
+++ b/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/s2s/CacheEntry.java b/src/main/java/com/juick/server/xmpp/s2s/CacheEntry.java
index 33e875bd..33e875bd 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/s2s/CacheEntry.java
+++ b/src/main/java/com/juick/server/xmpp/s2s/CacheEntry.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/s2s/Connection.java b/src/main/java/com/juick/server/xmpp/s2s/Connection.java
index 4fa8e741..4fa8e741 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/s2s/Connection.java
+++ b/src/main/java/com/juick/server/xmpp/s2s/Connection.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionIn.java b/src/main/java/com/juick/server/xmpp/s2s/ConnectionIn.java
index 72c3ba8d..72c3ba8d 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionIn.java
+++ b/src/main/java/com/juick/server/xmpp/s2s/ConnectionIn.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionListener.java b/src/main/java/com/juick/server/xmpp/s2s/ConnectionListener.java
index 4c32b9ae..4c32b9ae 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionListener.java
+++ b/src/main/java/com/juick/server/xmpp/s2s/ConnectionListener.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionOut.java b/src/main/java/com/juick/server/xmpp/s2s/ConnectionOut.java
index be485ab1..be485ab1 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionOut.java
+++ b/src/main/java/com/juick/server/xmpp/s2s/ConnectionOut.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/s2s/DNSQueries.java b/src/main/java/com/juick/server/xmpp/s2s/DNSQueries.java
index 1367d333..1367d333 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/s2s/DNSQueries.java
+++ b/src/main/java/com/juick/server/xmpp/s2s/DNSQueries.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/s2s/StanzaListener.java b/src/main/java/com/juick/server/xmpp/s2s/StanzaListener.java
index 6932298f..6932298f 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/s2s/StanzaListener.java
+++ b/src/main/java/com/juick/server/xmpp/s2s/StanzaListener.java
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/s2s/util/DialbackUtils.java b/src/main/java/com/juick/server/xmpp/s2s/util/DialbackUtils.java
index d25dbad8..d25dbad8 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/s2s/util/DialbackUtils.java
+++ b/src/main/java/com/juick/server/xmpp/s2s/util/DialbackUtils.java
diff --git a/juick-server/src/main/java/com/juick/service/ActivityPubService.java b/src/main/java/com/juick/service/ActivityPubService.java
index 892022cf..892022cf 100644
--- a/juick-server/src/main/java/com/juick/service/ActivityPubService.java
+++ b/src/main/java/com/juick/service/ActivityPubService.java
diff --git a/juick-server/src/main/java/com/juick/service/BaseJdbcService.java b/src/main/java/com/juick/service/BaseJdbcService.java
index 496a04ba..496a04ba 100644
--- a/juick-server/src/main/java/com/juick/service/BaseJdbcService.java
+++ b/src/main/java/com/juick/service/BaseJdbcService.java
diff --git a/juick-common/src/main/java/com/juick/service/CrosspostService.java b/src/main/java/com/juick/service/CrosspostService.java
index 99911250..99911250 100644
--- a/juick-common/src/main/java/com/juick/service/CrosspostService.java
+++ b/src/main/java/com/juick/service/CrosspostService.java
diff --git a/juick-server/src/main/java/com/juick/service/CrosspostServiceImpl.java b/src/main/java/com/juick/service/CrosspostServiceImpl.java
index d190faba..d190faba 100644
--- a/juick-server/src/main/java/com/juick/service/CrosspostServiceImpl.java
+++ b/src/main/java/com/juick/service/CrosspostServiceImpl.java
diff --git a/juick-common/src/main/java/com/juick/service/EmailService.java b/src/main/java/com/juick/service/EmailService.java
index 0708cd96..0708cd96 100644
--- a/juick-common/src/main/java/com/juick/service/EmailService.java
+++ b/src/main/java/com/juick/service/EmailService.java
diff --git a/juick-server/src/main/java/com/juick/service/EmailServiceImpl.java b/src/main/java/com/juick/service/EmailServiceImpl.java
index 78bdd42a..78bdd42a 100644
--- a/juick-server/src/main/java/com/juick/service/EmailServiceImpl.java
+++ b/src/main/java/com/juick/service/EmailServiceImpl.java
diff --git a/juick-common/src/main/java/com/juick/service/ImagesService.java b/src/main/java/com/juick/service/ImagesService.java
index 902301ed..902301ed 100644
--- a/juick-common/src/main/java/com/juick/service/ImagesService.java
+++ b/src/main/java/com/juick/service/ImagesService.java
diff --git a/juick-server/src/main/java/com/juick/service/ImagesServiceImpl.java b/src/main/java/com/juick/service/ImagesServiceImpl.java
index 67c8360e..67c8360e 100644
--- a/juick-server/src/main/java/com/juick/service/ImagesServiceImpl.java
+++ b/src/main/java/com/juick/service/ImagesServiceImpl.java
diff --git a/juick-common/src/main/java/com/juick/service/MessagesService.java b/src/main/java/com/juick/service/MessagesService.java
index 362501b5..362501b5 100644
--- a/juick-common/src/main/java/com/juick/service/MessagesService.java
+++ b/src/main/java/com/juick/service/MessagesService.java
diff --git a/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java b/src/main/java/com/juick/service/MessagesServiceImpl.java
index 0b7faf87..0b7faf87 100644
--- a/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java
+++ b/src/main/java/com/juick/service/MessagesServiceImpl.java
diff --git a/juick-common/src/main/java/com/juick/service/MessengerService.java b/src/main/java/com/juick/service/MessengerService.java
index e07c73fe..e07c73fe 100644
--- a/juick-common/src/main/java/com/juick/service/MessengerService.java
+++ b/src/main/java/com/juick/service/MessengerService.java
diff --git a/juick-server/src/main/java/com/juick/service/MessengerServiceImpl.java b/src/main/java/com/juick/service/MessengerServiceImpl.java
index 57101ffe..57101ffe 100644
--- a/juick-server/src/main/java/com/juick/service/MessengerServiceImpl.java
+++ b/src/main/java/com/juick/service/MessengerServiceImpl.java
diff --git a/juick-common/src/main/java/com/juick/service/PMQueriesService.java b/src/main/java/com/juick/service/PMQueriesService.java
index e0067544..e0067544 100644
--- a/juick-common/src/main/java/com/juick/service/PMQueriesService.java
+++ b/src/main/java/com/juick/service/PMQueriesService.java
diff --git a/juick-server/src/main/java/com/juick/service/PMQueriesServiceImpl.java b/src/main/java/com/juick/service/PMQueriesServiceImpl.java
index 712e4b0e..712e4b0e 100644
--- a/juick-server/src/main/java/com/juick/service/PMQueriesServiceImpl.java
+++ b/src/main/java/com/juick/service/PMQueriesServiceImpl.java
diff --git a/juick-common/src/main/java/com/juick/service/PrivacyQueriesService.java b/src/main/java/com/juick/service/PrivacyQueriesService.java
index 17dd6a9b..17dd6a9b 100644
--- a/juick-common/src/main/java/com/juick/service/PrivacyQueriesService.java
+++ b/src/main/java/com/juick/service/PrivacyQueriesService.java
diff --git a/juick-server/src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java b/src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java
index 9f9cda1d..9f9cda1d 100644
--- a/juick-server/src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java
+++ b/src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java
diff --git a/juick-common/src/main/java/com/juick/service/PushQueriesService.java b/src/main/java/com/juick/service/PushQueriesService.java
index f84a83e4..f84a83e4 100644
--- a/juick-common/src/main/java/com/juick/service/PushQueriesService.java
+++ b/src/main/java/com/juick/service/PushQueriesService.java
diff --git a/juick-server/src/main/java/com/juick/service/PushQueriesServiceImpl.java b/src/main/java/com/juick/service/PushQueriesServiceImpl.java
index 7f97956c..7f97956c 100644
--- a/juick-server/src/main/java/com/juick/service/PushQueriesServiceImpl.java
+++ b/src/main/java/com/juick/service/PushQueriesServiceImpl.java
diff --git a/juick-common/src/main/java/com/juick/service/SearchService.java b/src/main/java/com/juick/service/SearchService.java
index 0dae5cfc..0dae5cfc 100644
--- a/juick-common/src/main/java/com/juick/service/SearchService.java
+++ b/src/main/java/com/juick/service/SearchService.java
diff --git a/juick-common/src/main/java/com/juick/service/ShowQueriesService.java b/src/main/java/com/juick/service/ShowQueriesService.java
index 32b34b4e..32b34b4e 100644
--- a/juick-common/src/main/java/com/juick/service/ShowQueriesService.java
+++ b/src/main/java/com/juick/service/ShowQueriesService.java
diff --git a/juick-server/src/main/java/com/juick/service/ShowQueriesServiceImpl.java b/src/main/java/com/juick/service/ShowQueriesServiceImpl.java
index 0fba35f1..0fba35f1 100644
--- a/juick-server/src/main/java/com/juick/service/ShowQueriesServiceImpl.java
+++ b/src/main/java/com/juick/service/ShowQueriesServiceImpl.java
diff --git a/juick-common/src/main/java/com/juick/service/SocialService.java b/src/main/java/com/juick/service/SocialService.java
index eb77619b..eb77619b 100644
--- a/juick-common/src/main/java/com/juick/service/SocialService.java
+++ b/src/main/java/com/juick/service/SocialService.java
diff --git a/juick-server/src/main/java/com/juick/service/SphinxSearchService.java b/src/main/java/com/juick/service/SphinxSearchService.java
index de7bd7f2..de7bd7f2 100644
--- a/juick-server/src/main/java/com/juick/service/SphinxSearchService.java
+++ b/src/main/java/com/juick/service/SphinxSearchService.java
diff --git a/juick-common/src/main/java/com/juick/service/SubscriptionService.java b/src/main/java/com/juick/service/SubscriptionService.java
index 8bc8d071..8bc8d071 100644
--- a/juick-common/src/main/java/com/juick/service/SubscriptionService.java
+++ b/src/main/java/com/juick/service/SubscriptionService.java
diff --git a/juick-server/src/main/java/com/juick/service/SubscriptionServiceImpl.java b/src/main/java/com/juick/service/SubscriptionServiceImpl.java
index 5ce3593b..5ce3593b 100644
--- a/juick-server/src/main/java/com/juick/service/SubscriptionServiceImpl.java
+++ b/src/main/java/com/juick/service/SubscriptionServiceImpl.java
diff --git a/juick-common/src/main/java/com/juick/service/TagService.java b/src/main/java/com/juick/service/TagService.java
index 489f405a..489f405a 100644
--- a/juick-common/src/main/java/com/juick/service/TagService.java
+++ b/src/main/java/com/juick/service/TagService.java
diff --git a/juick-server/src/main/java/com/juick/service/TagServiceImpl.java b/src/main/java/com/juick/service/TagServiceImpl.java
index 42159d3b..42159d3b 100644
--- a/juick-server/src/main/java/com/juick/service/TagServiceImpl.java
+++ b/src/main/java/com/juick/service/TagServiceImpl.java
diff --git a/juick-common/src/main/java/com/juick/service/TelegramService.java b/src/main/java/com/juick/service/TelegramService.java
index 2954370c..2954370c 100644
--- a/juick-common/src/main/java/com/juick/service/TelegramService.java
+++ b/src/main/java/com/juick/service/TelegramService.java
diff --git a/juick-server/src/main/java/com/juick/service/TelegramServiceImpl.java b/src/main/java/com/juick/service/TelegramServiceImpl.java
index 99cbabf6..99cbabf6 100644
--- a/juick-server/src/main/java/com/juick/service/TelegramServiceImpl.java
+++ b/src/main/java/com/juick/service/TelegramServiceImpl.java
diff --git a/juick-common/src/main/java/com/juick/service/UserService.java b/src/main/java/com/juick/service/UserService.java
index 832f978a..832f978a 100644
--- a/juick-common/src/main/java/com/juick/service/UserService.java
+++ b/src/main/java/com/juick/service/UserService.java
diff --git a/juick-server/src/main/java/com/juick/service/UserServiceImpl.java b/src/main/java/com/juick/service/UserServiceImpl.java
index fdc4f28c..fdc4f28c 100644
--- a/juick-server/src/main/java/com/juick/service/UserServiceImpl.java
+++ b/src/main/java/com/juick/service/UserServiceImpl.java
diff --git a/juick-server/src/main/java/com/juick/service/activities/ActivityListener.java b/src/main/java/com/juick/service/activities/ActivityListener.java
index 863bda04..863bda04 100644
--- a/juick-server/src/main/java/com/juick/service/activities/ActivityListener.java
+++ b/src/main/java/com/juick/service/activities/ActivityListener.java
diff --git a/juick-server/src/main/java/com/juick/service/activities/DeleteMessageEvent.java b/src/main/java/com/juick/service/activities/DeleteMessageEvent.java
index 67e40f44..67e40f44 100644
--- a/juick-server/src/main/java/com/juick/service/activities/DeleteMessageEvent.java
+++ b/src/main/java/com/juick/service/activities/DeleteMessageEvent.java
diff --git a/juick-server/src/main/java/com/juick/service/activities/DeleteUserEvent.java b/src/main/java/com/juick/service/activities/DeleteUserEvent.java
index 8b51da9d..8b51da9d 100644
--- a/juick-server/src/main/java/com/juick/service/activities/DeleteUserEvent.java
+++ b/src/main/java/com/juick/service/activities/DeleteUserEvent.java
diff --git a/juick-server/src/main/java/com/juick/service/activities/FollowEvent.java b/src/main/java/com/juick/service/activities/FollowEvent.java
index c96613ba..c96613ba 100644
--- a/juick-server/src/main/java/com/juick/service/activities/FollowEvent.java
+++ b/src/main/java/com/juick/service/activities/FollowEvent.java
diff --git a/juick-server/src/main/java/com/juick/service/activities/UndoFollowEvent.java b/src/main/java/com/juick/service/activities/UndoFollowEvent.java
index 2b48e6f6..2b48e6f6 100644
--- a/juick-server/src/main/java/com/juick/service/activities/UndoFollowEvent.java
+++ b/src/main/java/com/juick/service/activities/UndoFollowEvent.java
diff --git a/juick-common/src/main/java/com/juick/service/component/DisconnectedEvent.java b/src/main/java/com/juick/service/component/DisconnectedEvent.java
index 552c3e66..552c3e66 100644
--- a/juick-common/src/main/java/com/juick/service/component/DisconnectedEvent.java
+++ b/src/main/java/com/juick/service/component/DisconnectedEvent.java
diff --git a/juick-common/src/main/java/com/juick/service/component/LikeEvent.java b/src/main/java/com/juick/service/component/LikeEvent.java
index 0d4df70c..0d4df70c 100644
--- a/juick-common/src/main/java/com/juick/service/component/LikeEvent.java
+++ b/src/main/java/com/juick/service/component/LikeEvent.java
diff --git a/juick-common/src/main/java/com/juick/service/component/MessageEvent.java b/src/main/java/com/juick/service/component/MessageEvent.java
index 82911a58..82911a58 100644
--- a/juick-common/src/main/java/com/juick/service/component/MessageEvent.java
+++ b/src/main/java/com/juick/service/component/MessageEvent.java
diff --git a/juick-common/src/main/java/com/juick/service/component/MessageReadEvent.java b/src/main/java/com/juick/service/component/MessageReadEvent.java
index b070c8cb..b070c8cb 100644
--- a/juick-common/src/main/java/com/juick/service/component/MessageReadEvent.java
+++ b/src/main/java/com/juick/service/component/MessageReadEvent.java
diff --git a/juick-common/src/main/java/com/juick/service/component/NotificationListener.java b/src/main/java/com/juick/service/component/NotificationListener.java
index 38d0490a..38d0490a 100644
--- a/juick-common/src/main/java/com/juick/service/component/NotificationListener.java
+++ b/src/main/java/com/juick/service/component/NotificationListener.java
diff --git a/juick-common/src/main/java/com/juick/service/component/PingEvent.java b/src/main/java/com/juick/service/component/PingEvent.java
index 8e3f3fa7..8e3f3fa7 100644
--- a/juick-common/src/main/java/com/juick/service/component/PingEvent.java
+++ b/src/main/java/com/juick/service/component/PingEvent.java
diff --git a/juick-common/src/main/java/com/juick/service/component/SubscribeEvent.java b/src/main/java/com/juick/service/component/SubscribeEvent.java
index 9b644f2f..9b644f2f 100644
--- a/juick-common/src/main/java/com/juick/service/component/SubscribeEvent.java
+++ b/src/main/java/com/juick/service/component/SubscribeEvent.java
diff --git a/juick-common/src/main/java/com/juick/service/component/TopEvent.java b/src/main/java/com/juick/service/component/TopEvent.java
index b7e24957..b7e24957 100644
--- a/juick-common/src/main/java/com/juick/service/component/TopEvent.java
+++ b/src/main/java/com/juick/service/component/TopEvent.java
diff --git a/juick-common/src/main/java/com/juick/service/component/UserUpdatedEvent.java b/src/main/java/com/juick/service/component/UserUpdatedEvent.java
index af2f579a..af2f579a 100644
--- a/juick-common/src/main/java/com/juick/service/component/UserUpdatedEvent.java
+++ b/src/main/java/com/juick/service/component/UserUpdatedEvent.java
diff --git a/juick-server/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java b/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java
index 9215d09a..9215d09a 100644
--- a/juick-server/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java
+++ b/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java
diff --git a/juick-server/src/main/java/com/juick/service/security/JuickUserDetailsService.java b/src/main/java/com/juick/service/security/JuickUserDetailsService.java
index 59425fab..59425fab 100644
--- a/juick-server/src/main/java/com/juick/service/security/JuickUserDetailsService.java
+++ b/src/main/java/com/juick/service/security/JuickUserDetailsService.java
diff --git a/juick-server/src/main/java/com/juick/service/security/NullUserDetailsService.java b/src/main/java/com/juick/service/security/NullUserDetailsService.java
index 91acefa3..91acefa3 100644
--- a/juick-server/src/main/java/com/juick/service/security/NullUserDetailsService.java
+++ b/src/main/java/com/juick/service/security/NullUserDetailsService.java
diff --git a/juick-server/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java b/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java
index e385d7dd..e385d7dd 100644
--- a/juick-server/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java
+++ b/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java
diff --git a/juick-server/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java b/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java
index 3631e5a4..3631e5a4 100644
--- a/juick-server/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java
+++ b/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java
diff --git a/juick-server/src/main/java/com/juick/service/security/entities/JuickUser.java b/src/main/java/com/juick/service/security/entities/JuickUser.java
index c43f112f..c43f112f 100644
--- a/juick-server/src/main/java/com/juick/service/security/entities/JuickUser.java
+++ b/src/main/java/com/juick/service/security/entities/JuickUser.java
diff --git a/juick-common/src/main/java/com/juick/util/DateFormatter.java b/src/main/java/com/juick/util/DateFormatter.java
index 8f569562..8f569562 100644
--- a/juick-common/src/main/java/com/juick/util/DateFormatter.java
+++ b/src/main/java/com/juick/util/DateFormatter.java
diff --git a/juick-common/src/main/java/com/juick/util/DateFormattersHolder.java b/src/main/java/com/juick/util/DateFormattersHolder.java
index 8292e68e..8292e68e 100644
--- a/juick-common/src/main/java/com/juick/util/DateFormattersHolder.java
+++ b/src/main/java/com/juick/util/DateFormattersHolder.java
diff --git a/juick-common/src/main/java/com/juick/util/MessageUtils.java b/src/main/java/com/juick/util/MessageUtils.java
index fd357c32..fd357c32 100644
--- a/juick-common/src/main/java/com/juick/util/MessageUtils.java
+++ b/src/main/java/com/juick/util/MessageUtils.java
diff --git a/juick-common/src/main/java/com/juick/util/PrettyTimeFormatter.java b/src/main/java/com/juick/util/PrettyTimeFormatter.java
index 383f4d9a..383f4d9a 100644
--- a/juick-common/src/main/java/com/juick/util/PrettyTimeFormatter.java
+++ b/src/main/java/com/juick/util/PrettyTimeFormatter.java
diff --git a/juick-common/src/main/java/com/juick/util/StreamUtils.java b/src/main/java/com/juick/util/StreamUtils.java
index 576107af..576107af 100644
--- a/juick-common/src/main/java/com/juick/util/StreamUtils.java
+++ b/src/main/java/com/juick/util/StreamUtils.java
diff --git a/juick-server/src/main/java/com/mitchellbosecke/pebble/extension/FormatterExtension.java b/src/main/java/com/mitchellbosecke/pebble/extension/FormatterExtension.java
index 9189c2be..9189c2be 100644
--- a/juick-server/src/main/java/com/mitchellbosecke/pebble/extension/FormatterExtension.java
+++ b/src/main/java/com/mitchellbosecke/pebble/extension/FormatterExtension.java
diff --git a/juick-server/src/main/java/com/mitchellbosecke/pebble/extension/filters/FormatMessageFilter.java b/src/main/java/com/mitchellbosecke/pebble/extension/filters/FormatMessageFilter.java
index 1b75727e..1b75727e 100644
--- a/juick-server/src/main/java/com/mitchellbosecke/pebble/extension/filters/FormatMessageFilter.java
+++ b/src/main/java/com/mitchellbosecke/pebble/extension/filters/FormatMessageFilter.java
diff --git a/juick-server/src/main/java/com/mitchellbosecke/pebble/extension/filters/PrettyTimeFilter.java b/src/main/java/com/mitchellbosecke/pebble/extension/filters/PrettyTimeFilter.java
index 72dab20d..72dab20d 100644
--- a/juick-server/src/main/java/com/mitchellbosecke/pebble/extension/filters/PrettyTimeFilter.java
+++ b/src/main/java/com/mitchellbosecke/pebble/extension/filters/PrettyTimeFilter.java
diff --git a/juick-server/src/main/java/com/mitchellbosecke/pebble/extension/filters/TagsListFilter.java b/src/main/java/com/mitchellbosecke/pebble/extension/filters/TagsListFilter.java
index c7b00ea3..c7b00ea3 100644
--- a/juick-server/src/main/java/com/mitchellbosecke/pebble/extension/filters/TagsListFilter.java
+++ b/src/main/java/com/mitchellbosecke/pebble/extension/filters/TagsListFilter.java
diff --git a/juick-server/src/main/java/com/mitchellbosecke/pebble/extension/filters/TimestampFilter.java b/src/main/java/com/mitchellbosecke/pebble/extension/filters/TimestampFilter.java
index 5f98c167..5f98c167 100644
--- a/juick-server/src/main/java/com/mitchellbosecke/pebble/extension/filters/TimestampFilter.java
+++ b/src/main/java/com/mitchellbosecke/pebble/extension/filters/TimestampFilter.java
diff --git a/juick-server/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java b/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java
index aae49bc7..aae49bc7 100644
--- a/juick-server/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java
+++ b/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java
diff --git a/juick-server/src/main/java/ru/sape/Sape.java b/src/main/java/ru/sape/Sape.java
index 38577c45..38577c45 100644
--- a/juick-server/src/main/java/ru/sape/Sape.java
+++ b/src/main/java/ru/sape/Sape.java
diff --git a/juick-server/src/main/java/ru/sape/SapeConnection.java b/src/main/java/ru/sape/SapeConnection.java
index a15658fa..a15658fa 100644
--- a/juick-server/src/main/java/ru/sape/SapeConnection.java
+++ b/src/main/java/ru/sape/SapeConnection.java
diff --git a/juick-server/src/main/java/ru/sape/SapePageLinks.java b/src/main/java/ru/sape/SapePageLinks.java
index e89b4e71..e89b4e71 100644
--- a/juick-server/src/main/java/ru/sape/SapePageLinks.java
+++ b/src/main/java/ru/sape/SapePageLinks.java
diff --git a/juick-server/src/main/resources/1x1.png b/src/main/resources/1x1.png
index 1914264c..1914264c 100644
--- a/juick-server/src/main/resources/1x1.png
+++ b/src/main/resources/1x1.png
Binary files differ
diff --git a/juick-server/src/main/resources/Transparent.gif b/src/main/resources/Transparent.gif
index f191b280..f191b280 100644
--- a/juick-server/src/main/resources/Transparent.gif
+++ b/src/main/resources/Transparent.gif
Binary files differ
diff --git a/juick-server/src/main/resources/db/migration/V1.10__favorites_user_uri.sql b/src/main/resources/db/migration/V1.10__favorites_user_uri.sql
index 8f382398..8f382398 100644
--- a/juick-server/src/main/resources/db/migration/V1.10__favorites_user_uri.sql
+++ b/src/main/resources/db/migration/V1.10__favorites_user_uri.sql
diff --git a/juick-server/src/main/resources/db/migration/V1.11__increase pm timestamp precision.sql b/src/main/resources/db/migration/V1.11__increase pm timestamp precision.sql
index e83eb621..e83eb621 100644
--- a/juick-server/src/main/resources/db/migration/V1.11__increase pm timestamp precision.sql
+++ b/src/main/resources/db/migration/V1.11__increase pm timestamp precision.sql
diff --git a/juick-server/src/main/resources/db/migration/V1.12__drop unused tables.sql b/src/main/resources/db/migration/V1.12__drop unused tables.sql
index 1599f5f6..1599f5f6 100644
--- a/juick-server/src/main/resources/db/migration/V1.12__drop unused tables.sql
+++ b/src/main/resources/db/migration/V1.12__drop unused tables.sql
diff --git a/juick-server/src/main/resources/db/migration/V1.13__drop unused tables.sql b/src/main/resources/db/migration/V1.13__drop unused tables.sql
index c35fc92c..c35fc92c 100644
--- a/juick-server/src/main/resources/db/migration/V1.13__drop unused tables.sql
+++ b/src/main/resources/db/migration/V1.13__drop unused tables.sql
diff --git a/juick-server/src/main/resources/db/migration/V1.14__drop broken pm_streams.sql b/src/main/resources/db/migration/V1.14__drop broken pm_streams.sql
index 448c5ce2..448c5ce2 100644
--- a/juick-server/src/main/resources/db/migration/V1.14__drop broken pm_streams.sql
+++ b/src/main/resources/db/migration/V1.14__drop broken pm_streams.sql
diff --git a/juick-server/src/main/resources/db/migration/V1.15__drop unused columns add ts for some tables.sql b/src/main/resources/db/migration/V1.15__drop unused columns add ts for some tables.sql
index 6b3ab388..6b3ab388 100644
--- a/juick-server/src/main/resources/db/migration/V1.15__drop unused columns add ts for some tables.sql
+++ b/src/main/resources/db/migration/V1.15__drop unused columns add ts for some tables.sql
diff --git a/juick-server/src/main/resources/db/migration/V1.16__last seen.sql b/src/main/resources/db/migration/V1.16__last seen.sql
index 52ca4e90..52ca4e90 100644
--- a/juick-server/src/main/resources/db/migration/V1.16__last seen.sql
+++ b/src/main/resources/db/migration/V1.16__last seen.sql
diff --git a/juick-server/src/main/resources/db/migration/V1.1__Add updated_at field.sql b/src/main/resources/db/migration/V1.1__Add updated_at field.sql
index dac179b1..dac179b1 100644
--- a/juick-server/src/main/resources/db/migration/V1.1__Add updated_at field.sql
+++ b/src/main/resources/db/migration/V1.1__Add updated_at field.sql
diff --git a/juick-server/src/main/resources/db/migration/V1.2__Drop telegram_chats.sql b/src/main/resources/db/migration/V1.2__Drop telegram_chats.sql
index c8faee0d..c8faee0d 100644
--- a/juick-server/src/main/resources/db/migration/V1.2__Drop telegram_chats.sql
+++ b/src/main/resources/db/migration/V1.2__Drop telegram_chats.sql
diff --git a/juick-server/src/main/resources/db/migration/V1.3__Nullable user_id column in auth table.sql b/src/main/resources/db/migration/V1.3__Nullable user_id column in auth table.sql
index ced85ade..ced85ade 100644
--- a/juick-server/src/main/resources/db/migration/V1.3__Nullable user_id column in auth table.sql
+++ b/src/main/resources/db/migration/V1.3__Nullable user_id column in auth table.sql
diff --git a/juick-server/src/main/resources/db/migration/V1.4__ActivityPub followers.sql b/src/main/resources/db/migration/V1.4__ActivityPub followers.sql
index 16b39f62..16b39f62 100644
--- a/juick-server/src/main/resources/db/migration/V1.4__ActivityPub followers.sql
+++ b/src/main/resources/db/migration/V1.4__ActivityPub followers.sql
diff --git a/juick-server/src/main/resources/db/migration/V1.5__Drop acct index.sql b/src/main/resources/db/migration/V1.5__Drop acct index.sql
index 58757d88..58757d88 100644
--- a/juick-server/src/main/resources/db/migration/V1.5__Drop acct index.sql
+++ b/src/main/resources/db/migration/V1.5__Drop acct index.sql
diff --git a/juick-server/src/main/resources/db/migration/V1.6__user_uri.sql b/src/main/resources/db/migration/V1.6__user_uri.sql
index c302907c..c302907c 100644
--- a/juick-server/src/main/resources/db/migration/V1.6__user_uri.sql
+++ b/src/main/resources/db/migration/V1.6__user_uri.sql
diff --git a/juick-server/src/main/resources/db/migration/V1.7__reply_uri.sql b/src/main/resources/db/migration/V1.7__reply_uri.sql
index 9ec35485..9ec35485 100644
--- a/juick-server/src/main/resources/db/migration/V1.7__reply_uri.sql
+++ b/src/main/resources/db/migration/V1.7__reply_uri.sql
diff --git a/juick-server/src/main/resources/db/migration/V1.8__html reply.sql b/src/main/resources/db/migration/V1.8__html reply.sql
index 9f939971..9f939971 100644
--- a/juick-server/src/main/resources/db/migration/V1.8__html reply.sql
+++ b/src/main/resources/db/migration/V1.8__html reply.sql
diff --git a/juick-server/src/main/resources/db/migration/V1.9__reply_uri_index.sql b/src/main/resources/db/migration/V1.9__reply_uri_index.sql
index 0ee3c77f..0ee3c77f 100644
--- a/juick-server/src/main/resources/db/migration/V1.9__reply_uri_index.sql
+++ b/src/main/resources/db/migration/V1.9__reply_uri_index.sql
diff --git a/juick-server/src/main/resources/errors.properties b/src/main/resources/errors.properties
index 7ec8fbfd..7ec8fbfd 100644
--- a/juick-server/src/main/resources/errors.properties
+++ b/src/main/resources/errors.properties
diff --git a/juick-server/src/main/resources/errors_ru.properties b/src/main/resources/errors_ru.properties
index ca13b926..ca13b926 100644
--- a/juick-server/src/main/resources/errors_ru.properties
+++ b/src/main/resources/errors_ru.properties
diff --git a/juick-server/src/main/resources/help b/src/main/resources/help
-Subproject ce103cd9a2a8a200c6ebb3b41525e7c8f639d98
+Subproject ce103cd9a2a8a200c6ebb3b41525e7c8f639d98
diff --git a/juick-server/src/main/resources/juick.png b/src/main/resources/juick.png
index a7b0e901..a7b0e901 100644
--- a/juick-server/src/main/resources/juick.png
+++ b/src/main/resources/juick.png
Binary files differ
diff --git a/juick-server/src/main/resources/juick.sql b/src/main/resources/juick.sql
index a6fb76cd..a6fb76cd 100644
--- a/juick-server/src/main/resources/juick.sql
+++ b/src/main/resources/juick.sql
diff --git a/juick-server/src/main/resources/messages.properties b/src/main/resources/messages.properties
index cfd8a826..cfd8a826 100644
--- a/juick-server/src/main/resources/messages.properties
+++ b/src/main/resources/messages.properties
diff --git a/juick-server/src/main/resources/messages_ru.properties b/src/main/resources/messages_ru.properties
index 2a2269ae..2a2269ae 100644
--- a/juick-server/src/main/resources/messages_ru.properties
+++ b/src/main/resources/messages_ru.properties
diff --git a/juick-server/src/main/resources/pg_schema_wip b/src/main/resources/pg_schema_wip
index 61178495..61178495 100644
--- a/juick-server/src/main/resources/pg_schema_wip
+++ b/src/main/resources/pg_schema_wip
diff --git a/juick-server/src/main/resources/rome.properties b/src/main/resources/rome.properties
index fdb9aaa2..fdb9aaa2 100644
--- a/juick-server/src/main/resources/rome.properties
+++ b/src/main/resources/rome.properties
diff --git a/juick-server/src/main/resources/schema.sql b/src/main/resources/schema.sql
index 2e8fad9b..2e8fad9b 100644
--- a/juick-server/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
diff --git a/juick-server/src/main/resources/static/favicon.png b/src/main/resources/static/favicon.png
index bc7161e2..bc7161e2 100644
--- a/juick-server/src/main/resources/static/favicon.png
+++ b/src/main/resources/static/favicon.png
Binary files differ
diff --git a/juick-server/src/main/resources/static/logo.png b/src/main/resources/static/logo.png
index 933f6099..933f6099 100644
--- a/juick-server/src/main/resources/static/logo.png
+++ b/src/main/resources/static/logo.png
Binary files differ
diff --git a/juick-server/src/main/resources/static/tagscloud.png b/src/main/resources/static/tagscloud.png
index 3e1bf169..3e1bf169 100644
--- a/juick-server/src/main/resources/static/tagscloud.png
+++ b/src/main/resources/static/tagscloud.png
Binary files differ
diff --git a/juick-server/src/main/resources/templates/layouts/content.html b/src/main/resources/templates/layouts/content.html
index d2d29c4e..d2d29c4e 100644
--- a/juick-server/src/main/resources/templates/layouts/content.html
+++ b/src/main/resources/templates/layouts/content.html
diff --git a/juick-server/src/main/resources/templates/layouts/default.html b/src/main/resources/templates/layouts/default.html
index 343885c4..343885c4 100644
--- a/juick-server/src/main/resources/templates/layouts/default.html
+++ b/src/main/resources/templates/layouts/default.html
diff --git a/juick-server/src/main/resources/templates/layouts/minimal.html b/src/main/resources/templates/layouts/minimal.html
index 15924521..15924521 100644
--- a/juick-server/src/main/resources/templates/layouts/minimal.html
+++ b/src/main/resources/templates/layouts/minimal.html
diff --git a/juick-server/src/main/resources/templates/layouts/note.html b/src/main/resources/templates/layouts/note.html
index 42b939c0..42b939c0 100644
--- a/juick-server/src/main/resources/templates/layouts/note.html
+++ b/src/main/resources/templates/layouts/note.html
diff --git a/juick-server/src/main/resources/templates/views/404.html b/src/main/resources/templates/views/404.html
index 02a790e6..02a790e6 100644
--- a/juick-server/src/main/resources/templates/views/404.html
+++ b/src/main/resources/templates/views/404.html
diff --git a/juick-server/src/main/resources/templates/views/blog.html b/src/main/resources/templates/views/blog.html
index 91decad6..91decad6 100644
--- a/juick-server/src/main/resources/templates/views/blog.html
+++ b/src/main/resources/templates/views/blog.html
diff --git a/juick-server/src/main/resources/templates/views/blog_tags.html b/src/main/resources/templates/views/blog_tags.html
index 48e517eb..48e517eb 100644
--- a/juick-server/src/main/resources/templates/views/blog_tags.html
+++ b/src/main/resources/templates/views/blog_tags.html
diff --git a/juick-server/src/main/resources/templates/views/help.html b/src/main/resources/templates/views/help.html
index 3a022497..3a022497 100644
--- a/juick-server/src/main/resources/templates/views/help.html
+++ b/src/main/resources/templates/views/help.html
diff --git a/juick-server/src/main/resources/templates/views/index.html b/src/main/resources/templates/views/index.html
index 97d726de..97d726de 100644
--- a/juick-server/src/main/resources/templates/views/index.html
+++ b/src/main/resources/templates/views/index.html
diff --git a/juick-server/src/main/resources/templates/views/login.html b/src/main/resources/templates/views/login.html
index a538cb26..a538cb26 100644
--- a/juick-server/src/main/resources/templates/views/login.html
+++ b/src/main/resources/templates/views/login.html
diff --git a/juick-server/src/main/resources/templates/views/login_success.html b/src/main/resources/templates/views/login_success.html
index ee71f12f..ee71f12f 100644
--- a/juick-server/src/main/resources/templates/views/login_success.html
+++ b/src/main/resources/templates/views/login_success.html
diff --git a/juick-server/src/main/resources/templates/views/macros/tags.html b/src/main/resources/templates/views/macros/tags.html
index defed8e6..defed8e6 100644
--- a/juick-server/src/main/resources/templates/views/macros/tags.html
+++ b/src/main/resources/templates/views/macros/tags.html
diff --git a/juick-server/src/main/resources/templates/views/partial/footer.html b/src/main/resources/templates/views/partial/footer.html
index 35972254..35972254 100644
--- a/juick-server/src/main/resources/templates/views/partial/footer.html
+++ b/src/main/resources/templates/views/partial/footer.html
diff --git a/juick-server/src/main/resources/templates/views/partial/homecolumn.html b/src/main/resources/templates/views/partial/homecolumn.html
index 01448bca..01448bca 100644
--- a/juick-server/src/main/resources/templates/views/partial/homecolumn.html
+++ b/src/main/resources/templates/views/partial/homecolumn.html
diff --git a/juick-server/src/main/resources/templates/views/partial/message.html b/src/main/resources/templates/views/partial/message.html
index 00ca048c..00ca048c 100644
--- a/juick-server/src/main/resources/templates/views/partial/message.html
+++ b/src/main/resources/templates/views/partial/message.html
diff --git a/juick-server/src/main/resources/templates/views/partial/navigation.html b/src/main/resources/templates/views/partial/navigation.html
index 03b6c56d..03b6c56d 100644
--- a/juick-server/src/main/resources/templates/views/partial/navigation.html
+++ b/src/main/resources/templates/views/partial/navigation.html
diff --git a/juick-server/src/main/resources/templates/views/partial/settings_tabs.html b/src/main/resources/templates/views/partial/settings_tabs.html
index 4715253e..4715253e 100644
--- a/juick-server/src/main/resources/templates/views/partial/settings_tabs.html
+++ b/src/main/resources/templates/views/partial/settings_tabs.html
diff --git a/juick-server/src/main/resources/templates/views/partial/tagcolumn.html b/src/main/resources/templates/views/partial/tagcolumn.html
index 3e61d3d3..3e61d3d3 100644
--- a/juick-server/src/main/resources/templates/views/partial/tagcolumn.html
+++ b/src/main/resources/templates/views/partial/tagcolumn.html
diff --git a/juick-server/src/main/resources/templates/views/partial/tags.html b/src/main/resources/templates/views/partial/tags.html
index 3235213e..3235213e 100644
--- a/juick-server/src/main/resources/templates/views/partial/tags.html
+++ b/src/main/resources/templates/views/partial/tags.html
diff --git a/juick-server/src/main/resources/templates/views/partial/usercolumn.html b/src/main/resources/templates/views/partial/usercolumn.html
index 2b1963e3..2b1963e3 100644
--- a/juick-server/src/main/resources/templates/views/partial/usercolumn.html
+++ b/src/main/resources/templates/views/partial/usercolumn.html
diff --git a/juick-server/src/main/resources/templates/views/partial/usertags.html b/src/main/resources/templates/views/partial/usertags.html
index 71d1303e..71d1303e 100644
--- a/juick-server/src/main/resources/templates/views/partial/usertags.html
+++ b/src/main/resources/templates/views/partial/usertags.html
diff --git a/juick-server/src/main/resources/templates/views/pm_inbox.html b/src/main/resources/templates/views/pm_inbox.html
index e82e120e..e82e120e 100644
--- a/juick-server/src/main/resources/templates/views/pm_inbox.html
+++ b/src/main/resources/templates/views/pm_inbox.html
diff --git a/juick-server/src/main/resources/templates/views/pm_sent.html b/src/main/resources/templates/views/pm_sent.html
index dcda64d8..dcda64d8 100644
--- a/juick-server/src/main/resources/templates/views/pm_sent.html
+++ b/src/main/resources/templates/views/pm_sent.html
diff --git a/juick-server/src/main/resources/templates/views/post.html b/src/main/resources/templates/views/post.html
index 3753b36c..3753b36c 100644
--- a/juick-server/src/main/resources/templates/views/post.html
+++ b/src/main/resources/templates/views/post.html
diff --git a/juick-server/src/main/resources/templates/views/post_success.html b/src/main/resources/templates/views/post_success.html
index 2106f3cb..2106f3cb 100644
--- a/juick-server/src/main/resources/templates/views/post_success.html
+++ b/src/main/resources/templates/views/post_success.html
diff --git a/juick-server/src/main/resources/templates/views/settings_about.html b/src/main/resources/templates/views/settings_about.html
index bbf9e772..bbf9e772 100644
--- a/juick-server/src/main/resources/templates/views/settings_about.html
+++ b/src/main/resources/templates/views/settings_about.html
diff --git a/juick-server/src/main/resources/templates/views/settings_auth-email.html b/src/main/resources/templates/views/settings_auth-email.html
index e906d704..e906d704 100644
--- a/juick-server/src/main/resources/templates/views/settings_auth-email.html
+++ b/src/main/resources/templates/views/settings_auth-email.html
diff --git a/juick-server/src/main/resources/templates/views/settings_main.html b/src/main/resources/templates/views/settings_main.html
index 65fbc984..65fbc984 100644
--- a/juick-server/src/main/resources/templates/views/settings_main.html
+++ b/src/main/resources/templates/views/settings_main.html
diff --git a/juick-server/src/main/resources/templates/views/settings_password.html b/src/main/resources/templates/views/settings_password.html
index aba0b139..aba0b139 100644
--- a/juick-server/src/main/resources/templates/views/settings_password.html
+++ b/src/main/resources/templates/views/settings_password.html
diff --git a/juick-server/src/main/resources/templates/views/settings_privacy.html b/src/main/resources/templates/views/settings_privacy.html
index 83b87b93..83b87b93 100644
--- a/juick-server/src/main/resources/templates/views/settings_privacy.html
+++ b/src/main/resources/templates/views/settings_privacy.html
diff --git a/juick-server/src/main/resources/templates/views/settings_result.html b/src/main/resources/templates/views/settings_result.html
index d87a5ea6..d87a5ea6 100644
--- a/juick-server/src/main/resources/templates/views/settings_result.html
+++ b/src/main/resources/templates/views/settings_result.html
diff --git a/juick-server/src/main/resources/templates/views/signup.html b/src/main/resources/templates/views/signup.html
index d6eb921f..d6eb921f 100644
--- a/juick-server/src/main/resources/templates/views/signup.html
+++ b/src/main/resources/templates/views/signup.html
diff --git a/juick-server/src/main/resources/templates/views/thread.html b/src/main/resources/templates/views/thread.html
index 478258cf..478258cf 100644
--- a/juick-server/src/main/resources/templates/views/thread.html
+++ b/src/main/resources/templates/views/thread.html
diff --git a/juick-server/src/main/resources/templates/views/users.html b/src/main/resources/templates/views/users.html
index 702ba6b9..702ba6b9 100644
--- a/juick-server/src/main/resources/templates/views/users.html
+++ b/src/main/resources/templates/views/users.html
diff --git a/juick-common/src/test/java/com/juick/FormatterTest.java b/src/test/java/com/juick/FormatterTest.java
index da9f5d26..da9f5d26 100644
--- a/juick-common/src/test/java/com/juick/FormatterTest.java
+++ b/src/test/java/com/juick/FormatterTest.java
diff --git a/juick-common/src/test/java/com/juick/MessageTest.java b/src/test/java/com/juick/MessageTest.java
index 6197f861..6197f861 100644
--- a/juick-common/src/test/java/com/juick/MessageTest.java
+++ b/src/test/java/com/juick/MessageTest.java
diff --git a/juick-common/src/test/java/com/juick/UserTest.java b/src/test/java/com/juick/UserTest.java
index 13331426..13331426 100644
--- a/juick-common/src/test/java/com/juick/UserTest.java
+++ b/src/test/java/com/juick/UserTest.java
diff --git a/juick-server/src/test/java/com/juick/server/configuration/SwaggerConfiguration.java b/src/test/java/com/juick/server/configuration/SwaggerConfiguration.java
index 7c03f393..7c03f393 100644
--- a/juick-server/src/test/java/com/juick/server/configuration/SwaggerConfiguration.java
+++ b/src/test/java/com/juick/server/configuration/SwaggerConfiguration.java
diff --git a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java b/src/test/java/com/juick/server/tests/ServerTests.java
index 1c643d86..1c643d86 100644
--- a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/src/test/java/com/juick/server/tests/ServerTests.java
diff --git a/juick-common/src/test/java/com/juick/test/util/MockUtils.java b/src/test/java/com/juick/test/util/MockUtils.java
index 017af4d1..017af4d1 100644
--- a/juick-common/src/test/java/com/juick/test/util/MockUtils.java
+++ b/src/test/java/com/juick/test/util/MockUtils.java
diff --git a/juick-server/src/test/resources/2915104.jpg b/src/test/resources/2915104.jpg
index 7f0fc3ba..7f0fc3ba 100644
--- a/juick-server/src/test/resources/2915104.jpg
+++ b/src/test/resources/2915104.jpg
Binary files differ
diff --git a/juick-server/src/test/resources/cmyk.jpg b/src/test/resources/cmyk.jpg
index 40af259c..40af259c 100644
--- a/juick-server/src/test/resources/cmyk.jpg
+++ b/src/test/resources/cmyk.jpg
Binary files differ
diff --git a/juick-server/src/test/resources/create.json b/src/test/resources/create.json
index 42d20161..42d20161 100644
--- a/juick-server/src/test/resources/create.json
+++ b/src/test/resources/create.json
diff --git a/juick-server/src/test/resources/data.sql b/src/test/resources/data.sql
index 102b11f4..102b11f4 100644
--- a/juick-server/src/test/resources/data.sql
+++ b/src/test/resources/data.sql
diff --git a/juick-server/src/test/resources/delete.json b/src/test/resources/delete.json
index 9bd3fdea..9bd3fdea 100644
--- a/juick-server/src/test/resources/delete.json
+++ b/src/test/resources/delete.json
diff --git a/juick-server/src/test/resources/follow.json b/src/test/resources/follow.json
index 93d46c24..93d46c24 100644
--- a/juick-server/src/test/resources/follow.json
+++ b/src/test/resources/follow.json
diff --git a/juick-server/src/test/resources/mention.json b/src/test/resources/mention.json
index c51265f1..c51265f1 100644
--- a/juick-server/src/test/resources/mention.json
+++ b/src/test/resources/mention.json
diff --git a/juick-server/src/test/resources/nojfif.jpg b/src/test/resources/nojfif.jpg
index 16ddec1b..16ddec1b 100644
--- a/juick-server/src/test/resources/nojfif.jpg
+++ b/src/test/resources/nojfif.jpg
Binary files differ
diff --git a/juick-server/src/test/resources/person.json b/src/test/resources/person.json
index 67e88257..67e88257 100644
--- a/juick-server/src/test/resources/person.json
+++ b/src/test/resources/person.json
diff --git a/juick-server/src/test/resources/templates/views/test.html b/src/test/resources/templates/views/test.html
index 7700be6f..7700be6f 100644
--- a/juick-server/src/test/resources/templates/views/test.html
+++ b/src/test/resources/templates/views/test.html
diff --git a/juick-server/src/test/resources/undo.json b/src/test/resources/undo.json
index 371c6bd6..371c6bd6 100644
--- a/juick-server/src/test/resources/undo.json
+++ b/src/test/resources/undo.json
diff --git a/juick-server/src/test/resources/webfinger.json b/src/test/resources/webfinger.json
index 55f9e4f3..55f9e4f3 100644
--- a/juick-server/src/test/resources/webfinger.json
+++ b/src/test/resources/webfinger.json
diff --git a/juick-server/src/test/resources/xnodeinfo2.json b/src/test/resources/xnodeinfo2.json
index 14be6394..14be6394 100644
--- a/juick-server/src/test/resources/xnodeinfo2.json
+++ b/src/test/resources/xnodeinfo2.json
diff --git a/juick-server/webpack.config.js b/webpack.config.js
index 8057ec15..8057ec15 100644
--- a/juick-server/webpack.config.js
+++ b/webpack.config.js
diff --git a/juick-server/yarn.lock b/yarn.lock
index c7d19853..c7d19853 100644
--- a/juick-server/yarn.lock
+++ b/yarn.lock