i = pageLinks.iterator(); i.hasNext() && count > 0; count--) {
+ if (s.length() > 0) {
+ s.append(linkDelimiter);
+ }
+
+ String l = i.next();
+
+ s.append(l);
+
+ i.remove();
+ }
+
+ if (showCode) {
+ s.insert(0, "");
+ s.append(" ");
+ }
+
+ return s.toString();
+ }
+}
diff --git a/juick-server/src/main/resources/errors.properties b/juick-server/src/main/resources/errors.properties
new file mode 100644
index 00000000..7ec8fbfd
--- /dev/null
+++ b/juick-server/src/main/resources/errors.properties
@@ -0,0 +1,3 @@
+error.title = Error page
+
+error.login=Wrong user or password
\ No newline at end of file
diff --git a/juick-server/src/main/resources/errors_ru.properties b/juick-server/src/main/resources/errors_ru.properties
new file mode 100644
index 00000000..ca13b926
--- /dev/null
+++ b/juick-server/src/main/resources/errors_ru.properties
@@ -0,0 +1,3 @@
+error.title = Произошла ошибка
+
+error.login=Произошла ошибка, проверьте имя пользователя и пароль
\ No newline at end of file
diff --git a/juick-server/src/main/resources/help b/juick-server/src/main/resources/help
new file mode 160000
index 00000000..ce103cd9
--- /dev/null
+++ b/juick-server/src/main/resources/help
@@ -0,0 +1 @@
+Subproject commit ce103cd9a2a8a200c6ebb3b41525e7c8f639d98c
diff --git a/juick-server/src/main/resources/messages.properties b/juick-server/src/main/resources/messages.properties
new file mode 100644
index 00000000..cfd8a826
--- /dev/null
+++ b/juick-server/src/main/resources/messages.properties
@@ -0,0 +1,80 @@
+date.format=MM/dd/yyyy
+
+link.settings=Settings
+link.returnToMain=Back to Home Page
+link.contacts=Contacts
+link.tos=TOS
+link.adv=Advertisement
+
+link.popular=Popular
+link.allMessages=Discover
+link.withPhotos=Photos
+link.trends=Trends
+link.my=My feed
+link.privateMessages=PM
+link.discuss=Discuss
+link.recommended=Recommended
+link.postMessage=Post
+link.Login=Login
+link.logout=Logout
+
+link.settings.main=Main
+link.settings.password=Password
+link.settings.about=About
+
+label.sponsor=Sponsor
+label.sponsors=Sponsors
+label.search=Search
+label.register=Register
+label.username=User name
+label.password=Password
+
+postForm.newMessage=New message...
+postForm.imageLink=Link to image
+postForm.imageFormats=JPG/PNG, up to 10 MB
+postForm.or=or
+postForm.upload=Upload
+postForm.tags=Tags (space separated)
+postForm.submit=Send
+
+message.recommend=Recommend
+message.recommendedBy=♡ recommended by
+message.recommendedOthers=and {0} others
+message.comment=Comment
+message.writeComment=Write a comment...
+message.share=Share
+message.subscribe=Subscribe
+message.subscribed=Subscribed
+message.delete=Delete
+message.loginForSending=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-server/src/main/resources/messages_ru.properties b/juick-server/src/main/resources/messages_ru.properties
new file mode 100644
index 00000000..2a2269ae
--- /dev/null
+++ b/juick-server/src/main/resources/messages_ru.properties
@@ -0,0 +1,78 @@
+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.recommendedOthers=и еще {0}
+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-server/src/main/resources/schema.sql b/juick-server/src/main/resources/schema.sql
index 851b764b..2e8fad9b 100644
--- a/juick-server/src/main/resources/schema.sql
+++ b/juick-server/src/main/resources/schema.sql
@@ -23,12 +23,12 @@ CREATE TABLE IF NOT EXISTS `bl_users` (
);
CREATE TABLE IF NOT EXISTS `facebook` (
`user_id` int(10) unsigned DEFAULT NULL,
- `fb_id` bigint(20) unsigned NOT NULL,
+ `fb_id` bigint(20) unsigned NULL,
`loginhash` char(36) DEFAULT NULL,
`access_token` char(255) DEFAULT NULL,
`ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
- `fb_name` char(64) NOT NULL,
- `fb_link` char(255) NOT NULL,
+ `fb_name` char(64) NULL,
+ `fb_link` char(255) NULL,
`crosspost` tinyint(1) unsigned NOT NULL DEFAULT '1'
);
diff --git a/juick-server/src/main/resources/static/favicon.png b/juick-server/src/main/resources/static/favicon.png
new file mode 100644
index 00000000..bc7161e2
Binary files /dev/null and b/juick-server/src/main/resources/static/favicon.png differ
diff --git a/juick-server/src/main/resources/static/logo.png b/juick-server/src/main/resources/static/logo.png
new file mode 100644
index 00000000..933f6099
Binary files /dev/null and b/juick-server/src/main/resources/static/logo.png differ
diff --git a/juick-server/src/main/resources/static/style.js b/juick-server/src/main/resources/static/style.js
new file mode 100644
index 00000000..8e1ce009
--- /dev/null
+++ b/juick-server/src/main/resources/static/style.js
@@ -0,0 +1,2 @@
+!function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=10)}({10:function(e,t,n){n(11),n(13),e.exports=n(15)},11:function(e,t,n){},13:function(e,t,n){},15:function(e,t,n){}});
+//# sourceMappingURL=style.js.map
\ No newline at end of file
diff --git a/juick-server/src/main/resources/static/style.js.map b/juick-server/src/main/resources/static/style.js.map
new file mode 100644
index 00000000..f3493280
--- /dev/null
+++ b/juick-server/src/main/resources/static/style.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///webpack/bootstrap"],"names":["installedModules","__webpack_require__","moduleId","exports","module","i","l","modules","call","m","c","d","name","getter","o","Object","defineProperty","enumerable","get","r","Symbol","toStringTag","value","t","mode","__esModule","ns","create","key","bind","n","object","property","prototype","hasOwnProperty","p","s"],"mappings":"aACA,IAAAA,KAGA,SAAAC,EAAAC,GAGA,GAAAF,EAAAE,GACA,OAAAF,EAAAE,GAAAC,QAGA,IAAAC,EAAAJ,EAAAE,IACAG,EAAAH,EACAI,GAAA,EACAH,YAUA,OANAI,EAAAL,GAAAM,KAAAJ,EAAAD,QAAAC,IAAAD,QAAAF,GAGAG,EAAAE,GAAA,EAGAF,EAAAD,QAKAF,EAAAQ,EAAAF,EAGAN,EAAAS,EAAAV,EAGAC,EAAAU,EAAA,SAAAR,EAAAS,EAAAC,GACAZ,EAAAa,EAAAX,EAAAS,IACAG,OAAAC,eAAAb,EAAAS,GAA0CK,YAAA,EAAAC,IAAAL,KAK1CZ,EAAAkB,EAAA,SAAAhB,GACA,oBAAAiB,eAAAC,aACAN,OAAAC,eAAAb,EAAAiB,OAAAC,aAAwDC,MAAA,WAExDP,OAAAC,eAAAb,EAAA,cAAiDmB,OAAA,KAQjDrB,EAAAsB,EAAA,SAAAD,EAAAE,GAEA,GADA,EAAAA,IAAAF,EAAArB,EAAAqB,IACA,EAAAE,EAAA,OAAAF,EACA,KAAAE,GAAA,iBAAAF,QAAAG,WAAA,OAAAH,EACA,IAAAI,EAAAX,OAAAY,OAAA,MAGA,GAFA1B,EAAAkB,EAAAO,GACAX,OAAAC,eAAAU,EAAA,WAAyCT,YAAA,EAAAK,UACzC,EAAAE,GAAA,iBAAAF,EAAA,QAAAM,KAAAN,EAAArB,EAAAU,EAAAe,EAAAE,EAAA,SAAAA,GAAgH,OAAAN,EAAAM,IAAqBC,KAAA,KAAAD,IACrI,OAAAF,GAIAzB,EAAA6B,EAAA,SAAA1B,GACA,IAAAS,EAAAT,KAAAqB,WACA,WAA2B,OAAArB,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAH,EAAAU,EAAAE,EAAA,IAAAA,GACAA,GAIAZ,EAAAa,EAAA,SAAAiB,EAAAC,GAAsD,OAAAjB,OAAAkB,UAAAC,eAAA1B,KAAAuB,EAAAC,IAGtD/B,EAAAkC,EAAA,GAIAlC,IAAAmC,EAAA","file":"style.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 10);\n"],"sourceRoot":""}
\ No newline at end of file
diff --git a/juick-server/src/main/resources/static/tagscloud.png b/juick-server/src/main/resources/static/tagscloud.png
new file mode 100644
index 00000000..3e1bf169
Binary files /dev/null and b/juick-server/src/main/resources/static/tagscloud.png differ
diff --git a/juick-server/src/main/resources/templates/layouts/content.html b/juick-server/src/main/resources/templates/layouts/content.html
new file mode 100644
index 00000000..2ca9fd7e
--- /dev/null
+++ b/juick-server/src/main/resources/templates/layouts/content.html
@@ -0,0 +1,50 @@
+
+
+
+ {{ 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-server/src/main/resources/templates/views/404.html b/juick-server/src/main/resources/templates/views/404.html
new file mode 100644
index 00000000..02a790e6
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/404.html
@@ -0,0 +1,11 @@
+{% extends "layouts/default" %}
+{% block content %}
+
+ Страница не найдена
+ Сожалеем, но страницу с этим адресом удалил её автор, либо её никогда не существовало.
+
+{% endblock %}
+
+{% block "column" %}
+{% include "views/partial/homecolumn" %}
+{% endblock %}
\ No newline at end of file
diff --git a/juick-server/src/main/resources/templates/views/blog.html b/juick-server/src/main/resources/templates/views/blog.html
new file mode 100644
index 00000000..9cf4714e
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/blog.html
@@ -0,0 +1,25 @@
+{% 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-server/src/main/resources/templates/views/blog_tags.html b/juick-server/src/main/resources/templates/views/blog_tags.html
new file mode 100644
index 00000000..48e517eb
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/blog_tags.html
@@ -0,0 +1,10 @@
+{% 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-server/src/main/resources/templates/views/help.html b/juick-server/src/main/resources/templates/views/help.html
new file mode 100644
index 00000000..3a022497
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/help.html
@@ -0,0 +1,10 @@
+{% extends "layouts/default" %}
+{% block content %}
+
+ {{ content | raw }}
+
+{% endblock %}
+
+{% block "column" %}
+{{ navigation | raw }}
+{% endblock %}
\ No newline at end of file
diff --git a/juick-server/src/main/resources/templates/views/index.html b/juick-server/src/main/resources/templates/views/index.html
new file mode 100644
index 00000000..97d726de
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/index.html
@@ -0,0 +1,29 @@
+{% 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-server/src/main/resources/templates/views/login.html b/juick-server/src/main/resources/templates/views/login.html
new file mode 100644
index 00000000..a538cb26
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/login.html
@@ -0,0 +1,144 @@
+
+
+
+ Juick
+
+
+
+ {{ i18n("messages","label.register") }}:
+
+
+
+
+
+
Blank window
+
+
+
+
+
diff --git a/juick-server/src/main/resources/templates/views/macros/tags.html b/juick-server/src/main/resources/templates/views/macros/tags.html
new file mode 100644
index 00000000..09278ffe
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/macros/tags.html
@@ -0,0 +1,5 @@
+{% macro tags(uname="", tagsList) %}
+{% for tag in tagsList %}
+{{ tag | raw }}
+{% endfor %}
+{% endmacro %}
\ No newline at end of file
diff --git a/juick-server/src/main/resources/templates/views/partial/footer.html b/juick-server/src/main/resources/templates/views/partial/footer.html
new file mode 100644
index 00000000..35972254
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/partial/footer.html
@@ -0,0 +1,16 @@
+
diff --git a/juick-server/src/main/resources/templates/views/partial/homecolumn.html b/juick-server/src/main/resources/templates/views/partial/homecolumn.html
new file mode 100644
index 00000000..64dd9cbd
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/partial/homecolumn.html
@@ -0,0 +1,25 @@
+
+
\ No newline at end of file
diff --git a/juick-server/src/main/resources/templates/views/partial/message.html b/juick-server/src/main/resources/templates/views/partial/message.html
new file mode 100644
index 00000000..0b6db3df
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/partial/message.html
@@ -0,0 +1,76 @@
+
+
+ {{ 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-server/src/main/resources/templates/views/partial/navigation.html b/juick-server/src/main/resources/templates/views/partial/navigation.html
new file mode 100644
index 00000000..fa1dadcc
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/partial/navigation.html
@@ -0,0 +1,40 @@
+
diff --git a/juick-server/src/main/resources/templates/views/partial/settings_tabs.html b/juick-server/src/main/resources/templates/views/partial/settings_tabs.html
new file mode 100644
index 00000000..4715253e
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/partial/settings_tabs.html
@@ -0,0 +1,6 @@
+
\ No newline at end of file
diff --git a/juick-server/src/main/resources/templates/views/partial/tagcolumn.html b/juick-server/src/main/resources/templates/views/partial/tagcolumn.html
new file mode 100644
index 00000000..3e61d3d3
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/partial/tagcolumn.html
@@ -0,0 +1,33 @@
+
+
*{{ tag.name }}
+
+{% if visitor is not empty and visitor.uid > 0 %}
+
+{% endif %}
diff --git a/juick-server/src/main/resources/templates/views/partial/tags.html b/juick-server/src/main/resources/templates/views/partial/tags.html
new file mode 100644
index 00000000..3235213e
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/partial/tags.html
@@ -0,0 +1,3 @@
+{% for tag in tags %}
+ {{ tag | raw }}
+{% endfor %}
\ No newline at end of file
diff --git a/juick-server/src/main/resources/templates/views/partial/usercolumn.html b/juick-server/src/main/resources/templates/views/partial/usercolumn.html
new file mode 100644
index 00000000..2b1963e3
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/partial/usercolumn.html
@@ -0,0 +1,89 @@
+{% 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-server/src/main/resources/templates/views/pm_inbox.html b/juick-server/src/main/resources/templates/views/pm_inbox.html
new file mode 100644
index 00000000..d6a9b65f
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/pm_inbox.html
@@ -0,0 +1,35 @@
+{% 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-server/src/main/resources/templates/views/pm_sent.html b/juick-server/src/main/resources/templates/views/pm_sent.html
new file mode 100644
index 00000000..bc42c4ab
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/pm_sent.html
@@ -0,0 +1,33 @@
+{% 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-server/src/main/resources/templates/views/post.html b/juick-server/src/main/resources/templates/views/post.html
new file mode 100644
index 00000000..1f642ce1
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/post.html
@@ -0,0 +1,19 @@
+{% extends "layouts/minimal" %}
+{% import "views/macros/tags" %}
+{% block content %}
+
+
+
+Теги:
+{{ tags(visitor.name, tags) }}
+{% endblock %}
\ No newline at end of file
diff --git a/juick-server/src/main/resources/templates/views/post_success.html b/juick-server/src/main/resources/templates/views/post_success.html
new file mode 100644
index 00000000..2106f3cb
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/post_success.html
@@ -0,0 +1,19 @@
+{% 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-server/src/main/resources/templates/views/settings_about.html b/juick-server/src/main/resources/templates/views/settings_about.html
new file mode 100644
index 00000000..bbf9e772
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/settings_about.html
@@ -0,0 +1,20 @@
+{% extends "layouts/default" %}
+{% block content %}
+
+
+
+{% endblock %}
+{% block "column" %}
+{% include "views/partial/settings_tabs" %}
+{% endblock %}
\ No newline at end of file
diff --git a/juick-server/src/main/resources/templates/views/settings_auth-email.html b/juick-server/src/main/resources/templates/views/settings_auth-email.html
new file mode 100644
index 00000000..e906d704
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/settings_auth-email.html
@@ -0,0 +1,9 @@
+{% 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-server/src/main/resources/templates/views/settings_main.html b/juick-server/src/main/resources/templates/views/settings_main.html
new file mode 100644
index 00000000..65fbc984
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/settings_main.html
@@ -0,0 +1,151 @@
+{% 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-server/src/main/resources/templates/views/settings_password.html b/juick-server/src/main/resources/templates/views/settings_password.html
new file mode 100644
index 00000000..aba0b139
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/settings_password.html
@@ -0,0 +1,17 @@
+{% 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-server/src/main/resources/templates/views/settings_privacy.html b/juick-server/src/main/resources/templates/views/settings_privacy.html
new file mode 100644
index 00000000..83b87b93
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/settings_privacy.html
@@ -0,0 +1,9 @@
+{% 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-server/src/main/resources/templates/views/settings_result.html b/juick-server/src/main/resources/templates/views/settings_result.html
new file mode 100644
index 00000000..d87a5ea6
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/settings_result.html
@@ -0,0 +1,9 @@
+{% 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-server/src/main/resources/templates/views/signup.html b/juick-server/src/main/resources/templates/views/signup.html
new file mode 100644
index 00000000..d6eb921f
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/signup.html
@@ -0,0 +1,43 @@
+{% extends "layouts/default" %}
+{% block content %}
+
+ {% if type | slice(0, 1) == 'f' %}
+
+
+Связать с существующим аккаунтом Juick
+
+
+{% if type != "xmpp" %}
+Создать новый аккаунт Juick
+
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/juick-server/src/main/resources/templates/views/test.html b/juick-server/src/main/resources/templates/views/test.html
new file mode 100644
index 00000000..7700be6f
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/test.html
@@ -0,0 +1,2 @@
+{% import "views/macros/tags" %}
+{{ tags("ugnich", tagsList)}}
\ No newline at end of file
diff --git a/juick-server/src/main/resources/templates/views/thread.html b/juick-server/src/main/resources/templates/views/thread.html
new file mode 100644
index 00000000..d281e3bb
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/thread.html
@@ -0,0 +1,173 @@
+{% extends "layouts/default" %}
+{% import "views/macros/tags" %}
+{% block content %}
+
+
+
+
+
{{ 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 visitor.uid > 0 %}
+ {% if visitor.uid != msg.user.uid %}
+ {% if visitorSubscribed %}
+
+ {{ i18n("messages","message.subscribed") }}
+
+ {% else %}
+
+ {{ i18n("messages","message.subscribe") }}
+
+ {% endif %}
+ {% else %}
+
+ {{ i18n("messages","message.delete") }}
+
+ {% endif %}
+ {% endif %}
+ {% if msg.FriendsOnly %}
+ Открыть доступ
+ {% endif %}
+
+ {% if msg.VisitorCanComment %}
+
+ {% endif %}
+ {% if recomm is not empty %}
+
{{ i18n("messages","message.recommendedBy") }}
+ {% for rec in recomm %}
+
@{{ rec }} {% if loop.index < (loop.length - 1) %}, {% endif %}
+ {% endfor %}
+ {% if msg.likes > recomm.size() %}
+ {{ i18n("messages","message.recommendedOthers", msg.likes - recomm.size()) }}
+ {% endif %}
+
+ {% endif %}
+
+
+
+ {% 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-server/src/main/resources/templates/views/users.html b/juick-server/src/main/resources/templates/views/users.html
new file mode 100644
index 00000000..702ba6b9
--- /dev/null
+++ b/juick-server/src/main/resources/templates/views/users.html
@@ -0,0 +1,17 @@
+{% 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-server/src/test/java/com/juick/server/tests/ServerTests.java b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
index 1931f13b..fc18dbf5 100644
--- a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
@@ -368,19 +368,19 @@ public class ServerTests {
@Test
public void testAllUnAuthorized() throws Exception {
- mockMvc.perform(get("/"))
+ mockMvc.perform(get("/api/"))
.andExpect(status().isMovedPermanently());
- mockMvc.perform(get("/auth"))
+ mockMvc.perform(get("/api/auth"))
.andExpect(status().isUnauthorized());
- mockMvc.perform(get("/home"))
+ mockMvc.perform(get("/api/home"))
.andExpect(status().isUnauthorized());
- mockMvc.perform(get("/messages/recommended"))
+ mockMvc.perform(get("/api/messages/recommended"))
.andExpect(status().isUnauthorized());
- mockMvc.perform(get("/messages/set_privacy"))
+ mockMvc.perform(get("/api/messages/set_privacy"))
.andExpect(status().isUnauthorized());
}
@@ -392,7 +392,7 @@ public class ServerTests {
Message msg = messagesService.getMessage(mid);
tagService.createTag("тест");
mockMvc.perform(
- get("/home")
+ get("/api/home")
.with(httpBasic(ugnichName, ugnichPassword)))
.andExpect(status().isOk())
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
@@ -411,12 +411,12 @@ public class ServerTests {
public void homeTestWithMessagesAndRememberMe() throws Exception {
String ugnichHash = userService.getHashByUID(ugnich.getUid());
mockMvc.perform(
- get("/home")
+ get("/api/home")
.with(httpBasic(ugnichName, ugnichPassword)))
.andExpect(status().isOk())
.andReturn();
- mockMvc.perform(get("/home")
+ mockMvc.perform(get("/api/home")
.param("hash", ugnichHash))
.andExpect(status().isOk());
}
@@ -424,7 +424,7 @@ public class ServerTests {
@Test
public void homeTestWithMessagesAndSimpleCors() throws Exception {
mockMvc.perform(
- get("/home")
+ get("/api/home")
.with(httpBasic(ugnichName, ugnichPassword))
.header("Origin", "http://api.example.net"))
.andExpect(status().isOk())
@@ -434,7 +434,7 @@ public class ServerTests {
@Test
public void homeTestWithPreflightCors() throws Exception {
mockMvc.perform(
- options("/home")
+ options("/api/home")
.with(httpBasic(ugnichName, ugnichPassword))
.header("Origin", "http://api.example.net")
.header("Access-Control-Request-Method", "POST")
@@ -449,10 +449,10 @@ public class ServerTests {
public void anonymousApis() throws Exception {
- mockMvc.perform(get("/messages"))
+ mockMvc.perform(get("/api/messages"))
.andExpect(status().isOk());
- mockMvc.perform(get("/users")
+ mockMvc.perform(get("/api/users")
.param("uname", "ugnich")
.param("uname", "freefd"))
.andExpect(status().isOk())
@@ -473,7 +473,7 @@ public class ServerTests {
messagesService.likeMessage(mid, freefdId, 2 );
messagesService.likeMessage(mid, freefdId, 3 );
- mockMvc.perform(get("/messages?"+ "hash=" + userIdHash))
+ mockMvc.perform(get("/api/messages?"+ "hash=" + userIdHash))
.andDo(print())
.andExpect(status().isOk())
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
@@ -482,7 +482,7 @@ public class ServerTests {
.andExpect((jsonPath("$[0].reactions[?(@.id == 2)].count",
is(Collections.singletonList(2)))));
- mockMvc.perform(get("/reactions?hash=" + userIdHash))
+ mockMvc.perform(get("/api/reactions?hash=" + userIdHash))
.andExpect(status().isOk())
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
.andExpect(jsonPath("$.length()", is(7)));
@@ -494,14 +494,14 @@ public class ServerTests {
Tag yo = tagService.getTag("yo", true);
messagesService.createMessage(ugnich.getUid(), "text", null, Arrays.asList(yo, weather));
messagesService.createMessage(freefd.getUid(), "text2", null, Collections.singletonList(yo));
- MvcResult result = mockMvc.perform(get("/tags"))
+ MvcResult result = mockMvc.perform(get("/api/tags"))
.andExpect(status().isOk())
.andReturn();
List tagsFromApi = jsonMapper.readValue(result.getResponse().getContentAsString(),
new TypeReference>(){});
TagStats yoStats = tagsFromApi.stream().filter(t -> t.getTag().getName().equals("yo")).findFirst().get();
assertThat(yoStats.getUsageCount(), is(2));
- MvcResult result2 = mockMvc.perform(get("/tags")
+ MvcResult result2 = mockMvc.perform(get("/api/tags")
.param("user_id", String.valueOf(ugnich.getUid())))
.andExpect(status().isOk())
.andReturn();
@@ -513,40 +513,40 @@ public class ServerTests {
@Test
public void postWithReferer() throws Exception {
- mockMvc.perform(post("/post")
+ mockMvc.perform(post("/api/post")
.param("body", "yo")
.with(httpBasic(ugnichName, ugnichPassword)))
.andExpect(status().isOk());
}
@Test
public void threadWithEphemeralNumberShouldReturn404() throws Exception {
- mockMvc.perform(get("/thread").param("mid", "999999999")
+ mockMvc.perform(get("/api/thread").param("mid", "999999999")
.with(httpBasic(ugnichName, ugnichPassword))).andExpect(status().is4xxClientError());
}
@Test
public void performRequestsWithIssuedToken() throws Exception {
String ugnichHash = userService.getHashByUID(ugnich.getUid());
- mockMvc.perform(get("/home")).andExpect(status().isUnauthorized());
- mockMvc.perform(get("/auth"))
+ mockMvc.perform(get("/api/home")).andExpect(status().isUnauthorized());
+ mockMvc.perform(get("/api/auth"))
.andExpect(status().isUnauthorized());
- mockMvc.perform(get("/auth").with(httpBasic(ugnichName, "wrongpassword")))
+ mockMvc.perform(get("/api/auth").with(httpBasic(ugnichName, "wrongpassword")))
.andExpect(status().isUnauthorized());
- MvcResult result = mockMvc.perform(get("/auth").with(httpBasic(ugnichName, ugnichPassword)))
+ MvcResult result = mockMvc.perform(get("/api/auth").with(httpBasic(ugnichName, ugnichPassword)))
.andExpect(status().isOk())
.andReturn();
String authHash = result.getResponse().getContentAsString();
assertThat(authHash, equalTo(ugnichHash));
- mockMvc.perform(get("/home").param("hash", ugnichHash)).andExpect(status().isOk());
+ mockMvc.perform(get("/api/home").param("hash", ugnichHash)).andExpect(status().isOk());
}
@Test
public void registerForNotificationsTests() throws Exception {
String token = "123456";
ExternalToken registration = new ExternalToken(null, "apns", token, null);
- mockMvc.perform(put("/notifications").with(httpBasic(ugnichName, ugnichPassword))
+ mockMvc.perform(put("/api/notifications").with(httpBasic(ugnichName, ugnichPassword))
.contentType(MediaType.APPLICATION_JSON_UTF8)
.content(jsonMapper.writeValueAsBytes(Collections.singletonList(registration))))
.andExpect(status().isOk());
- MvcResult result = mockMvc.perform(get("/notifications")
+ MvcResult result = mockMvc.perform(get("/api/notifications")
.param("uid", String.valueOf(ugnich.getUid()))
.with(httpBasic(juickName, juickPassword)))
.andExpect(status().isOk())
@@ -565,10 +565,10 @@ public class ServerTests {
@Test
public void notificationsTokensTest() throws Exception {
List tokens = Collections.singletonList(new ExternalToken(null, "gcm", "123456", null));
- mockMvc.perform(delete("/notifications").with(httpBasic(ugnichName, ugnichPassword))
+ mockMvc.perform(delete("/api/notifications").with(httpBasic(ugnichName, ugnichPassword))
.contentType(MediaType.APPLICATION_JSON_UTF8)
.content(jsonMapper.writeValueAsBytes(tokens))).andExpect(status().isForbidden());
- mockMvc.perform(delete("/notifications").with(httpBasic(juickName, juickPassword))
+ mockMvc.perform(delete("/api/notifications").with(httpBasic(juickName, juickPassword))
.contentType(MediaType.APPLICATION_JSON_UTF8)
.content(jsonMapper.writeValueAsBytes(tokens))).andExpect(status().isOk());
}
@@ -576,9 +576,9 @@ public class ServerTests {
public void notificationsSettingsAllowedOnlyForServiceUser() throws Exception {
CommandResult result = commandsManager.processCommand(ugnich, "yo", emptyUri);
String stringValueOfMid = String.valueOf(result.getNewMessage().get().getMid());
- mockMvc.perform(get("/notifications").with(httpBasic(juickName, juickPassword))
+ mockMvc.perform(get("/api/notifications").with(httpBasic(juickName, juickPassword))
.param("mid", stringValueOfMid).param("uid", String.valueOf(ugnich.getUid()))).andExpect(status().isOk());
- mockMvc.perform(get("/notifications")
+ mockMvc.perform(get("/api/notifications")
.param("mid", stringValueOfMid).param("uid", String.valueOf(ugnich.getUid()))).andExpect(status().isUnauthorized());
}
@Test
@@ -858,7 +858,7 @@ public class ServerTests {
"s2313334
\n" +
"\n" +
"--001a11454886e42be5056786ca70--";
- mockMvc.perform(post("/mail").with(httpBasic(juickName, juickPassword)).content(mail))
+ mockMvc.perform(post("/api/mail").with(httpBasic(juickName, juickPassword)).content(mail))
.andExpect(status().isOk());
}
@@ -869,14 +869,14 @@ public class ServerTests {
String freefdHash = userService.getHashByUID(freefd.getUid());
int freefdMid = messagesService.createMessage(freefd.getUid(), "to be not liked", null, null);
- mockMvc.perform(post("/like?mid=" + mid + "&hash=" + freefdHash))
+ mockMvc.perform(post("/api/like?mid=" + mid + "&hash=" + freefdHash))
.andExpect(status().isOk())
.andExpect(jsonPath("$.status", is("Message is added to your recommendations")));
- mockMvc.perform(get("/thread?mid=" + mid + "&hash=" + freefdHash))
+ mockMvc.perform(get("/api/thread?mid=" + mid + "&hash=" + freefdHash))
.andExpect(status().isOk())
.andExpect(jsonPath("$[0].recommendations.length()", is(1)))
.andExpect(jsonPath("$[0].recommendations[0]", is(freefdName)));
- mockMvc.perform(post("/like?mid=" + freefdMid + "&hash=" + freefdHash))
+ mockMvc.perform(post("/api/like?mid=" + freefdMid + "&hash=" + freefdHash))
.andExpect(status().isForbidden());
}
@@ -886,7 +886,7 @@ public class ServerTests {
String freefdHash = userService.getHashByUID(freefd.getUid());
int mid1 = messagesService.createMessage(user_id, "yo", null, new ArrayList<>());
- mockMvc.perform(post("/react?mid=" + mid1 + "&hash=" + freefdHash+ "&reactionId=2"))
+ mockMvc.perform(post("/api/react?mid=" + mid1 + "&hash=" + freefdHash+ "&reactionId=2"))
.andExpect(status().isOk());
Message msg4 = messagesService.getMessage(mid1);
@@ -894,9 +894,9 @@ public class ServerTests {
assertThat(messagesService.getMessages(AnonymousUser.INSTANCE, Collections.singletonList(mid1)).get(0).getLikes(), is(0));
Assert.assertEquals(1, msg4.getReactions().stream().filter(r -> r.getId() == 2)
.findFirst().orElseThrow(IllegalStateException::new).getCount());
- mockMvc.perform(post("/react?mid=" + mid1 + "&hash=" + freefdHash+ "&reactionId=1"))
+ mockMvc.perform(post("/api/react?mid=" + mid1 + "&hash=" + freefdHash+ "&reactionId=1"))
.andExpect(status().isOk());
- mockMvc.perform(post("/react?mid=" + mid1 + "&hash=" + freefdHash+ "&reactionId=1"))
+ mockMvc.perform(post("/api/react?mid=" + mid1 + "&hash=" + freefdHash+ "&reactionId=1"))
.andExpect(status().isOk());
assertThat(messagesService.getMessage(mid1).getLikes(), is(1));
}
@@ -920,7 +920,7 @@ public class ServerTests {
assertThat(lastRead.apply(ugnich, mid), is(1));
String ugnichHash = userService.getHashByUID(ugnich.getUid());
int freefdrid = messagesService.createReply(mid, 0, freefd, "again", null);
- mockMvc.perform(get(String.format("/thread/mark_read/%d-%d.gif?hash=%s", mid, freefdrid, ugnichHash)))
+ mockMvc.perform(get(String.format("/api/thread/mark_read/%d-%d.gif?hash=%s", mid, freefdrid, ugnichHash)))
.andExpect(status().isOk())
.andExpect(content().bytes(IOUtils.toByteArray(
Objects.requireNonNull(getClass().getClassLoader().getResource("Transparent.gif")))));
@@ -934,7 +934,7 @@ public class ServerTests {
privacyQueriesService.blacklistUser(ugnich, freefd);
newfreefdrid = messagesService.createReply(mid, 0, freefd, "after ban", null);
assertThat(lastRead.apply(ugnich, mid), lessThan(newfreefdrid));
- mockMvc.perform(get(String.format("/thread?mid=%d&hash=%s", mid, ugnichHash)))
+ mockMvc.perform(get(String.format("/api/thread?mid=%d&hash=%s", mid, ugnichHash)))
.andExpect(status().isOk());
assertThat(lastRead.apply(ugnich, mid), is(newfreefdrid));
}
@@ -1035,13 +1035,13 @@ public class ServerTests {
map.add("body", "yo");
map.add("hash", userService.getHashByUID(ugnich.getUid()));
ResponseEntity result = restTemplate.postForEntity(
- "/post",
+ "/api/post",
request, CommandResult.class);
assertThat(result.getStatusCode(), is(HttpStatus.OK));
}
@Test
public void emptyAuthenticatedPostShouldThrowBadRequest() throws Exception {
- mockMvc.perform(post("/post")
+ mockMvc.perform(post("/api/post")
.with(httpBasic(juickName, juickPassword)))
.andExpect(status().isBadRequest());
}
@@ -1061,7 +1061,7 @@ public class ServerTests {
commandsManager.processCommand(ugnich, "S @freefd", emptyUri);
assertThat(userService.getUserReaders(ugnich.getUid()).size(), is(1));
String hash = userService.getHashByUID(ugnich.getUid());
- mockMvc.perform(get("/me")
+ mockMvc.perform(get("/api/me")
.with(httpBasic(ugnichName, ugnichPassword)))
.andExpect(jsonPath("$.hash", is(hash)))
.andExpect(jsonPath("$.readers.length()", is(1)))
@@ -1148,7 +1148,7 @@ public class ServerTests {
}
@Test
public void messageEditingSpec() throws Exception {
- MvcResult result = mockMvc.perform(post("/post").with(httpBasic(ugnichName, ugnichPassword))
+ MvcResult result = mockMvc.perform(post("/api/post").with(httpBasic(ugnichName, ugnichPassword))
.param("body", "YO")).andExpect(status().is2xxSuccessful()).andReturn();
Message original = jsonMapper.readValue(result.getResponse().getContentAsString(), CommandResult.class)
.getNewMessage().get();
@@ -1156,17 +1156,17 @@ public class ServerTests {
assertThat(original.getUpdatedAt(), equalTo(original.getTimestamp()));
// to have updated_at greater than ts
Thread.sleep(1000);
- result = mockMvc.perform(post("/update").with(httpBasic(ugnichName, ugnichPassword))
+ result = mockMvc.perform(post("/api/update").with(httpBasic(ugnichName, ugnichPassword))
.param("mid", String.valueOf(original.getMid()))
.param("body", "PEOPLE")).andExpect(status().is2xxSuccessful()).andReturn();
Message edited = jsonMapper.readValue(result.getResponse().getContentAsString(), CommandResult.class)
.getNewMessage().get();
assertThat(edited.getText(), equalTo("PEOPLE"));
assertThat(edited.getUpdatedAt(), greaterThan(edited.getTimestamp()));
- mockMvc.perform(post("/update").with(httpBasic(freefdName, freefdPassword))
+ mockMvc.perform(post("/api/update").with(httpBasic(freefdName, freefdPassword))
.param("mid", String.valueOf(original.getMid()))
.param("body", "PEOPLE")).andExpect(status().is(403));
- result = mockMvc.perform(post("/comment").with(httpBasic(freefdName, freefdPassword))
+ result = mockMvc.perform(post("/api/comment").with(httpBasic(freefdName, freefdPassword))
.param("mid", String.valueOf(original.getMid()))
.param("body", "HEY")).andExpect(status().is2xxSuccessful()).andReturn();
Message comment = jsonMapper.readValue(result.getResponse().getContentAsString(), Message.class);
@@ -1174,7 +1174,7 @@ public class ServerTests {
assertThat(comment.getUpdatedAt(), is(comment.getTimestamp()));
// to have updated_at greater than ts
Thread.sleep(1000);
- result = mockMvc.perform(post("/update").with(httpBasic(freefdName, freefdPassword))
+ result = mockMvc.perform(post("/api/update").with(httpBasic(freefdName, freefdPassword))
.param("mid", String.valueOf(comment.getMid()))
.param("rid", String.valueOf(comment.getRid()))
.param("body", "HEY, JOE")).andExpect(status().is2xxSuccessful()).andReturn();
@@ -1223,7 +1223,7 @@ public class ServerTests {
public void xmppStatusApi() throws Exception {
Supplier getStatus = () -> {
try {
- MvcResult result = mockMvc.perform(get("/xmpp/status").with(httpBasic(ugnichName, ugnichPassword)))
+ MvcResult result = mockMvc.perform(get("/api/xmpp-status").with(httpBasic(ugnichName, ugnichPassword)))
.andExpect(status().isOk()).andReturn();
return jsonMapper.readValue(result.getResponse().getContentAsString(), XMPPStatus.class);
} catch (Exception e) {
@@ -1273,16 +1273,16 @@ public class ServerTests {
User isilmine = userService.getUserByUID(userService.createUser(userName, userPassword)).orElseThrow(IllegalStateException::new);
int mid = messagesService.createMessage(isilmine.getUid(), msgText, null, null);
- mockMvc.perform(get(String.format("/thread?mid=%d", mid)).with(httpBasic(ugnichName, ugnichPassword)))
+ mockMvc.perform(get(String.format("/api/thread?mid=%d", mid)).with(httpBasic(ugnichName, ugnichPassword)))
.andExpect(status().isOk());
jdbcTemplate.update("UPDATE users SET banned=1 WHERE id=?", isilmine.getUid());
- mockMvc.perform(get(String.format("/thread?mid=%d", mid)).with(httpBasic(ugnichName, ugnichPassword)))
+ mockMvc.perform(get(String.format("/api/thread?mid=%d", mid)).with(httpBasic(ugnichName, ugnichPassword)))
.andExpect(status().isNotFound());
- mockMvc.perform(get("/messages?uname=isilmine").with(httpBasic(ugnichName, ugnichPassword)))
+ mockMvc.perform(get("/api/messages?uname=isilmine").with(httpBasic(ugnichName, ugnichPassword)))
.andExpect(status().isNotFound());
- mockMvc.perform(get("/info/isilmine").with(httpBasic(ugnichName, ugnichPassword)))
+ mockMvc.perform(get("/api/info/isilmine").with(httpBasic(ugnichName, ugnichPassword)))
.andExpect(status().isNotFound());
- mockMvc.perform(get("/info/ugnich").with(httpBasic(ugnichName, ugnichPassword)))
+ mockMvc.perform(get("/api/info/ugnich").with(httpBasic(ugnichName, ugnichPassword)))
.andExpect(status().isOk());
}
@@ -1293,7 +1293,7 @@ public class ServerTests {
userService.createUser(userName, userPassword);
- mockMvc.perform(get("/auth").with(httpBasic(userName, userPassword))).andExpect(status().isUnauthorized());
+ mockMvc.perform(get("/api/auth").with(httpBasic(userName, userPassword))).andExpect(status().isUnauthorized());
}
@Test
public void bannedUserShouldBeShadowedFromRecommendationsList() throws IOException {
@@ -1342,7 +1342,7 @@ public class ServerTests {
}
@Test
public void userProfileAndBlogShouldBeExposedAsActivityStream() throws Exception {
- mockMvc.perform(get("/u/ugnich").accept(ActivityObject.LD_JSON_MEDIA_TYPE))
+ mockMvc.perform(get("/api/u/ugnich").accept(ActivityObject.LD_JSON_MEDIA_TYPE))
.andExpect(status().isOk())
.andExpect(jsonPath("$.icon.url", is("http://localhost:8080/i/a/1.png")))
.andExpect(jsonPath("$.publicKey.publicKeyPem", is(keystoreManager.getPublicKey())));
@@ -1352,7 +1352,7 @@ public class ServerTests {
String.format("message %d", i), null, null))
.collect(Collectors.toCollection(ArrayDeque::new)).descendingIterator());
List midsPage = mids.stream().limit(20).collect(Collectors.toList());
- mockMvc.perform(get("/u/ugnich/blog").accept(ActivityObject.ACTIVITY_JSON_MEDIA_TYPE))
+ mockMvc.perform(get("/api/u/ugnich/blog").accept(ActivityObject.ACTIVITY_JSON_MEDIA_TYPE))
.andExpect(status().isOk())
.andExpect(jsonPath("$.orderedItems", hasSize(20)))
.andExpect(jsonPath("$.next", is("http://localhost:8080/u/ugnich/blog?before=" + midsPage.get(midsPage.size() - 1))));
diff --git a/juick-server/src/test/java/com/juick/server/tests/WebAppTests.java b/juick-server/src/test/java/com/juick/server/tests/WebAppTests.java
new file mode 100644
index 00000000..456c5f32
--- /dev/null
+++ b/juick-server/src/test/java/com/juick/server/tests/WebAppTests.java
@@ -0,0 +1,466 @@
+/*
+ * 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(status().is3xxRedirection()).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))
+ .andExpect(status().is3xxRedirection()).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))
+ .andExpect(status().is3xxRedirection()).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))
+ .andExpect(status().isFound()).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))
+ .andExpect(status().is3xxRedirection()).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\'"));
+ }
+ @Test
+ public void bannedUserShouldBeShadowedFromRecommendationsList() throws IOException {
+ int ermineId = userService.createUser("ermine", "secret");
+ int monstreekId = userService.createUser("monstreek", "secret");
+ int pogoId = userService.createUser("pogo", "secret");
+ int fmapId = userService.createUser("fmap", "secret");
+ int mid = messagesService.createMessage(monstreekId, "KURWA", null, null);
+ assertThat(messagesService.recommendMessage(mid, ermineId), is(MessagesService.RecommendStatus.Added));
+ assertThat(messagesService.recommendMessage(mid, fmapId), is(MessagesService.RecommendStatus.Added));
+ assertThat(messagesService.recommendMessage(mid, pogoId), is(MessagesService.RecommendStatus.Added));
+ assertThat(messagesService.getMessage(mid).getLikes(), is(3));
+ assertThat(CollectionUtils.isEqualCollection(messagesService.getMessageRecommendations(mid), Arrays.asList("fmap", "ermine", "pogo")), is(true));
+ privacyQueriesService.blacklistUser(userService.getUserByName("monstreek"), userService.getUserByName("pogo"));
+ assertThat(messagesService.getMessage(mid).getLikes(), is(3));
+ assertThat(CollectionUtils.isEqualCollection(messagesService.getMessageRecommendations(mid), Arrays.asList("fmap", "ermine")), is(true));
+ HtmlPage page = webClient.getPage(String.format("http://localhost:8080/monstreek/%d", mid));
+ assertTrue(page.querySelector(".msg-recomms").getTextContent().contains("и еще 1"));
+ }
+}
--
cgit v1.2.3
+ 
+
+
+ {% endfor %}
+ 
+ {% elseif type | slice(0, 1) == 'v' %}
+ 
+ {% elseif type | slice(0, 1) == 'e' %}
+ 
+ {% elseif type | slice(0, 1) == 'd' %}
+ 
+ {% endif %}
+ 
+ 
{{ visitor.name }}
+ 
{{ user.name }}
+