pages = Arrays.asList("main", "password", "about", "email", "email-add", "email-del",
- "email-subscr", "auth-email", "privacy", "jid-del", "twitter-del", "telegram-del", "facebook-disable",
- "facebook-enable", "vk-del");
- String page = request.getParameter("page");
- if (StringUtils.isEmpty(page) || !pages.contains(page)) {
- throw new HttpBadRequestException();
- }
- String result = StringUtils.EMPTY;
- switch (page) {
- case "password":
- if (userService.updatePassword(visitor, request.getParameter("password"))) {
- result = "Password has been changed.
";
- String hash = userService.getHashByUID(visitor.getUid());
- Cookie c = new Cookie("hash", hash);
- c.setMaxAge(365 * 24 * 60 * 60);
- response.addCookie(c);
- }
- break;
- case "main":
- NotifyOpts opts = new NotifyOpts();
- opts.setRepliesEnabled(StringUtils.isNotEmpty(request.getParameter("jnotify")));
- opts.setSubscriptionsEnabled(StringUtils.isNotEmpty(request.getParameter("subscr_notify")));
- opts.setRecommendationsEnabled(StringUtils.isNotEmpty(request.getParameter("recomm")));
- if (subscriptionService.setNotifyOptions(visitor, opts)) {
- result = "Notification options has been updated
";
- }
- break;
- case "about":
- UserInfo info = new UserInfo();
- info.setFullName(request.getParameter("fullname"));
- info.setCountry(request.getParameter("country"));
- info.setUrl(request.getParameter("url"));
- info.setDescription(request.getParameter("descr"));
- String avatarTmpPath = HttpUtils.receiveMultiPartFile(avatar, tmpDir).getHost();
- if (StringUtils.isNotEmpty(avatarTmpPath)) {
- imagesService.saveAvatar(avatarTmpPath, visitor.getUid());
- }
- if (userService.updateUserInfo(visitor, info)) {
- applicationEventPublisher.publishEvent(new UserUpdatedEvent(this, visitor));
- result = String.format("Your info is updated.
Back to blog .
", visitor.getName());
- }
- break;
- case "jid-del":
- // FIXME: stop using ugnich-csv in parameters
- String[] params = request.getParameter("delete").split(";", 2);
- boolean res = false;
- if (params[0].equals("xmpp")) {
- res = userService.deleteJID(visitor.getUid(), params[1]);
- } else if (params[0].equals("xmpp-unauth")) {
- res = userService.unauthJID(visitor.getUid(), params[1]);
- }
- if (res) {
- result = "Deleted. Back .
";
- } else {
- result = "Error
";
- }
- break;
- case "email-add":
- if (!emailService.verifyAddressByCode(visitor.getUid(), request.getParameter("account"))) {
- String authCode = RandomStringUtils.randomAlphanumeric(8).toUpperCase();
- if (emailService.addVerificationCode(visitor.getUid(), request.getParameter("account"), authCode)) {
- Session session = Session.getDefaultInstance(System.getProperties());
- try {
- MimeMessage message = new MimeMessage(session);
- message.setFrom(new InternetAddress("noreply@mail.juick.com"));
- message.addRecipient(Message.RecipientType.TO, new InternetAddress(request.getParameter("account")));
- message.setSubject("Juick authorization link");
- message.setText(String.format("Follow link to attach this email to Juick account:\n" +
- "http://juick.com/settings?page=auth-email&code=%s\n\n" +
- "If you don't know, what this mean - just ignore this mail.\n", authCode));
- Transport.send(message);
- result = "Authorization link has been sent to your email. Follow it to proceed.
" +
- "Back
";
-
- } catch (MessagingException ex) {
- logger.error("mail exception", ex);
- throw new HttpBadRequestException();
- }
- }
- }
- break;
- case "email-del":
- if (emailService.deleteEmail(visitor.getUid(), request.getParameter("account"))) {
- result = "Deleted. Back .
";
- } else {
- result = "An error occured while deleting.
";
- }
- break;
- case "email-subscr":
- if (emailService.setNotificationsEmail(visitor.getUid(), request.getParameter("account"))) {
- result = String.format("Saved! Will send notifications to %s ." +
- "
Back
", request.getParameter("account"));
- } else {
- result = "Disabled.
Back
";
- }
- break;
- case "twitter-del":
- crosspostService.deleteTwitterToken(visitor.getUid());
- for (Cookie cookie : request.getCookies()) {
- if (cookie.getName().equals("request_token")) {
- cookie.setMaxAge(0);
- response.addCookie(cookie);
- }
- if (cookie.getName().equals("request_token_secret")) {
- cookie.setMaxAge(0);
- response.addCookie(cookie);
- }
- }
- result = "Back
";
- break;
- case "telegram-del":
- telegramService.deleteTelegramUser(visitor.getUid());
- telegramService.getTelegramIdentifiers(Collections.singletonList(visitor)).forEach(t -> {
- telegramService.deleteChat(t);
- });
- result = "Back
";
- break;
- case "facebook-disable":
- crosspostService.disableFBCrosspost(visitor.getUid());
- result = "Back
";
- break;
- case "facebook-enable":
- crosspostService.enableFBCrosspost(visitor.getUid());
- result = "Back
";
- break;
- case "vk-del":
- crosspostService.deleteVKUser(visitor.getUid());
- result = "Back
";
- break;
- default:
- throw new HttpBadRequestException();
- }
-
- model.addAttribute("title", "Настройки");
- model.addAttribute("visitor", visitor);
- model.addAttribute("result", result);
- return "views/settings_result";
- }
-}
diff --git a/juick-www/src/main/java/com/juick/www/controllers/SignUp.java b/juick-www/src/main/java/com/juick/www/controllers/SignUp.java
deleted file mode 100644
index 02a8006b..00000000
--- a/juick-www/src/main/java/com/juick/www/controllers/SignUp.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (C) 2008-2017, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see Login to post messages and comments
-message.sendLoginToXmpp=Send LOGIN to juick@juick.com
-
-messages.next=Next
-
-reply.reply=Reply
-reply.inReplyTo=in reply to
-reply.replies=Replies
-
-replies.showAsList=Show as list
-replies.showAsTree=Show as tree
-replies.unfoldAll=Unfold all
-
-question.areRegistered=Already registered?
-
-title.help=Help
-title.loginOrSignup=Juick - Log In or Sign Up
-title.index.anonym=Juick microblogs: popular posts
-title.index.user=Popular
-
-error.pageNotFound=Page not found
-error.pageNotFound.description=User probably deleted this post, or this page never existed.
-
-blog.blog=Blog
-blog.recommendations=Recommendations
-blog.photos=Photos
-blog.iread=I read
-blog.readers=My readers
-blog.bl=My blacklist
-blog.messages=Messages
-blog.comments=Comments
-blog.allPostsWithTag=All posts tagged
\ No newline at end of file
diff --git a/juick-www/src/main/resources/messages_ru.properties b/juick-www/src/main/resources/messages_ru.properties
deleted file mode 100644
index fca6aa4b..00000000
--- a/juick-www/src/main/resources/messages_ru.properties
+++ /dev/null
@@ -1,77 +0,0 @@
-date.format=dd.MM.yyyy
-
-link.settings=Настройки
-link.returnToMain=Вернуться на главную
-link.contacts=Контакты
-link.tos=TOS
-
-link.popular=Популярные
-link.allMessages=Обзор
-link.withPhotos=Фото
-link.trends=Темы
-link.my=Моя лента
-link.privateMessages=Приватные
-link.discuss=Диалоги
-link.recommended=Рекомендации
-link.postMessage=Написать
-link.Login=Войти
-link.logout=Выйти
-
-link.settings.main=Главная
-link.settings.password=Пароль
-link.settings.about=О пользователе
-
-label.sponsor=Спонсор
-label.sponsors=Спонсоры
-label.search=Поиск
-label.register=Зарегистрироваться
-label.username=Имя пользователя
-label.password=Пароль
-
-postForm.newMessage=Новое сообщение...
-postForm.imageLink=Ссылка на изображение
-postForm.imageFormats=JPG/PNG, до 10Мб
-postForm.or=или
-postForm.upload=загрузить
-postForm.tags=Теги (через пробел)
-postForm.submit=Отправить
-
-message.recommend=Рекомендовать
-message.recommendedBy=Рекомендовали
-message.comment=Комментировать
-message.writeComment=Написать комментарий...
-message.share=Поделиться
-message.subscribe=Подписаться
-message.subscribed=Подписан
-message.delete=Удалить
-message.loginForSending=Чтобы добавлять сообщения и комментарии, представьтесь
-message.sendLoginToXmpp=Отправьте LOGIN на juick@juick.com
-
-messages.next=Читать дальше
-
-reply.reply=Ответить
-reply.inReplyTo=в ответ на
-reply.replies=Ответы
-replies.showAsList=Показать списком
-replies.showAsTree=Показать деревом
-replies.unfoldAll=Раскрыть все
-
-question.areRegistered=Уже зарегистрированы?
-
-title.help=Справка
-title.loginOrSignup=Juick - Войдите в систему или зарегистрируйтесь
-title.index.anonym=Микроблоги Juick: популярные записи
-title.index.user=Популярные
-
-error.pageNotFound=Страница не найдена
-error.pageNotFound.description=Сожалеем, но страницу с этим адресом удалил её автор, либо её никогда не существовало.
-
-blog.blog=Блог
-blog.recommendations=Рекомендации
-blog.photos=Фотографии
-blog.iread=Я читаю
-blog.readers=Мои подписчики
-blog.bl=Черный список
-blog.messages=Сообщения
-blog.comments=Комментарии
-blog.allPostsWithTag=Все записи с тегом
\ No newline at end of file
diff --git a/juick-www/src/main/resources/static/favicon.png b/juick-www/src/main/resources/static/favicon.png
deleted file mode 100644
index bc7161e2..00000000
Binary files a/juick-www/src/main/resources/static/favicon.png and /dev/null differ
diff --git a/juick-www/src/main/resources/static/logo.png b/juick-www/src/main/resources/static/logo.png
deleted file mode 100644
index 933f6099..00000000
Binary files a/juick-www/src/main/resources/static/logo.png and /dev/null differ
diff --git a/juick-www/src/main/resources/static/tagscloud.png b/juick-www/src/main/resources/static/tagscloud.png
deleted file mode 100644
index 3e1bf169..00000000
Binary files a/juick-www/src/main/resources/static/tagscloud.png and /dev/null differ
diff --git a/juick-www/src/main/resources/templates/layouts/content.html b/juick-www/src/main/resources/templates/layouts/content.html
deleted file mode 100644
index 2ca9fd7e..00000000
--- a/juick-www/src/main/resources/templates/layouts/content.html
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
- {{ title | default('Juick') }}
-
-
- {% block content %}
- {% endblock %}
-
-
- {% block column %}
- {% endblock %}
-
-
-
- {% block content %}
- {% endblock %}
-
-
-{% include "views/partial/footer" %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/404.html b/juick-www/src/main/resources/templates/views/404.html
deleted file mode 100644
index 02a790e6..00000000
--- a/juick-www/src/main/resources/templates/views/404.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "layouts/default" %}
-{% block content %}
-
- Страница не найдена
- Сожалеем, но страницу с этим адресом удалил её автор, либо её никогда не существовало.
-
-{% endblock %}
-
-{% block "column" %}
-{% include "views/partial/homecolumn" %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/blog.html b/juick-www/src/main/resources/templates/views/blog.html
deleted file mode 100644
index 9cf4714e..00000000
--- a/juick-www/src/main/resources/templates/views/blog.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "layouts/default" %}
-{% import "views/macros/tags" %}
-{% block content %}
-{% if noindex %}
-
-{% endif %}
-{% if paramTag | default('') is not empty %}
-← {{ i18n("messages","blog.allPostsWithTag") }} {{ paramTag.name | escape }}
-{% endif %}
-
-
-{% if nextpage | default('') is not empty %}
-{{ i18n("messages","messages.next") }} →
-{% endif %}
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/usercolumn" %}
-{% if noindex %}
-
-{% endif %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/blog_tags.html b/juick-www/src/main/resources/templates/views/blog_tags.html
deleted file mode 100644
index 48e517eb..00000000
--- a/juick-www/src/main/resources/templates/views/blog_tags.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "layouts/default" %}
-{% import "views/macros/tags" %}
-{% block content %}
-
- {{ tags(user.name, tags) }}
-
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/usercolumn" %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/help.html b/juick-www/src/main/resources/templates/views/help.html
deleted file mode 100644
index 3a022497..00000000
--- a/juick-www/src/main/resources/templates/views/help.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "layouts/default" %}
-{% block content %}
-
- {{ content | raw }}
-
-{% endblock %}
-
-{% block "column" %}
-{{ navigation | raw }}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/index.html b/juick-www/src/main/resources/templates/views/index.html
deleted file mode 100644
index 97d726de..00000000
--- a/juick-www/src/main/resources/templates/views/index.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends "layouts/default" %}
-{% import "views/macros/tags" %}
-{% block content %}
-{% if noindex %}
-
-{% endif %}
-{% for msg in msgs %}
-{% include "views/partial/message" %}
-{% endfor %}
-{% if nextpage | default('') is not empty %}
-{{ i18n("messages","messages.next") }} →
-{% endif %}
-{% endblock %}
-{% block "column" %}
-{% if tag | default('') is not empty %}
-{% include "views/partial/tagcolumn" %}
-{% elseif visitor.uid > 0 %}
-{% if discover %}
-{% include "views/partial/homecolumn" %}
-{% else %}
-{% include "views/partial/usercolumn" %}
-{% endif %}
-{% else %}
-{% include "views/partial/homecolumn" %}
-{% endif %}
-{% if noindex %}
-
-{% endif %}
-{% endblock %}
diff --git a/juick-www/src/main/resources/templates/views/login.html b/juick-www/src/main/resources/templates/views/login.html
deleted file mode 100644
index a538cb26..00000000
--- a/juick-www/src/main/resources/templates/views/login.html
+++ /dev/null
@@ -1,144 +0,0 @@
-
-
-
- Juick
-
-
-
- {{ i18n("messages","label.register") }}:
-
-
-
-
-
-
Blank window
-
-
-
-
-
diff --git a/juick-www/src/main/resources/templates/views/macros/tags.html b/juick-www/src/main/resources/templates/views/macros/tags.html
deleted file mode 100644
index 09278ffe..00000000
--- a/juick-www/src/main/resources/templates/views/macros/tags.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% macro tags(uname="", tagsList) %}
-{% for tag in tagsList %}
-{{ tag | raw }}
-{% endfor %}
-{% endmacro %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/partial/footer.html b/juick-www/src/main/resources/templates/views/partial/footer.html
deleted file mode 100644
index 35972254..00000000
--- a/juick-www/src/main/resources/templates/views/partial/footer.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
diff --git a/juick-www/src/main/resources/templates/views/partial/homecolumn.html b/juick-www/src/main/resources/templates/views/partial/homecolumn.html
deleted file mode 100644
index 64dd9cbd..00000000
--- a/juick-www/src/main/resources/templates/views/partial/homecolumn.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/partial/message.html b/juick-www/src/main/resources/templates/views/partial/message.html
deleted file mode 100644
index 0b6db3df..00000000
--- a/juick-www/src/main/resources/templates/views/partial/message.html
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
- {{ msg | formatMessage }}
- {% if msg.AttachmentType is not empty %}
-
-
-
- {% endif %}
-
- {% if visitor.uid == msg.user.uid %}
-
-
-
- {{ i18n("messages","message.recommend") }}
-
- {% elseif visitor.uid > 0 %}
-
-
-
- {{ i18n("messages","message.recommend") }}
-
- {% else %}
-
-
-
- {{ i18n("messages","message.recommend") }}
-
- {% endif %}
- {% if (not msg.ReadOnly) or (visitor.uid == msg.user.uid) %}
-
-
- {% endif %}
- {% if msg.FriendsOnly %}
- Открыть доступ
- {% endif %}
-
-
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/partial/navigation.html b/juick-www/src/main/resources/templates/views/partial/navigation.html
deleted file mode 100644
index fa1dadcc..00000000
--- a/juick-www/src/main/resources/templates/views/partial/navigation.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
diff --git a/juick-www/src/main/resources/templates/views/partial/settings_tabs.html b/juick-www/src/main/resources/templates/views/partial/settings_tabs.html
deleted file mode 100644
index 4715253e..00000000
--- a/juick-www/src/main/resources/templates/views/partial/settings_tabs.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/partial/tagcolumn.html b/juick-www/src/main/resources/templates/views/partial/tagcolumn.html
deleted file mode 100644
index 3e61d3d3..00000000
--- a/juick-www/src/main/resources/templates/views/partial/tagcolumn.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
*{{ tag.name }}
-
-{% if visitor is not empty and visitor.uid > 0 %}
-
-{% endif %}
diff --git a/juick-www/src/main/resources/templates/views/partial/tags.html b/juick-www/src/main/resources/templates/views/partial/tags.html
deleted file mode 100644
index 3235213e..00000000
--- a/juick-www/src/main/resources/templates/views/partial/tags.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% for tag in tags %}
- {{ tag | raw }}
-{% endfor %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/partial/usercolumn.html b/juick-www/src/main/resources/templates/views/partial/usercolumn.html
deleted file mode 100644
index 2b1963e3..00000000
--- a/juick-www/src/main/resources/templates/views/partial/usercolumn.html
+++ /dev/null
@@ -1,89 +0,0 @@
-{% if visitor is not empty and visitor.uid > 0 and visitor.uid != user.uid %}
-
-
-{% else %}
-
-
- {% if iread is not empty %}
-
- {% for u in iread %}
-
-
-
-
- {% endfor %}
-
- {% endif %}
-
-
...
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/pm_inbox.html b/juick-www/src/main/resources/templates/views/pm_inbox.html
deleted file mode 100644
index d6a9b65f..00000000
--- a/juick-www/src/main/resources/templates/views/pm_inbox.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends "layouts/default" %}
-{% block content %}
-{% if not msgs.isEmpty() %}
-
- {% for msg in msgs %}
-
-
-
-
-
{{ msg | formatMessage }}
-
-
- {% endfor %}
-
-{% endif %}
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/usercolumn" %}
-{% endblock %}
diff --git a/juick-www/src/main/resources/templates/views/pm_sent.html b/juick-www/src/main/resources/templates/views/pm_sent.html
deleted file mode 100644
index bc42c4ab..00000000
--- a/juick-www/src/main/resources/templates/views/pm_sent.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% extends "layouts/default" %}
-{% block content %}
-
-{% if not msgs.isEmpty() %}
-
- {% for msg in msgs %}
-
-
-
-
{{ msg | formatMessage }}
-
- {% endfor %}
-
-{% endif %}
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/usercolumn" %}
-{% endblock %}
diff --git a/juick-www/src/main/resources/templates/views/post.html b/juick-www/src/main/resources/templates/views/post.html
deleted file mode 100644
index 1f642ce1..00000000
--- a/juick-www/src/main/resources/templates/views/post.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "layouts/minimal" %}
-{% import "views/macros/tags" %}
-{% block content %}
-
-
-
-Теги:
-{{ tags(visitor.name, tags) }}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/post_success.html b/juick-www/src/main/resources/templates/views/post_success.html
deleted file mode 100644
index 2106f3cb..00000000
--- a/juick-www/src/main/resources/templates/views/post_success.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "layouts/minimal" %}
-{% block content %}
-Сообщение опубликовано
-Поделитесь своим новым постом в социальных сетях:
-{% if sharetwi | default('') is not empty %}
-
-
-{% endif %}
-
-
-{% if facebook | default('') is not empty %}
-
-
-{% endif %}
-Ссылка на сообщение: {{ url }}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/settings_about.html b/juick-www/src/main/resources/templates/views/settings_about.html
deleted file mode 100644
index bbf9e772..00000000
--- a/juick-www/src/main/resources/templates/views/settings_about.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "layouts/default" %}
-{% block content %}
-
-
-
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/settings_tabs" %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/settings_auth-email.html b/juick-www/src/main/resources/templates/views/settings_auth-email.html
deleted file mode 100644
index e906d704..00000000
--- a/juick-www/src/main/resources/templates/views/settings_auth-email.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "layouts/default" %}
-{% block content %}
-
- {{ result }}
Settings .
-
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/settings_tabs" %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/settings_main.html b/juick-www/src/main/resources/templates/views/settings_main.html
deleted file mode 100644
index 65fbc984..00000000
--- a/juick-www/src/main/resources/templates/views/settings_main.html
+++ /dev/null
@@ -1,151 +0,0 @@
-{% extends "layouts/default" %}
-{% block content %}
-
- Настройки
-
-
-
- Telegram
- {% if telegram_name is not empty %}
-
- {% else %}
- To connect Telegram account: send any text message to @Juick_bot
-
- {% endif %}
-
- {% if jids | length > 0 %}
-
- {% endif %}
-
-
- E-mail
-
-
-
- {% if emails is not empty %}
-
-
-
- {% endif %}
-
- You can post to Juick via e-mail. Send your plain text
- messages to juick@juick.com
-
-
-
- Facebook
-
- {% if fbstatus.connected %}
- {% if fbstatus.crosspostEnabled %}
-
- {% else %}
-
- {% endif %}
- {% else %}
- Cross-posting to Facebook:
- {% endif %}
-
-
-
- Twitter
- {% if twitter_name is not empty %}
-
- {% else %}
- Cross-posting to Twitter:
- {% endif %}
-
-
-
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/settings_tabs" %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/settings_password.html b/juick-www/src/main/resources/templates/views/settings_password.html
deleted file mode 100644
index aba0b139..00000000
--- a/juick-www/src/main/resources/templates/views/settings_password.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "layouts/default" %}
-{% block content %}
-
-
- Changing your password
-
-
-
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/settings_tabs" %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/settings_privacy.html b/juick-www/src/main/resources/templates/views/settings_privacy.html
deleted file mode 100644
index 83b87b93..00000000
--- a/juick-www/src/main/resources/templates/views/settings_privacy.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "layouts/default" %}
-{% block content %}
-
- Privacy
-
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/settings_tabs" %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/settings_result.html b/juick-www/src/main/resources/templates/views/settings_result.html
deleted file mode 100644
index d87a5ea6..00000000
--- a/juick-www/src/main/resources/templates/views/settings_result.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "layouts/default" %}
-{% block content %}
-
- {{ result | raw }}
-
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/settings_tabs" %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/signup.html b/juick-www/src/main/resources/templates/views/signup.html
deleted file mode 100644
index 44fd366f..00000000
--- a/juick-www/src/main/resources/templates/views/signup.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% extends "layouts/default" %}
-{% block content %}
-
- {% if type | slice(0, 1) == 'f' %}
-
-
-Связать с существующим аккаунтом Juick
-
-
-Создать новый аккаунт Juick
-
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/test.html b/juick-www/src/main/resources/templates/views/test.html
deleted file mode 100644
index 7700be6f..00000000
--- a/juick-www/src/main/resources/templates/views/test.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{% import "views/macros/tags" %}
-{{ tags("ugnich", tagsList)}}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/thread.html b/juick-www/src/main/resources/templates/views/thread.html
deleted file mode 100644
index e002bc71..00000000
--- a/juick-www/src/main/resources/templates/views/thread.html
+++ /dev/null
@@ -1,170 +0,0 @@
-{% extends "layouts/default" %}
-{% import "views/macros/tags" %}
-{% block content %}
-
-
- {% if visitor.uid > 0 %}
-
- {% endif %}
-
{{ i18n("messages","reply.replies") }} ({{ replies.size() }})
-
- {% for msg in replies %}
-
-
-
-
{{ msg | formatMessage }}
- {% if msg.AttachmentType is not empty %}
-
- {% endif %}
-
/{{ msg.rid }}
- {% if msg.replyto > 0 %}
- {{ i18n("messages","reply.inReplyTo") }}
/{{ msg.replyto }}
- {% endif %}
- {% if msg.VisitorCanComment %}
- ·
-
-
- {% elseif visitor.uid == 0 %}
- ·
{{ i18n("messages","reply.reply") }}
-
- {% endfor %}
-
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/usercolumn" %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/main/resources/templates/views/users.html b/juick-www/src/main/resources/templates/views/users.html
deleted file mode 100644
index 702ba6b9..00000000
--- a/juick-www/src/main/resources/templates/views/users.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "layouts/default" %}
-{% import "views/macros/tags" %}
-{% block content %}
-
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/usercolumn" %}
-{% endblock %}
\ No newline at end of file
diff --git a/juick-www/src/test/java/com/juick/WebAppTests.java b/juick-www/src/test/java/com/juick/WebAppTests.java
deleted file mode 100644
index 74be2c92..00000000
--- a/juick-www/src/test/java/com/juick/WebAppTests.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
- * Copyright (C) 2008-2017, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see >_< "));
- }
-
- public DomElement fetchMeta(String url, String name) throws IOException {
- HtmlPage page = webClient.getPage(url);
- DomElement emptyMeta = new DomElement("", "meta", null, null);
- return page.getElementsByTagName("meta").stream()
- .filter(t -> t.getAttribute("name").equals(name)).findFirst().orElse(emptyMeta);
- }
- @Test
- public void testTwitterCards() throws Exception {
-
- int mid = messagesService.createMessage(ugnich.getUid(), "without image", null, null);
-
- assertThat(fetchMeta(String.format("http://localhost:8080/ugnich/%d", mid), "twitter:card")
- .getAttribute("content"), equalTo("summary"));
- int mid2 = messagesService.createMessage(ugnich.getUid(), "with image", "png", null);
- Message message = messagesService.getMessage(mid2);
- assertThat(fetchMeta(String.format("http://localhost:8080/ugnich/%d", mid2), "twitter:card")
- .getAttribute("content"), equalTo("summary_large_image"));
- assertThat(fetchMeta(String.format("http://localhost:8080/ugnich/%d", mid2), "og:description")
- .getAttribute("content"),
- startsWith(StringEscapeUtils.escapeHtml4(MessageUtils.getMessageHashTags(message))));
- }
- @Test
- public void postMessageTests() throws Exception {
- mockMvc.perform(post("/post2").param("body", "yo")).andExpect(redirectedUrl("http://localhost/login"));
- MvcResult loginResult = mockMvc.perform(post("/login")
- .param("username", ugnichName)
- .param("password", ugnichPassword)).andReturn();
- String msgText = "yoppppl";
- mockMvc.perform(post("/post2")
- .cookie(loginResult.getResponse().getCookies())
- .param("body", msgText)).andExpect(status().isFound());
- Message lastMessage = messagesService.getMessage(messagesService.getMyFeed(ugnich.getUid(), 0, false).get(0));
- assertThat(lastMessage.getText(), equalTo(msgText));
- mockMvc.perform(post("/post2")
- .cookie(loginResult.getResponse().getCookies())
- .param("img", "http://static.juick.com/settings/facebook.png")).andExpect(status().isFound());
- lastMessage = messagesService.getMessage(messagesService.getMyFeed(ugnich.getUid(), 0, false).get(0));
- assertThat(lastMessage.getAttachmentType(), equalTo("png"));
- mockMvc.perform(post("/post2")
- .cookie(loginResult.getResponse().getCookies())
- .param("img", "bad_url")).andExpect(status().isBadRequest());
- FileInputStream fi = new FileInputStream(new ClassPathResource("static/tagscloud.png").getFile());
- MockMultipartFile file = new MockMultipartFile("attach", fi);
- mockMvc.perform(multipart("/post2")
- .file(file)
- .cookie(loginResult.getResponse().getCookies())).andExpect(status().isFound());
- int mid = messagesService.createMessage(ugnich.getUid(), "dummy message", null, null);
- mockMvc.perform(post("/comment")
- .param("mid", String.valueOf(mid))
- .param("body", "yo")).andExpect(redirectedUrl("http://localhost/login"));
- mockMvc.perform(post("/comment")
- .cookie(loginResult.getResponse().getCookies())
- .param("wrong_param", "yo")).andExpect(status().isBadRequest());
- mockMvc.perform(post("/comment")
- .cookie(loginResult.getResponse().getCookies())
- .param("mid", String.valueOf(mid))
- .param("wrong_param", "yo")).andExpect(status().isBadRequest());
- mockMvc.perform(post("/comment")
- .cookie(loginResult.getResponse().getCookies())
- .param("mid", String.valueOf(mid))
- .param("img", "http://static.juick.com/settings/facebook.png")).andExpect(status().isFound());
- mockMvc.perform(multipart("/comment")
- .file(file)
- .cookie(loginResult.getResponse().getCookies())
- .param("mid", String.valueOf(mid))).andExpect(status().isFound());
- mockMvc.perform(post("/comment")
- .cookie(loginResult.getResponse().getCookies())
- .param("mid", String.valueOf(mid))
- .param("body", "yo")).andExpect(redirectedUrl(String.format("/%s/%d#%d", ugnichName, mid, 3)));
- mockMvc.perform(post("/post2")
- .cookie(loginResult.getResponse().getCookies())
- .param("body", String.format("D #%d/%d", mid, 3)))
- .andExpect(status().isFound());
- assertThat(messagesService.getReplies(ugnich, mid).size(), equalTo(2));
- }
- @Test
- public void hashLoginShouldNotUseSession() throws Exception {
- String hash = userService.getHashByUID(ugnich.getUid());
- MvcResult hashLoginResult = mockMvc.perform(get("/?show=my&hash=" + hash))
- .andExpect(status().isOk())
- .andExpect(model().attribute("visitor", hasProperty("authHash", equalTo(hash))))
- .andExpect(content().string(containsString(hash)))
- .andReturn();
- Cookie rememberMeFromHash = hashLoginResult.getResponse().getCookie("juick-remember-me");
- MvcResult formLoginResult = mockMvc.perform(post("/login")
- .param("username", ugnichName)
- .param("password", ugnichPassword)).andReturn();
- Cookie rememberMeFromForm = formLoginResult.getResponse().getCookie("juick-remember-me");
- mockMvc.perform(get("/?show=my").cookie(rememberMeFromForm)).andExpect(status().isOk())
- .andExpect(model().attribute("visitor", hasProperty("authHash", equalTo(hash))))
- .andExpect(content().string(containsString(hash)));
- mockMvc.perform(get("/?show=my").cookie(rememberMeFromHash)).andExpect(status().isOk())
- .andExpect(model().attribute("visitor", hasProperty("authHash", equalTo(hash))))
- .andExpect(content().string(containsString(hash)));
- }
- @Test
- public void nonExistentBlogShouldReturn404() throws Exception {
- mockMvc.perform(get("/ololoe/")).andExpect(status().isNotFound());
- }
- @Test
- public void discussionsShouldBePageableByTimestamp() throws Exception {
- String msgText = "Привет, я снова Угнич";
- int mid = messagesService.createMessage(ugnich.getUid(), msgText, null, null);
- int midNew = messagesService.createMessage(ugnich.getUid(), "Я более новый Угнич", null, null);
- MvcResult loginResult = mockMvc.perform(post("/login")
- .param("username", freefdName)
- .param("password", freefdPassword)).andReturn();
- Cookie loginCookie = loginResult.getResponse().getCookie("juick-remember-me");
- webClient.setCookieManager(new CookieManager());
- webClient.getCookieManager().addCookie(
- new com.gargoylesoftware.htmlunit.util.Cookie(loginCookie.getDomain(),
- loginCookie.getName(),
- loginCookie.getValue()));
- String discussionsUrl = "http://localhost:8080/?show=discuss";
- HtmlPage discussions = webClient.getPage(discussionsUrl);
- assertThat(discussions.querySelectorAll("article").size(), is(0));
- subscriptionService.subscribeMessage(messagesService.getMessage(mid), freefd);
- discussions = (HtmlPage) discussions.refresh();
- assertThat(discussions.querySelectorAll("article").size(), is(1));
- subscriptionService.subscribeMessage(messagesService.getMessage(midNew), freefd);
- discussions = (HtmlPage) discussions.refresh();
- assertThat(discussions.querySelectorAll("article").size(), is(2));
- assertThat(discussions.querySelectorAll("article").get(0).getAttributes().getNamedItem("data-mid").getNodeValue(), is(String.valueOf(midNew)));
- messagesService.createReply(mid, 0, freefd, "I'm replied", null);
- discussions = (HtmlPage) discussions.refresh();
- assertThat(discussions.querySelectorAll("article").size(), is(2));
- assertThat(discussions.querySelectorAll("article").get(0).getAttributes().getNamedItem("data-mid").getNodeValue(), is(String.valueOf(mid)));
- Message msg = messagesService.getMessage(mid);
- HtmlPage discussionsOld = webClient.getPage(discussionsUrl + "&to=" + msg.getUpdated().toEpochMilli());
- assertThat(discussionsOld.querySelectorAll("article").size(), is(1));
- assertThat(discussionsOld.querySelectorAll("article").get(0).getAttributes().getNamedItem("data-mid").getNodeValue(), is(String.valueOf(midNew)));
- List newMids = IntStream.rangeClosed(1, 19).map(i -> messagesService.createMessage(ugnich.getUid(), String.valueOf(i), null, null)).boxed().collect(Collectors.toList());
- for (Integer m : newMids) {
- subscriptionService.subscribeMessage(messagesService.getMessage(m), freefd);
- }
- discussions = (HtmlPage) discussions.refresh();
- assertThat(discussions.querySelectorAll("article").size(), is(20));
- assertThat(discussions.querySelectorAll("article")
- .get(19).getAttributes().getNamedItem("data-mid").getNodeValue(), is(String.valueOf(mid)));
- messagesService.createReply(midNew, 0, freefd, "I'm replied", null);
- discussions = (HtmlPage) discussions.refresh();
- assertThat(discussions.querySelectorAll("article")
- .get(0).getAttributes().getNamedItem("data-mid").getNodeValue(), is(String.valueOf(midNew)));
- Message old = messagesService.getMessage(newMids.get(0));
- discussionsOld = webClient.getPage(discussionsUrl + "&to=" + old.getUpdated().toEpochMilli());
- assertThat(discussionsOld.querySelectorAll("article").size(), is(1));
- assertThat(discussionsOld.querySelectorAll("article")
- .get(0).getAttributes().getNamedItem("data-mid").getNodeValue(), is(String.valueOf(mid)));
- }
- @Test
- public void redirectParamShouldCorrectlyRedirectLoggedUser() throws Exception {
- MvcResult formLoginResult = mockMvc.perform(post("/login")
- .param("username", ugnichName)
- .param("password", ugnichPassword)).andReturn();
- Cookie rememberMeFromForm = formLoginResult.getResponse().getCookie("juick-remember-me");
- mockMvc.perform(get("/login").cookie(rememberMeFromForm))
- .andExpect(status().is3xxRedirection())
- .andExpect(redirectedUrl("/"));
- mockMvc.perform(get("/login?redirect=false").cookie(rememberMeFromForm))
- .andExpect(status().is3xxRedirection())
- .andExpect(redirectedUrl("/login/success"));
- }
- @Test
- public void anythingRedirects() throws Exception {
- int mid = messagesService.createMessage(ugnich.getUid(), "yo", null, null);
- mockMvc.perform(get(String.format("/%d", mid)))
- .andExpect(status().isMovedPermanently())
- .andExpect(redirectedUrl(String.format("/%s/%d", ugnich.getName(), mid)));
- }
- @Test
- public void appAssociationsTest() throws Exception {
- mockMvc.perform((get("/.well-known/apple-app-site-association")))
- .andExpect(status().isOk())
- .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
- .andExpect(jsonPath("$.webcredentials.apps[0]", is(appId)));
- }
- @Test
- public void notificationsTests() throws Exception {
- MvcResult loginResult = mockMvc.perform(post("/login")
- .param("username", freefdName)
- .param("password", freefdPassword)).andReturn();
- Cookie loginCookie = loginResult.getResponse().getCookie("juick-remember-me");
- webClient.setCookieManager(new CookieManager());
- webClient.getCookieManager().addCookie(
- new com.gargoylesoftware.htmlunit.util.Cookie(loginCookie.getDomain(),
- loginCookie.getName(),
- loginCookie.getValue()));
- int mid = messagesService.createMessage(ugnich.getUid(), "new test", null, null);
- subscriptionService.subscribeMessage(messagesService.getMessage(mid), freefd);
- int rid = messagesService.createReply(mid, 0, ugnich, "new reply", null);
- HtmlPage discussionsPage = webClient.getPage("http://localhost:8080/?show=discuss");
- assertThat(discussionsPage.querySelectorAll("#global a .badge").size(), is(1));
- HtmlPage unreadThread = webClient.getPage(String.format("http://localhost:8080/ugnich/%d", mid));
- assertThat(unreadThread.querySelectorAll("#global a .badge").size(), is(0));
- }
- @Test
- public void escapeSqlTests() {
- String sql = String.format("SELECT * FROM table WHERE data='%s'", Utils.encodeSphinx("';-- DROP TABLE table"));
- assertThat(sql, is("SELECT * FROM table WHERE data='\\';-- DROP TABLE table\'"));
- }
-}
--
cgit v1.2.3
- 
-
-
- {% endfor %}
- 
- {% elseif type | slice(0, 1) == 'v' %}
- 
- {% elseif type | slice(0, 1) == 'x' %}
- 
- {% elseif type | slice(0, 1) == 'd' %}
- 
- {% endif %}
- 
- 
{{ visitor.name }}
- 
{{ user.name }}
-