From caa38aaaad625d4479c9dc82353624ee52b289cc Mon Sep 17 00:00:00 2001 From: scossar Date: Sun, 28 Jan 2018 18:33:55 -0800 Subject: [PATCH 001/202] Add support for mixed text directions --- app/assets/javascripts/application.js | 1 + .../discourse/components/d-editor.js.es6 | 21 +++++++++++++ .../discourse/components/text-field.js.es6 | 30 ++++++++++++++++++- .../discourse/helpers/category-link.js.es6 | 10 +++++-- .../discourse/helpers/dir-span.js.es6 | 14 +++++++++ .../initializers/post-decorations.js.es6 | 7 ++++- .../discourse/lib/text-direction.js.es6 | 28 +++++++++++++++++ .../javascripts/discourse/models/topic.js.es6 | 9 +++++- .../templates/components/categories-only.hbs | 2 +- .../components/category-title-link.hbs | 2 +- .../templates/list/topic-excerpt.raw.hbs | 2 +- .../templates/navigation/category.hbs | 2 +- .../templates/components/category-row.hbs | 2 +- config/locales/client.en.yml | 1 + config/locales/server.en.yml | 1 + config/site_settings.yml | 3 ++ 16 files changed, 125 insertions(+), 10 deletions(-) create mode 100644 app/assets/javascripts/discourse/helpers/dir-span.js.es6 create mode 100644 app/assets/javascripts/discourse/lib/text-direction.js.es6 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 02bc257b12..c6ca0b0c90 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -25,6 +25,7 @@ //= require ./discourse/lib/key-value-store //= require ./discourse/lib/computed //= require ./discourse/lib/formatter +//= require ./discourse/lib/text-direction //= require ./discourse/lib/eyeline //= require ./discourse/lib/show-modal //= require ./discourse/mixins/scrolling diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6 index c70f0b3bc9..10d1a4fa53 100644 --- a/app/assets/javascripts/discourse/components/d-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/d-editor.js.es6 @@ -8,6 +8,7 @@ import { emojiSearch, isSkinTonableEmoji } from 'pretty-text/emoji'; import { emojiUrlFor } from 'discourse/lib/text'; import { getRegister } from 'discourse-common/lib/get-owner'; import { findRawTemplate } from 'discourse/lib/raw-templates'; +import { siteDir } from 'discourse/lib/text-direction'; import { determinePostReplaceSelection, clipboardData } from 'discourse/lib/utilities'; import toMarkdown from 'discourse/lib/to-markdown'; import deprecated from 'discourse-common/lib/deprecated'; @@ -107,6 +108,17 @@ class Toolbar { perform: e => e.applyList(i => !i ? "1. " : `${parseInt(i) + 1}. `, 'list_item') }); + if (Discourse.SiteSettings.support_mixed_text_direction) { + this.addButton({ + id: 'toggle-direction', + group: 'extras', + icon: 'arrows-h', + shortcut: 'Shift+6', + title: 'composer.toggle_direction', + perform: e => e.toggleDirection(), + }); + } + if (site.mobileView) { this.groups.push({group: 'mobileExtras', buttons: []}); } @@ -647,6 +659,14 @@ export default Ember.Component.extend({ return null; }, + _toggleDirection() { + const $textArea = $(".d-editor-input"); + let currentDir = $textArea.attr('dir') ? $textArea.attr('dir') : siteDir(), + newDir = currentDir === 'ltr' ? 'rtl' : 'ltr'; + + $textArea.attr('dir', newDir).focus(); + }, + paste(e) { if (!$(".d-editor-input").is(":focus")) { return; @@ -724,6 +744,7 @@ export default Ember.Component.extend({ addText: text => this._addText(selected, text), replaceText: text => this._addText({pre: '', post: ''}, text), getText: () => this.get('value'), + toggleDirection: () => this._toggleDirection(), }; if (button.sendAction) { diff --git a/app/assets/javascripts/discourse/components/text-field.js.es6 b/app/assets/javascripts/discourse/components/text-field.js.es6 index a9246efa7d..c2bb0eaf51 100644 --- a/app/assets/javascripts/discourse/components/text-field.js.es6 +++ b/app/assets/javascripts/discourse/components/text-field.js.es6 @@ -1,7 +1,35 @@ import computed from "ember-addons/ember-computed-decorators"; +import { siteDir } from "discourse/lib/text-direction"; +import { isRTL } from "discourse/lib/text-direction"; +import { isLTR } from "discourse/lib/text-direction"; export default Ember.TextField.extend({ - attributeBindings: ['autocorrect', 'autocapitalize', 'autofocus', 'maxLength'], + attributeBindings: ['autocorrect', 'autocapitalize', 'autofocus', 'maxLength', 'dir'], + + @computed + dir() { + if (Discourse.SiteSettings.support_mixed_text_direction) { + let val = this.value; + if (val) { + return isRTL(val) ? 'rtl' : 'ltr'; + } else { + return siteDir(); + } + } + }, + + keyUp() { + if (Discourse.SiteSettings.support_mixed_text_direction) { + let val = this.value; + if (isRTL(val)) { + this.set('dir', 'rtl'); + } else if (isLTR(val)) { + this.set('dir', 'ltr'); + } else { + this.set('dir', siteDir()); + } + } + }, @computed("placeholderKey") placeholder(placeholderKey) { diff --git a/app/assets/javascripts/discourse/helpers/category-link.js.es6 b/app/assets/javascripts/discourse/helpers/category-link.js.es6 index 336e25314e..de7f73f579 100644 --- a/app/assets/javascripts/discourse/helpers/category-link.js.es6 +++ b/app/assets/javascripts/discourse/helpers/category-link.js.es6 @@ -1,4 +1,5 @@ import { registerUnbound } from 'discourse-common/lib/helpers'; +import { isRTL } from "discourse/lib/text-direction"; import { iconHTML } from 'discourse-common/lib/icon-library'; var get = Em.get, @@ -38,6 +39,7 @@ export function categoryBadgeHTML(category, opts) { let color = get(category, 'color'); let html = ""; let parentCat = null; + let categoryDir = ""; if (!opts.hideParent) { parentCat = Discourse.Category.findById(get(category, 'parent_category_id')); @@ -66,10 +68,14 @@ export function categoryBadgeHTML(category, opts) { let categoryName = escapeExpression(get(category, 'name')); + if (Discourse.SiteSettings.support_mixed_text_direction) { + categoryDir = isRTL(categoryName) ? 'dir="rtl"' : 'dir="ltr"'; + } + if (restricted) { - html += `${iconHTML('lock')}${categoryName}`; + html += `${iconHTML('lock')}${categoryName}`; } else { - html += `${categoryName}`; + html += `${categoryName}`; } html += ""; diff --git a/app/assets/javascripts/discourse/helpers/dir-span.js.es6 b/app/assets/javascripts/discourse/helpers/dir-span.js.es6 new file mode 100644 index 0000000000..6ce29e8f59 --- /dev/null +++ b/app/assets/javascripts/discourse/helpers/dir-span.js.es6 @@ -0,0 +1,14 @@ +import { registerUnbound } from "discourse-common/lib/helpers"; +import { isRTL } from 'discourse/lib/text-direction'; + +function setDir(text) { + if (Discourse.SiteSettings.support_mixed_text_direction) { + let textDir = isRTL(text) ? 'rtl' : 'ltr'; + return `${text}`; + } + return text; +} + +export default registerUnbound('dir-span', function(str) { + return new Handlebars.SafeString(setDir(str)); +}); diff --git a/app/assets/javascripts/discourse/initializers/post-decorations.js.es6 b/app/assets/javascripts/discourse/initializers/post-decorations.js.es6 index d17b2087ac..0cab9b554d 100644 --- a/app/assets/javascripts/discourse/initializers/post-decorations.js.es6 +++ b/app/assets/javascripts/discourse/initializers/post-decorations.js.es6 @@ -1,13 +1,18 @@ import highlightSyntax from 'discourse/lib/highlight-syntax'; import lightbox from 'discourse/lib/lightbox'; +import { setTextDirections } from "discourse/lib/text-direction"; import { withPluginApi } from 'discourse/lib/plugin-api'; export default { name: "post-decorations", - initialize() { + initialize(container) { withPluginApi('0.1', api => { + const siteSettings = container.lookup('site-settings:main'); api.decorateCooked(highlightSyntax); api.decorateCooked(lightbox); + if (siteSettings.support_mixed_text_direction) { + api.decorateCooked(setTextDirections); + } api.decorateCooked($elem => { const players = $('audio', $elem); diff --git a/app/assets/javascripts/discourse/lib/text-direction.js.es6 b/app/assets/javascripts/discourse/lib/text-direction.js.es6 new file mode 100644 index 0000000000..2a4b9da2c3 --- /dev/null +++ b/app/assets/javascripts/discourse/lib/text-direction.js.es6 @@ -0,0 +1,28 @@ +const ltrChars = 'A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u0300-\u0590\u0800-\u1FFF\u2C00-\uFB1C\uFDFE-\uFE6F\uFEFD-\uFFFF'; +const rtlChars = '\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC'; + +export function isRTL(text) { + const rtlDirCheck = new RegExp('^[^'+ltrChars+']*['+rtlChars+']'); + + return rtlDirCheck.test(text); +} + +export function isLTR(text) { + const ltrDirCheck = new RegExp('^[^'+rtlChars+']*['+ltrChars+']'); + + return ltrDirCheck.test(text); +} + +export function setTextDirections($elem) { + $elem.find('*').each((i, e) => { + let $e = $(e), + textContent = $e.text(); + if (textContent) { + isRTL(textContent) ? $e.attr('dir', 'rtl') : $e.attr('dir', 'ltr'); + } + }); +} + +export function siteDir() { + return $('html').hasClass('rtl') ? 'rtl' : 'ltr'; +} diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6 index 69a4f9c27f..4239398f05 100644 --- a/app/assets/javascripts/discourse/models/topic.js.es6 +++ b/app/assets/javascripts/discourse/models/topic.js.es6 @@ -3,6 +3,7 @@ import { flushMap } from 'discourse/models/store'; import RestModel from 'discourse/models/rest'; import { propertyEqual } from 'discourse/lib/computed'; import { longDate } from 'discourse/lib/formatter'; +import { isRTL } from 'discourse/lib/text-direction'; import computed from 'ember-addons/ember-computed-decorators'; import ActionSummary from 'discourse/models/action-summary'; import { popupAjaxError } from 'discourse/lib/ajax-error'; @@ -58,7 +59,13 @@ const Topic = RestModel.extend({ @computed('fancy_title') fancyTitle(title) { - return censor(emojiUnescape(title || ""), Discourse.Site.currentProp('censored_words')); + let fancyTitle = censor(emojiUnescape(title || ""), Discourse.Site.currentProp('censored_words')); + + if (Discourse.SiteSettings.support_mixed_text_direction) { + let titleDir = isRTL(title) ? 'rtl' : 'ltr'; + return '' + fancyTitle + ''; + } + return fancyTitle; }, // returns createdAt if there's no bumped date diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs index f10712bb61..2fa528e3a9 100644 --- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs +++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs @@ -16,7 +16,7 @@
{{category-title-link category=c}}
- {{{c.description_excerpt}}} + {{{dir-span c.description_excerpt}}}
diff --git a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs b/app/assets/javascripts/discourse/templates/components/category-title-link.hbs index fcb0bdeb07..3403e70d49 100644 --- a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs +++ b/app/assets/javascripts/discourse/templates/components/category-title-link.hbs @@ -3,7 +3,7 @@ {{d-icon 'lock'}} {{/if}} - {{category.name}} + {{dir-span category.name}} {{#if category.uploaded_logo.url}}
{{cdn-img src=category.uploaded_logo.url class="category-logo"}}
diff --git a/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs index 0a42a6a0c5..1c7b5eead0 100644 --- a/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs +++ b/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs @@ -1,6 +1,6 @@ {{#if topic.hasExcerpt}}
- {{{topic.escapedExcerpt}}} + {{{dir-span topic.escapedExcerpt}}} {{#if topic.excerptTruncated}} {{i18n 'read_more'}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs index d8dcac7040..55c7e7ef84 100644 --- a/app/assets/javascripts/discourse/templates/navigation/category.hbs +++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs @@ -5,7 +5,7 @@ {{#if category.uploaded_logo.url}} {{cdn-img src=category.uploaded_logo.url class="category-logo"}} {{#if category.description}} -

{{{category.description}}}

+

{{{dir-span category.description}}}

{{/if}} {{/if}} diff --git a/app/assets/javascripts/select-kit/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/templates/components/category-row.hbs index 985fe9cd74..85cdfd8f15 100644 --- a/app/assets/javascripts/select-kit/templates/components/category-row.hbs +++ b/app/assets/javascripts/select-kit/templates/components/category-row.hbs @@ -15,7 +15,7 @@ {{/if}} {{#if shouldDisplayDescription}} -
{{{description}}}
+
{{{dir-span description}}}
{{/if}} {{else}} {{{label}}} diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index dc948cbbdb..0edc451ef1 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1278,6 +1278,7 @@ en: olist_title: "Numbered List" ulist_title: "Bulleted List" list_item: "List item" + toggle_direction: "Toggle Direction" help: "Markdown Editing Help" collapse: "minimize the composer panel" abandon: "close composer and discard draft" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index d698d82fba..a328a54a71 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -966,6 +966,7 @@ en: default_locale: "The default language of this Discourse instance" allow_user_locale: "Allow users to choose their own language interface preference" set_locale_from_accept_language_header: "set interface language for anonymous users from their web browser's language headers. (EXPERIMENTAL, does not work with anonymous cache)" + support_mixed_text_direction: "Support mixed left-to-right and right-to-left text directions." min_post_length: "Minimum allowed post length in characters" min_first_post_length: "Minimum allowed first post (topic body) length in characters" min_private_message_post_length: "Minimum allowed post length in characters for messages" diff --git a/config/site_settings.yml b/config/site_settings.yml index e02399e151..3fddeee679 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -79,6 +79,9 @@ basic: set_locale_from_accept_language_header: default: false validator: "AllowUserLocaleEnabledValidator" + support_mixed_text_direction: + client: true + default: false categories_topics: default: 20 min: 5 From 42970e758e80b1dccf7aaeee637e36a4c7f2cf83 Mon Sep 17 00:00:00 2001 From: scossar Date: Sun, 28 Jan 2018 18:45:11 -0800 Subject: [PATCH 002/202] Use consistent style for string concatenation --- app/assets/javascripts/discourse/models/topic.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6 index 4239398f05..b8e6f89725 100644 --- a/app/assets/javascripts/discourse/models/topic.js.es6 +++ b/app/assets/javascripts/discourse/models/topic.js.es6 @@ -63,7 +63,7 @@ const Topic = RestModel.extend({ if (Discourse.SiteSettings.support_mixed_text_direction) { let titleDir = isRTL(title) ? 'rtl' : 'ltr'; - return '' + fancyTitle + ''; + return `${fancyTitle}`; } return fancyTitle; }, From 41f1e7430c2c01d158247a470f81a92158aafb09 Mon Sep 17 00:00:00 2001 From: scossar Date: Mon, 29 Jan 2018 17:42:19 -0800 Subject: [PATCH 003/202] Refactor code; add tests --- .../discourse/components/d-editor.js.es6 | 2 +- .../discourse/components/text-field.js.es6 | 8 +++--- .../discourse/lib/text-direction.js.es6 | 12 +++++---- .../components/d-editor-test.js.es6 | 20 +++++++++++++++ .../components/text-field-test.js.es6 | 24 ++++++++++++++++++ .../lib/category-badge-test.js.es6 | 25 +++++++++++++++++++ test/javascripts/models/topic-test.js.es6 | 9 +++++++ 7 files changed, 89 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6 index 10d1a4fa53..010f11bd2b 100644 --- a/app/assets/javascripts/discourse/components/d-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/d-editor.js.es6 @@ -112,7 +112,7 @@ class Toolbar { this.addButton({ id: 'toggle-direction', group: 'extras', - icon: 'arrows-h', + icon: 'exchange', shortcut: 'Shift+6', title: 'composer.toggle_direction', perform: e => e.toggleDirection(), diff --git a/app/assets/javascripts/discourse/components/text-field.js.es6 b/app/assets/javascripts/discourse/components/text-field.js.es6 index c2bb0eaf51..ae26f6e99f 100644 --- a/app/assets/javascripts/discourse/components/text-field.js.es6 +++ b/app/assets/javascripts/discourse/components/text-field.js.es6 @@ -1,14 +1,12 @@ import computed from "ember-addons/ember-computed-decorators"; -import { siteDir } from "discourse/lib/text-direction"; -import { isRTL } from "discourse/lib/text-direction"; -import { isLTR } from "discourse/lib/text-direction"; +import { siteDir, isRTL, isLTR } from "discourse/lib/text-direction"; export default Ember.TextField.extend({ attributeBindings: ['autocorrect', 'autocapitalize', 'autofocus', 'maxLength', 'dir'], @computed dir() { - if (Discourse.SiteSettings.support_mixed_text_direction) { + if (this.siteSettings.support_mixed_text_direction) { let val = this.value; if (val) { return isRTL(val) ? 'rtl' : 'ltr'; @@ -19,7 +17,7 @@ export default Ember.TextField.extend({ }, keyUp() { - if (Discourse.SiteSettings.support_mixed_text_direction) { + if (this.siteSettings.support_mixed_text_direction) { let val = this.value; if (isRTL(val)) { this.set('dir', 'rtl'); diff --git a/app/assets/javascripts/discourse/lib/text-direction.js.es6 b/app/assets/javascripts/discourse/lib/text-direction.js.es6 index 2a4b9da2c3..928b147ed7 100644 --- a/app/assets/javascripts/discourse/lib/text-direction.js.es6 +++ b/app/assets/javascripts/discourse/lib/text-direction.js.es6 @@ -1,15 +1,14 @@ const ltrChars = 'A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u0300-\u0590\u0800-\u1FFF\u2C00-\uFB1C\uFDFE-\uFE6F\uFEFD-\uFFFF'; const rtlChars = '\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC'; +const rtlDirCheck = new RegExp('^[^'+ltrChars+']*['+rtlChars+']'); +const ltrDirCheck = new RegExp('^[^'+rtlChars+']*['+ltrChars+']'); +let _siteDir; export function isRTL(text) { - const rtlDirCheck = new RegExp('^[^'+ltrChars+']*['+rtlChars+']'); - return rtlDirCheck.test(text); } export function isLTR(text) { - const ltrDirCheck = new RegExp('^[^'+rtlChars+']*['+ltrChars+']'); - return ltrDirCheck.test(text); } @@ -24,5 +23,8 @@ export function setTextDirections($elem) { } export function siteDir() { - return $('html').hasClass('rtl') ? 'rtl' : 'ltr'; + if (!_siteDir) { + _siteDir = $('html').hasClass('rtl') ? 'rtl' : 'ltr'; + } + return _siteDir; } diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js.es6 index faf4f30b3b..e0409e4957 100644 --- a/test/javascripts/components/d-editor-test.js.es6 +++ b/test/javascripts/components/d-editor-test.js.es6 @@ -715,6 +715,26 @@ testCase(`list button with line sequence`, function(assert, textarea) { }); }); +componentTest('clicking the toggle-direction button toggles the direction', { + template: '{{d-editor value=value}}', + beforeEach() { + this.siteSettings.support_mixed_text_direction = true; + this.siteSettings.default_locale = "en"; + }, + + test(assert) { + const textarea = this.$('textarea.d-editor-input'); + click('button.toggle-direction'); + andThen(() => { + assert.equal(textarea.attr('dir'), 'rtl'); + }); + click('button.toggle-direction'); + andThen(() => { + assert.equal(textarea.attr('dir'), 'ltr'); + }); + } +}); + testCase(`doesn't jump to bottom with long text`, function(assert, textarea) { let longText = 'hello world.'; diff --git a/test/javascripts/components/text-field-test.js.es6 b/test/javascripts/components/text-field-test.js.es6 index e18662c2ab..7a2de69a5a 100644 --- a/test/javascripts/components/text-field-test.js.es6 +++ b/test/javascripts/components/text-field-test.js.es6 @@ -22,3 +22,27 @@ componentTest("support a placeholder", { assert.equal(this.$('input').prop('placeholder'), 'placeholder.i18n.key'); } }); + +componentTest("sets the dir attribute to ltr for Hebrew text", { + template: `{{text-field value='זהו שם עברי עם מקום עברי'}}`, + beforeEach() { + this.siteSettings.support_mixed_text_direction = true; + }, + + test(assert) { + assert.equal(this.$('input').attr('dir'), 'rtl'); + } +}); + +componentTest("sets the dir attribute to ltr for English text", { + template: `{{text-field value='This is a ltr title'}}`, + beforeEach() { + this.siteSettings.support_mixed_text_direction = true; + }, + + test(assert) { + assert.equal(this.$('input').attr('dir'), 'ltr'); + } +}); + + diff --git a/test/javascripts/lib/category-badge-test.js.es6 b/test/javascripts/lib/category-badge-test.js.es6 index 17322d4619..5fdc807dec 100644 --- a/test/javascripts/lib/category-badge-test.js.es6 +++ b/test/javascripts/lib/category-badge-test.js.es6 @@ -45,3 +45,28 @@ QUnit.test("allowUncategorized", assert => { assert.blank(categoryBadgeHTML(uncategorized), "it doesn't return HTML for uncategorized by default"); assert.present(categoryBadgeHTML(uncategorized, {allowUncategorized: true}), "it returns HTML"); }); + +QUnit.test("category names are wrapped in dir-spans", assert => { + Discourse.SiteSettings.support_mixed_text_direction = true; + const store = createStore(); + const rtlCategory = store.createRecord('category', { + name: 'תכנות עם Ruby', + id: 123, + description_text: 'cool description', + color: 'ff0', + text_color: 'f00' + }); + + const ltrCategory = store.createRecord('category', { + name: 'Programming in Ruby', + id: 234 + }); + + let tag = parseHTML(categoryBadgeHTML(rtlCategory))[0]; + let dirSpan = tag.children[1].children[0]; + assert.equal(dirSpan.attributes.dir, 'rtl'); + + tag = parseHTML(categoryBadgeHTML(ltrCategory))[0]; + dirSpan = tag.children[1].children[0]; + assert.equal(dirSpan.attributes.dir, 'ltr'); +}); diff --git a/test/javascripts/models/topic-test.js.es6 b/test/javascripts/models/topic-test.js.es6 index 2e9ce44436..7c33bceff0 100644 --- a/test/javascripts/models/topic-test.js.es6 +++ b/test/javascripts/models/topic-test.js.es6 @@ -98,6 +98,15 @@ QUnit.test('fancyTitle', assert => { "supports emojis"); }); +QUnit.test('fancyTitle direction', assert => { + const rtlTopic = Topic.create({ fancy_title: "هذا اختبار" }); + const ltrTopic = Topic.create({ fancy_title: "This is a test"}); + + Discourse.SiteSettings.support_mixed_text_direction = true; + assert.equal(rtlTopic.get('fancyTitle'), `هذا اختبار`, "sets the dir-span to rtl"); + assert.equal(ltrTopic.get('fancyTitle'), `This is a test`, "sets the dir-span to ltr"); +}); + QUnit.test('excerpt', assert => { const topic = Topic.create({ excerpt: "This is a test topic :smile:", pinned: true }); From 5d18f72b8c17d09917a52c7f0ab4bbdbae41a7d9 Mon Sep 17 00:00:00 2001 From: scossar Date: Mon, 29 Jan 2018 19:16:35 -0800 Subject: [PATCH 004/202] Add tests for text-direction functions --- .../lib/text-direction-test.js.es6 | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 test/javascripts/lib/text-direction-test.js.es6 diff --git a/test/javascripts/lib/text-direction-test.js.es6 b/test/javascripts/lib/text-direction-test.js.es6 new file mode 100644 index 0000000000..c12c03cb1e --- /dev/null +++ b/test/javascripts/lib/text-direction-test.js.es6 @@ -0,0 +1,23 @@ +import { isRTL, isLTR, setTextDirections, siteDir } from 'discourse/lib/text-direction'; + +QUnit.module('lib:text-direction'); + +QUnit.test("isRTL", assert => { + // Hebrew + assert.equal(isRTL('זה מבחן'), true); + + // Arabic + assert.equal(isRTL('هذا اختبار'), true); + + // Persian + assert.equal(isRTL('این یک امتحان است'), true); + + assert.equal(isRTL('This is a test'), false); + assert.equal(isRTL(''), false); +}); + +QUnit.test("isLTR", assert => { + assert.equal(isLTR('This is a test'), true); + assert.equal(isLTR('זה מבחן'), false); +}); + From 843d88c5d0a3b937ef48f4ffa0df3e73572629e3 Mon Sep 17 00:00:00 2001 From: scossar Date: Mon, 29 Jan 2018 20:11:12 -0800 Subject: [PATCH 005/202] Remove unused imports --- test/javascripts/lib/text-direction-test.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/javascripts/lib/text-direction-test.js.es6 b/test/javascripts/lib/text-direction-test.js.es6 index c12c03cb1e..c8ddee262b 100644 --- a/test/javascripts/lib/text-direction-test.js.es6 +++ b/test/javascripts/lib/text-direction-test.js.es6 @@ -1,4 +1,4 @@ -import { isRTL, isLTR, setTextDirections, siteDir } from 'discourse/lib/text-direction'; +import { isRTL, isLTR } from 'discourse/lib/text-direction'; QUnit.module('lib:text-direction'); From 8c91d418ddc240cf6f1faf3561c140b1bdbce130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 31 Jan 2018 20:09:59 +0100 Subject: [PATCH 006/202] UX: improve semantic of login button for better password managers compatibility --- .../discourse/templates/modal/login.hbs | 29 +++++-------------- app/assets/stylesheets/desktop/login.scss | 3 ++ 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs index 81b3fb611d..9b47c12958 100644 --- a/app/assets/javascripts/discourse/templates/modal/login.hbs +++ b/app/assets/javascripts/discourse/templates/modal/login.hbs @@ -6,24 +6,14 @@
- - + + - - - + + + @@ -40,14 +30,11 @@
{{#if canLoginLocal}} - {{#if showSignupLink}} -   @@ -55,7 +42,7 @@ {{/if}} {{#if authenticate}} -   {{i18n 'login.authenticating'}} +  {{i18n 'login.authenticating'}} {{/if}} {{conditional-loading-spinner condition=showSpinner size="small"}} diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss index 23c933180f..3e7e61efcc 100644 --- a/app/assets/stylesheets/desktop/login.scss +++ b/app/assets/stylesheets/desktop/login.scss @@ -16,6 +16,9 @@ a { color: dark-light-choose($primary-high, $secondary-low); } + td { + padding-right: 5px; + } } // Create account From 826584b9c1dce7f59301c41c05a1a1d3eba95760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 31 Jan 2018 20:34:53 +0100 Subject: [PATCH 007/202] UX: prevent anons from clearing pins in topic view --- .../discourse/components/topic-status.js.es6 | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/discourse/components/topic-status.js.es6 b/app/assets/javascripts/discourse/components/topic-status.js.es6 index f1c8695dfd..be8076458e 100644 --- a/app/assets/javascripts/discourse/components/topic-status.js.es6 +++ b/app/assets/javascripts/discourse/components/topic-status.js.es6 @@ -8,15 +8,10 @@ export default Ember.Component.extend(bufferedRender({ rerenderTriggers: ['topic.archived', 'topic.closed', 'topic.pinned', 'topic.visible', 'topic.unpinned', 'topic.is_warning'], click(e) { - if ($(e.target).hasClass('d-icon-thumb-tack')) { + // only pin unpin for now + if (this.get("canAct") && $(e.target).hasClass('d-icon-thumb-tack')) { const topic = this.get('topic'); - - // only pin unpin for now - if (topic.get('pinned')) { - topic.clearPin(); - } else { - topic.rePin(); - } + topic.get('pinned') ? topic.clearPin() : topic.rePin(); } return false; From 4bcf9c5bf33b9edf5c38a822897cc441594bbbcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 31 Jan 2018 21:55:01 +0100 Subject: [PATCH 008/202] FIX: only count 'human' users in group.user_count --- app/models/group.rb | 18 +++++++++--------- spec/models/group_spec.rb | 19 ++++++++----------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/app/models/group.rb b/app/models/group.rb index a86d60c581..61f7e79f13 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -281,13 +281,13 @@ class Group < ActiveRecord::Base remove_subquery = case name when :admins - "SELECT id FROM users WHERE NOT admin" + "SELECT id FROM users WHERE id <= 0 OR NOT admin" when :moderators - "SELECT id FROM users WHERE NOT moderator" + "SELECT id FROM users WHERE id <= 0 OR NOT moderator" when :staff - "SELECT id FROM users WHERE NOT admin AND NOT moderator" + "SELECT id FROM users WHERE id <= 0 OR (NOT admin AND NOT moderator)" when :trust_level_0, :trust_level_1, :trust_level_2, :trust_level_3, :trust_level_4 - "SELECT id FROM users WHERE trust_level < #{id - 10}" + "SELECT id FROM users WHERE id <= 0 OR trust_level < #{id - 10}" end exec_sql <<-SQL @@ -301,15 +301,15 @@ class Group < ActiveRecord::Base insert_subquery = case name when :admins - "SELECT id FROM users WHERE admin" + "SELECT id FROM users WHERE id > 0 AND admin" when :moderators - "SELECT id FROM users WHERE moderator" + "SELECT id FROM users WHERE id > 0 AND moderator" when :staff - "SELECT id FROM users WHERE moderator OR admin" + "SELECT id FROM users WHERE id > 0 AND (moderator OR admin)" when :trust_level_1, :trust_level_2, :trust_level_3, :trust_level_4 - "SELECT id FROM users WHERE trust_level >= #{id - 10}" + "SELECT id FROM users WHERE id > 0 AND trust_level >= #{id - 10}" when :trust_level_0 - "SELECT id FROM users" + "SELECT id FROM users WHERE id > 0" end exec_sql <<-SQL diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb index 4dce0a96cd..856b6fa0f5 100644 --- a/spec/models/group_spec.rb +++ b/spec/models/group_spec.rb @@ -338,7 +338,7 @@ describe Group do user2 = Fabricate(:coding_horror) user2.change_trust_level!(TrustLevel[3]) - expect(Group[:trust_level_2].user_ids.sort.reject { |id| id < -1 }).to eq [-1, user.id, user2.id].sort + expect(Group[:trust_level_2].user_ids).to include(user.id, user2.id) end it "Correctly updates all automatic groups upon request" do @@ -346,7 +346,7 @@ describe Group do user = Fabricate(:user) user.change_trust_level!(TrustLevel[2]) - Group.exec_sql("update groups set user_count=0 where id = #{Group::AUTO_GROUPS[:trust_level_2]}") + Group.exec_sql("UPDATE groups SET user_count = 0 WHERE id = #{Group::AUTO_GROUPS[:trust_level_2]}") Group.refresh_automatic_groups! @@ -354,23 +354,20 @@ describe Group do expect(groups.count).to eq Group::AUTO_GROUPS.count g = groups.find { |grp| grp.id == Group::AUTO_GROUPS[:admins] } - expect(g.users.count).to eq(g.user_count) - expect(g.users.pluck(:id).sort.reject { |id| id < -1 }).to eq([-1, admin.id]) + expect(g.users.count).to eq g.user_count + expect(g.users.pluck(:id)).to contain_exactly(admin.id) g = groups.find { |grp| grp.id == Group::AUTO_GROUPS[:staff] } - expect(g.users.count).to eq (g.user_count) - expect(g.users.pluck(:id).sort.reject { |id| id < -1 }).to eq([-1, admin.id]) + expect(g.users.count).to eq g.user_count + expect(g.users.pluck(:id)).to contain_exactly(admin.id) g = groups.find { |grp| grp.id == Group::AUTO_GROUPS[:trust_level_1] } - # admin, system and user expect(g.users.count).to eq g.user_count - expect(g.users.where('users.id > -2').count).to eq 3 + expect(g.users.pluck(:id)).to contain_exactly(admin.id, user.id) g = groups.find { |grp| grp.id == Group::AUTO_GROUPS[:trust_level_2] } - # system and user expect(g.users.count).to eq g.user_count - expect(g.users.where('users.id > -2').count).to eq 2 - + expect(g.users.pluck(:id)).to contain_exactly(user.id) end it "can set members via usernames helper" do From 7d2283167a82c19744ebd61c4763535ca12a05e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 31 Jan 2018 22:31:16 +0100 Subject: [PATCH 009/202] UX: only crops images taller than 18:9 instead of 16:9 --- lib/cooked_post_processor.rb | 12 ++++-------- spec/components/cooked_post_processor_spec.rb | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb index 3582a42e46..e9637755f0 100644 --- a/lib/cooked_post_processor.rb +++ b/lib/cooked_post_processor.rb @@ -247,9 +247,9 @@ class CookedPostProcessor rescue URI::InvalidURIError end - # only crop when the image is taller than 16:9 - # we only use 95% of that to allow for a small margin - MIN_RATIO_TO_CROP ||= (9.0 / 16.0) * 0.95 + # only crop when the image is taller than 18:9 + # we only use 90% of that to allow for a small margin + MIN_RATIO_TO_CROP ||= (9.0 / 18.0) * 0.9 def convert_to_link!(img) src = img["src"] @@ -268,11 +268,7 @@ class CookedPostProcessor return if original_width <= width && original_height <= height return if original_width <= SiteSetting.max_image_width && original_height <= SiteSetting.max_image_height - crop = original_width.to_f / original_height.to_f < MIN_RATIO_TO_CROP - # prevent iPhone X screenshots from being cropped - crop &= original_width != 1125 && original_height != 2436 - - if crop + if crop = (original_width.to_f / original_height.to_f < MIN_RATIO_TO_CROP) width, height = ImageSizer.crop(original_width, original_height) img["width"] = width img["height"] = height diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb index b6bf69b1b0..d2b90f5e4d 100644 --- a/spec/components/cooked_post_processor_spec.rb +++ b/spec/components/cooked_post_processor_spec.rb @@ -180,7 +180,7 @@ describe CookedPostProcessor do SiteSetting.create_thumbnails = true Upload.expects(:get_from_url).returns(upload) - FastImage.expects(:size).returns([860, 1900]) + FastImage.expects(:size).returns([860, 2000]) OptimizedImage.expects(:resize).never OptimizedImage.expects(:crop).returns(true) From f2e7b74d888dba5da8641636370ea740fb38e06b Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 1 Feb 2018 12:26:45 +1100 Subject: [PATCH 010/202] FIX: don't return 200s when login is required to paths When running `ensure_login_required` it should always happen prior to `check_xhr` cause check xhr will trigger a 200 response --- app/controllers/about_controller.rb | 2 +- app/controllers/admin/admin_controller.rb | 4 +- .../admin/embeddable_hosts_controller.rb | 2 - app/controllers/admin/embedding_controller.rb | 2 +- app/controllers/categories_controller.rb | 2 +- .../category_hashtags_controller.rb | 2 +- app/controllers/composer_controller.rb | 2 +- .../composer_messages_controller.rb | 2 +- app/controllers/draft_controller.rb | 3 +- app/controllers/email_controller.rb | 2 +- app/controllers/groups_controller.rb | 2 +- app/controllers/inline_onebox_controller.rb | 2 +- app/controllers/invites_controller.rb | 6 ++- app/controllers/notifications_controller.rb | 2 +- app/controllers/onebox_controller.rb | 2 +- app/controllers/post_actions_controller.rb | 2 +- app/controllers/posts_controller.rb | 2 +- app/controllers/steps_controller.rb | 2 +- app/controllers/tag_groups_controller.rb | 2 +- app/controllers/tags_controller.rb | 9 ++-- app/controllers/topics_controller.rb | 51 ++++++++++--------- app/controllers/uploads_controller.rb | 2 +- app/controllers/user_api_keys_controller.rb | 2 +- app/controllers/users_controller.rb | 14 +++-- app/controllers/users_email_controller.rb | 2 +- app/controllers/wizard_controller.rb | 5 +- spec/controllers/wizard_controller_spec.rb | 7 +++ spec/requests/admin/admin_controller_spec.rb | 3 ++ 28 files changed, 81 insertions(+), 59 deletions(-) diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb index 0ca88b6945..48c401dee9 100644 --- a/app/controllers/about_controller.rb +++ b/app/controllers/about_controller.rb @@ -1,8 +1,8 @@ require_dependency 'rate_limiter' class AboutController < ApplicationController + prepend_before_action :check_xhr, :ensure_logged_in, only: [:live_post_counts] skip_before_action :check_xhr, only: [:index] - before_action :ensure_logged_in, only: [:live_post_counts] def index return redirect_to path('/login') if SiteSetting.login_required? && current_user.nil? diff --git a/app/controllers/admin/admin_controller.rb b/app/controllers/admin/admin_controller.rb index 1b786ac0de..e4dd34119f 100644 --- a/app/controllers/admin/admin_controller.rb +++ b/app/controllers/admin/admin_controller.rb @@ -1,7 +1,7 @@ class Admin::AdminController < ApplicationController - before_action :ensure_logged_in - before_action :ensure_staff + prepend_before_action :check_xhr, :ensure_logged_in + prepend_before_action :check_xhr, :ensure_staff def index render body: nil diff --git a/app/controllers/admin/embeddable_hosts_controller.rb b/app/controllers/admin/embeddable_hosts_controller.rb index f43ff95505..667db524fe 100644 --- a/app/controllers/admin/embeddable_hosts_controller.rb +++ b/app/controllers/admin/embeddable_hosts_controller.rb @@ -1,7 +1,5 @@ class Admin::EmbeddableHostsController < Admin::AdminController - before_action :ensure_logged_in, :ensure_staff - def create save_host(EmbeddableHost.new) end diff --git a/app/controllers/admin/embedding_controller.rb b/app/controllers/admin/embedding_controller.rb index ada7c668b9..ebac31e576 100644 --- a/app/controllers/admin/embedding_controller.rb +++ b/app/controllers/admin/embedding_controller.rb @@ -2,7 +2,7 @@ require_dependency 'embedding' class Admin::EmbeddingController < Admin::AdminController - before_action :ensure_logged_in, :ensure_staff, :fetch_embedding + before_action :fetch_embedding def show render_serialized(@embedding, EmbeddingSerializer, root: 'embedding', rest_serializer: true) diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index 56c49b9da9..7b9a25ec5c 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -2,7 +2,7 @@ require_dependency 'category_serializer' class CategoriesController < ApplicationController - before_action :ensure_logged_in, except: [:index, :categories_and_latest, :show, :redirect, :find_by_slug] + prepend_before_action :check_xhr, :ensure_logged_in, except: [:index, :categories_and_latest, :show, :redirect, :find_by_slug] before_action :fetch_category, only: [:show, :update, :destroy] before_action :initialize_staff_action_logger, only: [:create, :update, :destroy] skip_before_action :check_xhr, only: [:index, :categories_and_latest, :redirect] diff --git a/app/controllers/category_hashtags_controller.rb b/app/controllers/category_hashtags_controller.rb index e0b6f768d7..34e8bb0367 100644 --- a/app/controllers/category_hashtags_controller.rb +++ b/app/controllers/category_hashtags_controller.rb @@ -1,5 +1,5 @@ class CategoryHashtagsController < ApplicationController - before_action :ensure_logged_in + prepend_before_action :check_xhr, :ensure_logged_in def check category_slugs = params[:category_slugs] diff --git a/app/controllers/composer_controller.rb b/app/controllers/composer_controller.rb index 6eb78a5d06..7d103c634e 100644 --- a/app/controllers/composer_controller.rb +++ b/app/controllers/composer_controller.rb @@ -2,7 +2,7 @@ require_dependency 'html_to_markdown' class ComposerController < ApplicationController - before_action :ensure_logged_in + prepend_before_action :check_xhr, :ensure_logged_in def parse_html markdown_text = HtmlToMarkdown.new(params[:html]).to_markdown diff --git a/app/controllers/composer_messages_controller.rb b/app/controllers/composer_messages_controller.rb index 60bc8a75ba..64b3bc5382 100644 --- a/app/controllers/composer_messages_controller.rb +++ b/app/controllers/composer_messages_controller.rb @@ -2,7 +2,7 @@ require_dependency 'composer_messages_finder' class ComposerMessagesController < ApplicationController - before_action :ensure_logged_in + prepend_before_action :check_xhr, :ensure_logged_in def index finder = ComposerMessagesFinder.new(current_user, params.slice(:composer_action, :topic_id, :post_id)) diff --git a/app/controllers/draft_controller.rb b/app/controllers/draft_controller.rb index 5734a0326a..c3f9345c5b 100644 --- a/app/controllers/draft_controller.rb +++ b/app/controllers/draft_controller.rb @@ -1,6 +1,5 @@ class DraftController < ApplicationController - before_action :ensure_logged_in - # TODO really do we need to skip this? + prepend_before_action :ensure_logged_in skip_before_action :check_xhr, :preload_json def show diff --git a/app/controllers/email_controller.rb b/app/controllers/email_controller.rb index 9701cfc096..f0556f608d 100644 --- a/app/controllers/email_controller.rb +++ b/app/controllers/email_controller.rb @@ -1,7 +1,7 @@ class EmailController < ApplicationController - skip_before_action :check_xhr, :preload_json, :redirect_to_login_if_required layout 'no_ember' + skip_before_action :check_xhr, :preload_json, :redirect_to_login_if_required before_action :ensure_logged_in, only: :preferences_redirect def preferences_redirect diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 3fde94894c..e199c7cc89 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -1,6 +1,6 @@ class GroupsController < ApplicationController - before_action :ensure_logged_in, only: [ + prepend_before_action :check_xhr, :ensure_logged_in, only: [ :set_notifications, :mentionable, :messageable, diff --git a/app/controllers/inline_onebox_controller.rb b/app/controllers/inline_onebox_controller.rb index c7f4e30f75..33d2a61f27 100644 --- a/app/controllers/inline_onebox_controller.rb +++ b/app/controllers/inline_onebox_controller.rb @@ -1,7 +1,7 @@ require_dependency 'inline_oneboxer' class InlineOneboxController < ApplicationController - before_action :ensure_logged_in + prepend_before_action :check_xhr, :ensure_logged_in def show oneboxes = InlineOneboxer.new(params[:urls] || []).process diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb index 9bd0c0e391..aea0c9782f 100644 --- a/app/controllers/invites_controller.rb +++ b/app/controllers/invites_controller.rb @@ -2,11 +2,15 @@ require_dependency 'rate_limiter' class InvitesController < ApplicationController + prepend_before_action :check_xhr, :ensure_logged_in, only: [ + :destroy, :create, :create_invite_link, :rescind_all_invites, + :resend_invite, :resend_all_invites, :upload_csv + ] + skip_before_action :check_xhr, except: [:perform_accept_invitation] skip_before_action :preload_json, except: [:show] skip_before_action :redirect_to_login_if_required - before_action :ensure_logged_in, only: [:destroy, :create, :create_invite_link, :rescind_all_invites, :resend_invite, :resend_all_invites, :upload_csv] before_action :ensure_new_registrations_allowed, only: [:show, :perform_accept_invitation] before_action :ensure_not_logged_in, only: [:show, :perform_accept_invitation] diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb index bedfb6b515..16780e44d9 100644 --- a/app/controllers/notifications_controller.rb +++ b/app/controllers/notifications_controller.rb @@ -2,7 +2,7 @@ require_dependency 'notification_serializer' class NotificationsController < ApplicationController - before_action :ensure_logged_in + prepend_before_action :check_xhr, :ensure_logged_in def index user = diff --git a/app/controllers/onebox_controller.rb b/app/controllers/onebox_controller.rb index 15b99a7648..65b66b5964 100644 --- a/app/controllers/onebox_controller.rb +++ b/app/controllers/onebox_controller.rb @@ -1,7 +1,7 @@ require_dependency 'oneboxer' class OneboxController < ApplicationController - before_action :ensure_logged_in + prepend_before_action :check_xhr, :ensure_logged_in def show unless params[:refresh] == 'true' diff --git a/app/controllers/post_actions_controller.rb b/app/controllers/post_actions_controller.rb index 2bf6027ba2..022a3072e2 100644 --- a/app/controllers/post_actions_controller.rb +++ b/app/controllers/post_actions_controller.rb @@ -1,7 +1,7 @@ require_dependency 'discourse' class PostActionsController < ApplicationController - before_action :ensure_logged_in + prepend_before_action :check_xhr, :ensure_logged_in before_action :fetch_post_from_params before_action :fetch_post_action_type_id_from_params diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 639ee168c2..0ac234182d 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -8,7 +8,7 @@ require_dependency 'post_locker' class PostsController < ApplicationController - before_action :ensure_logged_in, except: [ + prepend_before_action :check_xhr, :ensure_logged_in, except: [ :show, :replies, :by_number, diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb index ebfd4b530d..8a341d53d3 100644 --- a/app/controllers/steps_controller.rb +++ b/app/controllers/steps_controller.rb @@ -5,7 +5,7 @@ require_dependency 'wizard/step_updater' class StepsController < ApplicationController before_action :ensure_wizard_enabled - before_action :ensure_logged_in + prepend_before_action :check_xhr, :ensure_logged_in before_action :ensure_admin def update diff --git a/app/controllers/tag_groups_controller.rb b/app/controllers/tag_groups_controller.rb index b55120954e..e039fb6cb7 100644 --- a/app/controllers/tag_groups_controller.rb +++ b/app/controllers/tag_groups_controller.rb @@ -1,6 +1,6 @@ class TagGroupsController < ApplicationController + prepend_before_action :check_xhr, :ensure_logged_in, except: [:index, :show] skip_before_action :check_xhr, only: [:index, :show] - before_action :ensure_logged_in, except: [:index, :show] before_action :fetch_tag_group, only: [:show, :update, :destroy] def index diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index a73416d04f..0c63c7a7ee 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -7,8 +7,7 @@ class TagsController < ::ApplicationController before_action :ensure_tags_enabled - skip_before_action :check_xhr, only: [:tag_feed, :show, :index] - before_action :ensure_logged_in, except: [ + prepend_before_action :check_xhr, :ensure_logged_in, except: [ :index, :show, :tag_feed, @@ -16,7 +15,11 @@ class TagsController < ::ApplicationController :check_hashtag, Discourse.anonymous_filters.map { |f| :"show_#{f}" } ].flatten - before_action :set_category_from_params, except: [:index, :update, :destroy, :tag_feed, :search, :notifications, :update_notifications] + + skip_before_action :check_xhr, only: [:tag_feed, :show, :index] + + before_action :set_category_from_params, except: [:index, :update, :destroy, + :tag_feed, :search, :notifications, :update_notifications] def index @description_meta = I18n.t("tags.title") diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index 439c568343..6d4f055534 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -6,31 +6,32 @@ require_dependency 'discourse_event' require_dependency 'rate_limiter' class TopicsController < ApplicationController - before_action :ensure_logged_in, only: [:timings, - :destroy_timings, - :update, - :star, - :destroy, - :recover, - :status, - :invite, - :mute, - :unmute, - :set_notifications, - :move_posts, - :merge_topic, - :clear_pin, - :re_pin, - :status_update, - :timer, - :bulk, - :reset_new, - :change_post_owners, - :change_timestamps, - :archive_message, - :move_to_inbox, - :convert_topic, - :bookmark] + prepend_before_action :check_xhr, :ensure_logged_in, only: [ + :timings, + :destroy_timings, + :update, + :destroy, + :recover, + :status, + :invite, + :mute, + :unmute, + :set_notifications, + :move_posts, + :merge_topic, + :clear_pin, + :re_pin, + :status_update, + :timer, + :bulk, + :reset_new, + :change_post_owners, + :change_timestamps, + :archive_message, + :move_to_inbox, + :convert_topic, + :bookmark + ] before_action :consider_user_for_promotion, only: :show diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index dcfaa4ed3c..13754d3f27 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -2,7 +2,7 @@ require "mini_mime" require_dependency 'upload_creator' class UploadsController < ApplicationController - before_action :ensure_logged_in, except: [:show] + prepend_before_action :check_xhr, :ensure_logged_in, except: [:show] skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required, only: [:show] def create diff --git a/app/controllers/user_api_keys_controller.rb b/app/controllers/user_api_keys_controller.rb index c6d41d2cc3..2dbc75ea23 100644 --- a/app/controllers/user_api_keys_controller.rb +++ b/app/controllers/user_api_keys_controller.rb @@ -2,9 +2,9 @@ class UserApiKeysController < ApplicationController layout 'no_ember' + prepend_before_action :check_xhr, :ensure_logged_in, only: [:create, :revoke, :undo_revoke] skip_before_action :redirect_to_login_if_required, only: [:new] skip_before_action :check_xhr, :preload_json - before_action :ensure_logged_in, only: [:create, :revoke, :undo_revoke] AUTH_API_VERSION ||= 2 diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index f4706ed858..29e52290c4 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -8,10 +8,18 @@ require_dependency 'admin_confirmation' class UsersController < ApplicationController skip_before_action :authorize_mini_profiler, only: [:avatar] - skip_before_action :check_xhr, only: [:show, :badges, :password_reset, :update, :account_created, :activate_account, :perform_account_activation, :user_preferences_redirect, :avatar, :my_redirect, :toggle_anon, :admin_login, :confirm_admin] - before_action :ensure_logged_in, only: [:username, :update, :user_preferences_redirect, :upload_user_image, - :pick_avatar, :destroy_user_image, :destroy, :check_emails, :topic_tracking_state] + prepend_before_action :check_xhr, :ensure_logged_in, only: [ + :username, :update, :user_preferences_redirect, :upload_user_image, + :pick_avatar, :destroy_user_image, :destroy, :check_emails, :topic_tracking_state, + :preferences + ] + + skip_before_action :check_xhr, only: [ + :show, :badges, :password_reset, :update, :account_created, + :activate_account, :perform_account_activation, :user_preferences_redirect, :avatar, + :my_redirect, :toggle_anon, :admin_login, :confirm_admin + ] before_action :respond_to_suspicious_request, only: [:create] diff --git a/app/controllers/users_email_controller.rb b/app/controllers/users_email_controller.rb index 6e1e2a1f0c..e34e905232 100644 --- a/app/controllers/users_email_controller.rb +++ b/app/controllers/users_email_controller.rb @@ -4,7 +4,7 @@ require_dependency 'email_updater' class UsersEmailController < ApplicationController - before_action :ensure_logged_in, only: [:index, :update] + prepend_before_action :check_xhr, :ensure_logged_in, only: [:index, :update] skip_before_action :check_xhr, only: [:confirm] skip_before_action :redirect_to_login_if_required, only: [:confirm] diff --git a/app/controllers/wizard_controller.rb b/app/controllers/wizard_controller.rb index 3c52ee68f3..78f224b17f 100644 --- a/app/controllers/wizard_controller.rb +++ b/app/controllers/wizard_controller.rb @@ -2,10 +2,9 @@ require_dependency 'wizard' require_dependency 'wizard/builder' class WizardController < ApplicationController + prepend_before_action :check_xhr, :ensure_admin, except: [:qunit] + prepend_before_action :check_xhr, :ensure_logged_in, except: [:qunit] before_action :ensure_wizard_enabled, only: [:index] - before_action :ensure_logged_in, except: [:qunit] - before_action :ensure_admin, except: [:qunit] - skip_before_action :check_xhr, :preload_json layout false diff --git a/spec/controllers/wizard_controller_spec.rb b/spec/controllers/wizard_controller_spec.rb index c1476d1258..0875e31c26 100644 --- a/spec/controllers/wizard_controller_spec.rb +++ b/spec/controllers/wizard_controller_spec.rb @@ -14,6 +14,13 @@ describe WizardController do expect(response.status).to eq(403) end + it 'needs you to be logged in' do + get :index + # for whatever reason, no access is 404 + # we may want to revisit this at some point and make it 403 + expect(response.status).to eq(404) + end + it "raises an error if you aren't an admin" do log_in(:moderator) get :index, format: :json diff --git a/spec/requests/admin/admin_controller_spec.rb b/spec/requests/admin/admin_controller_spec.rb index 031bb7dd06..c479ada153 100644 --- a/spec/requests/admin/admin_controller_spec.rb +++ b/spec/requests/admin/admin_controller_spec.rb @@ -4,5 +4,8 @@ RSpec.describe Admin::AdminController do it "should return the right response if user isn't a staff" do get "/admin", params: { api_key: 'asdiasiduga' } expect(response.status).to eq(404) + + get "/admin" + expect(response.status).to eq(404) end end From ee0d3f15c1914bd494ebe88a5831d40be88bbcae Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 1 Feb 2018 13:22:38 +1100 Subject: [PATCH 011/202] FEATURE: allow better fidelity for auto linkify, disable most tlds based linkify New site settings: enable_markdown_linkify: which is default on, auto links https:// and http:// and mail:// markdown_linkify_tlds: which allows control of what tlds get autolinked for cases such as www.site.com, default is com|net|gov --- .../engines/discourse-markdown-it.js.es6 | 4 +- config/locales/server.en.yml | 2 + config/site_settings.yml | 7 ++++ lib/pretty_text.rb | 1 - spec/components/pretty_text_spec.rb | 40 +++++++++++++++++++ spec/integrity/common_mark_spec.rb | 3 +- 6 files changed, 54 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6 index 4af5b67f08..0565004f93 100644 --- a/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6 +++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6 @@ -215,10 +215,12 @@ export function setup(opts, siteSettings, state) { html: true, breaks: opts.discourse.features.newline, xhtmlOut: false, - linkify: opts.discourse.features.linkify, + linkify: siteSettings.enable_markdown_linkify, typographer: siteSettings.enable_markdown_typographer }); + opts.engine.linkify.tlds(siteSettings.markdown_linkify_tlds.split('|')); + setupUrlDecoding(opts.engine); setupHoister(opts.engine); setupImageDimensions(opts.engine); diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 7b162be31e..cce71de797 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1066,6 +1066,8 @@ en: traditional_markdown_linebreaks: "Use traditional linebreaks in Markdown, which require two trailing spaces for a linebreak." enable_markdown_typographer: "Use basic typography rules to improve text readability of paragraphs of text, replaces (c) (tm) etc, with symbols, reduces number of question marks and so on" + enable_markdown_linkify: "Automatically treat text that looks like a link as a link: www.site.com and http://site.com will be automatically linked" + markdown_linkify_tlds: "List of top level domains that get automatically treated as links" post_undo_action_window_mins: "Number of minutes users are allowed to undo recent actions on a post (like, flag, etc)." must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site. WARNING: enabling this for a live site will revoke access for existing non-staff users!" pending_users_reminder_delay: "Notify moderators if new users have been waiting for approval for longer than this many hours. Set to -1 to disable notifications." diff --git a/config/site_settings.yml b/config/site_settings.yml index 1b19897afc..8d686b52ae 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -531,6 +531,13 @@ posting: enable_markdown_typographer: client: true default: true + enable_markdown_linkify: + client: true + default: true + markdown_linkify_tlds: + client: true + type: list + default: 'com|gov|net' enable_rich_text_paste: client: true default: false diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index 7655c76c8d..fafc6c7eb4 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -167,7 +167,6 @@ module PrettyText __optInput.emojiUnicodeReplacer = __emojiUnicodeReplacer; __optInput.lookupInlineOnebox = __lookupInlineOnebox; __optInput.lookupImageUrls = __lookupImageUrls; - #{opts[:linkify] == false ? "__optInput.linkify = false;" : ""} __optInput.censoredWords = #{WordWatcher.words_for_action(:censor).join('|').to_json}; JS diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index 6e0ee7e045..971d7dd600 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -1237,4 +1237,44 @@ HTML end + it "You can disable linkify" do + md = "www.cnn.com test.it http://test.com https://test.ab https://a" + cooked = PrettyText.cook(md) + + html = <<~HTML +

www.cnn.com test.it http://test.com https://test.ab https://a

+ HTML + + expect(cooked).to eq(html.strip) + + # notice how cnn.com is no longer linked but it is + SiteSetting.markdown_linkify_tlds = "not_com|it" + + cooked = PrettyText.cook(md) + html = <<~HTML +

www.cnn.com test.it http://test.com https://test.ab https://a

+ HTML + + expect(cooked).to eq(html.strip) + + # no tlds anymore + SiteSetting.markdown_linkify_tlds = "" + + cooked = PrettyText.cook(md) + html = <<~HTML +

www.cnn.com test.it http://test.com https://test.ab https://a

+ HTML + + expect(cooked).to eq(html.strip) + + # lastly ... what about no linkify + SiteSetting.enable_markdown_linkify = false + + cooked = PrettyText.cook(md) + + html = <<~HTML +

www.cnn.com test.it http://test.com https://test.ab https://a

+ HTML + end + end diff --git a/spec/integrity/common_mark_spec.rb b/spec/integrity/common_mark_spec.rb index 063e6ddff9..8900986661 100644 --- a/spec/integrity/common_mark_spec.rb +++ b/spec/integrity/common_mark_spec.rb @@ -27,7 +27,8 @@ describe "CommonMark" do html.gsub!('
', '
') html.gsub!(/]+) \/>/, "") - cooked = PrettyText.markdown(md, sanitize: false, linkify: false) + SiteSetting.enable_markdown_linkify = false + cooked = PrettyText.markdown(md, sanitize: false) cooked.strip! cooked.gsub!(" class=\"lang-auto\"", '') cooked.gsub!(/(.*)<\/span>/, "\\1") From 41986cdb2f5cfd690fa0d7defaf4ce2a88e5259d Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 1 Feb 2018 15:17:59 +1100 Subject: [PATCH 012/202] Refactor requires login logic, reduce duplicate code This also corrects the positioning in the chain of the check and removes misuse of prepend_before_action --- app/controllers/about_controller.rb | 4 ++- app/controllers/admin/admin_controller.rb | 4 +-- app/controllers/application_controller.rb | 25 ++++++++++++++++++- app/controllers/categories_controller.rb | 3 ++- .../category_hashtags_controller.rb | 2 +- app/controllers/composer_controller.rb | 2 +- .../composer_messages_controller.rb | 2 +- app/controllers/draft_controller.rb | 3 ++- app/controllers/groups_controller.rb | 2 +- app/controllers/inline_onebox_controller.rb | 2 +- app/controllers/invites_controller.rb | 2 +- app/controllers/notifications_controller.rb | 2 +- app/controllers/onebox_controller.rb | 2 +- app/controllers/post_actions_controller.rb | 3 ++- app/controllers/posts_controller.rb | 2 +- app/controllers/steps_controller.rb | 2 +- app/controllers/tag_groups_controller.rb | 3 ++- app/controllers/tags_controller.rb | 2 +- app/controllers/topics_controller.rb | 2 +- app/controllers/uploads_controller.rb | 3 ++- app/controllers/user_api_keys_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- app/controllers/users_email_controller.rb | 2 +- app/controllers/wizard_controller.rb | 5 ++-- 24 files changed, 57 insertions(+), 26 deletions(-) diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb index 48c401dee9..a95cedfca7 100644 --- a/app/controllers/about_controller.rb +++ b/app/controllers/about_controller.rb @@ -1,7 +1,9 @@ require_dependency 'rate_limiter' class AboutController < ApplicationController - prepend_before_action :check_xhr, :ensure_logged_in, only: [:live_post_counts] + + requires_login only: [:live_post_counts] + skip_before_action :check_xhr, only: [:index] def index diff --git a/app/controllers/admin/admin_controller.rb b/app/controllers/admin/admin_controller.rb index e4dd34119f..2a33fd6c90 100644 --- a/app/controllers/admin/admin_controller.rb +++ b/app/controllers/admin/admin_controller.rb @@ -1,7 +1,7 @@ class Admin::AdminController < ApplicationController - prepend_before_action :check_xhr, :ensure_logged_in - prepend_before_action :check_xhr, :ensure_staff + requires_login + before_action :ensure_staff def index render body: nil diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 479082fc6a..93e05225b2 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -48,8 +48,9 @@ class ApplicationController < ActionController::Base before_action :set_mobile_view before_action :block_if_readonly_mode before_action :authorize_mini_profiler - before_action :preload_json before_action :redirect_to_login_if_required + before_action :block_if_requires_login + before_action :preload_json before_action :check_xhr after_action :add_readonly_header after_action :perform_refresh_session @@ -570,6 +571,28 @@ class ApplicationController < ActionController::Base raise RenderEmpty.new unless ((request.format && request.format.json?) || request.xhr?) end + def self.requires_login(arg = {}) + @requires_login_arg = arg + end + + def self.requires_login_arg + @requires_login_arg + end + + def block_if_requires_login + if arg = self.class.requires_login_arg + check = + if except = arg[:except] + !except.include?(action_name.to_sym) + elsif only = arg[:only] + only.include?(action_name.to_sym) + else + true + end + ensure_logged_in if check + end + end + def ensure_logged_in raise Discourse::NotLoggedIn.new unless current_user.present? end diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index 7b9a25ec5c..58a95610c4 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -2,7 +2,8 @@ require_dependency 'category_serializer' class CategoriesController < ApplicationController - prepend_before_action :check_xhr, :ensure_logged_in, except: [:index, :categories_and_latest, :show, :redirect, :find_by_slug] + requires_login except: [:index, :categories_and_latest, :show, :redirect, :find_by_slug] + before_action :fetch_category, only: [:show, :update, :destroy] before_action :initialize_staff_action_logger, only: [:create, :update, :destroy] skip_before_action :check_xhr, only: [:index, :categories_and_latest, :redirect] diff --git a/app/controllers/category_hashtags_controller.rb b/app/controllers/category_hashtags_controller.rb index 34e8bb0367..4bbb85a406 100644 --- a/app/controllers/category_hashtags_controller.rb +++ b/app/controllers/category_hashtags_controller.rb @@ -1,5 +1,5 @@ class CategoryHashtagsController < ApplicationController - prepend_before_action :check_xhr, :ensure_logged_in + requires_login def check category_slugs = params[:category_slugs] diff --git a/app/controllers/composer_controller.rb b/app/controllers/composer_controller.rb index 7d103c634e..f5cb462ba4 100644 --- a/app/controllers/composer_controller.rb +++ b/app/controllers/composer_controller.rb @@ -2,7 +2,7 @@ require_dependency 'html_to_markdown' class ComposerController < ApplicationController - prepend_before_action :check_xhr, :ensure_logged_in + requires_login def parse_html markdown_text = HtmlToMarkdown.new(params[:html]).to_markdown diff --git a/app/controllers/composer_messages_controller.rb b/app/controllers/composer_messages_controller.rb index 64b3bc5382..26e879b109 100644 --- a/app/controllers/composer_messages_controller.rb +++ b/app/controllers/composer_messages_controller.rb @@ -2,7 +2,7 @@ require_dependency 'composer_messages_finder' class ComposerMessagesController < ApplicationController - prepend_before_action :check_xhr, :ensure_logged_in + requires_login def index finder = ComposerMessagesFinder.new(current_user, params.slice(:composer_action, :topic_id, :post_id)) diff --git a/app/controllers/draft_controller.rb b/app/controllers/draft_controller.rb index c3f9345c5b..ebd0dd1bcc 100644 --- a/app/controllers/draft_controller.rb +++ b/app/controllers/draft_controller.rb @@ -1,5 +1,6 @@ class DraftController < ApplicationController - prepend_before_action :ensure_logged_in + requires_login + skip_before_action :check_xhr, :preload_json def show diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index e199c7cc89..74f5479d26 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -1,6 +1,6 @@ class GroupsController < ApplicationController - prepend_before_action :check_xhr, :ensure_logged_in, only: [ + requires_login only: [ :set_notifications, :mentionable, :messageable, diff --git a/app/controllers/inline_onebox_controller.rb b/app/controllers/inline_onebox_controller.rb index 33d2a61f27..832f3d66a0 100644 --- a/app/controllers/inline_onebox_controller.rb +++ b/app/controllers/inline_onebox_controller.rb @@ -1,7 +1,7 @@ require_dependency 'inline_oneboxer' class InlineOneboxController < ApplicationController - prepend_before_action :check_xhr, :ensure_logged_in + requires_login def show oneboxes = InlineOneboxer.new(params[:urls] || []).process diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb index aea0c9782f..8773a34970 100644 --- a/app/controllers/invites_controller.rb +++ b/app/controllers/invites_controller.rb @@ -2,7 +2,7 @@ require_dependency 'rate_limiter' class InvitesController < ApplicationController - prepend_before_action :check_xhr, :ensure_logged_in, only: [ + requires_login only: [ :destroy, :create, :create_invite_link, :rescind_all_invites, :resend_invite, :resend_all_invites, :upload_csv ] diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb index 16780e44d9..e86545c01b 100644 --- a/app/controllers/notifications_controller.rb +++ b/app/controllers/notifications_controller.rb @@ -2,7 +2,7 @@ require_dependency 'notification_serializer' class NotificationsController < ApplicationController - prepend_before_action :check_xhr, :ensure_logged_in + requires_login def index user = diff --git a/app/controllers/onebox_controller.rb b/app/controllers/onebox_controller.rb index 65b66b5964..7c0d16af32 100644 --- a/app/controllers/onebox_controller.rb +++ b/app/controllers/onebox_controller.rb @@ -1,7 +1,7 @@ require_dependency 'oneboxer' class OneboxController < ApplicationController - prepend_before_action :check_xhr, :ensure_logged_in + requires_login def show unless params[:refresh] == 'true' diff --git a/app/controllers/post_actions_controller.rb b/app/controllers/post_actions_controller.rb index 022a3072e2..fa0314b999 100644 --- a/app/controllers/post_actions_controller.rb +++ b/app/controllers/post_actions_controller.rb @@ -1,7 +1,8 @@ require_dependency 'discourse' class PostActionsController < ApplicationController - prepend_before_action :check_xhr, :ensure_logged_in + requires_login + before_action :fetch_post_from_params before_action :fetch_post_action_type_id_from_params diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 0ac234182d..e3e4a21910 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -8,7 +8,7 @@ require_dependency 'post_locker' class PostsController < ApplicationController - prepend_before_action :check_xhr, :ensure_logged_in, except: [ + requires_login except: [ :show, :replies, :by_number, diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb index 8a341d53d3..d2b9285c67 100644 --- a/app/controllers/steps_controller.rb +++ b/app/controllers/steps_controller.rb @@ -3,9 +3,9 @@ require_dependency 'wizard/builder' require_dependency 'wizard/step_updater' class StepsController < ApplicationController + requires_login before_action :ensure_wizard_enabled - prepend_before_action :check_xhr, :ensure_logged_in before_action :ensure_admin def update diff --git a/app/controllers/tag_groups_controller.rb b/app/controllers/tag_groups_controller.rb index e039fb6cb7..8d819827f7 100644 --- a/app/controllers/tag_groups_controller.rb +++ b/app/controllers/tag_groups_controller.rb @@ -1,5 +1,6 @@ class TagGroupsController < ApplicationController - prepend_before_action :check_xhr, :ensure_logged_in, except: [:index, :show] + requires_login except: [:index, :show] + skip_before_action :check_xhr, only: [:index, :show] before_action :fetch_tag_group, only: [:show, :update, :destroy] diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 0c63c7a7ee..b97de2b817 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -7,7 +7,7 @@ class TagsController < ::ApplicationController before_action :ensure_tags_enabled - prepend_before_action :check_xhr, :ensure_logged_in, except: [ + requires_login except: [ :index, :show, :tag_feed, diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index 6d4f055534..76e6c879e1 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -6,7 +6,7 @@ require_dependency 'discourse_event' require_dependency 'rate_limiter' class TopicsController < ApplicationController - prepend_before_action :check_xhr, :ensure_logged_in, only: [ + requires_login only: [ :timings, :destroy_timings, :update, diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index 13754d3f27..39fc24124b 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -2,7 +2,8 @@ require "mini_mime" require_dependency 'upload_creator' class UploadsController < ApplicationController - prepend_before_action :check_xhr, :ensure_logged_in, except: [:show] + requires_login except: [:show] + skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required, only: [:show] def create diff --git a/app/controllers/user_api_keys_controller.rb b/app/controllers/user_api_keys_controller.rb index 2dbc75ea23..498a055e5d 100644 --- a/app/controllers/user_api_keys_controller.rb +++ b/app/controllers/user_api_keys_controller.rb @@ -2,7 +2,7 @@ class UserApiKeysController < ApplicationController layout 'no_ember' - prepend_before_action :check_xhr, :ensure_logged_in, only: [:create, :revoke, :undo_revoke] + requires_login only: [:create, :revoke, :undo_revoke] skip_before_action :redirect_to_login_if_required, only: [:new] skip_before_action :check_xhr, :preload_json diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 29e52290c4..72e706e86c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -9,7 +9,7 @@ class UsersController < ApplicationController skip_before_action :authorize_mini_profiler, only: [:avatar] - prepend_before_action :check_xhr, :ensure_logged_in, only: [ + requires_login only: [ :username, :update, :user_preferences_redirect, :upload_user_image, :pick_avatar, :destroy_user_image, :destroy, :check_emails, :topic_tracking_state, :preferences diff --git a/app/controllers/users_email_controller.rb b/app/controllers/users_email_controller.rb index e34e905232..e408a84f2a 100644 --- a/app/controllers/users_email_controller.rb +++ b/app/controllers/users_email_controller.rb @@ -4,7 +4,7 @@ require_dependency 'email_updater' class UsersEmailController < ApplicationController - prepend_before_action :check_xhr, :ensure_logged_in, only: [:index, :update] + requires_login only: [:index, :update] skip_before_action :check_xhr, only: [:confirm] skip_before_action :redirect_to_login_if_required, only: [:confirm] diff --git a/app/controllers/wizard_controller.rb b/app/controllers/wizard_controller.rb index 78f224b17f..1bfa774f14 100644 --- a/app/controllers/wizard_controller.rb +++ b/app/controllers/wizard_controller.rb @@ -2,8 +2,9 @@ require_dependency 'wizard' require_dependency 'wizard/builder' class WizardController < ApplicationController - prepend_before_action :check_xhr, :ensure_admin, except: [:qunit] - prepend_before_action :check_xhr, :ensure_logged_in, except: [:qunit] + requires_login except: [:qunit] + + before_action :ensure_admin, except: [:qunit] before_action :ensure_wizard_enabled, only: [:index] skip_before_action :check_xhr, :preload_json From 60ee9a4ccf67420bc89b0a19221320b5a193d96b Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 1 Feb 2018 15:56:22 +1100 Subject: [PATCH 013/202] make tests a bit happier --- .../pretty-text/engines/discourse-markdown-it.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6 index 0565004f93..ecec3b1697 100644 --- a/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6 +++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6 @@ -219,7 +219,7 @@ export function setup(opts, siteSettings, state) { typographer: siteSettings.enable_markdown_typographer }); - opts.engine.linkify.tlds(siteSettings.markdown_linkify_tlds.split('|')); + opts.engine.linkify.tlds((siteSettings.markdown_linkify_tlds || '').split('|')); setupUrlDecoding(opts.engine); setupHoister(opts.engine); From 187b0031c5377167a41c6ff5c8b362ffde13f634 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 1 Feb 2018 16:16:14 +1100 Subject: [PATCH 014/202] correct specs --- test/javascripts/acceptance/composer-topic-links-test.js.es6 | 3 ++- test/javascripts/lib/pretty-text-test.js.es6 | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/javascripts/acceptance/composer-topic-links-test.js.es6 b/test/javascripts/acceptance/composer-topic-links-test.js.es6 index 6f55248803..d8083623f2 100644 --- a/test/javascripts/acceptance/composer-topic-links-test.js.es6 +++ b/test/javascripts/acceptance/composer-topic-links-test.js.es6 @@ -4,7 +4,8 @@ acceptance("Composer topic featured links", { loggedIn: true, settings: { topic_featured_link_enabled: true, - max_topic_title_length: 80 + max_topic_title_length: 80, + enable_markdown_linkify: true, } }); diff --git a/test/javascripts/lib/pretty-text-test.js.es6 b/test/javascripts/lib/pretty-text-test.js.es6 index df81da1cfc..879ee6b448 100644 --- a/test/javascripts/lib/pretty-text-test.js.es6 +++ b/test/javascripts/lib/pretty-text-test.js.es6 @@ -13,7 +13,9 @@ const rawOpts = { emoji_set: 'emoji_one', highlighted_languages: 'json|ruby|javascript', default_code_lang: 'auto', - censored_pattern: '\\d{3}-\\d{4}|tech\\w*' + censored_pattern: '\\d{3}-\\d{4}|tech\\w*', + enable_markdown_linkify: true, + markdown_linkify_tlds: 'com' }, censoredWords: 'shucks|whiz|whizzer|a**le|badword*', getURL: url => url From 25ec077eca5d5d3fec0cd398e568e21bb66d7165 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 31 Jan 2018 11:26:00 +0530 Subject: [PATCH 015/202] rename 'min_private_message_{post/title}_length' to 'min_personal_message_{post/title}_length' --- .../discourse/components/flag-action-type.js.es6 | 4 ++-- .../discourse/controllers/flag.js.es6 | 2 +- .../javascripts/discourse/models/composer.js.es6 | 4 ++-- app/models/site_setting.rb | 4 ++-- config/environments/test.rb | 2 +- config/locales/server.en.yml | 4 ++-- config/site_settings.yml | 4 ++-- .../20180131052859_rename_private_personal.rb | 16 ++++++++++++++++ lib/text_sentinel.rb | 4 ++-- script/import_scripts/base.rb | 4 ++-- spec/components/text_sentinel_spec.rb | 2 +- .../topic_title_length_validator_spec.rb | 6 +++--- spec/models/site_setting_spec.rb | 2 +- spec/models/topic_spec.rb | 4 ++-- test/javascripts/models/composer-test.js.es6 | 8 ++++---- 15 files changed, 43 insertions(+), 27 deletions(-) create mode 100644 db/migrate/20180131052859_rename_private_personal.rb diff --git a/app/assets/javascripts/discourse/components/flag-action-type.js.es6 b/app/assets/javascripts/discourse/components/flag-action-type.js.es6 index 7f0ffb70ed..fe2b5c601a 100644 --- a/app/assets/javascripts/discourse/components/flag-action-type.js.es6 +++ b/app/assets/javascripts/discourse/components/flag-action-type.js.es6 @@ -34,13 +34,13 @@ export default Ember.Component.extend({ @computed('message.length') customMessageLengthClasses(messageLength) { - return (messageLength < Discourse.SiteSettings.min_private_message_post_length) ? "too-short" : "ok"; + return (messageLength < Discourse.SiteSettings.min_personal_message_post_length) ? "too-short" : "ok"; }, @computed('message.length') customMessageLength(messageLength) { const len = messageLength || 0; - const minLen = Discourse.SiteSettings.min_private_message_post_length; + const minLen = Discourse.SiteSettings.min_personal_message_post_length; if (len === 0) { return I18n.t("flagging.custom_message.at_least", { count: minLen }); } else if (len < minLen) { diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6 index e8d309c8c9..87b9daf001 100644 --- a/app/assets/javascripts/discourse/controllers/flag.js.es6 +++ b/app/assets/javascripts/discourse/controllers/flag.js.es6 @@ -80,7 +80,7 @@ export default Ember.Controller.extend(ModalFunctionality, { if (selected.get('is_custom_flag')) { const len = this.get('message.length') || 0; - return len >= Discourse.SiteSettings.min_private_message_post_length && + return len >= Discourse.SiteSettings.min_personal_message_post_length && len <= MAX_MESSAGE_LENGTH; } return true; diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index 4cdc2bd4c4..41ec3ba322 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -302,7 +302,7 @@ const Composer = RestModel.extend({ @computed('privateMessage') minimumTitleLength(privateMessage) { if (privateMessage) { - return this.siteSettings.min_private_message_title_length; + return this.siteSettings.min_personal_message_title_length; } else { return this.siteSettings.min_topic_title_length; } @@ -325,7 +325,7 @@ const Composer = RestModel.extend({ if (pmWithNonHumanUser) { return 1; } else if (privateMessage) { - return this.siteSettings.min_private_message_post_length; + return this.siteSettings.min_personal_message_post_length; } else if (topicFirstPost) { // first post (topic body) return this.siteSettings.min_first_post_length; diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb index 46951fa379..d0ce4465eb 100644 --- a/app/models/site_setting.rb +++ b/app/models/site_setting.rb @@ -38,7 +38,7 @@ class SiteSetting < ActiveRecord::Base end def self.private_message_title_length - min_private_message_title_length..max_topic_title_length + min_personal_message_title_length..max_topic_title_length end def self.post_length @@ -50,7 +50,7 @@ class SiteSetting < ActiveRecord::Base end def self.private_message_post_length - min_private_message_post_length..max_post_length + min_personal_message_post_length..max_post_length end def self.top_menu_items diff --git a/config/environments/test.rb b/config/environments/test.rb index 6143f0004a..8a0fc8c6c9 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -55,7 +55,7 @@ Discourse::Application.configure do s.set_regardless_of_locale(:s3_upload_bucket, 'bucket') s.set_regardless_of_locale(:min_post_length, 5) s.set_regardless_of_locale(:min_first_post_length, 5) - s.set_regardless_of_locale(:min_private_message_post_length, 10) + s.set_regardless_of_locale(:min_personal_message_post_length, 10) s.set_regardless_of_locale(:crawl_images, false) s.set_regardless_of_locale(:download_remote_images_to_local, false) s.set_regardless_of_locale(:unique_posts_mins, 0) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index cce71de797..d4fe579a12 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -970,13 +970,13 @@ en: set_locale_from_accept_language_header: "set interface language for anonymous users from their web browser's language headers. (EXPERIMENTAL, does not work with anonymous cache)" min_post_length: "Minimum allowed post length in characters" min_first_post_length: "Minimum allowed first post (topic body) length in characters" - min_private_message_post_length: "Minimum allowed post length in characters for messages" + min_personal_message_post_length: "Minimum allowed post length in characters for messages" max_post_length: "Maximum allowed post length in characters" topic_featured_link_enabled: "Enable posting a link with topics." show_topic_featured_link_in_digest: "Show the topic featured link in the digest email." min_topic_title_length: "Minimum allowed topic title length in characters" max_topic_title_length: "Maximum allowed topic title length in characters" - min_private_message_title_length: "Minimum allowed title length for a message in characters" + min_personal_message_title_length: "Minimum allowed title length for a message in characters" min_search_term_length: "Minimum valid search term length in characters" search_tokenize_chinese_japanese_korean: "Force search to tokenize Chinese/Japanese/Korean even on non CJK sites" search_prefer_recent_posts: "If searching your large forum is slow, this option tries an index of more recent posts first" diff --git a/config/site_settings.yml b/config/site_settings.yml index 8d686b52ae..22bc2846b0 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -447,7 +447,7 @@ posting: locale_default: zh_CN: 8 zh_TW: 8 - min_private_message_post_length: + min_personal_message_post_length: client: true min: 1 default: 10 @@ -490,7 +490,7 @@ posting: zh_CN: false zh_TW: false title_fancy_entities: true - min_private_message_title_length: + min_personal_message_title_length: client: true default: 2 min: 1 diff --git a/db/migrate/20180131052859_rename_private_personal.rb b/db/migrate/20180131052859_rename_private_personal.rb new file mode 100644 index 0000000000..d1b9dc4467 --- /dev/null +++ b/db/migrate/20180131052859_rename_private_personal.rb @@ -0,0 +1,16 @@ +class RenamePrivatePersonal < ActiveRecord::Migration[5.1] + + def setting(old, new) + execute "UPDATE site_settings SET name='#{new}' where name='#{old}'" + end + + def up + setting :min_private_message_post_length, :min_personal_message_post_length + setting :min_private_message_title_length, :min_personal_message_title_length + end + + def down + setting :min_private_message_post_length, :min_personal_message_post_length + setting :min_private_message_title_length, :min_personal_message_title_length + end +end diff --git a/lib/text_sentinel.rb b/lib/text_sentinel.rb index fa88e647f9..e9b5232004 100644 --- a/lib/text_sentinel.rb +++ b/lib/text_sentinel.rb @@ -19,9 +19,9 @@ class TextSentinel def self.body_sentinel(text, opts = {}) entropy = SiteSetting.body_min_entropy if opts[:private_message] - scale_entropy = SiteSetting.min_private_message_post_length.to_f / SiteSetting.min_post_length.to_f + scale_entropy = SiteSetting.min_personal_message_post_length.to_f / SiteSetting.min_post_length.to_f entropy = (entropy * scale_entropy).to_i - entropy = (SiteSetting.min_private_message_post_length.to_f * ENTROPY_SCALE).to_i if entropy > SiteSetting.min_private_message_post_length + entropy = (SiteSetting.min_personal_message_post_length.to_f * ENTROPY_SCALE).to_i if entropy > SiteSetting.min_personal_message_post_length else entropy = (SiteSetting.min_post_length.to_f * ENTROPY_SCALE).to_i if entropy > SiteSetting.min_post_length end diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb index 7f683818f7..594579eafe 100644 --- a/script/import_scripts/base.rb +++ b/script/import_scripts/base.rb @@ -71,8 +71,8 @@ class ImportScripts::Base min_topic_title_length: 1, min_post_length: 1, min_first_post_length: 1, - min_private_message_post_length: 1, - min_private_message_title_length: 1, + min_personal_message_post_length: 1, + min_personal_message_title_length: 1, allow_duplicate_topic_titles: true, disable_emails: true, max_attachment_size_kb: 102400, diff --git a/spec/components/text_sentinel_spec.rb b/spec/components/text_sentinel_spec.rb index 5707fa9895..e704f6d02c 100644 --- a/spec/components/text_sentinel_spec.rb +++ b/spec/components/text_sentinel_spec.rb @@ -143,7 +143,7 @@ describe TextSentinel do it "uses a sensible min entropy value when min pm body length is less than min entropy" do SiteSetting.min_post_length = 5 - SiteSetting.min_private_message_post_length = 3 + SiteSetting.min_personal_message_post_length = 3 SiteSetting.body_min_entropy = 7 expect(TextSentinel.body_sentinel('Lol', private_message: true)).to be_valid end diff --git a/spec/components/validators/topic_title_length_validator_spec.rb b/spec/components/validators/topic_title_length_validator_spec.rb index 58068ae7f2..dc39cca0eb 100644 --- a/spec/components/validators/topic_title_length_validator_spec.rb +++ b/spec/components/validators/topic_title_length_validator_spec.rb @@ -52,14 +52,14 @@ describe TopicTitleLengthValidator do describe 'private message' do let(:record) { Fabricate.build(:private_message_topic) } - it 'adds an error when topic title is shorter than SiteSetting.min_private_message_title_length' do - record.title = 'a' * (SiteSetting.min_private_message_title_length - 1) + it 'adds an error when topic title is shorter than SiteSetting.min_personal_message_title_length' do + record.title = 'a' * (SiteSetting.min_personal_message_title_length - 1) validate expect(record.errors[:title]).to be_present end it 'does not add an error when topic title is shorter than SiteSetting.min_topic_title_length' do - record.title = 'a' * (SiteSetting.min_private_message_title_length) + record.title = 'a' * (SiteSetting.min_personal_message_title_length) validate expect(record.errors[:title]).to_not be_present end diff --git a/spec/models/site_setting_spec.rb b/spec/models/site_setting_spec.rb index 65907a77a5..3daaed07f9 100644 --- a/spec/models/site_setting_spec.rb +++ b/spec/models/site_setting_spec.rb @@ -26,7 +26,7 @@ describe SiteSetting do describe 'private_message_title_length' do it 'returns a range of min/max pm topic title length' do - expect(SiteSetting.private_message_title_length).to eq(SiteSetting.defaults[:min_private_message_title_length]..SiteSetting.defaults[:max_topic_title_length]) + expect(SiteSetting.private_message_title_length).to eq(SiteSetting.defaults[:min_personal_message_title_length]..SiteSetting.defaults[:max_topic_title_length]) end end diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index 14a42e3406..a5f61c591d 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -215,11 +215,11 @@ describe Topic do context 'private message title' do before do SiteSetting.min_topic_title_length = 15 - SiteSetting.min_private_message_title_length = 3 + SiteSetting.min_personal_message_title_length = 3 end it 'allows shorter titles' do - pm = Fabricate.build(:private_message_topic, title: 'a' * SiteSetting.min_private_message_title_length) + pm = Fabricate.build(:private_message_topic, title: 'a' * SiteSetting.min_personal_message_title_length) expect(pm).to be_valid end diff --git a/test/javascripts/models/composer-test.js.es6 b/test/javascripts/models/composer-test.js.es6 index 02475ddb4b..4add3a8452 100644 --- a/test/javascripts/models/composer-test.js.es6 +++ b/test/javascripts/models/composer-test.js.es6 @@ -38,7 +38,7 @@ QUnit.test('missingReplyCharacters', assert => { missingReplyCharacters('hi', false, false, Discourse.SiteSettings.min_post_length - 2, 'too short public post'); missingReplyCharacters('hi', false, true, Discourse.SiteSettings.min_first_post_length - 2, 'too short first post'); - missingReplyCharacters('hi', true, false, Discourse.SiteSettings.min_private_message_post_length - 2, 'too short private message'); + missingReplyCharacters('hi', true, false, Discourse.SiteSettings.min_personal_message_post_length - 2, 'too short private message'); const link = "http://imgur.com/gallery/grxX8"; const composer = createComposer({ canEditTopicFeaturedLink: true, title: link, featuredLink: link, reply: link }); @@ -53,7 +53,7 @@ QUnit.test('missingTitleCharacters', assert => { }; missingTitleCharacters('hi', false, Discourse.SiteSettings.min_topic_title_length - 2, 'too short post title'); - missingTitleCharacters('z', true, Discourse.SiteSettings.min_private_message_title_length - 1, 'too short pm title'); + missingTitleCharacters('z', true, Discourse.SiteSettings.min_personal_message_title_length - 1, 'too short pm title'); }); QUnit.test('replyDirty', assert => { @@ -130,7 +130,7 @@ QUnit.test("Title length for regular topics", assert => { }); QUnit.test("Title length for private messages", assert => { - Discourse.SiteSettings.min_private_message_title_length = 5; + Discourse.SiteSettings.min_personal_message_title_length = 5; Discourse.SiteSettings.max_topic_title_length = 10; const composer = createComposer({action: Composer.PRIVATE_MESSAGE}); @@ -145,7 +145,7 @@ QUnit.test("Title length for private messages", assert => { }); QUnit.test("Title length for private messages", assert => { - Discourse.SiteSettings.min_private_message_title_length = 5; + Discourse.SiteSettings.min_personal_message_title_length = 5; Discourse.SiteSettings.max_topic_title_length = 10; const composer = createComposer({action: Composer.PRIVATE_MESSAGE}); From ff0376a80beefa8f218091a04f2d868a79380295 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 31 Jan 2018 11:33:12 +0530 Subject: [PATCH 016/202] rename 'enable_private_messages' to 'enable_personal_messages' --- .../discourse/components/topic-footer-buttons.js.es6 | 4 ++-- .../javascripts/discourse/controllers/user.js.es6 | 2 +- .../discourse/lib/keyboard-shortcuts.js.es6 | 2 +- .../javascripts/discourse/widgets/user-menu.js.es6 | 2 +- config/locales/server.en.yml | 2 +- config/site_settings.yml | 2 +- db/migrate/20180131052859_rename_private_personal.rb | 2 ++ lib/guardian.rb | 4 ++-- lib/guardian/post_guardian.rb | 2 +- lib/topic_query.rb | 2 +- spec/components/guardian_spec.rb | 10 +++++----- spec/components/topic_query_spec.rb | 2 +- test/javascripts/widgets/user-menu-test.js.es6 | 4 ++-- 13 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6 b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6 index d5ae0f8b0a..af05e670fa 100644 --- a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6 +++ b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6 @@ -8,12 +8,12 @@ export default Ember.Component.extend({ @computed('topic.isPrivateMessage') canArchive(isPM) { - return this.siteSettings.enable_private_messages && isPM; + return this.siteSettings.enable_personal_messages && isPM; }, @computed('topic.isPrivateMessage') showNotificationsButton(isPM) { - return (!isPM) || this.siteSettings.enable_private_messages; + return (!isPM) || this.siteSettings.enable_personal_messages; }, @computed('topic.details.can_invite_to') diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6 index c11210ee8b..c8fce33d5a 100644 --- a/app/assets/javascripts/discourse/controllers/user.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user.js.es6 @@ -52,7 +52,7 @@ export default Ember.Controller.extend(CanCheckEmails, { @computed('viewingSelf', 'currentUser.admin') showPrivateMessages(viewingSelf, isAdmin) { - return this.siteSettings.enable_private_messages && (viewingSelf || isAdmin); + return this.siteSettings.enable_personal_messages && (viewingSelf || isAdmin); }, @computed('viewingSelf', 'currentUser.staff') diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 index 367e6aa304..e65240981e 100644 --- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 +++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 @@ -71,7 +71,7 @@ export default { let siteSettings = this.container.lookup('site-settings:main'); // Disable the shortcut if private messages are disabled - if (!siteSettings.enable_private_messages) { + if (!siteSettings.enable_personal_messages) { delete bindings['g m']; } diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js.es6 b/app/assets/javascripts/discourse/widgets/user-menu.js.es6 index 115c3deb34..9b5502e91a 100644 --- a/app/assets/javascripts/discourse/widgets/user-menu.js.es6 +++ b/app/assets/javascripts/discourse/widgets/user-menu.js.es6 @@ -40,7 +40,7 @@ createWidget('user-menu-links', { icon: 'bookmark', href: `${path}/activity/bookmarks` }); - if (siteSettings.enable_private_messages) { + if (siteSettings.enable_personal_messages) { glyphs.push({ label: 'user.private_messages', className: 'user-pms-link', icon: 'envelope', diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index d4fe579a12..a2d4ca232f 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1036,7 +1036,7 @@ en: summary_percent_filter: "When a user clicks 'Summarize This Topic', show the top % of posts" summary_max_results: "Maximum posts returned by 'Summary This Topic'" - enable_private_messages: "Allow trust level 1 (configurable via min trust level to send messages) users to create messages and reply to messages. Note that staff can always send messages no matter what." + enable_personal_messages: "Allow trust level 1 (configurable via min trust level to send messages) users to create messages and reply to messages. Note that staff can always send messages no matter what." enable_system_message_replies: "Allows users to reply to system messages, even if private messages are disabled" enable_private_email_messages: "Allow trust level 4 (configurable via min trust level to send messages) users to send private email messages. Note that staff can always send messages no matter what." diff --git a/config/site_settings.yml b/config/site_settings.yml index 22bc2846b0..d9e6cd9a9e 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -505,7 +505,7 @@ posting: locale_default: zh_CN: 4 zh_TW: 4 - enable_private_messages: + enable_personal_messages: default: true client: true enable_system_message_replies: diff --git a/db/migrate/20180131052859_rename_private_personal.rb b/db/migrate/20180131052859_rename_private_personal.rb index d1b9dc4467..b97478f689 100644 --- a/db/migrate/20180131052859_rename_private_personal.rb +++ b/db/migrate/20180131052859_rename_private_personal.rb @@ -7,10 +7,12 @@ class RenamePrivatePersonal < ActiveRecord::Migration[5.1] def up setting :min_private_message_post_length, :min_personal_message_post_length setting :min_private_message_title_length, :min_personal_message_title_length + setting :enable_private_messages, :enable_personal_messages end def down setting :min_private_message_post_length, :min_personal_message_post_length setting :min_private_message_title_length, :min_personal_message_title_length + setting :enable_private_messages, :enable_personal_messages end end diff --git a/lib/guardian.rb b/lib/guardian.rb index 82f66a7016..789d479ec0 100644 --- a/lib/guardian.rb +++ b/lib/guardian.rb @@ -247,7 +247,7 @@ class Guardian def can_invite_to?(object, groups = nil) return false unless authenticated? return true if is_admin? - return false unless SiteSetting.enable_private_messages? + return false unless SiteSetting.enable_personal_messages? return false if (SiteSetting.max_invites_per_day.to_i == 0 && !is_staff?) return false unless can_see?(object) return false if groups.present? @@ -303,7 +303,7 @@ class Guardian # User disabled private message (is_staff? || is_group || target.user_option.allow_private_messages) && # PMs are enabled - (is_staff? || SiteSetting.enable_private_messages) && + (is_staff? || SiteSetting.enable_personal_messages) && # Can't send PMs to suspended users (is_staff? || is_group || !target.suspended?) && # Check group messageable level diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb index 5996f84812..e5e4e010f8 100644 --- a/lib/guardian/post_guardian.rb +++ b/lib/guardian/post_guardian.rb @@ -17,7 +17,7 @@ module PostGuardian result = if authenticated? && post && !@user.anonymous? return false if [:notify_user, :notify_moderators].include?(action_key) && - !SiteSetting.enable_private_messages? + !SiteSetting.enable_personal_messages? # we allow flagging for trust level 1 and higher # always allowed for private messages diff --git a/lib/topic_query.rb b/lib/topic_query.rb index 1556e085fc..34ca3f32dd 100644 --- a/lib/topic_query.rb +++ b/lib/topic_query.rb @@ -104,7 +104,7 @@ class TopicQuery # Don't suggest messages unless we have a user, and private messages are # enabled. return if topic.private_message? && - (@user.blank? || !SiteSetting.enable_private_messages?) + (@user.blank? || !SiteSetting.enable_personal_messages?) builder = SuggestedTopicsBuilder.new(topic) diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb index 09d4dc042d..0aa745ed9e 100644 --- a/spec/components/guardian_spec.rb +++ b/spec/components/guardian_spec.rb @@ -70,14 +70,14 @@ describe Guardian do end it "returns false for notify_user if private messages are disabled" do - SiteSetting.enable_private_messages = false + SiteSetting.enable_personal_messages = false user.trust_level = TrustLevel[2] expect(Guardian.new(user).post_can_act?(post, :notify_user)).to be_falsey expect(Guardian.new(user).post_can_act?(post, :notify_moderators)).to be_falsey end it "returns false for notify_user and notify_moderators if private messages are enabled but threshold not met" do - SiteSetting.enable_private_messages = true + SiteSetting.enable_personal_messages = true SiteSetting.min_trust_to_send_messages = 2 user.trust_level = TrustLevel[1] expect(Guardian.new(user).post_can_act?(post, :notify_user)).to be_falsey @@ -170,8 +170,8 @@ describe Guardian do expect(Guardian.new(user).can_send_private_message?(another_user)).to be_falsey end - context "enable_private_messages is false" do - before { SiteSetting.enable_private_messages = false } + context "enable_personal_messages is false" do + before { SiteSetting.enable_personal_messages = false } it "returns false if user is not staff member" do expect(Guardian.new(trust_level_4).can_send_private_message?(another_user)).to be_falsey @@ -451,7 +451,7 @@ describe Guardian do context "when private messages are disabled" do before do - SiteSetting.enable_private_messages = false + SiteSetting.enable_personal_messages = false end it "doesn't allow a regular user to invite" do diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb index 4ca84492b3..7d400cd5d4 100644 --- a/spec/components/topic_query_spec.rb +++ b/spec/components/topic_query_spec.rb @@ -696,7 +696,7 @@ describe TopicQuery do eq([new_pm.id, unread_pm.id, related_by_user_pm.id]) ) - SiteSetting.enable_private_messages = false + SiteSetting.enable_personal_messages = false expect(TopicQuery.new(user).list_suggested_for(pm_to_group)).to be_blank expect(TopicQuery.new(user).list_suggested_for(pm_to_user)).to be_blank end diff --git a/test/javascripts/widgets/user-menu-test.js.es6 b/test/javascripts/widgets/user-menu-test.js.es6 index 8b26410e0f..19b4640a65 100644 --- a/test/javascripts/widgets/user-menu-test.js.es6 +++ b/test/javascripts/widgets/user-menu-test.js.es6 @@ -35,7 +35,7 @@ widgetTest('log out', { widgetTest('private messages - disabled', { template: '{{mount-widget widget="user-menu"}}', beforeEach() { - this.siteSettings.enable_private_messages = false; + this.siteSettings.enable_personal_messages = false; }, test(assert) { @@ -46,7 +46,7 @@ widgetTest('private messages - disabled', { widgetTest('private messages - enabled', { template: '{{mount-widget widget="user-menu"}}', beforeEach() { - this.siteSettings.enable_private_messages = true; + this.siteSettings.enable_personal_messages = true; }, test(assert) { From 7e48c47d378c98f826f8778d0a98c732b483956e Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 31 Jan 2018 11:34:50 +0530 Subject: [PATCH 017/202] rename 'enable_private_email_messages' to 'enable_personal_email_messages' --- config/locales/server.en.yml | 2 +- config/site_settings.yml | 2 +- db/migrate/20180131052859_rename_private_personal.rb | 2 ++ lib/guardian.rb | 2 +- spec/components/topic_creator_spec.rb | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index a2d4ca232f..37a69c9951 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1038,7 +1038,7 @@ en: enable_personal_messages: "Allow trust level 1 (configurable via min trust level to send messages) users to create messages and reply to messages. Note that staff can always send messages no matter what." enable_system_message_replies: "Allows users to reply to system messages, even if private messages are disabled" - enable_private_email_messages: "Allow trust level 4 (configurable via min trust level to send messages) users to send private email messages. Note that staff can always send messages no matter what." + enable_personal_email_messages: "Allow trust level 4 (configurable via min trust level to send messages) users to send private email messages. Note that staff can always send messages no matter what." enable_long_polling: "Message bus used for notification can use long polling" long_polling_base_url: "Base URL used for long polling (when a CDN is serving dynamic content, be sure to set this to origin pull) eg: http://origin.site.com" diff --git a/config/site_settings.yml b/config/site_settings.yml index d9e6cd9a9e..20a5cd5426 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -510,7 +510,7 @@ posting: client: true enable_system_message_replies: default: true - enable_private_email_messages: + enable_personal_email_messages: default: false client: true validator: "EnablePrivateEmailMessagesValidator" diff --git a/db/migrate/20180131052859_rename_private_personal.rb b/db/migrate/20180131052859_rename_private_personal.rb index b97478f689..c97ade8ffe 100644 --- a/db/migrate/20180131052859_rename_private_personal.rb +++ b/db/migrate/20180131052859_rename_private_personal.rb @@ -8,11 +8,13 @@ class RenamePrivatePersonal < ActiveRecord::Migration[5.1] setting :min_private_message_post_length, :min_personal_message_post_length setting :min_private_message_title_length, :min_personal_message_title_length setting :enable_private_messages, :enable_personal_messages + setting :enable_private_email_messages, :enable_personal_email_messages end def down setting :min_private_message_post_length, :min_personal_message_post_length setting :min_private_message_title_length, :min_personal_message_title_length setting :enable_private_messages, :enable_personal_messages + setting :enable_private_email_messages, :enable_personal_email_messages end end diff --git a/lib/guardian.rb b/lib/guardian.rb index 789d479ec0..19d9fe7823 100644 --- a/lib/guardian.rb +++ b/lib/guardian.rb @@ -320,7 +320,7 @@ class Guardian # User is trusted enough @user.has_trust_level?(SiteSetting.min_trust_to_send_email_messages) && # PMs to email addresses are enabled - (is_staff? || SiteSetting.enable_private_email_messages) + (is_staff? || SiteSetting.enable_personal_email_messages) end def can_see_emails? diff --git a/spec/components/topic_creator_spec.rb b/spec/components/topic_creator_spec.rb index 0ed814cae1..ceb81d4e39 100644 --- a/spec/components/topic_creator_spec.rb +++ b/spec/components/topic_creator_spec.rb @@ -80,7 +80,7 @@ describe TopicCreator do end it "should be possible for a trusted user to send private messages via email" do - SiteSetting.expects(:enable_private_email_messages).returns(true) + SiteSetting.expects(:enable_personal_email_messages).returns(true) SiteSetting.min_trust_to_send_email_messages = TrustLevel[1] expect(TopicCreator.create(user, Guardian.new(user), pm_to_email_valid_attrs)).to be_valid @@ -89,7 +89,7 @@ describe TopicCreator do context 'failure cases' do it "should be rollback the changes when email is invalid" do - SiteSetting.expects(:enable_private_email_messages).returns(true) + SiteSetting.expects(:enable_personal_email_messages).returns(true) SiteSetting.min_trust_to_send_email_messages = TrustLevel[1] attrs = pm_to_email_valid_attrs.dup attrs[:target_emails] = "t" * 256 From 7cda3a37af3a9a0b9c1f2fc3771f629fd5a7e618 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 31 Jan 2018 11:37:10 +0530 Subject: [PATCH 018/202] rename 'private_email_time_window_seconds' to 'personal_email_time_window_seconds' --- app/services/notification_emailer.rb | 2 +- config/locales/server.en.yml | 2 +- config/site_settings.yml | 2 +- db/migrate/20180131052859_rename_private_personal.rb | 2 ++ spec/services/notification_emailer_spec.rb | 6 +++--- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/services/notification_emailer.rb b/app/services/notification_emailer.rb index 4a6b56f2a2..099b2030b4 100644 --- a/app/services/notification_emailer.rb +++ b/app/services/notification_emailer.rb @@ -99,7 +99,7 @@ class NotificationEmailer end def private_delay - SiteSetting.private_email_time_window_seconds + SiteSetting.personal_email_time_window_seconds end def post_type diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 37a69c9951..c253fa3e60 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1302,7 +1302,7 @@ en: create_thumbnails: "Create thumbnails and lightbox images that are too large to fit in a post." email_time_window_mins: "Wait (n) minutes before sending any notification emails, to give users a chance to edit and finalize their posts." - private_email_time_window_seconds: "Wait (n) seconds before sending any private notification emails, to give users a chance to edit and finalize their messages." + personal_email_time_window_seconds: "Wait (n) seconds before sending any private notification emails, to give users a chance to edit and finalize their messages." email_posts_context: "How many prior replies to include as context in notification emails." flush_timings_secs: "How frequently we flush timing data to the server, in seconds." title_max_word_length: "The maximum allowed word length, in characters, in a topic title." diff --git a/config/site_settings.yml b/config/site_settings.yml index 20a5cd5426..d7ca4eeb68 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -660,7 +660,7 @@ email: email_time_window_mins: default: 10 client: true - private_email_time_window_seconds: 20 + personal_email_time_window_seconds: 20 email_posts_context: 5 digest_min_excerpt_length: default: 100 diff --git a/db/migrate/20180131052859_rename_private_personal.rb b/db/migrate/20180131052859_rename_private_personal.rb index c97ade8ffe..80a17d549a 100644 --- a/db/migrate/20180131052859_rename_private_personal.rb +++ b/db/migrate/20180131052859_rename_private_personal.rb @@ -9,6 +9,7 @@ class RenamePrivatePersonal < ActiveRecord::Migration[5.1] setting :min_private_message_title_length, :min_personal_message_title_length setting :enable_private_messages, :enable_personal_messages setting :enable_private_email_messages, :enable_personal_email_messages + setting :private_email_time_window_seconds, :personal_email_time_window_seconds end def down @@ -16,5 +17,6 @@ class RenamePrivatePersonal < ActiveRecord::Migration[5.1] setting :min_private_message_title_length, :min_personal_message_title_length setting :enable_private_messages, :enable_personal_messages setting :enable_private_email_messages, :enable_personal_email_messages + setting :private_email_time_window_seconds, :personal_email_time_window_seconds end end diff --git a/spec/services/notification_emailer_spec.rb b/spec/services/notification_emailer_spec.rb index 2d8642826b..a3d60f441e 100644 --- a/spec/services/notification_emailer_spec.rb +++ b/spec/services/notification_emailer_spec.rb @@ -144,7 +144,7 @@ describe NotificationEmailer do context 'user_private_message' do let(:type) { :user_private_message } - let(:delay) { SiteSetting.private_email_time_window_seconds } + let(:delay) { SiteSetting.personal_email_time_window_seconds } let!(:notification) { create_notification(:private_message) } include_examples "enqueue_private" @@ -159,7 +159,7 @@ describe NotificationEmailer do context 'user_invited_to_private_message' do let(:type) { :user_invited_to_private_message } - let(:delay) { SiteSetting.private_email_time_window_seconds } + let(:delay) { SiteSetting.personal_email_time_window_seconds } let!(:notification) { create_notification(:invited_to_private_message) } include_examples "enqueue_public" @@ -167,7 +167,7 @@ describe NotificationEmailer do context 'user_invited_to_topic' do let(:type) { :user_invited_to_topic } - let(:delay) { SiteSetting.private_email_time_window_seconds } + let(:delay) { SiteSetting.personal_email_time_window_seconds } let!(:notification) { create_notification(:invited_to_topic) } include_examples "enqueue_public" From 6be536ca50c0ca00b86630aa422922f397e78792 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 31 Jan 2018 11:46:25 +0530 Subject: [PATCH 019/202] rename 'max_private_messages_per_day' to 'max_personal_messages_per_day' --- app/models/topic.rb | 2 +- config/locales/server.en.yml | 2 +- config/site_settings.yml | 2 +- db/migrate/20180131052859_rename_private_personal.rb | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index 3561ffbc5b..3bc8d72b4a 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -310,7 +310,7 @@ class Topic < ActiveRecord::Base def limit_private_messages_per_day return unless private_message? - apply_per_day_rate_limit_for("pms", :max_private_messages_per_day) + apply_per_day_rate_limit_for("pms", :max_personal_messages_per_day) end def self.fancy_title(title) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index c253fa3e60..abc6465bd6 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1203,7 +1203,7 @@ en: max_bookmarks_per_day: "Maximum number of bookmarks per user per day." max_edits_per_day: "Maximum number of edits per user per day." max_topics_per_day: "Maximum number of topics a user can create per day." - max_private_messages_per_day: "Maximum number of messages users can create per day." + max_personal_messages_per_day: "Maximum number of messages users can create per day." max_invites_per_day: "Maximum number of invites a user can send per day." max_topic_invitations_per_day: "Maximum number of topic invitations a user can send per day." diff --git a/config/site_settings.yml b/config/site_settings.yml index d7ca4eeb68..d126cf303e 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -1041,7 +1041,7 @@ rate_limits: rate_limit_new_user_create_topic: 120 rate_limit_new_user_create_post: 30 max_topics_per_day: 20 - max_private_messages_per_day: 20 + max_personal_messages_per_day: 20 max_likes_per_day: 50 max_bookmarks_per_day: 20 max_flags_per_day: 20 diff --git a/db/migrate/20180131052859_rename_private_personal.rb b/db/migrate/20180131052859_rename_private_personal.rb index 80a17d549a..56f75d8510 100644 --- a/db/migrate/20180131052859_rename_private_personal.rb +++ b/db/migrate/20180131052859_rename_private_personal.rb @@ -10,6 +10,7 @@ class RenamePrivatePersonal < ActiveRecord::Migration[5.1] setting :enable_private_messages, :enable_personal_messages setting :enable_private_email_messages, :enable_personal_email_messages setting :private_email_time_window_seconds, :personal_email_time_window_seconds + setting :max_private_messages_per_day, :max_personal_messages_per_day end def down @@ -18,5 +19,6 @@ class RenamePrivatePersonal < ActiveRecord::Migration[5.1] setting :enable_private_messages, :enable_personal_messages setting :enable_private_email_messages, :enable_personal_email_messages setting :private_email_time_window_seconds, :personal_email_time_window_seconds + setting :max_private_messages_per_day, :max_personal_messages_per_day end end From 49424fd79828d493ec0852054346225245ffe255 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 31 Jan 2018 11:57:50 +0530 Subject: [PATCH 020/202] rename private to personal --- .../discourse/templates/modal/keyboard-shortcuts-help.hbs | 2 +- app/assets/javascripts/discourse/templates/topic.hbs | 2 +- test/javascripts/helpers/site-settings.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs index 9dceda5cf8..539101bdaf 100644 --- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs +++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs @@ -11,7 +11,7 @@
  • {{{i18n 'keyboard_shortcuts_help.jump_to.top'}}}
  • {{{i18n 'keyboard_shortcuts_help.jump_to.bookmarks'}}}
  • {{{i18n 'keyboard_shortcuts_help.jump_to.profile'}}}
    • - {{#if siteSettings.enable_private_messages}} + {{#if siteSettings.enable_personal_messages}}
  • {{{i18n 'keyboard_shortcuts_help.jump_to.messages'}}}
    • {{/if}} diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index 1c9678a69c..ef2d4912cc 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -42,7 +42,7 @@ {{else}}

    {{#unless model.is_warning}} - {{#if siteSettings.enable_private_messages}} + {{#if siteSettings.enable_personal_messages}} {{d-icon "envelope"}} diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js index f11eb01177..e24782e70c 100644 --- a/test/javascripts/helpers/site-settings.js +++ b/test/javascripts/helpers/site-settings.js @@ -39,11 +39,11 @@ Discourse.SiteSettingsOriginal = { "delete_user_max_post_age":60, "delete_all_posts_max":15, "min_post_length":20, - "min_private_message_post_length":10, + "min_personal_message_post_length":10, "max_post_length":32000, "min_topic_title_length":15, "max_topic_title_length":255, - "min_private_message_title_length":2, + "min_personal_message_title_length":2, "allow_uncategorized_topics":true, "min_title_similar_length":10, "edit_history_visible_to_public":true, From f88b8a89457ec78fb3dbd1ce5c5733603031c615 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 31 Jan 2018 12:09:46 +0530 Subject: [PATCH 021/202] rename 'default_email_private_messages' to 'default_email_personal_messages' --- app/models/user_option.rb | 2 +- config/locales/server.en.yml | 2 +- config/site_settings.yml | 2 +- .../20180131052859_rename_private_personal.rb | 14 ++++++++------ spec/models/user_spec.rb | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/models/user_option.rb b/app/models/user_option.rb index e882e4ccf3..828ac58c60 100644 --- a/app/models/user_option.rb +++ b/app/models/user_option.rb @@ -27,7 +27,7 @@ class UserOption < ActiveRecord::Base self.mailing_list_mode_frequency = SiteSetting.default_email_mailing_list_mode_frequency self.email_direct = SiteSetting.default_email_direct self.automatically_unpin_topics = SiteSetting.default_topics_automatic_unpin - self.email_private_messages = SiteSetting.default_email_private_messages + self.email_private_messages = SiteSetting.default_email_personal_messages self.email_previous_replies = SiteSetting.default_email_previous_replies self.email_in_reply_to = SiteSetting.default_email_in_reply_to diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index abc6465bd6..9c1e475b9c 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1550,7 +1550,7 @@ en: default_email_digest_frequency: "How often users receive summary emails by default." default_include_tl0_in_digests: "Include posts from new users in summary emails by default. Users can change this in their preferences." - default_email_private_messages: "Send an email when someone messages the user by default." + default_email_personal_messages: "Send an email when someone messages the user by default." default_email_direct: "Send an email when someone quotes/replies to/mentions or invites the user by default." default_email_mailing_list_mode: "Send an email for every new post by default." default_email_mailing_list_mode_frequency: "Users who enable mailing list mode will receive emails this often by default." diff --git a/config/site_settings.yml b/config/site_settings.yml index d126cf303e..51e324a334 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -1421,7 +1421,7 @@ user_preferences: enum: 'DigestEmailSiteSetting' default: 10080 default_include_tl0_in_digests: false - default_email_private_messages: true + default_email_personal_messages: true default_email_direct: true default_email_mailing_list_mode: false default_email_mailing_list_mode_frequency: diff --git a/db/migrate/20180131052859_rename_private_personal.rb b/db/migrate/20180131052859_rename_private_personal.rb index 56f75d8510..8a4edead62 100644 --- a/db/migrate/20180131052859_rename_private_personal.rb +++ b/db/migrate/20180131052859_rename_private_personal.rb @@ -11,14 +11,16 @@ class RenamePrivatePersonal < ActiveRecord::Migration[5.1] setting :enable_private_email_messages, :enable_personal_email_messages setting :private_email_time_window_seconds, :personal_email_time_window_seconds setting :max_private_messages_per_day, :max_personal_messages_per_day + setting :default_email_private_messages, :default_email_personal_messages end def down - setting :min_private_message_post_length, :min_personal_message_post_length - setting :min_private_message_title_length, :min_personal_message_title_length - setting :enable_private_messages, :enable_personal_messages - setting :enable_private_email_messages, :enable_personal_email_messages - setting :private_email_time_window_seconds, :personal_email_time_window_seconds - setting :max_private_messages_per_day, :max_personal_messages_per_day + setting :min_personal_message_post_length, :min_private_message_post_length + setting :min_personal_message_title_length, :min_private_message_title_length + setting :enable_personal_messages, :enable_private_messages + setting :enable_personal_email_messages, :enable_private_email_messages + setting :personal_email_time_window_seconds, :private_email_time_window_seconds + setting :max_personal_messages_per_day, :max_private_messages_per_day + setting :default_email_personal_messages, :default_email_private_messages end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 164d121848..8e95731065 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1366,7 +1366,7 @@ describe User do before do SiteSetting.default_email_digest_frequency = 1440 # daily - SiteSetting.default_email_private_messages = false + SiteSetting.default_email_personal_messages = false SiteSetting.default_email_direct = false SiteSetting.default_email_mailing_list_mode = true SiteSetting.default_email_always = true From 8bc17af9cc458eeb617ff0266758184f8e00a979 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 31 Jan 2018 12:42:55 +0530 Subject: [PATCH 022/202] rename private to personal in locale files --- config/locales/server.ar.yml | 8 ++++---- config/locales/server.bs_BA.yml | 6 +++--- config/locales/server.ca.yml | 12 ++++++------ config/locales/server.da.yml | 8 ++++---- config/locales/server.de.yml | 14 +++++++------- config/locales/server.el.yml | 14 +++++++------- config/locales/server.es.yml | 14 +++++++------- config/locales/server.et.yml | 2 +- config/locales/server.fa_IR.yml | 12 ++++++------ config/locales/server.fi.yml | 14 +++++++------- config/locales/server.fr.yml | 12 ++++++------ config/locales/server.gl.yml | 2 +- config/locales/server.he.yml | 12 ++++++------ config/locales/server.it.yml | 14 +++++++------- config/locales/server.ja.yml | 6 +++--- config/locales/server.ko.yml | 10 +++++----- config/locales/server.nb_NO.yml | 4 ++-- config/locales/server.nl.yml | 10 +++++----- config/locales/server.pl_PL.yml | 12 ++++++------ config/locales/server.pt.yml | 12 ++++++------ config/locales/server.pt_BR.yml | 8 ++++---- config/locales/server.ro.yml | 12 ++++++------ config/locales/server.ru.yml | 8 ++++---- config/locales/server.sk.yml | 8 ++++---- config/locales/server.sq.yml | 6 +++--- config/locales/server.sr.yml | 2 +- config/locales/server.sv.yml | 12 ++++++------ config/locales/server.tr_TR.yml | 10 +++++----- config/locales/server.vi.yml | 10 +++++----- config/locales/server.zh_CN.yml | 14 +++++++------- config/locales/server.zh_TW.yml | 12 ++++++------ 31 files changed, 150 insertions(+), 150 deletions(-) diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index 46334a785b..7b60baa22f 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -926,12 +926,12 @@ ar: set_locale_from_accept_language_header: "اختيار لغة الواجة للمستخدمين المتخفون طبقا للغة المختارة بمتصفح الشبكة. ( إعداد تجريبى، لا يعمل مع ذاكرة المتصفح )" min_post_length: "الحد الأدنى المسموح به لطول المنشور بالأحرف" min_first_post_length: "الحد الأدنى المسموح به لطول أول منشور (المنشور الاول بالموضوع) بالأحرف" - min_private_message_post_length: "الحد الأدنى المسموح به لطول المنشور بالأحرف في الرسائل" + min_personal_message_post_length: "الحد الأدنى المسموح به لطول المنشور بالأحرف في الرسائل" max_post_length: "الحد الأقصي المسموح به لطول المنشور بالأحرف" topic_featured_link_enabled: "السماح بنشر روابط في الموضوعات" min_topic_title_length: "الحد الأدنى المسموح به موضوع طول اللقب في الأحرف" max_topic_title_length: "الحد الأعلى المسموح به لطول عنوان موضوع في الأحرف" - min_private_message_title_length: "الحد الأدنى المسموح به لطول عنوان لرسالة في الأحرف" + min_personal_message_title_length: "الحد الأدنى المسموح به لطول عنوان لرسالة في الأحرف" min_search_term_length: "الحد الأدنى الصالح لطول مصطلح في الأحرف" search_tokenize_chinese_japanese_korean: "ارغام الباحث على تجميع احرف اللغات الصينية واليابانية والكورية حتى على المواقع الغير معدة لتلك اللغات." search_prefer_recent_posts: "اذا كان البحث في المنتدي بطئ, هذا الخيار سوف يحاول فهرسة اخر المنشورات اولاً" @@ -1090,7 +1090,7 @@ ar: max_bookmarks_per_day: "أقصى عدد من العلامات لكلّ مستخدم يوميًّا." max_edits_per_day: "أقصى عدد من عمليّات التّحرير لكلّ مستخدم يوميًّا." max_topics_per_day: "أقصى عدد للمواضيع التي يمكن للعضو إنشائها باليوم." - max_private_messages_per_day: "أقصى عدد لرسائل الأعضاء التي يمكن إنشائها باليوم." + max_personal_messages_per_day: "أقصى عدد لرسائل الأعضاء التي يمكن إنشائها باليوم." max_invites_per_day: "أقصى عدد للدعوات التي يمكن للعضو إرسالها باليوم." max_topic_invitations_per_day: "أقصى عدد لدعوات الموضوع التي يمكن للعضو إرسالها باليوم." alert_admins_if_errors_per_minute: "عدد الأخطاء في الدقيقة الواحدة لكى يرسل تنبيه للمدير. قيمة 0 تعطل هذه الميزة. ملاحظة: تتطلب إعادة تشغيل." @@ -1263,7 +1263,7 @@ ar: enforce_square_emoji: "أجبِر النّسبة الباعيّة لكلّ الإيموجي لتكون مربّعة." approve_post_count: "عدد المنشورات للمستخدم الجديد او الاساسي يجب ان تتم الموافقه عليه " approve_unless_trust_level: "مشاركات للأعضاء أدنى من مستوى الثقة هذا يجب أن تتم الموافقة عليها." - default_email_private_messages: "أرسل بريد إلكتروني عندما يراسل شخص ما العضو إفتراضيا." + default_email_personal_messages: "أرسل بريد إلكتروني عندما يراسل شخص ما العضو إفتراضيا." default_email_direct: "ارسل بريد الكتروني عندما يقوم احدهم بالرد/الاقتباس الي/ذكر او دعوه مستخدم افتراضيا" default_email_mailing_list_mode: "ارسل بريد إلكتروني لكل مشاركة جديدة افتراضيا." disable_mailing_list_mode: "عدم السماح للمستخدمين بتفعيل خيار المراسله الجماعيه" diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml index c56485b2c9..508d7ba765 100644 --- a/config/locales/server.bs_BA.yml +++ b/config/locales/server.bs_BA.yml @@ -357,11 +357,11 @@ bs_BA: delete_old_hidden_posts: "Auto-delete any hidden posts that stay hidden for more than 30 days." allow_user_locale: "Allow users to choose their own language interface preference" min_post_length: "Minimum allowed post length in characters" - min_private_message_post_length: "Minimum allowed post length in characters for private messages" + min_personal_message_post_length: "Minimum allowed post length in characters for private messages" max_post_length: "Maximum allowed post length in characters" min_topic_title_length: "Minimum allowed topic title length in characters" max_topic_title_length: "Maximum allowed topic title length in characters" - min_private_message_title_length: "Minimum allowed title length for a private message in characters" + min_personal_message_title_length: "Minimum allowed title length for a private message in characters" min_search_term_length: "Minimum valid search term length in characters" allow_duplicate_topic_titles: "Allow topics with identical, duplicate titles." unique_posts_mins: "How many minutes before a user can make a post with the same content again" @@ -461,7 +461,7 @@ bs_BA: max_bookmarks_per_day: "Maximum number of bookmarks per user per day." max_edits_per_day: "Maximum number of edits per user per day." max_topics_per_day: "Maximum number of topics a user can create per day." - max_private_messages_per_day: "Maximum number of private messages users can create per day." + max_personal_messages_per_day: "Maximum number of private messages users can create per day." suggested_topics: "Number of suggested topics shown at the bottom of a topic." limit_suggested_to_category: "Only show topics from the current category in suggested topics." clean_up_uploads: "Remove orphan unreferenced uploads to prevent illegal hosting. WARNING: you may want to back up of your /uploads directory before enabling this setting." diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml index 21a6465faf..da26d75d3c 100644 --- a/config/locales/server.ca.yml +++ b/config/locales/server.ca.yml @@ -783,13 +783,13 @@ ca: set_locale_from_accept_language_header: "configura la llengua d'interfície per a persones anònimes des dels encapçalaments dels seus navegadors. (EXPERIMENTAL, no funciona amb memòria cau anònima)" min_post_length: "Mínim permès en caràcters per a l'extensió de publicacions " min_first_post_length: "Mínim permès en caràcters per a l'extensió de primera publicació (cos del tema)" - min_private_message_post_length: "Mínim permès en caràcters per a l'extensió de publicacions a missatges" + min_personal_message_post_length: "Mínim permès en caràcters per a l'extensió de publicacions a missatges" max_post_length: "Màxim permès en caràcters per a l'extensió de publicacions " topic_featured_link_enabled: "Activa la publicació d'enllaç amb temes." show_topic_featured_link_in_digest: "Mostra el tema de l'enllaç destacat al correu electrònic de resum automàtic." min_topic_title_length: "Mida mínima permesa del títol del tema en caràcters " max_topic_title_length: "Mida màxima permesa del títol del tema en caràcters " - min_private_message_title_length: "Mida mínima permesa del títol d'un missatge en caràcters " + min_personal_message_title_length: "Mida mínima permesa del títol d'un missatge en caràcters " min_search_term_length: "Mida mínima permesa d'un camp de cerca en caràcters " search_tokenize_chinese_japanese_korean: "Força la cerca per assegurar les dades en Xinès/Japonès/Coreà fins i tot en llocs que no siguin en aquestes llengües" search_prefer_recent_posts: "Si la cerca al teu fòrum va lenta, aquesta opció prova primer amb un índex de publicacions recents" @@ -835,7 +835,7 @@ ca: summary_likes_required: "Mínim nombre de m'agrades a un tema abans d'activar 'Resumeix aquest tema'" summary_percent_filter: "Quan una persona clica 'Resumeix aquest tema', mostra el '% o' principal de publicacions" summary_max_results: "Màxim de publicacions resultat de 'Resumeix aquest tema'" - enable_private_messages: "Permet que les persones amb nivell de confiança 1 puguin crear missatges i respondre'ls (configurable amb el mínim de nivell de confiança per enviar missatges). Fixa't que l'equip sempre pot enviar qualsevol mena de missatges." + enable_personal_messages: "Permet que les persones amb nivell de confiança 1 puguin crear missatges i respondre'ls (configurable amb el mínim de nivell de confiança per enviar missatges). Fixa't que l'equip sempre pot enviar qualsevol mena de missatges." enable_long_polling: "El bus de missatges emprat per a la notificació pot fer servir el mostreig llarg" long_polling_base_url: "La URL bàsica emprada per a mostreig llarg (quan una xarxa de lliurament de continguts serveix contingut dinàmic, assegura't de configurar-ho per llençar l'origen). Per exemple, http://origin.site.com" long_polling_interval: "Quantitat de temps que el servidor hauria d'esperar abans de respondre clients quan no hi ha dades d'enviament (connectat només a persones usuàries)" @@ -955,7 +955,7 @@ ca: max_bookmarks_per_day: "Quantitat màxima de preferits per persona i dia." max_edits_per_day: "Quantitat màxima d'edicions per persona i dia." max_topics_per_day: "Quantitat màxima de temes que una persona pot crear cada dia." - max_private_messages_per_day: "Quantitat màxima de missatges que una persona pot crear cada dia." + max_personal_messages_per_day: "Quantitat màxima de missatges que una persona pot crear cada dia." max_invites_per_day: "Quantitat màxima d'invitacions que una persona pot enviar cada dia." max_topic_invitations_per_day: "Quantitat màxima d'invitacions a temes que una persona por enviar cada dia." alert_admins_if_errors_per_minute: "Quantitat d'errors per minut per desencadenar una alerta admin. Un valor 0 inhabilita aquesta característica. NOTA: cal reiniciar." @@ -1019,7 +1019,7 @@ ca: max_users_notified_per_group_mention: "Quantitat màxima de persones que poden rebre alertes si un grup és mencionat (si el valor límit no troba alertes, serà augmentat)" create_thumbnails: "Crea miniatures i finestres d'imatge de massa amplada per cabre a una publicació." email_time_window_mins: "Espera (n) minuts abans d'enviar qualsevol alerta de correu, per tal de possibilitar l'edició i la finalització de les publicacions." - private_email_time_window_seconds: "Espera (n) segons abans d'enviar qualsevol correu privat d'alerta, per tal de possibilitar l'edició i la finalització dels missatges." + personal_email_time_window_seconds: "Espera (n) segons abans d'enviar qualsevol correu privat d'alerta, per tal de possibilitar l'edició i la finalització dels missatges." email_posts_context: "Quantes respostes prèvies per incloure com a context a correus d'alerta." flush_timings_secs: "Amb quanta freqüència descarreguem al servidor les dades de temporització, en segons." title_max_word_length: "La mida màxima permesa de la paraula, en caràcters al títol d'un tema." @@ -1181,7 +1181,7 @@ ca: code_formatting_style: "El botó de codi al compositor serà per defecte d'aquest estil de format de codi" default_email_digest_frequency: "Amb quina freqüència les persones rebran els correus resumits per defecte." default_include_tl0_in_digests: "Inclou publicacions de noves persones a correus resumits per defecte. Les persones ho poden canviar a les seves preferències." - default_email_private_messages: "Envia un correu s'enviïn missatges a la persona usuària per defecte." + default_email_personal_messages: "Envia un correu s'enviïn missatges a la persona usuària per defecte." default_email_direct: "Envia un correu quan se citi/respongui/mencioni la persona usuària o persones convidades per defecte." default_email_mailing_list_mode: "Envia un correu per a cada nova publicació per defecte." default_email_mailing_list_mode_frequency: "Per defecte, les persones que activen el mode llista de correu rebran correus amb aquesta freqüència." diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml index 59a8da7edb..0570d3858b 100644 --- a/config/locales/server.da.yml +++ b/config/locales/server.da.yml @@ -819,13 +819,13 @@ da: set_locale_from_accept_language_header: "set interface language for anonymous users from their web browser's language headers. (EXPERIMENTAL, does not work with anonymous cache)" min_post_length: "Minimumlængde tilladt for indlæg i tegn" min_first_post_length: "Minimum tilladte antal tegn (i emne felt) i første indlæg" - min_private_message_post_length: "Minimumlængde tilladt for indlæg i tegn" + min_personal_message_post_length: "Minimumlængde tilladt for indlæg i tegn" max_post_length: "Maksimal længde af indlæg i tegn" topic_featured_link_enabled: "Tillad opslag af et link med emner." show_topic_featured_link_in_digest: "Vis link med det fremhævede emne i e-mail-sammendraget." min_topic_title_length: "Minimumslængde af emnetitel i tegn." max_topic_title_length: "Maksimumslængde af emnetitel i tegn." - min_private_message_title_length: "Minimumslængde af emnetitel i tegn." + min_personal_message_title_length: "Minimumslængde af emnetitel i tegn." min_search_term_length: "Antal tegn i søgefeltet skal have et minimum" search_tokenize_chinese_japanese_korean: "Tving søg til at \"tokenize\" Chinese/Japanese/Korean selv på sites som ikke er CJK" search_prefer_recent_posts: "Såfremt søgning på forum er langsomt, kan denne option indeksere og vise nyeste indlæg først" @@ -869,7 +869,7 @@ da: summary_likes_required: "Minimum antal likes på et emne før 'opsummer dette emne' er aktiveret" summary_percent_filter: "Når en bruger kllikker 'Opsummer dette Emne' vises top % af indlæg" summary_max_results: "Max antal indlæg indeholdt i 'Opsummer dette Emne'" - enable_private_messages: "Tillad Trust Level 1 (kan konfigureres minimum trust level til at sende beskeder), brugere til at sende og svare på beskeder. Bemærk at moderatorer beskeder, uanset hvad." + enable_personal_messages: "Tillad Trust Level 1 (kan konfigureres minimum trust level til at sende beskeder), brugere til at sende og svare på beskeder. Bemærk at moderatorer beskeder, uanset hvad." enable_long_polling: "Message bus til underretninger kan bruge long polling" long_polling_base_url: "URL anvendt for afsteminger (når CDN leverer dynamisk indhold, så sæt dette til oprindelig / orginal) f.eks: http://origin.site.com" long_polling_interval: "Mængde tid før serveren bør vente før den svarer klienter når der ikke er ny data at sende (kun for brugere der er logget ind)" @@ -991,7 +991,7 @@ da: emoji_set: "Hvordan kunne du tænke dig din emoji?" default_email_digest_frequency: "Hvor ofte brugere som standard modtager mails med sammendrag." default_include_tl0_in_digests: "Inkluder som standard indlæg fra nye brugre i mails med sammendrag. Brugere kan ændre dette i deres indstillinger." - default_email_private_messages: "Send som standard en email når nogen sender brugeren en besked." + default_email_personal_messages: "Send som standard en email når nogen sender brugeren en besked." default_email_direct: "Send som standard en email når nogen citerer/svarer/nævner/inviterer brugeren." default_email_mailing_list_mode: "Send som standard en email for hvert nyt indlæg." default_email_always: "Send som standard en email-notifikation selv hvis brugeren er aktiv." diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index 2fa6cc8568..725e788106 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -873,13 +873,13 @@ de: set_locale_from_accept_language_header: "Sprache der Benutzeroberfläche für anonyme Benutzer an Hand der Spracheinstellung ihres Browsers wählen (EXPERIMENTELL, funktioniert nicht mit Caches für anonyme Benutzer)" min_post_length: "Minimal zulässige Beitragslänge in Zeichen." min_first_post_length: "Minimal zulässige Länge des ersten Beitrags (eines Themas) in Zeichen" - min_private_message_post_length: "Minimale zulässige Beitragslänge in Zeichen für Nachrichten" + min_personal_message_post_length: "Minimale zulässige Beitragslänge in Zeichen für Nachrichten" max_post_length: "Maximale zulässige Beitragslänge in Zeichen." topic_featured_link_enabled: "Beitrag mit Link zu hervorgehobenen Themen erlauben" show_topic_featured_link_in_digest: "Zeige den Hervorgehobene Themen Link in der E-Mail-Zusammenfassung." min_topic_title_length: "Minimale zulässige Titellänge von Themen in Zeichen." max_topic_title_length: "Maximale zulässige Titellänge von Themen in Zeichen." - min_private_message_title_length: "Minimale zulässige Titellänge von Nachrichten in Zeichen." + min_personal_message_title_length: "Minimale zulässige Titellänge von Nachrichten in Zeichen." min_search_term_length: "Minimale zulässige Länge der Suche in Zeichen." search_tokenize_chinese_japanese_korean: "Zwinge die Suche Chinesisch, Japanisch und Koreanisch zu erkennen, auch wenn die Site keine dieser Sprachen nutzt" search_prefer_recent_posts: "Wenn das Durchsuchen deines großen Forums langsam ist, dann versucht diese Option zuerst einen Index der letzten Beiträge." @@ -934,8 +934,8 @@ de: summary_likes_required: "Mindestanzahl an Likes in einem Thema, bevor die \"Thema zusammenfassen\" Funktion aktiviert wird." summary_percent_filter: "Zeige die besten (n)% der Beiträge eines Themas in der \"Thema zusammenfassen\"-Ansicht." summary_max_results: "Maximale Anzahl der sichtbaren Beiträge beim Zusammenfassen von Themen" - enable_private_messages: "Erlaube Benutzer mit der Vertrauensstufe 1 (konfigurierbar über die minimale Vertrauensstufe zum Senden von Nachrichten), Nachrichten zu erstellen und auf Nachrichten zu antworten. Beachte, dass das Team immer Nachrichten und Antworten senden können." - enable_private_email_messages: "Erlaube Benutzern mit Vertrauensstufe 4 (konfigurierbar über die Mindestvertrauensstufe, um Nachrichten zu senden), private E-Mail-Nachrichten zu senden. Bitte beachte, dass Team-Mitglieder immer und in jedem Fall Nachrichten senden können." + enable_personal_messages: "Erlaube Benutzer mit der Vertrauensstufe 1 (konfigurierbar über die minimale Vertrauensstufe zum Senden von Nachrichten), Nachrichten zu erstellen und auf Nachrichten zu antworten. Beachte, dass das Team immer Nachrichten und Antworten senden können." + enable_personal_email_messages: "Erlaube Benutzern mit Vertrauensstufe 4 (konfigurierbar über die Mindestvertrauensstufe, um Nachrichten zu senden), private E-Mail-Nachrichten zu senden. Bitte beachte, dass Team-Mitglieder immer und in jedem Fall Nachrichten senden können." enable_long_polling: "Nachrichtenbus für Benachrichtigungen kann Long-Polling nutzen." long_polling_base_url: "Basis-URL für Long Polling (wenn zum Ausliefern von dynamischen Inhalten ein CDN verwendet wird, setze es auf Origin Pull), z. B. http://origin.site.com" long_polling_interval: "Wartezeit, bevor der Server auf Clients reagiert, wenn keine Daten gesendet werden müssen (nur für angemeldete Benutzer)" @@ -1070,7 +1070,7 @@ de: max_bookmarks_per_day: "Maximale Anzahl der Lesezeichen pro Benutzer und Tag." max_edits_per_day: "Maximale Anzahl der Bearbeitungen pro Benutzer und Tag." max_topics_per_day: "Maximale Anzahl der Themen, die ein Benutzer pro Tag erstellen kann." - max_private_messages_per_day: "Maximale Zahl Direktnachrichten, die ein Benutzer pro Tag erstellen kann." + max_personal_messages_per_day: "Maximale Zahl Direktnachrichten, die ein Benutzer pro Tag erstellen kann." max_invites_per_day: "Maximale Zahl an Einladungen, die ein Benutzer pro Tag verschicken kann." max_topic_invitations_per_day: "Maximale Zahl an Thema-Einladungen, die ein Benutzer pro Tag verschicken kann." max_logins_per_ip_per_hour: "Maximale Anzahl der erlaubten Anmeldungen pro IP-Adresse und Stunde" @@ -1141,7 +1141,7 @@ de: enable_mentions: "Erlaube Benutzern, andere Benutzer zu erwähnen." create_thumbnails: "Erzeuge ein Vorschaubild und eine Lightbox für Bilder, die zu groß sind, um in einem Beitrag angezeigt zu werden." email_time_window_mins: "Warte (n) Minuten bevor eine E-Mail-Benachrichtigung geschickt wird, um Benutzern Gelegenheit zu geben, ihre Beiträge abschließend bearbeiten zu können." - private_email_time_window_seconds: "Warte (n) Sekunden bevor eine E-Mail-Benachrichtigung geschickt wird, um Benutzern Gelegenheit zu geben, ihre Beiträge abschließend bearbeiten zu können." + personal_email_time_window_seconds: "Warte (n) Sekunden bevor eine E-Mail-Benachrichtigung geschickt wird, um Benutzern Gelegenheit zu geben, ihre Beiträge abschließend bearbeiten zu können." email_posts_context: "Anzahl der Antworten, welche als Kontext einer Benachrichtigungs-E-Mail hinzugefügt werden." flush_timings_secs: "Sekunden, nach denen Zeiteinstellungen auf den Server übertragen werden." title_max_word_length: "Maximal erlaubte Wortlänge in Thementiteln, in Zeichen." @@ -1320,7 +1320,7 @@ de: watched_words_regular_expressions: "Beobachtete Wörter sind reguläre Ausdrücke." default_email_digest_frequency: "Wie häufig sollen Benutzer standardmäßig E-Mail-Zusammenfassungen erhalten?" default_include_tl0_in_digests: "Beiträge von neuen Benutzern in E-Mail-Zusammenfassungen standardmäßig anzeigen. Benutzer können dies in ihren Einstelllungen ändern." - default_email_private_messages: "Sende einem Benutzer standardmäßig eine E-Mail, wenn dieser eine Nachricht von einem anderen Benutzer erhält." + default_email_personal_messages: "Sende einem Benutzer standardmäßig eine E-Mail, wenn dieser eine Nachricht von einem anderen Benutzer erhält." default_email_direct: "Aktiviere standardmäßig, dass eine E-Mail gesendet wird, sobald ein Benutzer einen anderen Benutzer zitiert / einem anderen Benutzer antwortet / oder einen anderen Benutzer erwähnt bzw. einlädt." default_email_mailing_list_mode: "Sende standardmäßig eine E-Mail für jeden neuen Beitrag." default_email_mailing_list_mode_frequency: "Benutzer, die den Mailinglisten-Modus einschalten, werden standardmäßig so häufig eine E-Mail erhalten." diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml index f271eb0d4d..28aafed69e 100644 --- a/config/locales/server.el.yml +++ b/config/locales/server.el.yml @@ -872,13 +872,13 @@ el: set_locale_from_accept_language_header: "θέστε την γλώσσα του interface για ανώνυμους χρήστες από τη γλώσσα που χρησιμοποιεί το πρόγραμμα περιήγησης τους. (ΠΕΙΡΑΜΑΤΙΚΟ ΧΑΡΑΚΤΗΡΙΣΤΙΚΟ, δεν λειτουργεί με ανώνυμη cache)" min_post_length: "Ελάχιστο επιτρεπτό μήκος ανάρτησης σε χαρακτήρες" min_first_post_length: "Ελάχιστο επιτρεπτό μήκος πρώτης ανάρτησης (σώμα νήματος) σε χαρακτήρες" - min_private_message_post_length: "Ελάχιστο επιτρεπτό μήκος ανάρτησης σε χαρακτήρες για μηνύματα" + min_personal_message_post_length: "Ελάχιστο επιτρεπτό μήκος ανάρτησης σε χαρακτήρες για μηνύματα" max_post_length: "Μέγιστο επιτρεπτό μήκος ανάρτησης σε χαρακτήρες" topic_featured_link_enabled: "Ενεργοποίηση ανάρτησης ενός συνδέσμου με νήματα." show_topic_featured_link_in_digest: "Δείξε το σύνδεσμο προτεινόμενου νήματος στο συνοπτικό email." min_topic_title_length: "Ελάχιστο επιτρεπτό μήκος τίτλου νήματος σε χαρακτήρες" max_topic_title_length: "Μέγιστο επιτρεπτό μήκος τίτλου νήματος σε χαρακτήρες" - min_private_message_title_length: "Ελάχιστο επιτρεπτό μήκος τίτλου για ένα μήνυμα σε χαρακτήρες" + min_personal_message_title_length: "Ελάχιστο επιτρεπτό μήκος τίτλου για ένα μήνυμα σε χαρακτήρες" min_search_term_length: "Ελάχιστο έγκυρο μήκος όρου αναζήτησης σε χαρακτήρες" search_tokenize_chinese_japanese_korean: "Ανάγκασε την αναζήτηση να κάνει tokenize Κινέζικα / Ιαπωνικά / κορεατικά, ακόμη και σε μη CJK ιστότοπους" search_prefer_recent_posts: "Εάν η αναζήτηση στην ιστοσελίδα σας είναι αργή, αυτή η επιλογή δημιουργεί κατάλογο των πιο πρόσφατων αναρτήσεων πρώτα" @@ -933,8 +933,8 @@ el: summary_likes_required: "Ελάχιστος αριθμός ''Μου αρέσει'' σε ένα θέμα πριν ενεργοποιηθεί το «Συνοψίστε αυτό το θέμα» " summary_percent_filter: "Όταν ο χρήστης επιλέξει «Συνοψίστε αυτό το θέμα», δείξε το κορυφαίο % των αναρτήσεων" summary_max_results: "Μέγιστος αριθμός αναρτήσεων στο «Συνοψίστε αυτό το θέμα»" - enable_private_messages: "Επίτρεψε στους χρήστες επιπέδου εμπιστοσύνης 1 (ρυθμιζόμενο μέσω min trust level to send messages) να δημιουργήσουν μηνύματα και να απαντήσουν σε μηνύματα. Σημειώστε ότι οι συνεργάτες μπορούν πάντα να στέλνουν μηνύματα." - enable_private_email_messages: "Επίτρεψε στους χρήστες επιπέδου εμπιστοσύνης 4 (ρυθμιζόμενο μέσω min trust level to send messages) να στέλνουν προσωπικά μηνύματα email. Σημειώστε ότι οι συνεργάτες μπορούν πάντα να στέλνουν μηνύματα." + enable_personal_messages: "Επίτρεψε στους χρήστες επιπέδου εμπιστοσύνης 1 (ρυθμιζόμενο μέσω min trust level to send messages) να δημιουργήσουν μηνύματα και να απαντήσουν σε μηνύματα. Σημειώστε ότι οι συνεργάτες μπορούν πάντα να στέλνουν μηνύματα." + enable_personal_email_messages: "Επίτρεψε στους χρήστες επιπέδου εμπιστοσύνης 4 (ρυθμιζόμενο μέσω min trust level to send messages) να στέλνουν προσωπικά μηνύματα email. Σημειώστε ότι οι συνεργάτες μπορούν πάντα να στέλνουν μηνύματα." enable_long_polling: "Η αρτηρία μηνυμάτων που χρησιμοποιείτε για ειδοποιήσεις μπορεί να χρησιμοποιήσει μακρυά μέθοδο εξέτασης." long_polling_base_url: "Base URL που χρησιμοποιείτε για μακρύ ψήφισμα (όταν ένα CDN εξυπηρετεί δυναμικό περιεχόμενο, βεβαιωθείτε ότι το ορίσατε σε έλξη προέλευσης ) π.χ.: http://origin.site.com" long_polling_interval: "Χρονικό διάστημα που ο διακομιστής θα πρέπει να περιμένει πριν απαντήσει στους πελάτες όταν δεν υπάρχουν δεδομένα για την αποστολή (μόνο συνδεδεμένοι χρήστες )" @@ -1067,7 +1067,7 @@ el: max_bookmarks_per_day: "Μέγιστος αριθμός σελιδοδεικτών ανά χρήστη ανά ημέρα." max_edits_per_day: "Μέγιστος αριθμός επεξεργασιών ανά χρήστη ανά ημέρα." max_topics_per_day: "Μέγιστος αριθμός νημάτων που μπορεί να δημιουργήσει ο χρήστης σε μια ημέρα." - max_private_messages_per_day: "Μέγιστος αριθμός μηνυμάτων που μπορεί να δημιουργήσει ο χρήστης σε μια ημέρα." + max_personal_messages_per_day: "Μέγιστος αριθμός μηνυμάτων που μπορεί να δημιουργήσει ο χρήστης σε μια ημέρα." max_invites_per_day: "Μέγιστος αριθμός προσκλήσεων που μπορεί να στείλει ο χρήστης σε μια ημέρα." max_topic_invitations_per_day: "Μέγιστος αριθμός προσκλήσεων νημάτων που μπορεί να στείλει ο χρήστης σε μια ημέρα." max_logins_per_ip_per_hour: "Μέγιστος αριθμός επιτρεπόμενων συνδέσεων ανα διεύθυνση IP την ώρα" @@ -1137,7 +1137,7 @@ el: max_users_notified_per_group_mention: "Μέγιστος αριθμός χρηστών που ίσως λάβουν μια ειδοποίηση εάν μια ομάδα αναφέρεται (εάν φτάσουν το κατώφλι, δεν θα σταλούν ειδοποιήσεις)" create_thumbnails: "Δημιούργησε μικρογραφίες και lightbox για εικόνες που είναι πολύ μεγάλες για να χωρέσουν σε μια ανάρτηση." email_time_window_mins: "Αναμονή (χ) λεπτών πριν την αποστολή οποιουδήποτε ειδοποιητικού email, έτσι ώστε να δωθεί στους χρήστες η ευκαιρία να επεξεργασθούν και να οριστικοποιήσουν τις αναρτήσεις τους. " - private_email_time_window_seconds: "Αναμονή (χ) δευτερολέπτων πριν την αποστολή οποιουδήποτε προσωπικού ειδοποιητικού email, έτσι ώστε να δωθεί στους χρήστες η ευκαιρία να επεξεργασθούν και να οριστικοποιήσουν τα μηνύματα τους. " + personal_email_time_window_seconds: "Αναμονή (χ) δευτερολέπτων πριν την αποστολή οποιουδήποτε προσωπικού ειδοποιητικού email, έτσι ώστε να δωθεί στους χρήστες η ευκαιρία να επεξεργασθούν και να οριστικοποιήσουν τα μηνύματα τους. " email_posts_context: "Πόσες προηγούμενες απαντήσεις να συμπεριλαμβάνονται ως περιεχόμενο στα ειδοποιητικά μηνύματα. " flush_timings_secs: "Πόσο συχνά θα καθαρίσουμε τα δεδομένα χρονισμού στο σέρβερ, σε δευτερόλεπτα." title_max_word_length: "Το μέγιστο επιτρεπόμενο όριο λέξεων, σε χαρακτήρες, σε ένα τίτλο νήματος." @@ -1314,7 +1314,7 @@ el: watched_words_regular_expressions: "Οι λέξεις που επιτηρούνται είναι regular expressions." default_email_digest_frequency: "Πόσο συχνά οι χρήστες λαμβάνουν συνοπτικά email από προεπιλογή." default_include_tl0_in_digests: "Συμπεριέλαβε αναρτήσεις από νέους χρήστες στα συνοπτικά email από προεπιλογή. Οι χρήστες μπορούν να το αλλάξουν αυτό στις προτιμήσεις τους. " - default_email_private_messages: "Στείλε email όταν κάποιος στέλνει μήνυμα στο χρήστη από προεπιλογή." + default_email_personal_messages: "Στείλε email όταν κάποιος στέλνει μήνυμα στο χρήστη από προεπιλογή." default_email_direct: "Στείλε email όταν κάποιος παραθέτει/απαντάει σε/αναφέρει ή προσκαλεί το χρήστη από προεπιλογή." default_email_mailing_list_mode: "Στείλε email για κάθε νέα ανάρτηση από προεπιλογή." default_email_mailing_list_mode_frequency: "Οι χρήστες, οι οποίοι έχουν ενεργοποιήσει την λειτουργία ταχυδρομικής λίστας θα λαμβάνουν emails τόσο συχνά από προεπιλογή." diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index 3fb1b1119f..e7e77f23c3 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -881,13 +881,13 @@ es: set_locale_from_accept_language_header: "Establece el lenguaje de la interfaz para usuarios anónimos desde el lenguaje declarado por su navegador web. (EXPERIMENTAL, no funciona con caché anónimo)" min_post_length: "Extensión mínima de los posts, en número de caracteres" min_first_post_length: "Extensión mínima permitida en el primer mensaje (cuerpo del tema) en caracteres" - min_private_message_post_length: "Extensión mínima de los posts en los mensajes, en número de caracteres" + min_personal_message_post_length: "Extensión mínima de los posts en los mensajes, en número de caracteres" max_post_length: "Extensión máxima de los posts, en número de caracteres" topic_featured_link_enabled: "Activar publicar temas a partir de un enlace." show_topic_featured_link_in_digest: "Mostrar el enlace destacado por el tema en el email de resumen." min_topic_title_length: "Extensión mínima del título de los temas, en número de caracteres" max_topic_title_length: "Extensión máxima del título de los temas, en número de caracteres" - min_private_message_title_length: "Extensión mínima del título de los temas en mensajes, en número de caracteres" + min_personal_message_title_length: "Extensión mínima del título de los temas en mensajes, en número de caracteres" min_search_term_length: "Extensión mínima de una búsqueda válida, en número de caracteres" search_tokenize_chinese_japanese_korean: "Forzar la búsqueda a tokenizar Chino/Japonés/Coreano incluso en sitios que no basados en esos idiomas" search_prefer_recent_posts: "Si la búsqueda en tu foro gigante es lenta, esta opción prueba primero un índice de posts más recientes" @@ -943,8 +943,8 @@ es: summary_likes_required: "Mínimo de \"me gusta\" en un tema para habilitar 'Resumen de este tema'" summary_percent_filter: "Cuando un usuario hace clic en 'Resumen de este tema', se muestra el n % mejores posts" summary_max_results: "Máximo de posts devueltos en \"Resumen de este tema\"" - enable_private_messages: "Permitir a los usuarios con nivel 1 de confianza (configurable vía mínimo nivel para enviar mensajes) crear y responder a mensajes directos. Ten en cuenta que el staff siempre puede enviar mensajes directos." - enable_private_email_messages: "Permita que el nivel de confianza 4 (configurable a través del nivel mínimo de confianza para enviar mensajes) envíe mensajes de correo electrónico privados. Tenga en cuenta que el personal siempre puede enviar mensajes, pase lo que pase." + enable_personal_messages: "Permitir a los usuarios con nivel 1 de confianza (configurable vía mínimo nivel para enviar mensajes) crear y responder a mensajes directos. Ten en cuenta que el staff siempre puede enviar mensajes directos." + enable_personal_email_messages: "Permita que el nivel de confianza 4 (configurable a través del nivel mínimo de confianza para enviar mensajes) envíe mensajes de correo electrónico privados. Tenga en cuenta que el personal siempre puede enviar mensajes, pase lo que pase." enable_long_polling: "Los mensajes usados para notificaciones pueden usar el long polling" long_polling_base_url: "URL base usada para el 'long polling' (cuando un CDN esta sirviendo contenido dinámico, asegúrate de ajustar esto al 'pull' de origen) ejemplo: http://origin.site.com" long_polling_interval: "Cantidad de tiempo que el servidor debe de esperar antes de responder a los clientes que no hay datos enviados (solamente usuarios con sesión iniciada)." @@ -1079,7 +1079,7 @@ es: max_bookmarks_per_day: "Máximo número de marcadores por usuario y día." max_edits_per_day: "Máximo número de ediciones por usuario y día." max_topics_per_day: "Máximo número de temas que un usuario puede crear al día." - max_private_messages_per_day: "Máximo número de mensajes por usuario y día." + max_personal_messages_per_day: "Máximo número de mensajes por usuario y día." max_invites_per_day: "Máximo número de invitaciones que un usuario puede enviar al día." max_topic_invitations_per_day: "Máximo número de invitaciones a un tema que un usuario puede enviar por día." max_logins_per_ip_per_hour: "Máximo número de inicios de sesión permitidos por direcciones IP por hora." @@ -1150,7 +1150,7 @@ es: enable_mentions: "Permitir a los usuarios mencionar a otros usuarios." create_thumbnails: "Crear miniaturas de imágenes y lightbox cuando estas son demasiado grandes para encajar en un post." email_time_window_mins: "Esperar (n) minutos antes de enviar cualquier email de notificación, para dar a los usuarios margen con el que editar y finalizar sus posts." - private_email_time_window_seconds: "Espera (n) segundos antes de enviar cualquier email de notificación, para dar a los usuarios margen con el que editar y finalizar sus mensajes." + personal_email_time_window_seconds: "Espera (n) segundos antes de enviar cualquier email de notificación, para dar a los usuarios margen con el que editar y finalizar sus mensajes." email_posts_context: "Cuántas respuestas previas se incluirán como contexto en los emails de notificación." flush_timings_secs: "Cuán frecuente, en segundos, se alinean los datos de sincronización con el servidor." title_max_word_length: "La longitud máxima permitida de una palabra, en caracteres, en el título del tema." @@ -1329,7 +1329,7 @@ es: watched_words_regular_expressions: "Palabras observadas son expresiones regulares." default_email_digest_frequency: "Cuán a menudo recibirán los usuarios emails de resumen por defecto." default_include_tl0_in_digests: "Incluir temas de usuarios nuevos en los emails de resumen por defecto. Los usuarios pueden cambiar esto en sus preferencias." - default_email_private_messages: "Enviar un email cuando alguien envíe un mensaje al usuario por defecto." + default_email_personal_messages: "Enviar un email cuando alguien envíe un mensaje al usuario por defecto." default_email_direct: "Enviar un email cuando alguien cite/responda/mencione o invite al usuario por defecto." default_email_mailing_list_mode: "Enviar un email por cada nuevo post por defecto." default_email_mailing_list_mode_frequency: "Los usuarios que activen el modo lista de correo recibirán correos con esta frecuencia por defecto." diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml index 4f9f296593..2bf46d961c 100644 --- a/config/locales/server.et.yml +++ b/config/locales/server.et.yml @@ -679,7 +679,7 @@ et: max_post_length: "Maksimaalne lubatud postituse pikkus tähemärkides" min_topic_title_length: "Lühim lubatud teema pealkirja pikkus tähemärkides" max_topic_title_length: "Maksimaalne lubatud teema pealkirja pikkus tähemärkides" - min_private_message_title_length: "Minimaalne lubatud teema pealkirja pikkus tähemärkides" + min_personal_message_title_length: "Minimaalne lubatud teema pealkirja pikkus tähemärkides" enable_instagram_logins: "Luba autentimine Instagrami abil, nõuab instagram_consumer_key ja instagram_consumer_secret" instagram_consumer_key: "Teenusekasutaja avalik võti Instagrami abil autentimiseks" instagram_consumer_secret: "Teenusekasutaja salajane võti Instagrami abil autentimiseks" diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml index c68066aac8..09693d2d0e 100644 --- a/config/locales/server.fa_IR.yml +++ b/config/locales/server.fa_IR.yml @@ -809,13 +809,13 @@ fa_IR: set_locale_from_accept_language_header: "تنظیم زبان برای رابط کاربری کاربران ناشناس که از هدر مرورگر دریافت می‌شود. (تجربی، با کش ناشناس کار نمی‌کند)" min_post_length: "حداقل طول مجاز نوشته به نویسه" min_first_post_length: "حداقل طول نوشته به نویسه (topic body)" - min_private_message_post_length: "حداقل طول نوشته به نویسه در پیام‌ها " + min_personal_message_post_length: "حداقل طول نوشته به نویسه در پیام‌ها " max_post_length: "حداکثر طول نوشته به نویسه" topic_featured_link_enabled: "فعال بودن ارسال لینک در موضوعات" show_topic_featured_link_in_digest: "نمایش پیوند‌های برجسته موضوع در ایمیل خلاصه" min_topic_title_length: "حداقل طول عنوان نوشته به نویسه" max_topic_title_length: "حداکثر طول مجاز عنوان موضوع به نویسه" - min_private_message_title_length: "حداقل طول مجاز عنوان برای پیام به نویسه" + min_personal_message_title_length: "حداقل طول مجاز عنوان برای پیام به نویسه" min_search_term_length: "حداقل طول واژه جستجوی معتبر به نویسه" search_tokenize_chinese_japanese_korean: "اجبار جستجو برای tokenize کردن چینی/ژاپنی/کره‌ای حتی در سایت هایی که از این زبان‌ها استفاده نمی‌کنند" search_prefer_recent_posts: "اگر سرعت جستجوی انجمن پایین است، این گزینه آخرین نوشته‌ها را در ابتدا ایندکس گذاری می‌کند." @@ -864,7 +864,7 @@ fa_IR: summary_likes_required: "حداقل پسندها در این جستار قبل از اینکه \" خلاصه این موضوع\" فعال شود" summary_percent_filter: "وقتی کاربر بر روی ' خلاصه این موضوع' کلیک کرد٬‌ % بهترین نوشته‌ها را نشان بده" summary_max_results: "حداکثر نوشته‌های برگردانده شد با \" خلاصه این موضوع\"" - enable_private_messages: "اجازه ارسال پیام به کاربران سطح اعتماد 1 (قابل تنظیم با حداقل سطح اعتماد برای ارسال پیام). توجه کنید که همکاران در هر شرایطی می‌توانند پیام ارسال کنند." + enable_personal_messages: "اجازه ارسال پیام به کاربران سطح اعتماد 1 (قابل تنظیم با حداقل سطح اعتماد برای ارسال پیام). توجه کنید که همکاران در هر شرایطی می‌توانند پیام ارسال کنند." enable_long_polling: "message bus استفاده شده برای آگاه سازی می تواند برای رای گیری طولانی استفاده شود. " long_polling_base_url: " URL پایه استفاده شده برای رای گیری طولانی (وقتی CDN خدمت محتوای پویا می دهد٬ از تنظیم بودن منشا این کشش مطمئن شوید) برای نمونه : http://origin.site.com" long_polling_interval: "مدت زمانی که سرور قبل پاسخ دادن به مشتری‌ها باید صبر کند، وقتی در آن‌جا داده ای برای ارسال نیست (فقط کاربران وارد شده)" @@ -986,7 +986,7 @@ fa_IR: max_bookmarks_per_day: "حداکثر تعداد نشانک هر کاربر در روز" max_edits_per_day: "حداکثر تعداد ویرایش هر کاربر در روز" max_topics_per_day: "حداکثر تعداد موضوعاتی که هر کاربر در روز می توانند ایجاد کند" - max_private_messages_per_day: "حداکثر تعداد پیام هایی که هر کاربر در روز می توانند ایجاد کند" + max_personal_messages_per_day: "حداکثر تعداد پیام هایی که هر کاربر در روز می توانند ایجاد کند" max_invites_per_day: "حداکثر تعداد دعوت‌نامه‌هایی که هر کاربر در روز می توانند ارسال کند" max_topic_invitations_per_day: "حداکثر تعداد دعوت‌‌نامه‌هایی که یک کاربر می‌تواند برای عناوین در یک روز ارسال کند." max_logins_per_ip_per_hour: "حداکثر تعداد ورود به ازای هر آیپی در ساعت" @@ -1055,7 +1055,7 @@ fa_IR: max_users_notified_per_group_mention: "حداکثر تعداد کاربرانی که اگر به گروه اشاره شود، اعلان دریافت می‌کنند (اگر آستانه براورده شود هیچ اعلانی ارسال نخواهد شد)" create_thumbnails: "ایجاد تصویر بند‌انگشتی و کادر تصاویر کوچک عکس‌ها را درست که برای جا شدن در نوشته بسیار بزگ هستند" email_time_window_mins: "قبل از ارسال هرگونه آگاهی‌سازی از طریق ایمیل (n) دقیقه صبر کن، برای اینکه به کاربران فرصت بدهید تا بتوانند نوشته‌های خود را ویرایش و نهایی کنند. " - private_email_time_window_seconds: "قبل از ارسال ایمیل آگاه‌سازی خصوصی، (n) ثانیه صبر کنید تا به کاربر اجازه ویرایش پیام نهایی خود را بدهید." + personal_email_time_window_seconds: "قبل از ارسال ایمیل آگاه‌سازی خصوصی، (n) ثانیه صبر کنید تا به کاربر اجازه ویرایش پیام نهایی خود را بدهید." email_posts_context: "چند پاسخ قبلی تا شامل متن خلاصه در ایمیل های آگاهی سازی شود. " flush_timings_secs: "هر چند وقت یک بار اطلاعات زمان‌بندی سرور را خالی کنیم، واحد ثانیه" title_max_word_length: "حداکثر طول مجاز کلمه٬ در نویسه، در عنوان موضوع." @@ -1221,7 +1221,7 @@ fa_IR: code_formatting_style: "کد دکمه در composer به صورت پیشفرض این حالت خواهد بود" default_email_digest_frequency: "به صورت پیشفرض هر چند وقت یک بار ایمیل خلاصه دریافت شود." default_include_tl0_in_digests: "قرار دادن نوشته‌های کاربران جدید در خلاصه ایمیل به صورت پیشفرض. کاربران می‌توانند این تنظیمات را از طریق تنظیمات شخصیشان ویرایش کنند." - default_email_private_messages: "به صورت پیشفرض وقتی پیامی ارسال می‌شود به او ایمیل بفرست." + default_email_personal_messages: "به صورت پیشفرض وقتی پیامی ارسال می‌شود به او ایمیل بفرست." default_email_direct: "ارسال ایمیل وقتی نقل‌قول، پاسخ، اشاره یا دعوت دریافت می‌کند" default_email_mailing_list_mode: "ارسال ایمیل برای نوشته‌های جدید" default_email_mailing_list_mode_frequency: "کاربرانی که ارسال ایمیل را فعال کنند، در این بازه زمانی ایمیل دریافت می‌کنند." diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index cc8c3e9a59..2713e7c926 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -868,13 +868,13 @@ fi: set_locale_from_accept_language_header: "Aseta sivuston kieli kirjautumattomille käyttäjille selaimen kielivalinnan perusteella. (KOKEELLINEN, ei toimi anonyymin välimuistin kanssa)" min_post_length: "Viestin merkkien minimimäärä" min_first_post_length: "Ketjun aloitusviestin (leipätekstin) merkkien minimimäärä" - min_private_message_post_length: "Viestin merkkien minimimäärä viesteille" + min_personal_message_post_length: "Viestin merkkien minimimäärä viesteille" max_post_length: "Viestin merkkien minimimäärä" topic_featured_link_enabled: "Ota käyttöön ketjulinkit." show_topic_featured_link_in_digest: "Näytä ketjulinkki tiivistelmäsähköpostissa." min_topic_title_length: "Viestin otsikon merkkien minimimäärä" max_topic_title_length: "Viestin otsikon merkkien maksimimäärä" - min_private_message_title_length: "Viestin otsikon merkkien minimimäärä viestille" + min_personal_message_title_length: "Viestin otsikon merkkien minimimäärä viestille" min_search_term_length: "Haun merkkien minimimäärä" search_tokenize_chinese_japanese_korean: "Pakota haku käsittelemään kiinaa/japania/koreaa myös muunkielisillä sivustoilla" search_prefer_recent_posts: "Jos hakeminen suurelta palstaltasi on hidasta, tämä asetus kokeilee hakemistorakennetta, jossa tuoreimmat viestit ovat ensin" @@ -928,8 +928,8 @@ fi: summary_likes_required: "Montako tykkäystä ketjussa pitää olla, jotta ketjun tiivistelmä otetaan käyttöön" summary_percent_filter: "Kun käyttäjä klikkaa 'Näytä ketjun tiivistelmä', näytä paras % viesteistä" summary_max_results: "Maksimimäärä viestejä, jotka näytetään ketjun tiivistelmässä" - enable_private_messages: "Salli luottamustason 1 (muokattavissa asetuksista) käyttäjien lähettää yksityisviestejä ja vastata viesteihin. Huomaa, että henkilökunta voi aina lähettää viestejä." - enable_private_email_messages: "Salli luottamustason 4 (säädettävissä toisella asetuksella) käyttäjien lähettää yksityisviestitoiminnolla sähköpostia. Huomioi, että henkilökunta voi lähettää riippumatta asetuksista." + enable_personal_messages: "Salli luottamustason 1 (muokattavissa asetuksista) käyttäjien lähettää yksityisviestejä ja vastata viesteihin. Huomaa, että henkilökunta voi aina lähettää viestejä." + enable_personal_email_messages: "Salli luottamustason 4 (säädettävissä toisella asetuksella) käyttäjien lähettää yksityisviestitoiminnolla sähköpostia. Huomioi, että henkilökunta voi lähettää riippumatta asetuksista." enable_long_polling: "Ilmoitusten käyttämä viestiväylä voi käyttää long pollingia" long_polling_base_url: "Base URL, jota käytetään long pollingissa (kun CDN on käytössä, varmista että tähän on asetettu origin pull) esim: http://origin.site.com" long_polling_interval: "Kuinka kauan palvelimen pitäisi odottaa ennen vastaamista asiakkaalle, kun ei ole mitään dataa jota lähettää (vain kirjautuneille käyttäjille)" @@ -1062,7 +1062,7 @@ fi: max_bookmarks_per_day: "Kirjanmerkkien päivittäinen maksimimäärä per käyttäjä." max_edits_per_day: "Muokkausten päivittäinen maksimimäärä per käyttäjä." max_topics_per_day: "Kuinka monta ketjua käyttäjä voi aloittaa päivässä." - max_private_messages_per_day: "Viestien päivittäinen maksimimäärä per käyttäjä." + max_personal_messages_per_day: "Viestien päivittäinen maksimimäärä per käyttäjä." max_invites_per_day: "Maksimimäärä kutsuja, jonka käyttäjä voi lähettää päivässä." max_topic_invitations_per_day: "Maksimimäärä ketjukutsuja, jonka yksittäinen käyttäjä voi lähettää päivässä" max_logins_per_ip_per_hour: "Enimmäismäärä kirjautumisia IP-osoitetta kohden tunnissa" @@ -1133,7 +1133,7 @@ fi: enable_mentions: "Salli käyttäjän mainita toinen käyttäjä." create_thumbnails: "Luo esikatselu- ja lightbox-kuvia, jotka ovat liian suuria mahtuakseen viestiin." email_time_window_mins: "Odota (n) minuuttia ennen ilmoitussähköpostien lähettämistä, jotta käyttäjällä on aikaa muokata ja viimeistellä viestinsä." - private_email_time_window_seconds: "Odota (n) sekuntia ennen sähköposti-ilmoitusten lähettämistä käyttäjille, jotta kirjoittajalla on mahdollisuus tehdä muokkaukset ja viimeistellä viestinsä." + personal_email_time_window_seconds: "Odota (n) sekuntia ennen sähköposti-ilmoitusten lähettämistä käyttäjille, jotta kirjoittajalla on mahdollisuus tehdä muokkaukset ja viimeistellä viestinsä." email_posts_context: "Kuinka monta edellistä vastausta liitetään kontekstiksi sähköposti-ilmoituksessa." flush_timings_secs: "Kuinka usein timing data päivitetään palvelimelle, sekunneissa." title_max_word_length: "Sanan enimmäispituus merkkeinä ketjun otsikossa" @@ -1312,7 +1312,7 @@ fi: watched_words_regular_expressions: "Tarkkaillut sanat ovat säännöllisiä lausekkeita." default_email_digest_frequency: "Kuinka usein käyttäjille lähetetään sähköpostikooste oletuksena." default_include_tl0_in_digests: "Sisällytä uusien käyttäjien viestit sähköpostikoosteisiin oletuksena. Tätä voi muuttaa käyttäjäasetuksissa." - default_email_private_messages: "Lähetä oletuksena sähköposti, kun joku lähettää käyttäjälle viestin." + default_email_personal_messages: "Lähetä oletuksena sähköposti, kun joku lähettää käyttäjälle viestin." default_email_direct: "Lähetä oletuksena sähköposti, kun joku lainaa/vastaa/mainitsee tai kutsuu käyttäjän." default_email_mailing_list_mode: "Lähetä oletuksena sähköposti jokaisesta uudesta viestistä." default_email_mailing_list_mode_frequency: "Postituslistatilassa käyttäjä saa sähköpostia oletuksena näin usein." diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index 7b75135a66..abb5e38a64 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -867,13 +867,13 @@ fr: set_locale_from_accept_language_header: "configurer la langue de l'interface pour les visiteurs à partir des entêtes de langue de leur navigateur. (EXPÉRIMENTAL, ne fonctionne pas avec le cache anonyme)" min_post_length: "Longueur minimale autorisée des messages en nombre de caractères" min_first_post_length: "Longueur minimale d'un premier message (corps de sujet) en nombre de caractères" - min_private_message_post_length: "Longueur minimale des messages en nombre de caractères" + min_personal_message_post_length: "Longueur minimale des messages en nombre de caractères" max_post_length: "Longueur maximale autorisée des messages en nombres de caractères" topic_featured_link_enabled: "Activer la création de sujets avec lien" show_topic_featured_link_in_digest: "Afficher les sujets avec lien dans le résumé par courriel." min_topic_title_length: "Longueur minimale autorisée des titres de sujet en nombre de caractères" max_topic_title_length: "Longueur maximale autorisée des titres de sujet en nombre de caractères" - min_private_message_title_length: "Longueur minimale pour un titre de message en nombre de caractères" + min_personal_message_title_length: "Longueur minimale pour un titre de message en nombre de caractères" min_search_term_length: "Longueur minimale autorisée du texte saisie avant de lancer une recherche en nombre de caractères" search_tokenize_chinese_japanese_korean: "Forcer la tokenisation dans la recherche chinois/japonais/koréen, même sur des sites non-CJK." search_prefer_recent_posts: "Si la recherche dans votre forum est lente, cette option tente l'indéxation des messages les plus récents en premier" @@ -925,7 +925,7 @@ fr: summary_likes_required: "Nombre de J'aime minimum dans un sujet avant que le 'Résumé du sujet' soit activé" summary_percent_filter: "Quand un utilisateur clique sur « Résumer ce sujet », montrer le top % des messages" summary_max_results: "Nombre maximum de messages retournés par « Résumer ce sujet »" - enable_private_messages: "Autoriser les utilisateurs de niveau de confiance 1 à créer des messages et à répondre (configurable via le niveau de confiance minimum pour envoyer des messages). Notez que les responsables peuvent toujours envoyer des messages." + enable_personal_messages: "Autoriser les utilisateurs de niveau de confiance 1 à créer des messages et à répondre (configurable via le niveau de confiance minimum pour envoyer des messages). Notez que les responsables peuvent toujours envoyer des messages." enable_long_polling: "Utiliser les requêtes longues pour le flux de notifications." long_polling_base_url: "Racine de l'URL utilisée pour les requêtes longues (dans le cas de l'utilisation d'un CDN pour fournir du contenu dynamique, pensez à le configurer en mode \"origin pull\") par exemple : http://origin.site.com" long_polling_interval: "Délai d'attente du serveur avant de répondre aux clients lorsqu'il n'y a pas de données à envoyer\n(réservé aux utilisateurs connectés)" @@ -1048,7 +1048,7 @@ fr: max_bookmarks_per_day: "Nombre maximum de signets par utilisateur et par jour." max_edits_per_day: "Nombre maximum de modifications par utilisateur chaque jour." max_topics_per_day: "Nombre maximum de sujet qu'utilisateur peut créer par jour." - max_private_messages_per_day: "Nombre maximum de messages que les utilisateurs peuvent créer chaque jour." + max_personal_messages_per_day: "Nombre maximum de messages que les utilisateurs peuvent créer chaque jour." max_invites_per_day: "Nombre maximum d'invitations qu'un utilisateur peut envoyer par jour." max_topic_invitations_per_day: "Nombre maximum d'invitations à un sujet qu'un utilisateur peut envoyer par jour." max_logins_per_ip_per_hour: "Nombre maximum de connexions autorisées par adresse IP et par heure" @@ -1117,7 +1117,7 @@ fr: max_users_notified_per_group_mention: "Nombre maximum d'utilisateurs qui peuvent recevoir une notification si un groupe est mentionné (si le seuil est atteint, aucune notification ne sera envoyée)" create_thumbnails: "Créer un aperçu pour les images imbriquées qui sont trop large pour le message." email_time_window_mins: "Attendre (n) minutes avant l'envoi des courriels de notification, afin de laisser une chance aux utilisateurs de modifier ou finaliser leurs messages." - private_email_time_window_seconds: "Attendre (n) secondes avant d'envoyer des courriels de notification privés, afin de donner aux utilisateurs la chance d'éditer et de finaliser leurs messages." + personal_email_time_window_seconds: "Attendre (n) secondes avant d'envoyer des courriels de notification privés, afin de donner aux utilisateurs la chance d'éditer et de finaliser leurs messages." email_posts_context: "Combien de réponses précédentes doit-on inclure dans les courriels de notifications pour situer le contexte." flush_timings_secs: "À quelle fréquence les données de timing doivent être vider, en secondes." title_max_word_length: "Le nombre maximum de caractères dans le titre d'un sujet." @@ -1288,7 +1288,7 @@ fr: watched_words_regular_expressions: "Les mots surveillés sont des expressions régulières." default_email_digest_frequency: "Par défaut, à quelle fréquence les utilisateurs reçoivent les résumés par courriel." default_include_tl0_in_digests: "Par défaut, inclure les messages des nouveaux utilisateurs dans les résumés par courriel. Les utilisateurs peuvent changer cela dans leurs préférences." - default_email_private_messages: "Envoyer un courriel quand quelqu'un envoie un message à un utilisateur." + default_email_personal_messages: "Envoyer un courriel quand quelqu'un envoie un message à un utilisateur." default_email_direct: "Envoyer un courriel quand quelqu'un cite/répond à/mentionne ou invite un utilisateur." default_email_mailing_list_mode: "Envoyer un courriel pour chaque nouveau message." default_email_mailing_list_mode_frequency: "Par défaut, les utilisateurs ayant activé la liste de diffusion recevront des courriels à cette fréquence." diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml index d77428c94c..72189b9311 100644 --- a/config/locales/server.gl.yml +++ b/config/locales/server.gl.yml @@ -388,7 +388,7 @@ gl: allow_user_locale: "Permitir os usuarios escoller o idioma da interface" min_post_length: "Número mínimo de caracteres permitido para unha publicación" min_first_post_length: "Número mínimo de caracteres (corpo do tema) permitido para unha primeira publicación" - min_private_message_post_length: "Número mínimo de caracteres permitido para unha mensaxe" + min_personal_message_post_length: "Número mínimo de caracteres permitido para unha mensaxe" max_post_length: "Número máximo de caracteres permitido para unha publicación" post_undo_action_window_mins: "Número de minutos que os usuarios teñen para desfacer accións recentes nunha publicación (gústames, denuncias, etc)." enable_badges: "Activar o sistema de insignias" diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index 67f443f2c1..d96c139fb0 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -849,13 +849,13 @@ he: set_locale_from_accept_language_header: "קבעו את שפת הממשק עבור משתמשים אנונימיים לפי השפה בדפדפן. (נ-י-ס-י-ו-נ-י, לא עובד עם cache אנונימי)" min_post_length: "מספר התווים המותר כאורך מינימלי לפוסט" min_first_post_length: "אורך מינימלי מותר לפוסט ראשון (בגוף הנושא) בתווים " - min_private_message_post_length: "אורך הפוסט המינימלי המותר בתווים להודעות" + min_personal_message_post_length: "אורך הפוסט המינימלי המותר בתווים להודעות" max_post_length: "מספר התווים המקסימלי כאורך פוסט" topic_featured_link_enabled: "איפשור של פרסום קישור עם נושאים." show_topic_featured_link_in_digest: "הצגת קישור מומלץ של הנושא במייל התמצות." min_topic_title_length: "מספר התווים המינימלי הנדרש לכותרת נושא" max_topic_title_length: "מספר התווים המקסימלי המותר לכותרת נושא" - min_private_message_title_length: "אורך הכותרת המנימילי המותר להודעה בתווים" + min_personal_message_title_length: "אורך הכותרת המנימילי המותר להודעה בתווים" min_search_term_length: "מספר התווים המינמלי התקין כאורך מונח לחיפוש" search_tokenize_chinese_japanese_korean: "אלצו את החיפוש לנתח סינית/יפנית/קוריאנית גם באתרים שאינם בשפות אלו" search_prefer_recent_posts: "אם חיפוש בפורום הגדול שלכם איטי, אופציה זו מנסה לאנדקס קודם כל את הפוסטים החדשים יותר" @@ -904,7 +904,7 @@ he: summary_likes_required: "מינימום הלייקים לנושא לפני שהאפשרות \"סיכום נושא זה\" תתאפשר" summary_percent_filter: "כאשר משתמש/ת מקליקים על \"סיכום נושא זה\", הציגו את % הפוסטים הראשונים" summary_max_results: "מספר הפוסטים שיוחזרו באמצעות \"סיכום נושא זה\"" - enable_private_messages: "הרשו למשתמשי רמת אמון 1 (ניתן להגדרה באמצעות רמת אמון מינימלית לשליחת הודעות) ליצור הודעות ולענות להודעות. שימו לב שהצוות תמיד יכול לשלוח הודעות, לא משנה מה." + enable_personal_messages: "הרשו למשתמשי רמת אמון 1 (ניתן להגדרה באמצעות רמת אמון מינימלית לשליחת הודעות) ליצור הודעות ולענות להודעות. שימו לב שהצוות תמיד יכול לשלוח הודעות, לא משנה מה." enable_long_polling: "באס הודעות שמשמש להתראות יכול להשתמש בתשאול ארוך (long polling)" long_polling_base_url: "בסיס ה-URL שנמצא בשימוש עבור long polling (כאשר CDN מחזיר תוכן דינמי, זכרו להגדיר את ערך זה ל-Origin pull, דוגמת http://origin.site.com)" long_polling_interval: "כמות הזמן שהשרת צריך לחכות לפני שעונה ללקוחות, כאשר אין מידע לשליחה (משתמשים רשומים מחוברים למערכת בלבד)" @@ -1027,7 +1027,7 @@ he: max_bookmarks_per_day: "מספר מקסימלי של סימניות למשתמשים ביום." max_edits_per_day: "מספר עריכות מקסימלי מותר למשתמשים ליום." max_topics_per_day: "מספר מקסימלי של נושאים שמשתמשים יכולים ליצור ביום." - max_private_messages_per_day: "מספר מקסימלי של הודעות שמשתמשים יכולים ליצור ביום." + max_personal_messages_per_day: "מספר מקסימלי של הודעות שמשתמשים יכולים ליצור ביום." max_invites_per_day: "מספר מקסימלי של הזמנות שיכולים משתמשים לשלוח ביום." max_topic_invitations_per_day: "מספר מירבי של הזמנות לנושא שמשתמשים יכולים לשלוח ביום. " max_logins_per_ip_per_hour: "מספר מקסימלי של התחברויות מורשות לכל כתובת IP בשעה" @@ -1096,7 +1096,7 @@ he: max_users_notified_per_group_mention: "מספר מקסימלי של משתמשים שיכולים לקבל התראה אם מוזכרת קבוצה (אם מגיעים לסף זה לא תועלה התראה)" create_thumbnails: "יצירת תמונות מוקטנות והארת תמונות גדולות מידי מלהיכלל בפוסט." email_time_window_mins: "המתינו (n) דקות לפני משלוח כל התראת מייל, כדי לאפשר למשתמשים הזדמנות לערוך ולוודא באופן סופי את הפוסטים שלהם." - private_email_time_window_seconds: "המתינו (n) שניות לפני משלוח מיילים אישיים להתראה, על מנת לאפשר למשתמשים לערוך או לתקן את ההודעה." + personal_email_time_window_seconds: "המתינו (n) שניות לפני משלוח מיילים אישיים להתראה, על מנת לאפשר למשתמשים לערוך או לתקן את ההודעה." email_posts_context: "כמה תגובות קודמות יש לכלול כהקשר במיילים עם התראות." flush_timings_secs: "באיזו תדירות אנחנו מזרימים מידע לשרת, בשניות." title_max_word_length: "האורך המקסימלי המותר למילה בכותרת נושא, בתווים. " @@ -1263,7 +1263,7 @@ he: max_allowed_message_recipients: "מספר מקסימלי של נמענים מותר בהודעה." default_email_digest_frequency: "באיזו תדירות משתמשים יקבלו סיכומי מיילים כברירת מחדל." default_include_tl0_in_digests: "כללו פוסטים ממשתמשים חדשים בדוא\"ל מסכם כברירת מחדל. משתמשים יוכלו לשנות זאת בהעדפות האישיות." - default_email_private_messages: "שלח מייל כשמישהו שולח הודעה למשתמש, בתור ברירת מחדל." + default_email_personal_messages: "שלח מייל כשמישהו שולח הודעה למשתמש, בתור ברירת מחדל." default_email_direct: "שלח מייל כשמישהו מצטט/מגיב-ל/מזכיר או מזמין משתמש, בתור ברירת מחדל." default_email_mailing_list_mode: "שלח מייל עבור כל פוסט חדש בתור ברירת מחדל. " default_email_mailing_list_mode_frequency: "משתמשים שאיפשרו את מצב רשימת התפוצה יקבלו מיילים בתדירות זו כברירת מחדל." diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index af3edb7ef8..6f38112031 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -864,13 +864,13 @@ it: set_locale_from_accept_language_header: "imposta la lingua di interfaccia per gli utenti anonimi in base ai language header del loro browser.\n(SPERIMENTALE, non funziona con cache anonima)" min_post_length: "Lunghezza minima dei messaggi in caratteri" min_first_post_length: "Lunghezza minima del primo messaggio (corpo del testo), in caratteri" - min_private_message_post_length: "Lunghezza minima in caratteri per i messaggi" + min_personal_message_post_length: "Lunghezza minima in caratteri per i messaggi" max_post_length: "Lunghezza massima dei messaggi in caratteri" topic_featured_link_enabled: "Abilita la pubblicazione di collegamenti con gli argomenti." show_topic_featured_link_in_digest: "Mostra i collegamenti in primo piano dell'argomento nella email riepilogativa." min_topic_title_length: "Numero minimo di caratteri per i titoli degli argomenti" max_topic_title_length: "Numero massimo di caratteri per i titoli degli argomenti" - min_private_message_title_length: "Numero minimo di caratteri per un messaggio" + min_personal_message_title_length: "Numero minimo di caratteri per un messaggio" min_search_term_length: "Numero minimo di caratteri per le parole cercate" search_tokenize_chinese_japanese_korean: "Attiva la tokenizzazione dei caratteri Cinesi/Giapponesi/Coreani nella ricerca anche sui siti non CJK" search_prefer_recent_posts: "Se il tuo forum è corposo e la ricerca è lenta, questa opzione tenta di indicizzare prima i messaggi più recenti" @@ -925,8 +925,8 @@ it: summary_likes_required: "Minimo numero di \"Mi piace\" in un argomento affinché venga abilitato 'Riassumi Questo Argomento'" summary_percent_filter: "Quando un utente clicca su 'Riassumi Questo Argomento', mostra i primi % messaggi" summary_max_results: "Massimo numero di messaggi mostrati in 'Riassumi Argomento'" - enable_private_messages: "Autorizza gli utenti con livello di esperienza 1 (configurabile attraverso \"min livello di esperienza per l'invio di messaggi\") a creare e rispondere ai messaggi. Nota che lo staff può inviare messaggi in ogni caso." - enable_private_email_messages: "Consenti agli utenti a livello di esperienza 4 (configurabile attraverso \"min trust level to send messages\") di inviare messaggi privati via email . Nota che lo staff può inviare messaggi in ogni caso." + enable_personal_messages: "Autorizza gli utenti con livello di esperienza 1 (configurabile attraverso \"min livello di esperienza per l'invio di messaggi\") a creare e rispondere ai messaggi. Nota che lo staff può inviare messaggi in ogni caso." + enable_personal_email_messages: "Consenti agli utenti a livello di esperienza 4 (configurabile attraverso \"min trust level to send messages\") di inviare messaggi privati via email . Nota che lo staff può inviare messaggi in ogni caso." enable_long_polling: "Il message bus per le notifiche può usare il long polling" long_polling_base_url: "URL di base usato per il long polling (quando una CDN serve contenuto dinamico, bisogna impostarlo come origin pull) es. http://origin.site.com" long_polling_interval: "Tempo di attesa prima che il server risponda ai client che non ci sono dati da trasmettere (solo per utenti autenticati)" @@ -1059,7 +1059,7 @@ it: max_bookmarks_per_day: "Massimo numero di segnalibri per utente al giorno." max_edits_per_day: "Massimo numero di modifiche per utente al giorno." max_topics_per_day: "Massimo numero di argomenti che un utente può creare al giorno." - max_private_messages_per_day: "Numero massimo di messaggi che gli utenti possono creare al giorno." + max_personal_messages_per_day: "Numero massimo di messaggi che gli utenti possono creare al giorno." max_invites_per_day: "Numero massimo di inviti che un utente può inviare in un giorno." max_topic_invitations_per_day: "Numero massimo di inviti ad argomenti che un utente può inviare al giorno." max_logins_per_ip_per_hour: "Numero massimo di accessi consentiti per indirizzo Ip per ora" @@ -1129,7 +1129,7 @@ it: max_users_notified_per_group_mention: "Massimo numero di utenti che possono ricevere una notifica se un gruppo è menzionato (se la soglia è raggiunta, nessuna notifica verrà inviata)" create_thumbnails: "Crea anteprime e lightbox delle immagini che sono troppo grandi per essere contenute in un messaggio." email_time_window_mins: "Aspetta (n) minuti prima di inviare email di notifica, per dare agli utenti la possibilità di modificare e completare i loro messaggi." - private_email_time_window_seconds: "Attendi (n) secondi prima di inviare una notifica privata per email, per dare agli utenti la possibilità di modificare e finalizzare i loro messaggi." + personal_email_time_window_seconds: "Attendi (n) secondi prima di inviare una notifica privata per email, per dare agli utenti la possibilità di modificare e finalizzare i loro messaggi." email_posts_context: "Quante risposte precedenti inserire come contesto nelle email di notifica." flush_timings_secs: "Frequenza di svuotamento dei dati temporali verso il server, in secondi." title_max_word_length: "La lunghezza massima di una parola, in caratteri, nel titolo di un argomento." @@ -1306,7 +1306,7 @@ it: watched_words_regular_expressions: "Le parole osservate sono espressioni regolari." default_email_digest_frequency: "Con quale frequenza gli utenti ricevono email riepilogative di default." default_include_tl0_in_digests: "Per impostazione predefinita, includi i messaggi dei nuovi utenti nelle email riepilogative. Gli utenti possono modificare questa impostazione nelle loro preferenze" - default_email_private_messages: " Invia una email quando qualcuno scrive un messaggio ad un utente di default." + default_email_personal_messages: " Invia una email quando qualcuno scrive un messaggio ad un utente di default." default_email_direct: "Invia una email quando qualcuno cita/risponde/menziona un utente di default." default_email_mailing_list_mode: "Invia una email per ogni nuovo messaggio di default." default_email_mailing_list_mode_frequency: "Con quale frequenza gli utenti che hanno attivato la modalità mailing list riceveranno email di default." diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml index 787fa3dd93..ecdff419af 100644 --- a/config/locales/server.ja.yml +++ b/config/locales/server.ja.yml @@ -552,11 +552,11 @@ ja: allow_user_locale: "ユーザーが言語を選択できるようにする" min_post_length: "投稿を許可する最少の文字数" min_first_post_length: "最初の投稿(投稿本文)を許可する最少の文字数" - min_private_message_post_length: "メッセージに投稿可能な最少の文字数" + min_personal_message_post_length: "メッセージに投稿可能な最少の文字数" max_post_length: "投稿を許可する最大の文字数" min_topic_title_length: "トピックタイトルとして許可する最小の文字数" max_topic_title_length: "トピックタイトルとして許可する最大の文字数" - min_private_message_title_length: "プライベートメッセージのタイトルとして許容する最小の文字数" + min_personal_message_title_length: "プライベートメッセージのタイトルとして許容する最小の文字数" min_search_term_length: "検索ワードとして有効にする最小の文字数" allow_uncategorized_topics: "カテゴリなしのトピック作成を許可するか。警告：未分類のトピックがある場合は、これをオフにする前に、再分類する必要があります。" allow_duplicate_topic_titles: "トピックタイトルの重複を許可" @@ -676,7 +676,7 @@ ja: max_bookmarks_per_day: "ユーザが一日にブックマークできる最大数" max_edits_per_day: "ユーザが一日に編集できる最大数" max_topics_per_day: "ユーザが一日に作成できるトピックの最大数" - max_private_messages_per_day: "ユーザが一日に作成できるメッセージの最大数" + max_personal_messages_per_day: "ユーザが一日に作成できるメッセージの最大数" max_invites_per_day: "ユーザが一日に招待できる最大数" max_topic_invitations_per_day: "ユーザが一日にトピックに招待できる最大数" suggested_topics: "トピック下部に表示されるおすすめトピックの数" diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml index 27f21799fc..ac6ec69c3e 100644 --- a/config/locales/server.ko.yml +++ b/config/locales/server.ko.yml @@ -793,13 +793,13 @@ ko: set_locale_from_accept_language_header: "익명 사용자의 인터페이스 언어를 웹브라우저 언어 헤더를 기준으로 변경하기(실험적인 기능입니다. 익명 cache와 동작하지 않습니다.)" min_post_length: "글의 최소 글자 수" min_first_post_length: "첫 글 (내용)의 최소 길이" - min_private_message_post_length: "메세지 내용의 최소 길이" + min_personal_message_post_length: "메세지 내용의 최소 길이" max_post_length: "글의 최대 글자 수" topic_featured_link_enabled: "토픽에 링크 게시글 달기 활성화" show_topic_featured_link_in_digest: "요약 메일에 토픽 주요 링크 보이게 하기." min_topic_title_length: "글타래 제목의 최소 글자 수" max_topic_title_length: "글타래 제목의 최대 글자 수" - min_private_message_title_length: "메세지 제목의 최소 길이" + min_personal_message_title_length: "메세지 제목의 최소 길이" min_search_term_length: "검색을 하기 위한 최소 글자 수" search_tokenize_chinese_japanese_korean: "CJK(한중일) 설정이 되어 있지 않은 사이트라도, 검색시 한중일 언어를 토크나이징하도록 강제합니다." search_prefer_recent_posts: "이 옵션을 켜면, 포럼이 너무 커서 검색이 느리게 작동할 때 최근의 포스트부터 먼저 검색합니다." @@ -848,7 +848,7 @@ ko: summary_likes_required: "하나의 글타래에 대하여 요약본 보기 모드가 활성화되기 전까지 요구되는 최소 좋아요 수" summary_percent_filter: "요약본 보기를 클릭시, 글 중에 몇 %의 상위 글을 보여줄 것인가?" summary_max_results: "이 주제에 대한 요약 글 최대 갯수" - enable_private_messages: "신뢰도 1 사용자(메시지 전송을 위한 최소 신뢰도로 설정가능)가 메시지를 작성하고 답장을 쓸 수 있도록 허용합니다. 운영진은 언제나 메시지를 보낼 수 있음을 참고하세요." + enable_personal_messages: "신뢰도 1 사용자(메시지 전송을 위한 최소 신뢰도로 설정가능)가 메시지를 작성하고 답장을 쓸 수 있도록 허용합니다. 운영진은 언제나 메시지를 보낼 수 있음을 참고하세요." enable_long_polling: "Message bus used for notification can use long polling" long_polling_base_url: "long polling에 사용 될 Base URL (CDN이 동적 콘텐트를 제공할 시에는 origin pull로 설정) eg: http://origin.site.com" long_polling_interval: "보낼 데이터가 없을 때 응답 전에 서버가 기다려야하는 시간 (로그인된 유저 전용)" @@ -973,7 +973,7 @@ ko: max_bookmarks_per_day: "사용자가 하루동안 할 수 있는 최대 북마크 개수" max_edits_per_day: "사용자가 하루동안 할 수 있는 최대 편집 수" max_topics_per_day: "사용자가 하루동안 생성할 수 있는 최대 글타래 개수" - max_private_messages_per_day: "하루에 유저가 쓸 수 있는 최대 메세지 갯수" + max_personal_messages_per_day: "하루에 유저가 쓸 수 있는 최대 메세지 갯수" max_invites_per_day: "하루에 보낼 수 있는 초대장의 최대치입니다." max_topic_invitations_per_day: "하루에 유저가 최대로 보낼 수 있는 글타래 초대장 수" max_logins_per_ip_per_hour: "시간 당 동일 IP에서 로그인할 수 있는 최대 사용자 수" @@ -1041,7 +1041,7 @@ ko: max_users_notified_per_group_mention: "그룹이 멘션을 받으면 알림을 받는 최대사용자의 수(최대치에 도달하면 알림이 전송되지 않음)" create_thumbnails: "글의 너무 큰 크기의 이미지는 thumnails와 lightbox를 만든다." email_time_window_mins: "알림 메일을 보내기 전 대기 기간(분), 사용자에게 글의 변경하고 완료할 수 있는 기회를 준다." - private_email_time_window_seconds: "사용자가 메시지를 재편집할 기회를 주기 위하여 개인 알림 메일을 보내기 이전에 설정한 시간만큼 대기합니다." + personal_email_time_window_seconds: "사용자가 메시지를 재편집할 기회를 주기 위하여 개인 알림 메일을 보내기 이전에 설정한 시간만큼 대기합니다." email_posts_context: "알림메일의 내용에 추가할 기존 답글 수" flush_timings_secs: "사용자의 이용 시간 데이터를 서버로 보내는 기간(초)" title_max_word_length: "글타래 제목안에 단어들의 최대 길이" diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml index ef38d44f60..ba68114b12 100644 --- a/config/locales/server.nb_NO.yml +++ b/config/locales/server.nb_NO.yml @@ -693,11 +693,11 @@ nb_NO: allow_user_locale: "Tillat brukere å velge eget språk" min_post_length: "Minimum tillatt lengde for innlegg i tegn" min_first_post_length: "Minimum tillatt lengde på for teksten i første innlegg" - min_private_message_post_length: "Minste tillatte innleggslengde for meldinger i antall tegn" + min_personal_message_post_length: "Minste tillatte innleggslengde for meldinger i antall tegn" max_post_length: "Maksimum tillatt lengde for innlegg i tegn" min_topic_title_length: "Minimum tillatt lengde for tittel i tegn" max_topic_title_length: "Maksimum tillatt lengde for innlegg i tegn" - min_private_message_title_length: "Minste antall tegn tillatt til bruk for tittellengde i meldinger" + min_personal_message_title_length: "Minste antall tegn tillatt til bruk for tittellengde i meldinger" min_search_term_length: "Minimum lengde på søkeord i tegn" allow_duplicate_topic_titles: "Tillat flere tråder med identisk tittel." unique_posts_mins: "Hvor mange minutter før en bruker kan lage et innlegg med det samme innholdet igjen" diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml index f486c0f4ca..335e023390 100644 --- a/config/locales/server.nl.yml +++ b/config/locales/server.nl.yml @@ -846,13 +846,13 @@ nl: set_locale_from_accept_language_header: "Taal van interface voor anonieme gebruikers instellen op basis van de taalheaders van hun webbrowser. (EXPERIMENTEEL, werkt niet met anonieme cache)" min_post_length: "Minimaal toegestane lengte van een bericht in tekens" min_first_post_length: "Minimaal toegestane lengte van eerste bericht (topictekst) in tekens" - min_private_message_post_length: "Minimaal toegestane berichtlengte in tekens voor privéberichten" + min_personal_message_post_length: "Minimaal toegestane berichtlengte in tekens voor privéberichten" max_post_length: "Maximaal toegestane lengte van een bericht in tekens" topic_featured_link_enabled: "Plaatsing van een koppeling met topics toestaan" show_topic_featured_link_in_digest: "Koppeling naar aanbevolen topics in de samenvattingsmail tonen" min_topic_title_length: "Minimaal toegestane lengte van een topictitel in tekens" max_topic_title_length: "Maximaal toegestane lengte van een topictitel in tekens" - min_private_message_title_length: "Minimaal toegestane titellengte voor een bericht in tekens" + min_personal_message_title_length: "Minimaal toegestane titellengte voor een bericht in tekens" min_search_term_length: "Minimumlengte van een zoekterm in tekens" search_prefer_recent_posts: "Als doorzoeken van uw grote forum traag werkt, probeert deze optie eerst een index van recentere berichten" search_recent_posts_size: "Het aantal in de index te behouden recente berichten " @@ -897,7 +897,7 @@ nl: summary_likes_required: "Minimale aantal likes in een topic voordat 'Dit topic samenvatten' wordt ingeschakeld" summary_percent_filter: "Wanneer een gebruiker op 'Dit topic samenvatten' klikt, de top % van berichten tonen" summary_max_results: "Maximale aantal getoonde berichten in 'Dit topic samenvatten'" - enable_private_messages: "Gebruikers met vertrouwensniveau 1 (instelbaar via het minimale niveau om berichten te verzenden) toestaan om berichten aan te maken en op berichten te antwoorden. Houd er rekening mee dat stafleden altijd berichten kunnen verzenden." + enable_personal_messages: "Gebruikers met vertrouwensniveau 1 (instelbaar via het minimale niveau om berichten te verzenden) toestaan om berichten aan te maken en op berichten te antwoorden. Houd er rekening mee dat stafleden altijd berichten kunnen verzenden." enable_long_polling: "Gebruikte 'message bus' voor melding kan 'long polling' gebruiken" long_polling_base_url: "Basis-URL voor 'long polling' (als een CDN dynamische inhoud aanbiedt, zorg er dan voor dat dit op 'origin pull' is ingesteld), zoals http://origin.site.com" long_polling_interval: "De hoeveelheid tijd die de server zou moeten wachten voordat het clients beantwoord als er geen data te verzenden is (alleen voor ingelogde gebruikers)" @@ -1000,7 +1000,7 @@ nl: max_bookmarks_per_day: "Maximale aantal bladwijzers per gebruiker per dag." max_edits_per_day: "Maximale aantal bewerkingen per gebruiker per dag." max_topics_per_day: "Maximale aantal topics dat een gebruiker per dag kan plaatsen." - max_private_messages_per_day: "Maximale aantal berichten dat een gebruiker per dag kan plaatsen." + max_personal_messages_per_day: "Maximale aantal berichten dat een gebruiker per dag kan plaatsen." max_invites_per_day: "Maximale aantal uitnodigingen dat een gebruiker per dag kan versturen." max_topic_invitations_per_day: "Maximale aantal uitnodigingen voor een topic dat een gebruiker per dag kan versturen." max_logins_per_ip_per_hour: "Maximale aantal toegestane aanmeldingen per IP-adres per uur" @@ -1180,7 +1180,7 @@ nl: approve_post_count: "Het aantal berichten van een nieuwe of normale gebruiker dat moet worden goedgekeurd" approve_unless_trust_level: "Posts voor gebruikers onder dit vertrouwensniveau moeten worden goedgekeurd" approve_new_topics_unless_trust_level: "Nieuwe topics voor gebruikers onder dit vertrouwensniveau moeten worden goedgekeurd" - default_email_private_messages: "Stuur standaard een e-mail als iemand de gebruiker bericht." + default_email_personal_messages: "Stuur standaard een e-mail als iemand de gebruiker bericht." default_email_direct: "Stuur standaard een e-mail wanneer iemand de gebruiker citeert/beantwoordt/vermeldt of uitnodigt." default_email_mailing_list_mode: "Stuur standaard een email voor elk nieuw bericht." default_email_always: "Standaard een e-mailmelding verzenden, zelfs wanneer de gebruiker actief is" diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index 80e185dc7e..2ab110c644 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -935,13 +935,13 @@ pl_PL: set_locale_from_accept_language_header: "ustaw język interfejsu dla niezalogowanych użytkowników na podstawie języka w nagłówku ich przeglądarki. (EKSPERYMENTALNE, nie działa z anonimowym cache)" min_post_length: "Minimalna długość wpisu w znakach" min_first_post_length: "Minimalna długość treści (liczba znaków) pierwszego wpisu w temacie " - min_private_message_post_length: "Minimalna długość treści wiadomości " + min_personal_message_post_length: "Minimalna długość treści wiadomości " max_post_length: "Maksymalna długość wpisu, w znakach" topic_featured_link_enabled: "Włącz dodawanie linków w tematach." show_topic_featured_link_in_digest: "Pokazuj polecany link tematu w podsumowaniu mailowym." min_topic_title_length: "Minimalna długość tytułu tematu, w znakach" max_topic_title_length: "Maksymalna długość tytułu tematu, w znakach" - min_private_message_title_length: "Minimalna liczba znaków w temacie wiadomości " + min_personal_message_title_length: "Minimalna liczba znaków w temacie wiadomości " min_search_term_length: "Minimalna długość wyszukiwanego tekstu, w znakach" search_tokenize_chinese_japanese_korean: "Wymuś wyszukiwanie żeby tokenizowało Chiński/Japoński/Koreański nawet na stronach nie-CJK" search_prefer_recent_posts: "Jeśli wyszukiwanie na twoim duży forum jest wolne, ta opcja pozwala zaindeskować ostanie posty wpierw." @@ -993,7 +993,7 @@ pl_PL: summary_likes_required: "Minimalna liczba polubień w temacie zanim 'Podsumowanie tematu' jest dostępne" summary_percent_filter: "Gdy użytkownik kliknie na 'Podsumowaniu tematu', pokaż % najlepszych wpisów" summary_max_results: "Maksymalna liczba wpisów w 'Podsumowaniu tematu'" - enable_private_messages: "Zezwalaj użytkownikom o poziomie zaufania 1 (możliwe do zmiany przez min trust level to send messages) na tworzenie wiadomości i odpowiadanie na nie. Zwróć uwagę, że administracja zawsze może wysyłać wiadomości bez względu na wszystko." + enable_personal_messages: "Zezwalaj użytkownikom o poziomie zaufania 1 (możliwe do zmiany przez min trust level to send messages) na tworzenie wiadomości i odpowiadanie na nie. Zwróć uwagę, że administracja zawsze może wysyłać wiadomości bez względu na wszystko." enable_long_polling: "Message bus used for notification can use long polling" long_polling_base_url: "Podstawowy URL używany dla long polling (kiedy CDN dostarcza dynamicznych treści, upewnij się że ustawiłeś to w origin pull) np.: http://origin.site.com" long_polling_interval: "Okres czasu jaki serwer powinien odczekać przed odpowiedzią klientowi kiedy nie ma danych do przesłania (tylko do zalogowanych użytkowników)" @@ -1119,7 +1119,7 @@ pl_PL: max_bookmarks_per_day: "Maksymalna liczba zakładek per użytkownik per dzień." max_edits_per_day: "Maksymalna liczba edycji per użytkownik per dzień." max_topics_per_day: "Maksymalna liczba tematów jakie użytkownik może stworzyć jednego dnia." - max_private_messages_per_day: "Maksymalna liczba wiadomości jakie użytkownik może wysłać jednego dnia." + max_personal_messages_per_day: "Maksymalna liczba wiadomości jakie użytkownik może wysłać jednego dnia." max_invites_per_day: "Maksymalna liczba zaproszeń jakie użytkownik może wysłać jednego dnia." max_topic_invitations_per_day: "Maksymalna dzienna liczba zaproszeń do tematu, jakie może wysłać użytkownik." max_logins_per_ip_per_hour: "Maksymalna liczba logowań dozwolona per adres IP na godzinę" @@ -1188,7 +1188,7 @@ pl_PL: max_users_notified_per_group_mention: "Maksymalna liczba użytkowników, którzy mogą otrzymać powiadomienie jeśli ktoś wspomniał o grupie (jeśli próg został osiągnięty, nie będzie żadnych powiadomień)" create_thumbnails: "Stwórz miniatury i obrazy lightbox, które są za duże, aby pasować do postu." email_time_window_mins: "Odczekaj (n) minut przed wysłaniem maila z powiadomieniem, aby dać użytkownikom szansę na edytowanie i ukończenie postów." - private_email_time_window_seconds: "Poczekaj (n) sekund przed wysłaniem jakichkolwiek prywatnych powiadomień emailem, by dać szansę użytkownikom na edycję i sfinalizowanie ich wiadomości." + personal_email_time_window_seconds: "Poczekaj (n) sekund przed wysłaniem jakichkolwiek prywatnych powiadomień emailem, by dać szansę użytkownikom na edycję i sfinalizowanie ich wiadomości." email_posts_context: "Jak wiele poprzednich wiadomości zawrzeć jako kontekst i emailu powiadamiającym." flush_timings_secs: "W sekundach, jak często wysyłamy dane czasowe na serwer." title_max_word_length: "Maksymalna dozwolona długość słowa, w znakach, jako tytuł tematu." @@ -1356,7 +1356,7 @@ pl_PL: max_allowed_message_recipients: "Maksymalna dozwolona liczba odbiorców dla wiadomości." default_email_digest_frequency: "Domyślnie, jak często użytkownicy otrzymują emaile podsumowujące." default_include_tl0_in_digests: "Domyślnie uwzględniaj posty od nowych użytkowników w podsumowaniach mailowych. Użytkownicy mogą dokonywać zmian w swoich ustawieniach." - default_email_private_messages: "Domyślnie wysyłaj email, gdy użytkownik otrzyma wiadomość." + default_email_personal_messages: "Domyślnie wysyłaj email, gdy użytkownik otrzyma wiadomość." default_email_direct: "Domyślnie wysyłaj email, gdy ktoś zacytuje/odpowie/wspomni lub zaprosi użytkownika." default_email_mailing_list_mode: "Domyślnie wyślij email dla każdego nowego posta." default_email_mailing_list_mode_frequency: "Domyślnie użytkownicy, którzy włączą tryb listy mailingowej będą otrzymywać emaile tak często." diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index e7346ed940..c3a80aebf4 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -781,13 +781,13 @@ pt: set_locale_from_accept_language_header: "defina a língua de interface para utilizadores anónimos com base nos cabeçalhos de língua dos seus navegadores. (EXPERIMENTAL, não funciona com cache anónima)" min_post_length: "Tamanho mínimo permitido por mensagem, em caracteres" min_first_post_length: "Tamanho mínimo permitido para a primeira mensagem (corpo do tópico), em caracteres" - min_private_message_post_length: "Tamanho mínimo permitido para mensagens, em caracteres" + min_personal_message_post_length: "Tamanho mínimo permitido para mensagens, em caracteres" max_post_length: "Tamanho máximo permitido por mensagem, em caracteres" topic_featured_link_enabled: "Permitir publicar uma ligação com tópicos." show_topic_featured_link_in_digest: "Mostrar a ligação destacada do tópico no email de resumo." min_topic_title_length: "Tamanho mínimo permitido por título de cada tópico, em caracteres" max_topic_title_length: "Tamanho máximo permitido por título de cada tópico, em caracteres" - min_private_message_title_length: "Tamanho mínimo permitido por título nas mensagens, em caracteres" + min_personal_message_title_length: "Tamanho mínimo permitido por título nas mensagens, em caracteres" min_search_term_length: "Tamanho mínimo válido para termos de pesquisa, em caracteres" search_tokenize_chinese_japanese_korean: "Forçar pesquisa para atomizar Chinês/Japonês/Coreano mesmo em sites que não sejam CJC" search_prefer_recent_posts: "Se pesquisar no seu fórum vasto é lento, esta opção tenta usar um índex de publicações recentes primeiro" @@ -833,7 +833,7 @@ pt: summary_likes_required: "Número mínimo de gostos num tópico antes que 'Resumir Este Tópico' seja ativo." summary_percent_filter: "Quando um utilizador clica em 'Resumir Este Tópico', mostrar as melhores % de mensagens" summary_max_results: "Número máximo de mensagens devolvidas por 'Resumo deste Tópico'" - enable_private_messages: "Permitir que utilizadores de nível de confiança 1 (configurável através do nível de confiança mínimo para enviar mensagens) criem mensagens e respostas a mensagens. Note que a equipa de apoio pode mandar mensagens de qualquer maneira." + enable_personal_messages: "Permitir que utilizadores de nível de confiança 1 (configurável através do nível de confiança mínimo para enviar mensagens) criem mensagens e respostas a mensagens. Note que a equipa de apoio pode mandar mensagens de qualquer maneira." enable_long_polling: "O sistema de mensagens usado para notificações pode fazer solicitações longas" long_polling_base_url: "URL base usada para solicitação ao servidor (quando um CDN serve conteúdo dinâmico, certifique-se de configurá-lo para a 'pull' original) ex: http://origem.sítio.com" long_polling_interval: "Quantidade de tempo que um servidor deve esperar antes de notificar os clientes quando não há dados para serem enviados (apenas utilizadores ligados)" @@ -949,7 +949,7 @@ pt: max_bookmarks_per_day: "Número máximo de marcadores por utilizador por dia." max_edits_per_day: "Número máximo de edições por utilizador por dia." max_topics_per_day: "Número máximo de tópicos que um utilizador pode criar por dia." - max_private_messages_per_day: "Número máximo de mensagens que os utilizadores podem criar por dia." + max_personal_messages_per_day: "Número máximo de mensagens que os utilizadores podem criar por dia." max_invites_per_day: "Número máximo de convites que um utilizador pode enviar por dia." max_topic_invitations_per_day: "Número máximo de convites para tópicos que um utilizador pode enviar por dia." alert_admins_if_errors_per_minute: "Número de erros por minuto necessários para disparar um alerta de administração. Um valor maior que 0 desativa esta funcionalidade. NOTA: requer reinício." @@ -1013,7 +1013,7 @@ pt: max_users_notified_per_group_mention: "Número máximo de utilizadores que podem receber uma notificação se um grupo é mencionado (se o limite é atingido nenhuma notificação será levantada)" create_thumbnails: "Criar imagens miniatura e lightbox que são demasiado largas para caber numa mensagem." email_time_window_mins: "Esperar (n) minutos antes de enviar quaisquer emails de notificação, para dar aos utilizadores a hipótese de editarem e finalizarem as suas mensagens." - private_email_time_window_seconds: "Espere (n) segundos antes de enviar emails de notificação privados, para dar aos utilizadores a oportunidade de editar e finalizar as suas mensagens." + personal_email_time_window_seconds: "Espere (n) segundos antes de enviar emails de notificação privados, para dar aos utilizadores a oportunidade de editar e finalizar as suas mensagens." email_posts_context: "Quantas respostas prévias a serem incluídas como contexto em emails de notificação." flush_timings_secs: "Com que frequência o servidor é alimentado com dados de sincronização, em segundos." title_max_word_length: "Tamanho máximo permitido de comprimento de palavras, em caracteres, no título de um tópico." @@ -1170,7 +1170,7 @@ pt: code_formatting_style: "Botão de código no compositor por defeito usa este estilo de formatação" default_email_digest_frequency: "Por defeito, quantas frequentemente os utilizadores recebem emails de resumo." default_include_tl0_in_digests: "Incluir publicações de novos utilizadores nos emails de resumo por defeito. Utilizadores podem alterar isto nas suas preferências." - default_email_private_messages: "Por defeito, enviar um email quando alguém envia mensagens ao utilizador." + default_email_personal_messages: "Por defeito, enviar um email quando alguém envia mensagens ao utilizador." default_email_direct: "Por defeito, enviar um email quando alguém cita/responde a/menciona ou convida o utilizador." default_email_mailing_list_mode: "Por defeito, enviar um email por cada nova mensagem." default_email_mailing_list_mode_frequency: "Utilizadores que activem o modo de lista de distribuição receberão, por omissão, emails com esta frequência." diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index d8f6f1a75a..575a863b2c 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -793,11 +793,11 @@ pt_BR: set_locale_from_accept_language_header: "define a língua da interface para os usuários anônimos de acordo com os cabeçalhos de língua de seus navegadores. (EXPERIMENTAL, não funciona com cache anônimo)" min_post_length: "Comprimento mínimo permitido do post em caracteres" min_first_post_length: "Comprimento mínimo de caracteres permitido para primeira mensagem (corpo do tópico)" - min_private_message_post_length: "Comprimento mínimo de caracteres permitido para mensagens" + min_personal_message_post_length: "Comprimento mínimo de caracteres permitido para mensagens" max_post_length: "Comprimento máximo permitido para o post em caracteres" min_topic_title_length: "Comprimento mínimo permitido para o título do post em caracteres" max_topic_title_length: "Comprimento máximo permitido para o título do post em caracteres" - min_private_message_title_length: "Comprimento mínimo de caracteres permitido para o título de uma mensagem" + min_personal_message_title_length: "Comprimento mínimo de caracteres permitido para o título de uma mensagem" min_search_term_length: "Comprimento mínimo válido para o termo de pesquisa em caracteres" search_tokenize_chinese_japanese_korean: "Força a busca a tokenizar Mandarim/Japonês/Coreano até para sites que não são nesses idiomas" search_prefer_recent_posts: "Se buscar o seu fórum está lento, essa opção tenta indexar as publicações mais recentes primeiro" @@ -843,7 +843,7 @@ pt_BR: summary_likes_required: "Curtidas mínimas em um tópico antes de 'Resumir este tópico, ficar habilitado" summary_percent_filter: "Quando um usuário clicar em 'Resumor este tópico', mostrar os melhores % mensagens" summary_max_results: "Máximo número de posts quando resumidos por Categoria " - enable_private_messages: "Permitir que usuários de nível de confiança 1 (configurável via o nível mínimo de confiança para enviar mensagens) criem e respondam a mensagens. Note que a equipe sempre pode enviar mensagens, independente do caso." + enable_personal_messages: "Permitir que usuários de nível de confiança 1 (configurável via o nível mínimo de confiança para enviar mensagens) criem e respondam a mensagens. Note que a equipe sempre pode enviar mensagens, independente do caso." enable_long_polling: "O sistema de mensagens das notificações pode fazer solicitações longas." long_polling_base_url: "URL Utilizada para \"long polling\" ( Quando um CDN for configurado, tenha certeza que essa configuração seja a padrão) ex: http://origin.site.com" long_polling_interval: "Tempo que o servidor deve aguardar antes de responder quando não existe nenhum dado para ser enviado. (apenas usuários logados)" @@ -957,7 +957,7 @@ pt_BR: max_bookmarks_per_day: "Número máximo de novos favoritos por usuário por dia." max_edits_per_day: "Número máximo de edições que um usuário pode fazer por dia." max_topics_per_day: "Número máximo de postagens que um usuário pode criar por dia." - max_private_messages_per_day: "Máximo número de mensagens que usuários podem criar por dia." + max_personal_messages_per_day: "Máximo número de mensagens que usuários podem criar por dia." max_invites_per_day: "Número máximo de convites que um usuário pode enviar por dia." max_topic_invitations_per_day: "Número máximo de convites para tópicos que um usuário pode enviar por dia." alert_admins_if_errors_per_minute: "Número de erros por minutos para desencadear um alerta aos administradores. Um valor igual a 0 desabilita esse recurso. NOTA: requer reinicialização." diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml index 5764c9fb1d..c0ce72e49e 100644 --- a/config/locales/server.ro.yml +++ b/config/locales/server.ro.yml @@ -789,13 +789,13 @@ ro: set_locale_from_accept_language_header: "setează limba interfeței pentru utilizatorii anonimi pe baza header-elor de limbă ale web browser-elor lor. (EXPERIMENTAL, nu funcționează cu cache anonim)" min_post_length: "Lungimea minimă a postării, în caractere" min_first_post_length: "Numărul minim de caractere permis pentru prima postare (în corpul mesajului)" - min_private_message_post_length: "Numărul minim de caractere permis pentru mesaje, per postare" + min_personal_message_post_length: "Numărul minim de caractere permis pentru mesaje, per postare" max_post_length: "Lungimea maximă permisă a postării, în caractere" topic_featured_link_enabled: "Activează postarea unui link cu subiecte." show_topic_featured_link_in_digest: "Arată link-ul promovat al subiectului în rezumatul pe email." min_topic_title_length: "Minimul de caractere permis în titlul unui subiect" max_topic_title_length: "Maximul de caractere permis în titlul unui subiect" - min_private_message_title_length: "Numărul minim de caractere permis în titlul unui mesaj" + min_personal_message_title_length: "Numărul minim de caractere permis în titlul unui mesaj" min_search_term_length: "Lungimea minimă a unui termen de căutare valid, în caractere." search_tokenize_chinese_japanese_korean: "Forțează căutarea să utilizeze tokens chineză/japoneză/coreană chiar și pe site-uri care nu sunt CJK." search_prefer_recent_posts: "Dacă ai un forum mare și căutarea este prea lentă, această opțiune încearcă să indexeze mai multe postări recente întâi." @@ -841,7 +841,7 @@ ro: summary_likes_required: "Minimul de aprecieri într-un subiect înainte de a se activa 'Rezumă acest subiect'." summary_percent_filter: "Când un utilizator face click pe 'Rezumatul acestui subiect', arată primele % de postări" summary_max_results: "Numărul maxim de postări returnate de \"Rezumatul acestui subiect\"" - enable_private_messages: "Acordă nivelul de încredere 1 (configurabil via nivel minim de încredere pentru trimiterea de mesaje) utilizatorilor, pentru a le permite să creeze și să răspundă la mesaje. Atenție: echipa poate oricând să trimită mesaje, indiferent de setări." + enable_personal_messages: "Acordă nivelul de încredere 1 (configurabil via nivel minim de încredere pentru trimiterea de mesaje) utilizatorilor, pentru a le permite să creeze și să răspundă la mesaje. Atenție: echipa poate oricând să trimită mesaje, indiferent de setări." enable_long_polling: "Bus-ul de mesaje folosit pentru notificări poate utiliza long polling." long_polling_base_url: "URL de bază folosit pentru long polling (atunci când un CDN servește conținut dinamic, asigură-te că setezi asta pe origin pull) ex: http://origin.site.com" long_polling_interval: "Durata cât serverul va trebui să aștepte înainte de a răspunde clienților atunci când nu există date de trimis (exclusiv utilizatori autentificați)" @@ -958,7 +958,7 @@ ro: max_bookmarks_per_day: "Numărul maxim zilnic de semne de carte per utilizator." max_edits_per_day: "Numărul maxim zilnic de editări per utilizator." max_topics_per_day: "Numărul maxim de subiecte pe care un utilizator le poare crea zilnic." - max_private_messages_per_day: "Număr maxim de mesaje pe care utilizatorii le pot crea pe zi." + max_personal_messages_per_day: "Număr maxim de mesaje pe care utilizatorii le pot crea pe zi." max_invites_per_day: "Număr maxim de invitații pe care un utilizator le poate trimite pe zi." max_topic_invitations_per_day: "Numărul maxim de invitații la subiect pe care un utilizator le poate trimite pe zi." alert_admins_if_errors_per_minute: "Numărul de erori pe minut la care să se declanșeze o alerta admin. Valoarea 0 dezactivează această funcționalitate. NOTĂ: necesită restart." @@ -1022,7 +1022,7 @@ ro: max_users_notified_per_group_mention: "Numărul maxim de utilizatori care pot primi o notificare dacă un grup este menționat (dacă pragul este atins, nici o notificare nu va fi trimisă)" create_thumbnails: "Creează previzualizări de tipul thumbnail și lightbox ale imaginilor ce sunt prea mari să încapă într-o postare." email_time_window_mins: "Așteaptă (n) minute până să trimiți un email de notificare, pentru a da utilizatorilor șansa să-și editeze și să-și finalizeze postările." - private_email_time_window_seconds: "Așteaptă (n) secunde înainte de a trimite emailuri de notificare privată, pentru a-i da utilizatorului șansa să își editeze sau finalizeze mesajele." + personal_email_time_window_seconds: "Așteaptă (n) secunde înainte de a trimite emailuri de notificare privată, pentru a-i da utilizatorului șansa să își editeze sau finalizeze mesajele." email_posts_context: "Câte răspunsuri precedente să fie incluse drept context în email-urile de notificare." flush_timings_secs: "Cât de frecvent se resetează datele legate de timp de pe server, în secunde." title_max_word_length: "Numărul maxim de caractere din titlul unui subiect." @@ -1178,7 +1178,7 @@ ro: code_formatting_style: "Butonul Cod din cadrul editorului va fi setat cu opțiunea implicită pe acest stil de formatare cod " default_email_digest_frequency: "Frecvența implicită cu care utilizatorii primesc emailuri-rezumat." default_include_tl0_in_digests: "Implicit, include postări de la utilizatori noi în emailurile-rezumat. Utilizatorii pot schimba această opțiune din preferințele lor." - default_email_private_messages: "Implicit, trimite un email atunci când cineva trimite un mesaj unui utilizator." + default_email_personal_messages: "Implicit, trimite un email atunci când cineva trimite un mesaj unui utilizator." default_email_direct: "Implicit, trimite un mesaj când cineva citează/răspunde/menționează sau invită un utilizator." default_email_mailing_list_mode: "Implicit, trimite un email pentru fiecare nou mesaj." default_email_mailing_list_mode_frequency: "Implicit, utilizatorii care activează modul mailing list vor primi emailuri cu această frecvență." diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml index ffa033217b..e82b9ec4c3 100644 --- a/config/locales/server.ru.yml +++ b/config/locales/server.ru.yml @@ -830,12 +830,12 @@ ru: allow_user_locale: "Позволять пользователям выбирать язык интерфейса" min_post_length: "Минимально допустимое количество символов в одном сообщении." min_first_post_length: "Минимально допустимое количество символов в первом сообщении (или теле темы)" - min_private_message_post_length: "Минимально допустимое количество символов в сообщении в беседе." + min_personal_message_post_length: "Минимально допустимое количество символов в сообщении в беседе." max_post_length: "Максимально допустимое количество символов в одном сообщении." topic_featured_link_enabled: "Разрешить публиковать ссылку с темами." min_topic_title_length: "Минимально допустимое количество символов в названии темы." max_topic_title_length: "Максимально допустимое количество символов в названии темы." - min_private_message_title_length: "Минимально допустимое количество символов в заголовке сообщения в беседе." + min_personal_message_title_length: "Минимально допустимое количество символов в заголовке сообщения в беседе." min_search_term_length: "Минимальное количество символов в поисковом запросе." allow_duplicate_topic_titles: "Разрешить создание тем с одинаковыми названиями." unique_posts_mins: "Количество минут до того, как пользователь сможет разместить сообщение с тем же содержанием." @@ -952,7 +952,7 @@ ru: max_bookmarks_per_day: "Максимальное количество созданных закладок пользователем в день." max_edits_per_day: "Максимальное количество редактирований пользователем в день." max_topics_per_day: "Максимальное количество тем, которые пользователь может создать за один день." - max_private_messages_per_day: "Максимальное количество тем, которые пользователь может создать за один день." + max_personal_messages_per_day: "Максимальное количество тем, которые пользователь может создать за один день." max_invites_per_day: "Максимальное количество приглашений, которое может отправить пользователь за один день." max_topic_invitations_per_day: "Максимальное количество приглашений в тему, которое может отправить пользователь в течении дня." alert_admins_if_errors_per_minute: "Количество ошибок в минуту для предупреждения администратора. Значение 0 отключает эту опцию. ВНИМАНИЕ: требуется перезагрузка." @@ -1105,7 +1105,7 @@ ru: emoji_set: "Какую коллекцию Emoji использовать?" enforce_square_emoji: "Принудительно использовать квадратный формат для всех смайлов." approve_unless_trust_level: "Сообщения для пользователей ниже этого уровня доверия подлежат проверки" - default_email_private_messages: "По умолчанию присылать почтовое уведомление, когда кто-то оставляет пользователю личное сообщение." + default_email_personal_messages: "По умолчанию присылать почтовое уведомление, когда кто-то оставляет пользователю личное сообщение." default_email_mailing_list_mode: "По умолчанию присылать почтовое уведомление, когда появляется новое сообщение." default_other_external_links_in_new_tab: "По умолчанию открывать внешние ссылки в новой вкладке." default_other_dynamic_favicon: "Показывать количество новых/обновлённых тем на иконке веб-браузера по умолчанию." diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml index d300784b05..91194d8d50 100644 --- a/config/locales/server.sk.yml +++ b/config/locales/server.sk.yml @@ -731,11 +731,11 @@ sk: allow_user_locale: "Povoliť používateľom zvoliť si vlastný jazyk" min_post_length: "Minimálny povolený počet znakov v príspevkoch" min_first_post_length: "Minimálny povolený počet znakov pre prvý príspevok (obsah témy)" - min_private_message_post_length: "Minimálny povolený počet znakov v správe" + min_personal_message_post_length: "Minimálny povolený počet znakov v správe" max_post_length: "Maximálny povolený počet znakov v príspevkoch" min_topic_title_length: "Minimálny povolený počet znakov v názve témy" max_topic_title_length: "Maximálny povolený počet znakov v názve témy" - min_private_message_title_length: "Minimálny povolený počet znakov v správe" + min_personal_message_title_length: "Minimálny povolený počet znakov v správe" min_search_term_length: "Minimálny povolený počet znakov vo vyhľadávaní" search_tokenize_chinese_japanese_korean: "Prinúť vyhľádávanie rozložiť Čínštinu/Japončinu/Kórejčinu dokonca i pre nie CJK stránky" allow_uncategorized_topics: "Pvoliť vytváranie tém bez kategórií. UPOZORNENIE: Pokiaľ existujú nekategorizované témy, musíte ich zaradiť do kategórii skôr než túto možnosť vypnete." @@ -870,7 +870,7 @@ sk: max_bookmarks_per_day: "Maximálny počet záložiek na jedného používateľa denne." max_edits_per_day: "Maximálny počet úprav používateľa denne." max_topics_per_day: "Maximálny počet tém používateľa denne." - max_private_messages_per_day: "Maximálny počet správ ktoré môže používateľ denne vytvoriť." + max_personal_messages_per_day: "Maximálny počet správ ktoré môže používateľ denne vytvoriť." max_invites_per_day: "Maximálny počet pozvánok ktoré môže používateľ denne zaslať." max_topic_invitations_per_day: "Maximálny počet pozvánok do tém ktoré môže používateľ denne zaslať." suggested_topics: "Zobrazovaný počet navrhovaných tém na konci témy." @@ -1029,7 +1029,7 @@ sk: approve_unless_trust_level: "Príspevky používateľov pod touto úrovňou důvery musia byť schválené" auto_close_messages_post_count: "Maximálny počet povolených príspevkov v správe kým je automaticky uzavretá (0 znamená vypnuté)" auto_close_topics_post_count: "Maximálny počet povolených príspevkov v téme kým je automaticky uzavretá (0 znamená vypnuté)" - default_email_private_messages: "Štandardne poslať email použivateľovi, ktorému niekto poslal správu." + default_email_personal_messages: "Štandardne poslať email použivateľovi, ktorému niekto poslal správu." default_email_direct: "Štandardne poslať email ak niekto cituje/odpovedá na/zmieni alebo pozve používateľa." default_email_mailing_list_mode: "Štandardne poslať email pre každý nový príspevok." default_email_always: "Štandardne poslať emailovú správu dokonca i vtedy, ak je používateľ aktívny." diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml index 537722da2d..d71d4083fa 100644 --- a/config/locales/server.sq.yml +++ b/config/locales/server.sq.yml @@ -546,11 +546,11 @@ sq: allow_user_locale: "Allow users to choose their own language interface preference" min_post_length: "Minimum allowed post length in characters" min_first_post_length: "Minimum allowed first post (topic body) length in characters" - min_private_message_post_length: "Minimum allowed post length in characters for messages" + min_personal_message_post_length: "Minimum allowed post length in characters for messages" max_post_length: "Maximum allowed post length in characters" min_topic_title_length: "Minimum allowed topic title length in characters" max_topic_title_length: "Maximum allowed topic title length in characters" - min_private_message_title_length: "Minimum allowed title length for a message in characters" + min_personal_message_title_length: "Minimum allowed title length for a message in characters" min_search_term_length: "Minimum valid search term length in characters" allow_uncategorized_topics: "Allow topics to be created without a category. WARNING: If there are any uncategorized topics, you must recategorize them before turning this off." allow_duplicate_topic_titles: "Allow topics with identical, duplicate titles." @@ -671,7 +671,7 @@ sq: max_bookmarks_per_day: "Maximum number of bookmarks per user per day." max_edits_per_day: "Maximum number of edits per user per day." max_topics_per_day: "Maximum number of topics a user can create per day." - max_private_messages_per_day: "Maximum number of messages users can create per day." + max_personal_messages_per_day: "Maximum number of messages users can create per day." max_invites_per_day: "Maximum number of invites a user can send per day." max_topic_invitations_per_day: "Maximum number of topic invitations a user can send per day." suggested_topics: "Number of suggested topics shown at the bottom of a topic." diff --git a/config/locales/server.sr.yml b/config/locales/server.sr.yml index 4d988855b4..a5ff51bc38 100644 --- a/config/locales/server.sr.yml +++ b/config/locales/server.sr.yml @@ -118,7 +118,7 @@ sr: site_settings: min_topic_title_length: "Minimalna dozvoljena dužina naslova teme u znakovima" max_topic_title_length: "Maksimalna dozvoljena dužina naslova teme u znakovima" - min_private_message_title_length: "Minimalna dozvoljena dužina naslova poruke u znakovima" + min_personal_message_title_length: "Minimalna dozvoljena dužina naslova poruke u znakovima" min_search_term_length: "Minimalna dozvoljena dužina termina za pretragu u znakovima" apple_touch_icon_url: "Ikonica koja se koristi za Apple touch uređaje. Preporučena veličina 144px sa 144px." max_replies_in_first_day: "Maksimalan broj odgovora koje korisnik može da kreira u prvih 24 sata nakon kreiranja svoje prve poruke." diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml index 4074488961..fe5e079574 100644 --- a/config/locales/server.sv.yml +++ b/config/locales/server.sv.yml @@ -736,13 +736,13 @@ sv: set_locale_from_accept_language_header: "sätt gränssnittets språk för anonyma användare från deras webbläsares rubriks språk. (EXPERIMENTELLT, det fungerar inte med anonym cache)" min_post_length: "Minsta tillåtna inläggslängd i antal tecken" min_first_post_length: "Lägsta antal tillåtna tecken i första inlägget (ämnestext)" - min_private_message_post_length: "Lägst antal tillåtna tecken i inlägg för meddelanden" + min_personal_message_post_length: "Lägst antal tillåtna tecken i inlägg för meddelanden" max_post_length: "Högsta tillåtna längd på inlägg i antal tecken" topic_featured_link_enabled: "Möjliggör att lägga upp en länk med ämnen." show_topic_featured_link_in_digest: "Visa ämnet i skiss länken som fanns i det nerkortade emailet." min_topic_title_length: "Lägsta tillåtna längd på ämnesrubrik i antal tecken" max_topic_title_length: "Högsta tillåtna längd på ämnesrubrik i antal tecken" - min_private_message_title_length: "Lägst tillåtna längd på rubrik för ett meddelande i antal tecken" + min_personal_message_title_length: "Lägst tillåtna längd på rubrik för ett meddelande i antal tecken" min_search_term_length: "Lägsta giltiga teckenlängd på sökterm" search_tokenize_chinese_japanese_korean: "Framtvinga sökning för att tokenisera kinesiska/japanska/koreanska även på webbplatser som inte är på dessa språk" search_prefer_recent_posts: "Om sökningar på ditt stora forum går långsamt, försök detta alternativ som är ett index av de senaste inläggen först." @@ -787,7 +787,7 @@ sv: summary_likes_required: "Minsta antal gillningar i ett ämne innan 'Sammanfatta det här ämnet' möjliggörs" summary_percent_filter: "Visa högsta % av inläggen när en användare bockar i 'Sammanfatta det här ämnet'" summary_max_results: "Maximalt antal inlägg som returneras av 'Sammanfatta det här ämnet'" - enable_private_messages: "Tillåt användare med förtroendenivå 1 (konfigurera via minsta förtroendenivå för att skicka meddelanden) att skapa meddelanden och svara på meddelanden. Notera att personalen oavsett alltid kan skicka meddelanden. " + enable_personal_messages: "Tillåt användare med förtroendenivå 1 (konfigurera via minsta förtroendenivå för att skicka meddelanden) att skapa meddelanden och svara på meddelanden. Notera att personalen oavsett alltid kan skicka meddelanden. " enable_long_polling: "Meddelande-buss som används för notifiering kan använda long polling" long_polling_base_url: "URL som används för long polling (när en CDN levererar dynamiskt innehåll, kontrollera att det här är inställt till origin pull) se: http://origin.site.com" long_polling_interval: "Tid som servern bör vänta innan den svarar på klienter när det inte finns någon data att skicka (endast loggad på användare)" @@ -901,7 +901,7 @@ sv: max_bookmarks_per_day: "Max antal bokmärken per användare och dag." max_edits_per_day: "Max antal redigeringar per användare och dag." max_topics_per_day: "Max antal ämnen en användare kan skapa per dag." - max_private_messages_per_day: "Max antal meddelanden användare kan skapa per dag." + max_personal_messages_per_day: "Max antal meddelanden användare kan skapa per dag." max_invites_per_day: "Max antal inbjudningar en användare kan skicka per dag." max_topic_invitations_per_day: "Max antal ämnesinbjudningar en användare kan skicka per dag." alert_admins_if_errors_per_minute: "Antal felindikeringar per minut för att utlösa ett administratörslarm. Ange 0 för att inaktivera den här funktionen. OBS: kräver omstart." @@ -963,7 +963,7 @@ sv: max_users_notified_per_group_mention: "Maximalt antal användare som kan få ett meddelande om en grupp anges (om tröskeln är uppfyllt kommer inga meddelande att skickas)" create_thumbnails: "Skapa miniatyrer och \"lightboxa\" bilder som är för stora för att passa in i ett inlägg." email_time_window_mins: "Vänta (n) minuter innan något notifikationsmejl skickas ut, för att ge användare chansen att redigera och slutföra deras inlägg." - private_email_time_window_seconds: "Vänta (n) sekunder innan någon privat e-postnotifikation skickas ut för att ge användare chansen att redigera och slutföra deras meddelande." + personal_email_time_window_seconds: "Vänta (n) sekunder innan någon privat e-postnotifikation skickas ut för att ge användare chansen att redigera och slutföra deras meddelande." email_posts_context: "Hur många tidigare svar som ska inkluderas som kontext i e-postnotifikationer." flush_timings_secs: "Hur frekvent vi spolar tidsdata till servern, i sekunder." title_max_word_length: "Den maximala tillåtna ordlängden, i tecken, i ett ämnes rubrik." @@ -1119,7 +1119,7 @@ sv: code_formatting_style: "Kodknappen i redigeraren kommer att använda den här kodformatteringsstilen som standard" default_email_digest_frequency: "Standardinställning för hur ofta användare mottar e-postsammanfattningar." default_include_tl0_in_digests: "Standardinställning för hur ofta nya användare får e-postsammanfattningar. Användare kan ändra det i sina inställningar." - default_email_private_messages: "Ange standardinställningen till att skicka ett e-post när någon skickar användaren ett meddelande." + default_email_personal_messages: "Ange standardinställningen till att skicka ett e-post när någon skickar användaren ett meddelande." default_email_direct: "Ange standardinställningen till att skicka ett e-post när någon citerar/svarar/nämner eller bjuder in användaren." default_email_mailing_list_mode: "Ange standardinställningen till att skicka ett e-post för varje nytt inlägg." default_email_mailing_list_mode_frequency: "Standardinställning för hur ofta användare som aktiverar utskicksläge kommer att motta e-post." diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml index 2d49802ea4..472a752b7e 100644 --- a/config/locales/server.tr_TR.yml +++ b/config/locales/server.tr_TR.yml @@ -641,11 +641,11 @@ tr_TR: set_locale_from_accept_language_header: "anonim kullanıcıların arayüz dilini tarayıcılarının dil başlığından al. (DENEYSELDİR, anonim önbellek ile çalışmaz)" min_post_length: "Gönderide olması gereken en az karakter sayısı" min_first_post_length: "İlk gönderi için (konu içi) izin verilen en az karakter sayısı" - min_private_message_post_length: "İleti gönderileri için izin verilen en az karakter sayısı" + min_personal_message_post_length: "İleti gönderileri için izin verilen en az karakter sayısı" max_post_length: "Gönderide izin verilen en fazla karakter sayısı" min_topic_title_length: "Konuda olması gereken en az karakter sayısı" max_topic_title_length: "Konu başlığında izin verilen en fazla karakter sayısı" - min_private_message_title_length: "İleti başlıkları için izin verilen en az karakter sayısı" + min_personal_message_title_length: "İleti başlıkları için izin verilen en az karakter sayısı" min_search_term_length: "Arama için girilecek kelimede olması gereken en az karakter sayısı" search_tokenize_chinese_japanese_korean: " CJK olmayan siteler dahil, -Çince/Japonca/Korece için aramayı bilgileri sıfırlamaya zorla" search_prefer_recent_posts: "Eğer büyük forumunuzda arama yavaş ise, bu seçenek daha yeni gönderilerin dizine eklenmesini deneyecek" @@ -689,7 +689,7 @@ tr_TR: summary_likes_required: "'Bu Konuyu Özetle'nin etkinleştirilmesi için konuda olması gereken en az beğeni sayısı" summary_percent_filter: "Kullanıcı 'Bu Konuyu Özetle'ye tıkladığında, gönderinin ilk % kısmını göster" summary_max_results: "'Bu Konuyu Özetle'den dönen en fazla gönderi sayısı" - enable_private_messages: "Güven seviyesi 1'e(özel ileti göndermek için en az seviye ayarıyla belirlenebilir) sahip kullanıcıların ileti oluşturup cevaplamasına izin ver. Görevliler her durumda ileti gönderebilir." + enable_personal_messages: "Güven seviyesi 1'e(özel ileti göndermek için en az seviye ayarıyla belirlenebilir) sahip kullanıcıların ileti oluşturup cevaplamasına izin ver. Görevliler her durumda ileti gönderebilir." enable_long_polling: "Bildiri için kullanılan ileti yolu uzun sorgular yapabilir" long_polling_base_url: "Uzun sorgular için kullanılan baz URL (CDN dinamik içerik sunuyorsa, bunu origin olarak ayarladığına emin ol) ör: http://origin.site.com" long_polling_interval: "Gönderilecek bilgi olmadığı zaman sunucunun kullanıcılara geri dönmeden önce beklemesi gereken zaman (sadece giriş yapmış kullanıcın için)" @@ -794,7 +794,7 @@ tr_TR: max_bookmarks_per_day: "Kullanıcı başına düşen günlük en fazla imleme sayısı." max_edits_per_day: "Bir günde, bir kullanıcının yapabileceği en fazla düzenleme sayısı." max_topics_per_day: "Bir günde, bir kullanıcının oluşturabileceği en fazla konu sayısı." - max_private_messages_per_day: "Bir günde kullanıcıların oluşturabileceği en fazla ileti sayısı" + max_personal_messages_per_day: "Bir günde kullanıcıların oluşturabileceği en fazla ileti sayısı" max_invites_per_day: "Bir günde, bir kullanıcının yollayabileceği en fazla davet sayısı." max_topic_invitations_per_day: "Bir günde, bir kullanıcının yollayabileceği en fazla başlık daveti sayısı." categories_topics: "/categories sayfasında gösterilecek olan konu sayısı." @@ -970,7 +970,7 @@ tr_TR: enforce_square_emoji: "Tüm emojileri kare en-boy oranına zorla" approve_unless_trust_level: "Bu güven seviyesi altındaki kullanıcılardan gelen gönderilerin onaylanması gerekir" default_email_digest_frequency: "Öntanımlı olarak kullanıcılar ne sıklıkla e-posta özeti alacak." - default_email_private_messages: "Öntanımlı olarak birisi bir kullanıcıya ileti attığında e-posta gönder." + default_email_personal_messages: "Öntanımlı olarak birisi bir kullanıcıya ileti attığında e-posta gönder." default_email_direct: "Öntanımlı olarak birisi bir kullanıcı hakkında alıntı yapma, cevaplama, bahsetme ya da davet etme eylemlerini gerçekleştirdiğinde e-posta gönder." default_email_mailing_list_mode: "Öntanımlı olarak her yeni gönderi için bir e-posta gönder." disable_mailing_list_mode: "Kullanıcıların duyuru listesi modunu etkinleştirmesini engelle." diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml index a55aafc269..dcaccb35e2 100644 --- a/config/locales/server.vi.yml +++ b/config/locales/server.vi.yml @@ -616,11 +616,11 @@ vi: set_locale_from_accept_language_header: "đặt ngôn ngữ giao diện cho người dùng ẩn danh từ tiêu đề ngôn ngữ trình duyệt web của họ. (KINH NGHIỆM, không hoạt động với bộ nhớ cache ẩn danh)" min_post_length: "Số kí tự tối thiểu trong bài đăng." min_first_post_length: "Chiều dài tối thiểu cho bài viết đầu tiên (nội dung chủ đề) tính theo ký tự." - min_private_message_post_length: "Số kí tự tối thiểu trong tin nhắn." + min_personal_message_post_length: "Số kí tự tối thiểu trong tin nhắn." max_post_length: "Số kí tự tối đa trong bài đăng." min_topic_title_length: "Số kí tự tối thiểu trong tiêu đề chủ đề." max_topic_title_length: "Số kí tự tối đa trong tiêu đề chủ đề." - min_private_message_title_length: "Chiều dài tối thiểu cho phép theo số kí tự của một thông điệp" + min_personal_message_title_length: "Chiều dài tối thiểu cho phép theo số kí tự của một thông điệp" min_search_term_length: "Số kí tự tối thiểu trong từ khóa tìm kiếm." search_tokenize_chinese_japanese_korean: "Bắt buộc tìm kiếm tách từ Chinese/Japanese/Korean ngay cả trên các site không phải là CJK" allow_uncategorized_topics: "Cho phép các chủ đề được tạo ra mà không gán chuyên mục. LƯU Ý: Nếu có bất kỳ chủ đề nào chưa gán chuyên mục, bạn phải phân loại chúng trước khi thay đổi." @@ -761,7 +761,7 @@ vi: max_bookmarks_per_day: "Số tối đa người dùng có thể đánh dấu mỗi ngày." max_edits_per_day: "Số tối đa người dùng có thể chỉnh sửa mỗi ngày." max_topics_per_day: "Số chủ đề tối đa người dùng có thể tạo mỗi ngày." - max_private_messages_per_day: "Số tin nhắn tối đa người dùng có thể tạo mỗi ngày." + max_personal_messages_per_day: "Số tin nhắn tối đa người dùng có thể tạo mỗi ngày." max_invites_per_day: "Số tối đa người dùng có thể gửi lời mời mỗi ngày." max_topic_invitations_per_day: "Số tối đa lời mời chủ đề thành viên có thể gửi mỗi ngày." alert_admins_if_errors_per_minute: "Số lỗi trong một phút để kích hoạt cảnh báo admin, điền 0 để tắt tính năng này. LƯU Ý: yêu cầu khởi động lại." @@ -817,7 +817,7 @@ vi: max_mentions_per_post: "Số tối đa thông báo @name mà tất cả mọi người có thể sử dụng trong bài viết." create_thumbnails: "Tạo ảnh nhỏ và ảnh lightbox nếu quá lớn để vừa trong một bài đăng." email_time_window_mins: "Chờ (n) phút trước khi gửi bất kỳ một email thông báo nào, để cung cấp cho người dùng cơ hội để chỉnh sửa và hoàn tất bài viết của họ." - private_email_time_window_seconds: "Đợi (n) giây trước khi gửi bất kỳ thông báo email nào, để cho thành viên cơ hội để chỉnh sửa và hoàn thiện các thông điệp của họ." + personal_email_time_window_seconds: "Đợi (n) giây trước khi gửi bất kỳ thông báo email nào, để cho thành viên cơ hội để chỉnh sửa và hoàn thiện các thông điệp của họ." email_posts_context: "Có bao nhiêu trả lời trước được kèm theo như là bối cảnh trong email thông báo." flush_timings_secs: "Tần suất tuôn dữ liệu thời gian tới server, theo giây." title_max_word_length: "Chiều dài tối đa chữ cho phép, tính theo ký tự, trong một tiêu đề chủ đề." @@ -934,7 +934,7 @@ vi: enforce_square_emoji: "Sử dụng kích thước vuông cho tất cả các emoji." approve_post_count: "Số lượng bài viết từ một thành viên mới hoặc thành viên cũ phải được duyệt" approve_unless_trust_level: "Bài viết của thành viên dưới cấp độ tin cậy này phải được duyệt" - default_email_private_messages: "Gửi email khi ai đó nhắn tin cho thành viên theo mặc định." + default_email_personal_messages: "Gửi email khi ai đó nhắn tin cho thành viên theo mặc định." default_email_direct: "Gửi email khi ai đó trích dẫn/trả lời/đề cập hoặc mời thành viên theo mặc định." default_email_mailing_list_mode: "Mặc định gửi email cho mỗi bài viết mới." disable_mailing_list_mode: "Không cho phép thành viên bật chế độ danh sách thư." diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index 114480b9ec..0a592faa86 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -827,13 +827,13 @@ zh_CN: set_locale_from_accept_language_header: "为未登录用户按照他们的浏览器发送的请求头部设置界面语言。（实验性，无法和匿名缓存共同使用）" min_post_length: "帖子允许的最少字符数" min_first_post_length: "第一帖（主题内容）允许的最少字符数" - min_private_message_post_length: "私信允许的最小字符数" + min_personal_message_post_length: "私信允许的最小字符数" max_post_length: "帖子允许的最大字符数" topic_featured_link_enabled: "允许发链接帖。" show_topic_featured_link_in_digest: "在摘要邮件中显示主题特色链接。" min_topic_title_length: "标题允许的最少字符数" max_topic_title_length: "标题允许的最大字符数" - min_private_message_title_length: "私信标题允许的最小字符数" + min_personal_message_title_length: "私信标题允许的最小字符数" min_search_term_length: "搜索条件允许的最少字符数" search_tokenize_chinese_japanese_korean: "在非中/日/韩语站点强制切割中/日/韩语搜索分词" search_prefer_recent_posts: "如果搜索大型论坛较慢，这个选项将优先尝试最新的帖子" @@ -888,8 +888,8 @@ zh_CN: summary_likes_required: "在一个主题启用'摘要模式'的最小赞的数量" summary_percent_filter: "当用户点击摘要，显示前 % 几的帖子" summary_max_results: "“概括主题”返回的最大帖子数量" - enable_private_messages: "允许信任等级1（可以另外选择发送私信的信任等级）的用户创建私信和回复私信。注意：管理人员不受限制。" - enable_private_email_messages: "允许信任等级 4 (可通过发送私信的最低信任等级进行设置) 的用户创建私信和回复私信。注意：管理人员不受限制。" + enable_personal_messages: "允许信任等级1（可以另外选择发送私信的信任等级）的用户创建私信和回复私信。注意：管理人员不受限制。" + enable_personal_email_messages: "允许信任等级 4 (可通过发送私信的最低信任等级进行设置) 的用户创建私信和回复私信。注意：管理人员不受限制。" enable_long_polling: "启用 Message bus 使通知功能可以使用长轮询（long polling）" long_polling_base_url: "长轮询的基本 URL（当用 CDN 分发动态能让时，请设置此至原始拉取地址）例如：http://origin.site.com" long_polling_interval: "当没有数据向客户端发送时服务器端应等待的时间（仅对已登录用户有效）" @@ -1022,7 +1022,7 @@ zh_CN: max_bookmarks_per_day: "每个用户每天能做书签数量的最大值。" max_edits_per_day: "每个用户每天能编辑的次数的最大值。" max_topics_per_day: "每个用户每天能创建的主题数量的最大值。" - max_private_messages_per_day: "每个用户每天能发私信数量的最大值。" + max_personal_messages_per_day: "每个用户每天能发私信数量的最大值。" max_invites_per_day: "每个用户每天能创建的邀请数量的最大值。" max_topic_invitations_per_day: "每个用户每天能创建的邀请至主题数量的最大值。" max_logins_per_ip_per_hour: "一小时内同一个IP（网络）地址能允许最大的登陆次数。" @@ -1093,7 +1093,7 @@ zh_CN: enable_mentions: "允许用户提及其他用户。" create_thumbnails: "为太大而无法恰当地显示在帖子里的图片创建 lightbox 缩略图。" email_time_window_mins: "等待多少（n）分钟才给用户发送通知电子邮件，好让他们有机会自己来编辑和完善他们的帖子。" - private_email_time_window_seconds: "等待多少（n）秒再给用户发送通知电子邮件，这可以让用户有时间来编辑和完善他们的私信。" + personal_email_time_window_seconds: "等待多少（n）秒再给用户发送通知电子邮件，这可以让用户有时间来编辑和完善他们的私信。" email_posts_context: "在通知邮件中包含的作为上下文的回复数量。" flush_timings_secs: "向服务器刷新时间数据的频率，以秒为单位。" title_max_word_length: "在主题的标题中，允许的词语长度的最大字符数。" @@ -1271,7 +1271,7 @@ zh_CN: watched_words_regular_expressions: "监视词是正则表达式。" default_email_digest_frequency: "用户收到摘要邮件的默认频率。" default_include_tl0_in_digests: "在摘要邮件中默认包含新用户帖子。用户可以自行在参数设置中更改这个设置。" - default_email_private_messages: "默认在有人发私信给用户时发送一封邮件通知。" + default_email_personal_messages: "默认在有人发私信给用户时发送一封邮件通知。" default_email_direct: "默认在有人引用、回复、提及或者邀请用户时发送一封邮件通知。" default_email_mailing_list_mode: "默认为每一个新帖子发送一封邮件通知。" default_email_mailing_list_mode_frequency: "邮件列表模式下，用户收到邮件的默认频率。" diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml index 94d81c4a70..9f06500644 100644 --- a/config/locales/server.zh_TW.yml +++ b/config/locales/server.zh_TW.yml @@ -766,13 +766,13 @@ zh_TW: set_locale_from_accept_language_header: "為未登錄用戶按照他們的瀏覽器發送的請求頭部設置界面語言。（實驗性，無法和匿名緩存共同使用）" min_post_length: "文章允許的最小文字數" min_first_post_length: "第一篇文章允許的最少文字數" - min_private_message_post_length: "私訊允許的最小文字數" + min_personal_message_post_length: "私訊允許的最小文字數" max_post_length: "文章允許的最大文字數" topic_featured_link_enabled: "允許發連結帖。" show_topic_featured_link_in_digest: "在摘要郵件中顯示主題特色連結。" min_topic_title_length: "標題允許的最小文字數" max_topic_title_length: "標題允許的最大文字數" - min_private_message_title_length: "標題允許的最小文字數" + min_personal_message_title_length: "標題允許的最小文字數" min_search_term_length: "搜尋條件允許的最小文字數" search_tokenize_chinese_japanese_korean: "在非中/日/韓語站點強制切割中/日/韓語搜索分詞" search_prefer_recent_posts: "如果搜索大型論壇較慢，這個選項將優先嘗試最新的帖子" @@ -820,7 +820,7 @@ zh_TW: summary_likes_required: "如果使用了\"此話題的摘用\"，話題顯示時需滿足最小得到\"讚\"的數量" summary_percent_filter: "當用戶點擊 \"此話題的摘要\"，顯示前面多少 % 的文章" summary_max_results: "“概括主題”返回的最大帖子數量" - enable_private_messages: "允許信任等級1（可以另外選擇發送消息的信任等級）的用戶創建消息和回覆消息。注意：管理人員不受限制。" + enable_personal_messages: "允許信任等級1（可以另外選擇發送消息的信任等級）的用戶創建消息和回覆消息。注意：管理人員不受限制。" enable_long_polling: "啟用消息匯流排使通知功能可以使用長輪詢（long polling）" long_polling_base_url: "長輪詢的基本 URL（當用 CDN 分發動態內容，請設置此至原始拉取地址）例如：http://origin.site.com" long_polling_interval: "當沒有數據向客戶端發送時伺服器端應等待的時間（僅對已登錄用戶有效）" @@ -939,7 +939,7 @@ zh_TW: max_bookmarks_per_day: "每個用戶每天最多能建立\"書籤\"的數量" max_edits_per_day: "每個用戶每天最大的\"編輯次數\"的數量" max_topics_per_day: "每個用戶每天最多建立\"討論話題\"的數量" - max_private_messages_per_day: "用戶每天能建立訊息的數量上限" + max_personal_messages_per_day: "用戶每天能建立訊息的數量上限" max_invites_per_day: "每個用戶每天最多能邀請用戶的數量。" max_topic_invitations_per_day: "每個用戶每天能創建的邀請至主題數量的最大值。" alert_admins_if_errors_per_minute: "觸發管理員警示的每分鐘錯誤數量。設為 0 會停用這個功能。注意：需要重啟。" @@ -1003,7 +1003,7 @@ zh_TW: max_users_notified_per_group_mention: "當群組被提及時，接受提醒的最大用戶數 ( 超過閾值後將不發送提醒 )" create_thumbnails: "為太大而無法在帖子裡正常顯示的圖片創造縮略圖及 lightbox 圖片。" email_time_window_mins: "等待多少 (n) 分鐘才給用戶發送通知電子郵件，好讓他們有機會自己來編輯和完善他們的帖子。" - private_email_time_window_seconds: "等待多少（n）秒再給用戶發送通知電子郵件，這可以讓用戶有時間來編輯和完善他們的消息。" + personal_email_time_window_seconds: "等待多少（n）秒再給用戶發送通知電子郵件，這可以讓用戶有時間來編輯和完善他們的消息。" email_posts_context: "在通知電郵中包含的作為上下文的回覆數量。" flush_timings_secs: "刷新時間資料的頻率，以秒為單位" title_max_word_length: "在主題的標題中，允許的詞語長度的最大字元數。" @@ -1164,7 +1164,7 @@ zh_TW: code_formatting_style: "編輯器中的代碼格式化按鈕設置的預設格式" default_email_digest_frequency: "用戶收到摘要郵件的預設頻率。" default_include_tl0_in_digests: "在摘要郵件中預設包含新用戶的貼文。用戶可以自行在參數設置中更改這個設定。" - default_email_private_messages: "預設在有人發消息給用戶時發送一封郵件通知。" + default_email_personal_messages: "預設在有人發消息給用戶時發送一封郵件通知。" default_email_direct: "預設在有人引用、回覆、提及或者邀請用戶時發送一封郵件通知。" default_email_mailing_list_mode: "預設為每一個新帖子發送一封郵件通知。" default_email_mailing_list_mode_frequency: "郵件列表模式下，用戶收到郵件的預設頻率。" From 9bbfad1081918c6e126fa45d7ec9d61737514d4b Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 31 Jan 2018 12:51:31 +0530 Subject: [PATCH 023/202] rename private to personal --- lib/tasks/import.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake index f26e7b3025..9c9110c490 100644 --- a/lib/tasks/import.rake +++ b/lib/tasks/import.rake @@ -164,7 +164,7 @@ def insert_user_options , #{SiteSetting.default_email_mailing_list_mode} , #{SiteSetting.default_email_mailing_list_mode_frequency} , #{SiteSetting.default_email_direct} - , #{SiteSetting.default_email_private_messages} + , #{SiteSetting.default_email_personal_messages} , #{SiteSetting.default_email_previous_replies} , #{SiteSetting.default_email_in_reply_to} , #{SiteSetting.default_email_digest_frequency.to_i > 0} From 350cbb17001da5a5b5b1268c89880e7340170893 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Thu, 1 Feb 2018 00:00:14 +0530 Subject: [PATCH 024/202] deprecate existing site settings --- lib/site_settings/deprecated_settings.rb | 9 +++++- spec/models/site_setting_spec.rb | 39 ++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/lib/site_settings/deprecated_settings.rb b/lib/site_settings/deprecated_settings.rb index ca63777b4c..f4bc23820a 100644 --- a/lib/site_settings/deprecated_settings.rb +++ b/lib/site_settings/deprecated_settings.rb @@ -2,7 +2,14 @@ module SiteSettings; end module SiteSettings::DeprecatedSettings DEPRECATED_SETTINGS = [ - %w[use_https force_https 1.7] + %w[use_https force_https 1.7], + %w[min_private_message_post_length min_personal_message_post_length 2.0], + %w[min_private_message_title_length min_personal_message_title_length 2.0], + %w[enable_private_messages enable_personal_messages 2.0], + %w[enable_private_email_messages enable_personal_email_messages 2.0], + %w[private_email_time_window_seconds personal_email_time_window_seconds 2.0], + %w[max_private_messages_per_day max_personal_messages_per_day 2.0], + %w[default_email_private_messages default_email_personal_messages 2.0] ] def setup_deprecated_methods diff --git a/spec/models/site_setting_spec.rb b/spec/models/site_setting_spec.rb index 3daaed07f9..a81cd57909 100644 --- a/spec/models/site_setting_spec.rb +++ b/spec/models/site_setting_spec.rb @@ -123,11 +123,12 @@ describe SiteSetting do end context 'deprecated site settings' do - before do - SiteSetting.force_https = true - end describe '#use_https' do + before do + SiteSetting.force_https = true + end + it 'should act as a proxy to the new methods' do expect(SiteSetting.use_https).to eq(true) expect(SiteSetting.use_https?).to eq(true) @@ -138,5 +139,37 @@ describe SiteSetting do expect(SiteSetting.force_https?).to eq(false) end end + + describe 'rename private message to personal message' do + before do + SiteSetting.min_personal_message_title_length = 15 + SiteSetting.enable_personal_messages = true + SiteSetting.personal_email_time_window_seconds = 15 + SiteSetting.max_personal_messages_per_day = 15 + SiteSetting.default_email_personal_messages = true + end + + it 'should act as a proxy to the new methods' do + expect(SiteSetting.min_private_message_title_length).to eq(15) + SiteSetting.min_private_message_title_length = 5 + expect(SiteSetting.min_personal_message_title_length).to eq(5) + + expect(SiteSetting.enable_private_messages).to eq(true) + SiteSetting.enable_private_messages = false + expect(SiteSetting.enable_personal_messages).to eq(false) + + expect(SiteSetting.private_email_time_window_seconds).to eq(15) + SiteSetting.private_email_time_window_seconds = 5 + expect(SiteSetting.personal_email_time_window_seconds).to eq(5) + + expect(SiteSetting.max_private_messages_per_day).to eq(15) + SiteSetting.max_private_messages_per_day = 5 + expect(SiteSetting.max_personal_messages_per_day).to eq(5) + + expect(SiteSetting.default_email_private_messages).to eq(true) + SiteSetting.default_email_private_messages = false + expect(SiteSetting.default_email_personal_messages).to eq(false) + end + end end end From a08832bd0896655167a58c2079d100c40d8d94d0 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Thu, 1 Feb 2018 19:25:14 +0530 Subject: [PATCH 025/202] rename 'private messages' to 'personal messages' in locale --- config/locales/server.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 9c1e475b9c..603f92adc0 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1037,7 +1037,7 @@ en: summary_max_results: "Maximum posts returned by 'Summary This Topic'" enable_personal_messages: "Allow trust level 1 (configurable via min trust level to send messages) users to create messages and reply to messages. Note that staff can always send messages no matter what." - enable_system_message_replies: "Allows users to reply to system messages, even if private messages are disabled" + enable_system_message_replies: "Allows users to reply to system messages, even if personal messages are disabled" enable_personal_email_messages: "Allow trust level 4 (configurable via min trust level to send messages) users to send private email messages. Note that staff can always send messages no matter what." enable_long_polling: "Message bus used for notification can use long polling" From f85055d653b843b67a4fc6b72b82c0476dd20569 Mon Sep 17 00:00:00 2001 From: Joshua Rosenfeld Date: Thu, 1 Feb 2018 08:59:37 -0500 Subject: [PATCH 026/202] FIX: Remove activation link from account approved email (#5548) --- app/mailers/user_notifications.rb | 1 - app/models/user.rb | 3 +-- config/locales/server.en.yml | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb index 236acc0dab..17260a5d8e 100644 --- a/app/mailers/user_notifications.rb +++ b/app/mailers/user_notifications.rb @@ -22,7 +22,6 @@ class UserNotifications < ActionMailer::Base build_email(user.email, template: 'user_notifications.signup_after_approval', locale: user_locale(user), - email_token: opts[:email_token], new_user_tips: I18n.t('system_messages.usage_tips.text_body_template', base_url: Discourse.base_url, locale: locale)) end diff --git a/app/models/user.rb b/app/models/user.rb index 1d4283659e..464d3fe9d7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1096,8 +1096,7 @@ class User < ActiveRecord::Base if SiteSetting.must_approve_users Jobs.enqueue(:critical_user_email, type: :signup_after_approval, - user_id: id, - email_token: email_tokens.first.token + user_id: id ) end end diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 603f92adc0..c32b730f3f 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -2836,8 +2836,8 @@ en: A staff member approved your account on %{site_name}. - Click the following link to confirm and activate your new account: - %{base_url}/u/activate-account/%{email_token} + You can now access your new account by logging in at: + %{base_url} If the above link is not clickable, try copying and pasting it into the address bar of your web browser. From 9923829402997c7af3e25121d6d3a345536f3884 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Thu, 1 Feb 2018 16:42:56 +0100 Subject: [PATCH 027/202] FEATURE: Menu toggle for different reply modes Allow users to access different reply modes from the composer. Actions introduced: - reply_as_new_topic - reply_as_private_message - reply_to_topic - reply_as_whisper/not --- .../components/composer-action-title.js.es6 | 63 ++++++++ .../discourse/models/composer.js.es6 | 140 +++++++++--------- .../components/composer-action-title.hbs | 12 ++ .../discourse/templates/composer.hbs | 2 +- .../components/composer-actions.js.es6 | 132 +++++++++++++++++ .../stylesheets/common/base/compose.scss | 26 +++- .../common/select-kit/composer-actions.scss | 22 +++ config/locales/client.ar.yml | 2 - config/locales/client.ca.yml | 2 - config/locales/client.cs.yml | 2 - config/locales/client.da.yml | 2 - config/locales/client.de.yml | 2 - config/locales/client.el.yml | 2 - config/locales/client.en.yml | 19 ++- config/locales/client.es.yml | 2 - config/locales/client.et.yml | 2 - config/locales/client.fa_IR.yml | 2 - config/locales/client.fi.yml | 2 - config/locales/client.fr.yml | 2 - config/locales/client.gl.yml | 2 - config/locales/client.he.yml | 2 - config/locales/client.it.yml | 2 - config/locales/client.ja.yml | 2 - config/locales/client.ko.yml | 2 - config/locales/client.lv.yml | 2 - config/locales/client.nb_NO.yml | 2 - config/locales/client.nl.yml | 2 - config/locales/client.pl_PL.yml | 2 - config/locales/client.pt.yml | 2 - config/locales/client.pt_BR.yml | 2 - config/locales/client.ro.yml | 2 - config/locales/client.ru.yml | 2 - config/locales/client.sk.yml | 2 - config/locales/client.sq.yml | 2 - config/locales/client.sv.yml | 2 - config/locales/client.th.yml | 2 - config/locales/client.tr_TR.yml | 2 - config/locales/client.ur.yml | 2 - config/locales/client.vi.yml | 2 - config/locales/client.zh_CN.yml | 2 - config/locales/client.zh_TW.yml | 2 - .../acceptance/composer-actions-test.js.es6 | 101 +++++++++++++ 42 files changed, 439 insertions(+), 144 deletions(-) create mode 100644 app/assets/javascripts/discourse/components/composer-action-title.js.es6 create mode 100644 app/assets/javascripts/discourse/templates/components/composer-action-title.hbs create mode 100644 app/assets/javascripts/select-kit/components/composer-actions.js.es6 create mode 100644 app/assets/stylesheets/common/select-kit/composer-actions.scss create mode 100644 test/javascripts/acceptance/composer-actions-test.js.es6 diff --git a/app/assets/javascripts/discourse/components/composer-action-title.js.es6 b/app/assets/javascripts/discourse/components/composer-action-title.js.es6 new file mode 100644 index 0000000000..bc6e0e95bf --- /dev/null +++ b/app/assets/javascripts/discourse/components/composer-action-title.js.es6 @@ -0,0 +1,63 @@ +import { default as computed } from 'ember-addons/ember-computed-decorators'; +import { PRIVATE_MESSAGE, CREATE_TOPIC, REPLY, EDIT } from "discourse/models/composer"; +import { iconHTML } from 'discourse-common/lib/icon-library'; + +export default Ember.Component.extend({ + classNames: ["composer-action-title"], + options: Ember.computed.alias("model.replyOptions"), + action: Ember.computed.alias("model.action"), + isEditing: Ember.computed.equal("action", EDIT), + + @computed("options", "action") + actionTitle(opts, action) { + switch (action) { + case PRIVATE_MESSAGE: + return I18n.t("topic.private_message"); + case CREATE_TOPIC: + return I18n.t("topic.create_long"); + case REPLY: + if (opts.userAvatar && opts.userLink) { + return this._formatReplyToUserPost(opts.userAvatar, opts.userLink); + } else if (opts.topicLink) { + return this._formatReplyToTopic(opts.topicLink); + } + case EDIT: + if (opts.userAvatar && opts.userLink && opts.topicLink) { + return this._formatEditUserPost( + opts.userAvatar, + opts.userLink, + opts.topicLink, + opts.originalUser + ); + } + }; + }, + + _formatEditUserPost(userAvatar, userLink, topicLink, originalUser) { + let editTitle = ` + ${topicLink.anchor} + ${userAvatar} + ${userLink.anchor} + ${iconHTML("mail-forward", { class: "reply-to-glyph" })} + `; + + if (originalUser) { + editTitle += ` + ${originalUser.avatar} + ${originalUser.username} + `; + } + + return editTitle.htmlSafe(); + }, + + _formatReplyToTopic(link) { + return `${link.anchor}`.htmlSafe(); + }, + + _formatReplyToUserPost(avatar, link) { + const htmlLink = `${link.anchor}`; + return `${avatar}${htmlLink}`.htmlSafe(); + }, + +}); diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index 41ec3ba322..3b9815b9d8 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -1,4 +1,3 @@ -import { iconHTML } from 'discourse-common/lib/icon-library'; import RestModel from 'discourse/models/rest'; import Topic from 'discourse/models/topic'; import { throwAjaxError } from 'discourse/lib/ajax-error'; @@ -6,45 +5,45 @@ import Quote from 'discourse/lib/quote'; import Draft from 'discourse/models/draft'; import computed from 'ember-addons/ember-computed-decorators'; import { escapeExpression, tinyAvatar } from 'discourse/lib/utilities'; -import { emojiUnescape } from 'discourse/lib/text'; + +// The actions the composer can take +export const + CREATE_TOPIC = 'createTopic', + PRIVATE_MESSAGE = 'privateMessage', + NEW_PRIVATE_MESSAGE_KEY = 'new_private_message', + REPLY = 'reply', + EDIT = 'edit', + REPLY_AS_NEW_TOPIC_KEY = "reply_as_new_topic", + REPLY_AS_NEW_PRIVATE_MESSAGE_KEY = "reply_as_new_private_message"; const CLOSED = 'closed', - SAVING = 'saving', - OPEN = 'open', - DRAFT = 'draft', + SAVING = 'saving', + OPEN = 'open', + DRAFT = 'draft', - // The actions the composer can take - CREATE_TOPIC = 'createTopic', - PRIVATE_MESSAGE = 'privateMessage', - NEW_PRIVATE_MESSAGE_KEY = 'new_private_message', - REPLY = 'reply', - EDIT = 'edit', - REPLY_AS_NEW_TOPIC_KEY = "reply_as_new_topic", - REPLY_AS_NEW_PRIVATE_MESSAGE_KEY = "reply_as_new_private_message", + // When creating, these fields are moved into the post model from the composer model + _create_serializer = { + raw: 'reply', + title: 'title', + unlist_topic: 'unlistTopic', + category: 'categoryId', + topic_id: 'topic.id', + is_warning: 'isWarning', + whisper: 'whisper', + archetype: 'archetypeId', + target_usernames: 'targetUsernames', + typing_duration_msecs: 'typingTime', + composer_open_duration_msecs: 'composerTime', + tags: 'tags', + featured_link: 'featuredLink' + }, - // When creating, these fields are moved into the post model from the composer model - _create_serializer = { - raw: 'reply', - title: 'title', - unlist_topic: 'unlistTopic', - category: 'categoryId', - topic_id: 'topic.id', - is_warning: 'isWarning', - whisper: 'whisper', - archetype: 'archetypeId', - target_usernames: 'targetUsernames', - typing_duration_msecs: 'typingTime', - composer_open_duration_msecs: 'composerTime', - tags: 'tags', - featured_link: 'featuredLink' - }, - - _edit_topic_serializer = { - title: 'topic.title', - categoryId: 'topic.category.id', - tags: 'topic.tags', - featuredLink: 'topic.featured_link' - }; + _edit_topic_serializer = { + title: 'topic.title', + categoryId: 'topic.category.id', + tags: 'topic.tags', + featuredLink: 'topic.featured_link' + }; const _saveLabels = {}; _saveLabels[EDIT] = 'composer.save_edit'; @@ -167,52 +166,55 @@ const Composer = RestModel.extend({ return this.get('canEditTopicFeaturedLink') ? 'composer.title_or_link_placeholder' : 'composer.title_placeholder'; }, - // Determine the appropriate title for this action - actionTitle: function() { - const topic = this.get('topic'); + @computed("action", "post", "topic", "topic.title") + replyOptions(action, post, topic, topicTitle) { + let options = { + userLink: null, + topicLink: null, + postLink: null, + userAvatar: null, + originalUser: null + }; - let postLink, topicLink, usernameLink; if (topic) { - const postNumber = this.get('post.post_number'); - postLink = "" + - I18n.t("post.post_number", { number: postNumber }) + ""; - - let title = topic.get('fancy_title') || escapeExpression(topic.get('title')); - - topicLink = " " + title + ""; - usernameLink = "" + this.get('post.username') + ""; + options.topicLink = { + href: topic.get("url"), + anchor: topic.get("fancy_title") || escapeExpression(topicTitle) + }; } - let postDescription; - const post = this.get('post'); - if (post) { - postDescription = I18n.t('post.' + this.get('action'), { - link: postLink, - replyAvatar: tinyAvatar(post.get('avatar_template')), - username: this.get('post.username'), - usernameLink - }); + options.label = I18n.t(`post.${action}`); + options.userAvatar = tinyAvatar(post.get("avatar_template")); if (!this.site.mobileView) { - const replyUsername = post.get('reply_to_user.username'); - const replyAvatarTemplate = post.get('reply_to_user.avatar_template'); - if (replyUsername && replyAvatarTemplate && this.get('action') === EDIT) { - postDescription += ` ${iconHTML('mail-forward', { class: 'reply-to-glyph' })} ` + tinyAvatar(replyAvatarTemplate) + " " + replyUsername; + const originalUserName = post.get('reply_to_user.username'); + const originalUserAvatar = post.get('reply_to_user.avatar_template'); + if (originalUserName && originalUserAvatar && action === EDIT) { + options.originalUser = { + username: originalUserName, + avatar: tinyAvatar(originalUserAvatar) + }; } } } - switch (this.get('action')) { - case PRIVATE_MESSAGE: return I18n.t('topic.private_message'); - case CREATE_TOPIC: return I18n.t('topic.create_long'); - case REPLY: - case EDIT: - if (postDescription) return postDescription; - if (topic) return emojiUnescape(I18n.t('post.reply_topic', { link: topicLink })); + if (topic && post) { + const postNumber = post.get("post_number"); + + options.postLink = { + href: `${topic.get("url")}/${postNumber}`, + anchor: I18n.t("post.post_number", { number: postNumber }) + }; + + options.userLink = { + href: `${topic.get("url")}/${postNumber}`, + anchor: post.get("username") + }; } - }.property('action', 'post', 'topic', 'topic.title'), + return options; + }, // whether to disable the post button cantSubmitPost: function() { diff --git a/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs b/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs new file mode 100644 index 0000000000..fcb2bacfa0 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs @@ -0,0 +1,12 @@ +{{#if isEditing}} + {{d-icon "pencil"}} +{{else}} + {{composer-actions + composerModel=model + options=model.replyOptions + whispering=model.whisper + canWhisper=canWhisper + action=model.action}} +{{/if}} + +{{actionTitle}} diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs index ed0b8c4028..beb60b375a 100644 --- a/app/assets/javascripts/discourse/templates/composer.hbs +++ b/app/assets/javascripts/discourse/templates/composer.hbs @@ -16,7 +16,7 @@ {{plugin-outlet name="composer-open" args=(hash model=model)}}
    - {{{model.actionTitle}}} + {{composer-action-title model=model canWhisper=canWhisper}} {{#unless site.mobileView}} {{#if whisperOrUnlistTopicText}} diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 b/app/assets/javascripts/select-kit/components/composer-actions.js.es6 new file mode 100644 index 0000000000..d8b3a2be47 --- /dev/null +++ b/app/assets/javascripts/select-kit/components/composer-actions.js.es6 @@ -0,0 +1,132 @@ +import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box"; +import { default as computed } from "ember-addons/ember-computed-decorators"; +import { default as Composer, REPLY, EDIT } from "discourse/models/composer"; + +export default DropdownSelectBoxComponent.extend({ + composerController: Ember.inject.controller("composer"), + pluginApiIdentifiers: ["composer-actions"], + classNames: "composer-actions", + fullWidthOnMobile: true, + collectionHeight: "auto", + autofilterable: false, + filterable: false, + allowInitialValueMutation: false, + allowAutoSelectFirst: false, + showFullTitle: false, + + computeHeaderContent() { + let content = this.baseHeaderComputedContent(); + + switch (this.get("action")) { + case REPLY: + content.icon = "mail-forward"; + break; + case EDIT: + content.icon = "pencil"; + break; + }; + + return content; + }, + + @computed("options", "canWhisper", "whispering", "composerModel.post.username") + content(options, canWhisper, whispering, postUsername) { + let items = [ + { + name: I18n.t("composer.composer_actions.reply_as_new_topic.label"), + description: I18n.t("composer.composer_actions.reply_as_new_topic.desc"), + icon: "plus", + id: "reply_as_new_topic" + } + ]; + + if (postUsername && postUsername !== this.currentUser.get("username")) { + items.push({ + name: I18n.t("composer.composer_actions.reply_as_private_message.label"), + description: I18n.t("composer.composer_actions.reply_as_private_message.desc"), + icon: "envelope", + id: "reply_as_private_message" + }); + } + + if (Ember.get(options, "postLink")) { + items.push({ + name: I18n.t("composer.composer_actions.reply_to_topic.label"), + description: I18n.t("composer.composer_actions.reply_to_topic.desc"), + icon: "mail-forward", + id: "reply_to_topic" + }); + } + + if (canWhisper) { + if (whispering) { + items.push({ + name: I18n.t("composer.composer_actions.reply_as_not_whisper.label"), + description: I18n.t("composer.composer_actions.reply_as_not_whisper.desc"), + icon: "eye", + id: "reply_as_not_whisper" + }); + } else { + items.push({ + name: I18n.t("composer.composer_actions.reply_as_whisper.label"), + description: I18n.t("composer.composer_actions.reply_as_whisper.desc"), + icon: "eye-slash", + id: "reply_as_whisper" + }); + } + } + + return items; + }, + + _replyFromExisting(options) { + const topicTitle = this.get("composerModel.topic.title"); + let url = this.get("composerModel.post.url") || this.get("composerModel.topic.url"); + + this.get("composerController").open(options).then(() => { + url = `${location.protocol}//${location.host}${url}`; + const link = `[${Handlebars.escapeExpression(topicTitle)}](${url})`; + this.get("composerController").get("model").prependText(`${I18n.t("post.continue_discussion", { postLink: link })}`, {new_line: true}); + }); + }, + + actions: { + onSelect(value) { + switch(value) { + case "reply_as_whisper": + this.set("composerModel.whisper", true); + this.get("composerController").save(); + break; + + case "reply_as_not_whisper": + this.set("composerModel.whisper", false); + this.get("composerController").save(); + break; + + case "reply_to_topic": + this.set("composerModel.post", null); + this.get("composerController").save(); + break; + + case "reply_as_new_topic": + const replyAsNewTopicOpts = { + action: Composer.CREATE_TOPIC, + draftKey: Composer.REPLY_AS_NEW_TOPIC_KEY, + categoryId: this.get("composerModel.topic.category.id") + }; + this._replyFromExisting(replyAsNewTopicOpts); + break; + + case "reply_as_private_message": + const replyAsPrivateMsgOpts = { + action: Composer.PRIVATE_MESSAGE, + archetypeId: "private_message", + draftKey: Composer.REPLY_AS_NEW_PRIVATE_MESSAGE_KEY, + usernames: this.get("composerModel.post.username") + }; + this._replyFromExisting(replyAsPrivateMsgOpts); + break; + } + } + } +}); diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss index bd343963b3..5160d934dd 100644 --- a/app/assets/stylesheets/common/base/compose.scss +++ b/app/assets/stylesheets/common/base/compose.scss @@ -11,7 +11,7 @@ max-width: 1475px; width: 100%; &.hide-preview { - max-width:740px; + max-width:740px; } @media screen and (max-width: 1200px) { min-width: 0; @@ -29,7 +29,7 @@ .saving-text, .draft-text { display: none; - padding-left: 10px; + padding-left: 10px; .spinner { margin-left: 5px; border-color: $secondary; @@ -96,11 +96,25 @@ color: $primary-high; } .reply-details { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; max-width: calc(100% - 100px); } + .composer-action-title { + display: inline-flex; + align-items: center; + justify-content: space-between; + + .topic-link, .user-link, .username { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + max-width: calc(100%-125px); + margin-right: 5px; + } + + .d-icon { + margin-right: 5px; + } + } .composer-controls { margin-left: auto; margin-right: -5px; @@ -378,4 +392,4 @@ div.ac-wrap { .md-table { overflow-y: auto; -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/common/select-kit/composer-actions.scss b/app/assets/stylesheets/common/select-kit/composer-actions.scss new file mode 100644 index 0000000000..a2dace0107 --- /dev/null +++ b/app/assets/stylesheets/common/select-kit/composer-actions.scss @@ -0,0 +1,22 @@ +.select-kit { + &.dropdown-select-box { + &.composer-actions { + margin: 0; + .select-kit-header { + background: none; + outline: none; + padding: 0; + + .d-icon { + border: 1px solid $primary-low; + padding: 5px; + margin: 0; + + &:hover { + background: $primary-low; + } + } + } + } + } +} diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml index dfe5b65c70..fcbc996ac8 100644 --- a/config/locales/client.ar.yml +++ b/config/locales/client.ar.yml @@ -1855,8 +1855,6 @@ ar: many: لقد حدّدت {{count}} منشور. other: لقد حدّدت {{count}} منشور. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "اقتبس" edit_reason: "السبب:" post_number: "المنشور {{number}}" diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml index bd1bb04b05..7abb2bad4d 100644 --- a/config/locales/client.ca.yml +++ b/config/locales/client.ca.yml @@ -1505,8 +1505,6 @@ ca: one: Has seleccionat 1 publicació other: Has seleccionat {{count}} publicacions. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Cita" edit_reason: "Motiu:" post_number: "publicació {{number}}" diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index b4aff06758..1ccb8cd93c 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -1542,8 +1542,6 @@ cs: few: Máte označeny {{count}} příspěvky. other: Máte označeno {{count}} příspěvků. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Cituj" edit_reason: "Důvod: " post_number: "příspěvek č. {{number}}" diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index a48aaee063..b652bd9ad8 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -1540,8 +1540,6 @@ da: one: Du har valgt 1 indlæg. other: Du har valgt {{count}} indlæg. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Citér" edit_reason: "Reason: " post_number: "indlæg {{number}}" diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index 16fc0a2d61..c1fde58866 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -1695,8 +1695,6 @@ de: one: Du hast 1 Beitrag ausgewählt. other: Du hast {{count}} Beiträge ausgewählt. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Zitat" edit: " {{link}} {{replyAvatar}} {{username}}" edit_reason: "Grund: " diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml index 51d9a38c54..5dee9bb3a9 100644 --- a/config/locales/client.el.yml +++ b/config/locales/client.el.yml @@ -1654,8 +1654,6 @@ el: one: Έχεις επιλέξει 1 ανάρτηση. other: Έχεις επιλέξει {{count}} αναρτήσεις. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Παράθεση" edit_reason: "Αιτία:" post_number: "ανάρτηση {{number}}" diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 2cfdb0e1d1..2a0127f39d 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1291,6 +1291,23 @@ en: admin_options_title: "Optional staff settings for this topic" + composer_actions: + reply_as_new_topic: + label: Reply as linked topic + desc: Create a new topic + reply_as_private_message: + label: New message + desc: Create a private message + reply_to_topic: + label: Reply to topic + desc: Reply to the original post without replying to a specific post + reply_as_whisper: + label: Reply as whipser + desc: This message will only be visible by staff members + reply_as_not_whisper: + label: Reply as not whisher + desc: This message will be visible by anyone + notifications: tooltip: regular: @@ -1882,8 +1899,6 @@ en: other: "You have selected {{count}} posts." post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Quote" edit: " {{link}} {{replyAvatar}} {{username}}" edit_reason: "Reason: " diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index 7d90c9c29d..5c3311303b 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -1702,8 +1702,6 @@ es: one: Has seleccionado 1 post. other: Has seleccionado {{count}} posts. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Citar" edit: "{{link}} {{replyAvatar}} {{username}} " edit_reason: "Motivo:" diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml index b5af341632..081d116139 100644 --- a/config/locales/client.et.yml +++ b/config/locales/client.et.yml @@ -1599,8 +1599,6 @@ et: one: Oled valinud 1 postituse. other: Oled valinud {{count}} postitust. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Tsitaat" edit_reason: "Põhjus:" post_number: "postitus {{number}}" diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml index 7324b3d6e5..6af668a8b9 100644 --- a/config/locales/client.fa_IR.yml +++ b/config/locales/client.fa_IR.yml @@ -1512,8 +1512,6 @@ fa_IR: description: other: شما {{count}} نوشته انتخاب کرده اید post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "نقل‌قول" edit_reason: "دلیل:" post_number: "نوشته {{number}}" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index 80ff33b64e..e900163c6d 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -1699,8 +1699,6 @@ fi: one: Olet valinnut yhden viestin. other: Olet valinnut {{count}} viestiä. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Lainaa" edit: " {{link}} {{replyAvatar}} {{username}}" edit_reason: "Syy:" diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index fb23784f14..3ca5f14f9c 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -1695,8 +1695,6 @@ fr: one: vous avez sélectionné 1 message. other: Vous avez sélectionné {{count}} messages. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Citer" edit: " {{link}} {{replyAvatar}} {{username}}" edit_reason: "Raison :" diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml index b982402aba..a70d651147 100644 --- a/config/locales/client.gl.yml +++ b/config/locales/client.gl.yml @@ -1188,8 +1188,6 @@ gl: one: Seleccionaches unha publicación. other: Seleccionaches {{count}} publicacións. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" edit_reason: "Razón:" post_number: "publicación {{number}}" last_edited_on: "última edición da publicación" diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index 3e7e7ddf0c..c3a9655f08 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -1561,8 +1561,6 @@ he: one: בחרתם פוסט אחד. other: בחרתם {{count}} פוסטים. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "ציטוט" edit_reason: "סיבה: " post_number: "פוסט {{number}}" diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index a646603399..d42929dd86 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -1691,8 +1691,6 @@ it: one: Hai selezionato 1 messaggio. other: Hai selezionato {{count}} messaggi. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Cita" edit_reason: "Motivo:" post_number: "messaggio {{number}}" diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index 2db0766819..f39726ff71 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -1567,8 +1567,6 @@ ja: description: other: {{count}}個の投稿を選択中。 post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "引用" edit_reason: "理由: " post_number: "投稿{{number}}" diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml index 4a72621106..90581f22b4 100644 --- a/config/locales/client.ko.yml +++ b/config/locales/client.ko.yml @@ -1578,8 +1578,6 @@ ko: description: other: {{count}}개의 개시글을 선택하셨어요. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "인용하기" edit_reason: "Reason: " post_number: "{{number}}번째 글" diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml index ed00ec83da..df3d7e9591 100644 --- a/config/locales/client.lv.yml +++ b/config/locales/client.lv.yml @@ -1623,8 +1623,6 @@ lv: one: Jūs esat izvēlējies 1 ierakstu. other: Jūs esat izvēlējies {{count}} ierakstus. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Citāts" edit_reason: "Iemesls:" post_number: "ieraksts {{number}}" diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index 6c5b33a3f2..57258dd419 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -1702,8 +1702,6 @@ nb_NO: one: Du har valgt 1 innlegg. other: Du har valgt {{count}} innlegg. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Sitat" edit: " {{link}} {{replyAvatar}} {{username}}" edit_reason: "Begrunnelse:" diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml index c50421b1a1..05d96910ef 100644 --- a/config/locales/client.nl.yml +++ b/config/locales/client.nl.yml @@ -1623,8 +1623,6 @@ nl: one: U hebt 1 bericht geselecteerd. other: U hebt {{count}} berichten geselecteerd. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Citeren" edit_reason: "Reden: " post_number: "bericht {{number}}" diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml index 44980ea0d0..373ccc956c 100644 --- a/config/locales/client.pl_PL.yml +++ b/config/locales/client.pl_PL.yml @@ -1784,8 +1784,6 @@ pl_PL: many: Wybrano {{count}} wpisów. other: Wybrano {{count}} wpisów. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Cytuj" edit_reason: "Powód" post_number: "wpis {{number}}" diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index fd667b5ac2..641d809ba4 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -1514,8 +1514,6 @@ pt: one: Selecionou 1 publicação. other: Selecionou {{count}} publicações. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Citar" edit_reason: "Motivo:" post_number: "publicação {{number}}" diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml index f94403a25e..95838a2e05 100644 --- a/config/locales/client.pt_BR.yml +++ b/config/locales/client.pt_BR.yml @@ -1581,8 +1581,6 @@ pt_BR: one: 1 resposta selecionada. other: {{count}} respostas selecionadas. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Citação" edit_reason: "Motivo:" post_number: "resposta {{number}}" diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml index 11a6e9f587..795e66f650 100644 --- a/config/locales/client.ro.yml +++ b/config/locales/client.ro.yml @@ -1487,8 +1487,6 @@ ro: few: Ai selectat {{count}} mesaje. other: Ai selectat {{count}} de mesaje. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Citează" edit_reason: "Motivul edit[rii: " post_number: "postarea {{number}}" diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index f0421e01e9..211f98c3bb 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -1687,8 +1687,6 @@ ru: many: Вы выбрали {{count}} сообщений. other: Вы выбрали {{count}} сообщений. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Цитата" edit_reason: "Причина:" post_number: "сообщение {{number}}" diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml index 928dea873a..873a2d0353 100644 --- a/config/locales/client.sk.yml +++ b/config/locales/client.sk.yml @@ -1428,8 +1428,6 @@ sk: few: Označili ste {{count}} príspevky other: Označili ste {{count}} príspevkov post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Citácia" edit_reason: "Dôvod:" post_number: "príspevok {{number}}" diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index 665b5e622b..ceca48bba6 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -1391,8 +1391,6 @@ sq: one: Keni përzgjedhur 1 postim. other: Keni përzgjedhur {{count}} postime. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" edit_reason: "Arsyeja:" post_number: "postimi {{number}}" last_edited_on: "redaktimi i fundit u krye më" diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index f2bcf7ae5e..bbb3959bf5 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -1485,8 +1485,6 @@ sv: one: Du har markerat 1 inlägg. other: Du har markerat {{count}} inlägg. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Citat" edit_reason: "Anledning:" post_number: "inlägg {{number}}" diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml index 4b4130e1ae..d78a454e76 100644 --- a/config/locales/client.th.yml +++ b/config/locales/client.th.yml @@ -1129,8 +1129,6 @@ th: description: other: คุณได้เลือก {{count}} โพสต์. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" edit_reason: "เหตุผล:" post_number: "โพสต์ {{number}}" last_edited_on: "โพสแก้ไขล่าสุดเมื่อ" diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml index 0b5a6255f2..c5a7a4275c 100644 --- a/config/locales/client.tr_TR.yml +++ b/config/locales/client.tr_TR.yml @@ -1501,8 +1501,6 @@ tr_TR: description: other: {{count}} gönderi seçtiniz. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Alıntı" edit_reason: "Neden: " post_number: "gönderi {{number}}" diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml index 21604d91b5..0e7c1899e3 100644 --- a/config/locales/client.ur.yml +++ b/config/locales/client.ur.yml @@ -1443,8 +1443,6 @@ ur: one: آپ نے 1 پوسٹ منتخب کی ہے۔ other: آپ نے {{count}} پوسٹس منتخب کی ہیں۔ post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "اقتباس کریں" edit_reason: "وجہ:" post_number: "پوسٹ {{number}}" diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml index 143b0a6fad..30a91db4cd 100644 --- a/config/locales/client.vi.yml +++ b/config/locales/client.vi.yml @@ -1414,8 +1414,6 @@ vi: description: other: Bạn đã chọn {{count}} bài viết. post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "Trích dẫn" edit_reason: "Lý do: " post_number: "bài viết {{number}}" diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index 35835966f2..e2e1131257 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -1623,8 +1623,6 @@ zh_CN: description: other: 已选择 {{count}} 个帖子。 post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "引用" edit: " {{link}} {{replyAvatar}} {{username}}" edit_reason: "理由：" diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index 6fd464b20e..0a26c393e2 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -1404,8 +1404,6 @@ zh_TW: description: other: 你已選擇了 {{count}} 篇文章。 post: - reply: " {{replyAvatar}} {{usernameLink}}" - reply_topic: " {{link}}" quote_reply: "引用" edit_reason: "原因: " post_number: "文章 {{number}}" diff --git a/test/javascripts/acceptance/composer-actions-test.js.es6 b/test/javascripts/acceptance/composer-actions-test.js.es6 new file mode 100644 index 0000000000..f8b848389a --- /dev/null +++ b/test/javascripts/acceptance/composer-actions-test.js.es6 @@ -0,0 +1,101 @@ +import { acceptance } from 'helpers/qunit-helpers'; + +acceptance('Composer Actions', { + loggedIn: true, + settings: { + enable_whispers: true + } +}); + +QUnit.test('replying to post', assert => { + const composerActions = selectKit('.composer-actions'); + + visit('/t/internationalization-localization/280'); + click('article#post_3 button.reply'); + + composerActions.expand(); + + andThen(() => { + assert.equal(composerActions.rowByIndex(0).value(), 'reply_as_new_topic'); + assert.equal(composerActions.rowByIndex(1).value(), 'reply_as_private_message'); + assert.equal(composerActions.rowByIndex(2).value(), 'reply_to_topic'); + assert.equal(composerActions.rowByIndex(3).value(), 'reply_as_whisper'); + }); +}); + +QUnit.test('replying to post - reply_as_private_message', assert => { + const composerActions = selectKit('.composer-actions'); + + visit('/t/internationalization-localization/280'); + click('article#post_3 button.reply'); + + composerActions.expand().selectRowByValue('reply_as_private_message'); + + andThen(() => { + assert.equal(find('.users-input .item:eq(0)').text(), 'codinghorror'); + assert.ok(find('.d-editor-input').val().indexOf('Continuing the discussion') >= 0); + }); +}); + +QUnit.test('replying to post - reply_to_topic', assert => { + const composerActions = selectKit('.composer-actions'); + + visit('/t/internationalization-localization/280'); + click('article#post_3 button.reply'); + fillIn('.d-editor-input', 'test replying to topic when intially replied to post'); + composerActions.expand().selectRowByValue('reply_to_topic'); + + andThen(() => { + assert.equal(find('.topic-post:last .cooked p').html().trim(), 'test replying to topic when intially replied to post'); + assert.notOk(exists(find('.topic-post:last .reply-to-tab'))); + }); +}); + +QUnit.test('replying to post - reply_as_whisper', assert => { + const composerActions = selectKit('.composer-actions'); + + visit('/t/internationalization-localization/280'); + click('article#post_3 button.reply'); + fillIn('.d-editor-input', 'test replying as whisper to topic when intially not a whisper'); + composerActions.expand().selectRowByValue('reply_as_whisper'); + + andThen(() => { + assert.ok(exists(find('.topic-post:last .post-info.whisper'))); + assert.equal(find('.topic-post:last .cooked p').html().trim(), 'test replying as whisper to topic when intially not a whisper'); + }); +}); + +QUnit.test('replying to post - reply_as_not_whisper', assert => { + const composerActions = selectKit('.composer-actions'); + + visit('/t/internationalization-localization/280'); + click('article#post_3 button.reply'); + fillIn('.d-editor-input', 'test replying as not a whisper to topic when intially a whisper'); + selectKit('.toolbar-popup-menu-options').expand().selectRowByValue('toggleWhisper'); + composerActions.expand().selectRowByValue('reply_as_not_whisper'); + + andThen(() => { + assert.notOk(exists(find('.topic-post:last .post-info.whisper'))); + assert.equal(find('.topic-post:last .cooked p').html().trim(), 'test replying as not a whisper to topic when intially a whisper'); + }); +}); + +QUnit.test('replying to post - reply_as_new_topic', assert => { + const composerActions = selectKit('.composer-actions'); + const categoryChooser = selectKit('.title-wrapper .category-chooser'); + const categoryChooserReplyArea = selectKit('.reply-area .category-chooser'); + + visit('/t/internationalization-localization/280'); + + click('#topic-title .d-icon-pencil'); + categoryChooser.expand().selectRowByValue(4); + click('#topic-title .submit-edit'); + + click('article#post_3 button.reply'); + composerActions.expand().selectRowByValue('reply_as_new_topic'); + + andThen(() => { + assert.equal(categoryChooserReplyArea.header().name(), 'faq'); + assert.ok(find('.d-editor-input').val().indexOf('Continuing the discussion') >= 0); + }); +}); From 97ddaeeae82f81ab153de3d2c7571d4f1167268a Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Thu, 1 Feb 2018 16:56:07 +0100 Subject: [PATCH 028/202] FIX: use css instead of js to fix select-kit-collection max-height --- .../select-kit/components/category-drop.js.es6 | 1 - .../components/composer-actions.js.es6 | 1 - .../components/notifications-button.js.es6 | 1 - .../select-kit/components/period-chooser.js.es6 | 1 - .../select-kit/components/select-kit.js.es6 | 1 - .../select-kit/components/tag-drop.js.es6 | 1 - .../toolbar-popup-menu-options.js.es6 | 1 - .../select-kit/mixins/dom-helpers.js.es6 | 1 - .../common/select-kit/dropdown-select-box.scss | 1 + .../common/select-kit/select-kit.scss | 1 + .../components/single-select-test.js.es6 | 17 ----------------- 11 files changed, 2 insertions(+), 25 deletions(-) diff --git a/app/assets/javascripts/select-kit/components/category-drop.js.es6 b/app/assets/javascripts/select-kit/components/category-drop.js.es6 index 89a8d485f0..50e938439b 100644 --- a/app/assets/javascripts/select-kit/components/category-drop.js.es6 +++ b/app/assets/javascripts/select-kit/components/category-drop.js.es6 @@ -9,7 +9,6 @@ export default ComboBoxComponent.extend({ classNameBindings: ["categoryStyle"], classNames: "category-drop", verticalOffset: 3, - collectionHeight: "200", content: Ember.computed.alias("categories"), rowComponent: "category-row", headerComponent: "category-drop/category-drop-header", diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 b/app/assets/javascripts/select-kit/components/composer-actions.js.es6 index d8b3a2be47..6eb218d45b 100644 --- a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 +++ b/app/assets/javascripts/select-kit/components/composer-actions.js.es6 @@ -7,7 +7,6 @@ export default DropdownSelectBoxComponent.extend({ pluginApiIdentifiers: ["composer-actions"], classNames: "composer-actions", fullWidthOnMobile: true, - collectionHeight: "auto", autofilterable: false, filterable: false, allowInitialValueMutation: false, diff --git a/app/assets/javascripts/select-kit/components/notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/notifications-button.js.es6 index eaa9c6780f..1c91d22a8e 100644 --- a/app/assets/javascripts/select-kit/components/notifications-button.js.es6 +++ b/app/assets/javascripts/select-kit/components/notifications-button.js.es6 @@ -8,7 +8,6 @@ export default DropdownSelectBoxComponent.extend({ nameProperty: "key", fullWidthOnMobile: true, content: allLevels, - collectionHeight: "auto", castInteger: true, autofilterable: false, filterable: false, diff --git a/app/assets/javascripts/select-kit/components/period-chooser.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser.js.es6 index 02bb13c907..939bdedd94 100644 --- a/app/assets/javascripts/select-kit/components/period-chooser.js.es6 +++ b/app/assets/javascripts/select-kit/components/period-chooser.js.es6 @@ -4,7 +4,6 @@ export default DropdownSelectBoxComponent.extend({ classNames: ["period-chooser"], rowComponent: "period-chooser/period-chooser-row", headerComponent: "period-chooser/period-chooser-header", - collectionHeight: "auto", content: Ember.computed.alias("site.periods"), value: Ember.computed.alias("period"), isHidden: Ember.computed.alias("showPeriods"), diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6 index e08b74e32f..732af67d8f 100644 --- a/app/assets/javascripts/select-kit/components/select-kit.js.es6 +++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6 @@ -54,7 +54,6 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi headerComputedContent: null, collectionHeaderComputedContent: null, collectionComponent: "select-kit/select-kit-collection", - collectionHeight: 200, verticalOffset: 0, horizontalOffset: 0, fullWidthOnMobile: false, diff --git a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop.js.es6 index 1ebcd1e9ba..a91a6ae773 100644 --- a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 +++ b/app/assets/javascripts/select-kit/components/tag-drop.js.es6 @@ -8,7 +8,6 @@ export default ComboBoxComponent.extend({ classNameBindings: ["categoryStyle", "tagClass"], classNames: "tag-drop", verticalOffset: 3, - collectionHeight: "200", value: Ember.computed.alias("tagId"), headerComponent: "tag-drop/tag-drop-header", rowComponent: "tag-drop/tag-drop-row", diff --git a/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6 b/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6 index d679b9421e..8a54a215f1 100644 --- a/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6 +++ b/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6 @@ -6,7 +6,6 @@ export default DropdownSelectBoxComponent.extend({ classNames: ["toolbar-popup-menu-options"], isHidden: Ember.computed.empty("computedContent"), showFullTitle: false, - collectionHeight: "auto", @computed("title") collectionHeader(title) { diff --git a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 index eb7e93715f..e3521cfdc0 100644 --- a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 +++ b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 @@ -42,7 +42,6 @@ export default Ember.Mixin.create({ @on("didRender") _adjustPosition() { - this.$collection().css("max-height", this.get("collectionHeight")); this._applyFixedPosition(); this._applyDirection(); this._positionWrapper(); diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss index dca3847436..0190b38d98 100644 --- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss +++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss @@ -95,6 +95,7 @@ .select-box-kit-collection, .select-kit-collection { padding: 0; + max-height: auto; } .dropdown-select-box-header { diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss index 26e4ba8242..5c47572a5c 100644 --- a/app/assets/stylesheets/common/select-kit/select-kit.scss +++ b/app/assets/stylesheets/common/select-kit/select-kit.scss @@ -197,6 +197,7 @@ border-radius: inherit; -webkit-overflow-scrolling: touch; margin: 0; + max-height: 200px; .select-kit-collection { padding: 0; diff --git a/test/javascripts/components/single-select-test.js.es6 b/test/javascripts/components/single-select-test.js.es6 index 2e39a6dd40..3cf74cd51a 100644 --- a/test/javascripts/components/single-select-test.js.es6 +++ b/test/javascripts/components/single-select-test.js.es6 @@ -158,23 +158,6 @@ componentTest('doesn’t render collection content before first expand', { } }); -componentTest('supports options to limit size', { - template: '{{single-select collectionHeight=20 content=content}}', - - beforeEach() { - this.set("content", ["robin", "régis"]); - }, - - test(assert) { - this.get('subject').expand(); - - andThen(() => { - const height = find(".select-kit-collection").height(); - assert.equal(parseInt(height, 10), 20, "it limits the height"); - }); - } -}); - componentTest('dynamic headerText', { template: '{{single-select value=1 content=content}}', From 64ba876ff4fcaa43c8b2d699af5910d9c94d9216 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 1 Feb 2018 11:33:48 -0500 Subject: [PATCH 029/202] FIX: Don't show "Grant Badge" if badges are disabled --- .../discourse/widgets/post-admin-menu.js.es6 | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 index d79580ae45..32f0a43c38 100644 --- a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 @@ -10,7 +10,7 @@ createWidget('post-admin-menu-button', jQuery.extend(ButtonClass, { } })); -export function buildManageButtons(attrs, currentUser) { +export function buildManageButtons(attrs, currentUser, siteSettings) { if (!currentUser) { return []; } @@ -67,12 +67,14 @@ export function buildManageButtons(attrs, currentUser) { } if (currentUser.staff) { - contents.push({ - icon: 'certificate', - label: 'post.controls.grant_badge', - action: 'grantBadge', - className: 'grant-badge' - }); + if (siteSettings.enable_badges) { + contents.push({ + icon: 'certificate', + label: 'post.controls.grant_badge', + action: 'grantBadge', + className: 'grant-badge' + }); + } const action = attrs.locked ? "unlock" : "lock"; contents.push({ @@ -112,7 +114,7 @@ export default createWidget('post-admin-menu', { const contents = []; contents.push(h('h3', I18n.t('admin_title'))); - buildManageButtons(this.attrs, this.currentUser).forEach(b => { + buildManageButtons(this.attrs, this.currentUser, this.siteSettings).forEach(b => { contents.push(this.attach('post-admin-menu-button', b)); }); From e3301c4869bae7d7ffbc1e9229342f5af76e9054 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Thu, 1 Feb 2018 18:08:55 +0100 Subject: [PATCH 030/202] FIX: max-height auto is not valid --- .../stylesheets/common/select-kit/dropdown-select-box.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss index 0190b38d98..375a2e04d8 100644 --- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss +++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss @@ -95,7 +95,7 @@ .select-box-kit-collection, .select-kit-collection { padding: 0; - max-height: auto; + max-height: 100%; } .dropdown-select-box-header { From 42399261ba465a7980f8a591e30dc019f086b3e5 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Thu, 1 Feb 2018 18:41:11 +0100 Subject: [PATCH 031/202] adds margin to avatar in composer-action-title --- app/assets/stylesheets/common/base/compose.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss index 5160d934dd..0b78319214 100644 --- a/app/assets/stylesheets/common/base/compose.scss +++ b/app/assets/stylesheets/common/base/compose.scss @@ -114,6 +114,10 @@ .d-icon { margin-right: 5px; } + + img.avatar { + margin-right: 3px; + } } .composer-controls { margin-left: auto; From a4aeb74abafc0bea8cf2f3c2f3202f614fe4f6e2 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Thu, 1 Feb 2018 19:54:48 +0100 Subject: [PATCH 032/202] typo --- config/locales/client.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 2a0127f39d..158923c3f2 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1302,10 +1302,10 @@ en: label: Reply to topic desc: Reply to the original post without replying to a specific post reply_as_whisper: - label: Reply as whipser + label: Reply as whisper desc: This message will only be visible by staff members reply_as_not_whisper: - label: Reply as not whisher + label: Reply as not whisper desc: This message will be visible by anyone notifications: From 08db10491e75ab20cdcde3a047faecad43718758 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 1 Feb 2018 15:23:52 -0500 Subject: [PATCH 033/202] Adds a new plugin API for adding classes to be shown on user avatars --- .../discourse/helpers/bound-avatar.js.es6 | 8 +++++++- .../discourse/helpers/user-avatar.js.es6 | 17 ++++++++++++++++ .../discourse/initializers/banner.js.es6 | 2 +- .../discourse/lib/plugin-api.js.es6 | 20 ++++++++++++++++++- 4 files changed, 44 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 index 2833f8cefb..43cea519d4 100644 --- a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 +++ b/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 @@ -1,5 +1,6 @@ import { htmlHelper } from 'discourse-common/lib/helpers'; import { avatarImg } from 'discourse/lib/utilities'; +import { classesForUser } from 'discourse/helpers/user-avatar'; export default htmlHelper((user, size) => { if (Ember.isEmpty(user)) { @@ -7,5 +8,10 @@ export default htmlHelper((user, size) => { } const avatarTemplate = Em.get(user, 'avatar_template'); - return avatarImg({ size, avatarTemplate }); + let args = { size, avatarTemplate }; + let extraClasses = classesForUser(user).join(' '); + if (extraClasses && extraClasses.length) { + args.extraClasses = extraClasses; + } + return avatarImg(args); }); diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 index 71e6e87249..8054631dfa 100644 --- a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 +++ b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 @@ -1,6 +1,23 @@ import { registerUnbound } from 'discourse-common/lib/helpers'; import { avatarImg, formatUsername } from 'discourse/lib/utilities'; +let _customAvatarHelpers; + +export function registerCustomAvatarHelper(fn) { + _customAvatarHelpers = _customAvatarHelpers || []; + _customAvatarHelpers.push(fn); +} + +export function classesForUser(u) { + let result = []; + if (_customAvatarHelpers) { + for (let i=0; i<_customAvatarHelpers.length; i++) { + result = result.concat(_customAvatarHelpers[i](u)); + } + } + return result; +} + function renderAvatar(user, options) { options = options || {}; diff --git a/app/assets/javascripts/discourse/initializers/banner.js.es6 b/app/assets/javascripts/discourse/initializers/banner.js.es6 index 9c9ff47d92..1e9695d081 100644 --- a/app/assets/javascripts/discourse/initializers/banner.js.es6 +++ b/app/assets/javascripts/discourse/initializers/banner.js.es6 @@ -1,11 +1,11 @@ import PreloadStore from 'preload-store'; +import { withPluginApi } from 'discourse/lib/plugin-api'; export default { name: "banner", after: "message-bus", initialize(container) { - const banner = Em.Object.create(PreloadStore.get("banner")), site = container.lookup('site:main'); diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 index 60fc1233a5..bc15c48952 100644 --- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 +++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 @@ -23,9 +23,10 @@ import { addNavItem } from 'discourse/models/nav-item'; import { replaceFormatter } from 'discourse/lib/utilities'; import { modifySelectKit } from "select-kit/mixins/plugin-api"; import { addGTMPageChangedCallback } from 'discourse/lib/page-tracker'; +import { registerCustomAvatarHelper } from 'discourse/helpers/user-avatar'; // If you add any methods to the API ensure you bump up this number -const PLUGIN_API_VERSION = '0.8.17'; +const PLUGIN_API_VERSION = '0.8.18'; class PluginApi { constructor(version, container) { @@ -368,6 +369,23 @@ class PluginApi { appEvents.on(name, fn); } + /** + Registers a function to generate custom avatar CSS classes + for a particular user. + + Takes a function that will accept a user as a parameter + and return an array of CSS classes to apply. + + ```javascript + api.customUserAvatarClasses(user => { + if (Ember.get(user, 'primary_group_name') === 'managers') { + return ['managers']; + } + }); + **/ + customUserAvatarClasses(fn) { + registerCustomAvatarHelper(fn); + } /** * Changes a setting associated with a widget. For example, if From ef2a7ac0f7c0b8821fa7b361b9a4aee812a97cef Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 1 Feb 2018 15:50:41 -0500 Subject: [PATCH 034/202] FIX: admin reports would sometimes return fewer than 30 days of data, causing current 30 day period counts to be too small and prev30day counts to count the wrong days --- app/models/report.rb | 13 ++++---- spec/models/report_spec.rb | 63 ++++++++++++++++++++++++++++++++------ 2 files changed, 60 insertions(+), 16 deletions(-) diff --git a/app/models/report.rb b/app/models/report.rb index 83f046cc36..04f27453a0 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -10,7 +10,7 @@ class Report def initialize(type) @type = type - @start_date ||= 1.month.ago.beginning_of_day + @start_date ||= Report.default_days.days.ago.beginning_of_day @end_date ||= Time.zone.now.end_of_day end @@ -75,11 +75,12 @@ class Report report.data << { x: date, y: count } end - report.total = data.sum(:count) - report.prev30Days = data.where('date >= ? AND date <= ?', - (report.start_date - 31.days).to_date, - (report.end_date - 31.days).to_date) - .sum(:count) + report.total = data.sum(:count) + + report.prev30Days = data.where( + 'date >= ? AND date < ?', + (report.start_date - 31.days).to_date, report.start_date.to_date + ).sum(:count) end def self.report_visits(report) diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb index c70f9a4fff..a7e5fc8bbb 100644 --- a/spec/models/report_spec.rb +++ b/spec/models/report_spec.rb @@ -2,6 +2,50 @@ require 'rails_helper' describe Report do + describe "counting" do + describe "requests" do + before do + freeze_time DateTime.parse('2017-03-01 12:00') + + # today, an incomplete day: + ApplicationRequest.create(date: 0.days.ago.to_time, req_type: ApplicationRequest.req_types['http_total'], count: 1) + + # 60 complete days: + 30.times do |i| + ApplicationRequest.create(date: (i + 1).days.ago.to_time, req_type: ApplicationRequest.req_types['http_total'], count: 10) + end + 30.times do |i| + ApplicationRequest.create(date: (31 + i).days.ago.to_time, req_type: ApplicationRequest.req_types['http_total'], count: 100) + end + end + + subject(:json) { Report.find("http_total_reqs").as_json } + + it "counts the correct records" do + expect(json[:data].size).to eq(31) # today and 30 full days + expect(json[:data][0..-2].sum { |d| d[:y] }).to eq(300) + expect(json[:prev30Days]).to eq(3000) + end + end + + describe "topics" do + before do + freeze_time DateTime.parse('2017-03-01 12:00') + + ((0..32).to_a + [60, 61, 62, 63]).each do |i| + Fabricate(:topic, created_at: i.days.ago) + end + end + + subject(:json) { Report.find("topics").as_json } + + it "counts the correct records" do + expect(json[:data].size).to eq(31) + expect(json[:prev30Days]).to eq(3) + end + end + end + describe 'visits report' do let(:report) { Report.find('visits') } @@ -58,18 +102,17 @@ describe Report do Fabricate(fabricator, created_at: 35.days.ago) end - context 'returns a report with data' - it "returns today's data" do - expect(report.data.select { |v| v[:x].today? }).to be_present - end + it "returns today's data" do + expect(report.data.select { |v| v[:x].today? }).to be_present + end - it 'returns total data' do - expect(report.total).to eq 7 - end + it 'returns total data' do + expect(report.total).to eq 7 + end - it "returns previous 30 day's data" do - expect(report.prev30Days).to be_present - end + it "returns previous 30 day's data" do + expect(report.prev30Days).to be_present + end end end end From 9fa71e198e59ca4969532a8aa8cf2aff993ae193 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 1 Feb 2018 15:59:39 -0500 Subject: [PATCH 035/202] FIX: admin reports charts should use same time of day as dashboard numbers --- app/controllers/admin/reports_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index 6490c96d73..dec448528d 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -7,8 +7,8 @@ class Admin::ReportsController < Admin::AdminController raise Discourse::NotFound unless report_type =~ /^[a-z0-9\_]+$/ - start_date = params[:start_date].present? ? Time.parse(params[:start_date]) : 30.days.ago - end_date = params[:end_date].present? ? Time.parse(params[:end_date]) : start_date + 30.days + start_date = (params[:start_date].present? ? Time.zone.parse(params[:start_date]) : 30.days.ago).beginning_of_day + end_date = (params[:end_date].present? ? Time.zone.parse(params[:end_date]) : start_date + 30.days).end_of_day if params.has_key?(:category_id) && params[:category_id].to_i > 0 category_id = params[:category_id].to_i From 9f96d59a177c20624bc8abf94a8288829c1c0cc0 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 1 Feb 2018 16:31:09 -0500 Subject: [PATCH 036/202] FIX: Unused import --- app/assets/javascripts/discourse/initializers/banner.js.es6 | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/discourse/initializers/banner.js.es6 b/app/assets/javascripts/discourse/initializers/banner.js.es6 index 1e9695d081..4ce88b2c48 100644 --- a/app/assets/javascripts/discourse/initializers/banner.js.es6 +++ b/app/assets/javascripts/discourse/initializers/banner.js.es6 @@ -1,5 +1,4 @@ import PreloadStore from 'preload-store'; -import { withPluginApi } from 'discourse/lib/plugin-api'; export default { name: "banner", From 0156ae486d85af8e9c647cab613ea9c8a0835574 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 1 Feb 2018 16:59:10 -0500 Subject: [PATCH 037/202] Apply extra classes to header avatar --- .../javascripts/discourse/helpers/bound-avatar.js.es6 | 11 +++-------- .../javascripts/discourse/helpers/user-avatar.js.es6 | 8 ++++++++ .../javascripts/discourse/widgets/header.js.es6 | 11 +++++++---- app/assets/javascripts/discourse/widgets/post.js.es6 | 6 +++++- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 index 43cea519d4..a284fb3671 100644 --- a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 +++ b/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 @@ -1,17 +1,12 @@ import { htmlHelper } from 'discourse-common/lib/helpers'; import { avatarImg } from 'discourse/lib/utilities'; -import { classesForUser } from 'discourse/helpers/user-avatar'; +import { addExtraUserClasses } from 'discourse/helpers/user-avatar'; export default htmlHelper((user, size) => { if (Ember.isEmpty(user)) { return "
    "; } - const avatarTemplate = Em.get(user, 'avatar_template'); - let args = { size, avatarTemplate }; - let extraClasses = classesForUser(user).join(' '); - if (extraClasses && extraClasses.length) { - args.extraClasses = extraClasses; - } - return avatarImg(args); + const avatarTemplate = Ember.get(user, 'avatar_template'); + return avatarImg(addExtraUserClasses(user, { size, avatarTemplate })); }); diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 index 8054631dfa..e20528bd42 100644 --- a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 +++ b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 @@ -8,6 +8,14 @@ export function registerCustomAvatarHelper(fn) { _customAvatarHelpers.push(fn); } +export function addExtraUserClasses(u, args) { + let extraClasses = classesForUser(u).join(' '); + if (extraClasses && extraClasses.length) { + args.extraClasses = extraClasses; + } + return args; +} + export function classesForUser(u) { let result = []; if (_customAvatarHelpers) { diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6 index db166e6659..0cfc041914 100644 --- a/app/assets/javascripts/discourse/widgets/header.js.es6 +++ b/app/assets/javascripts/discourse/widgets/header.js.es6 @@ -5,6 +5,7 @@ import DiscourseURL from 'discourse/lib/url'; import { wantsNewWindow } from 'discourse/lib/intercept-click'; import { applySearchAutocomplete } from "discourse/lib/search"; import { ajax } from 'discourse/lib/ajax'; +import { addExtraUserClasses } from 'discourse/helpers/user-avatar'; import { h } from 'virtual-dom'; @@ -30,10 +31,12 @@ createWidget('header-notifications', { html(attrs) { const { user } = attrs; - const contents = [ avatarImg(this.settings.avatarSize, { - template: user.get('avatar_template'), - username: user.get('username') - }) ]; + const contents = [ + avatarImg(this.settings.avatarSize, addExtraUserClasses(user, { + template: user.get('avatar_template'), + username: user.get('username') + })) + ]; const unreadNotifications = user.get('unread_notifications'); if (!!unreadNotifications) { diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6 index 29618627e6..887493fd45 100644 --- a/app/assets/javascripts/discourse/widgets/post.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post.js.es6 @@ -17,9 +17,13 @@ export function avatarImg(wanted, attrs) { if (!url || url.length === 0) { return; } const title = formatUsername(attrs.username); + let className = 'avatar' + ( + attrs.extraClasses ? " " + attrs.extraClasses : "" + ); + const properties = { attributes: { alt: '', width: size, height: size, src: Discourse.getURLWithCDN(url), title }, - className: 'avatar' + className }; return h('img', properties); From f7df68c9a3be377cef09e2a80c615fce92091b36 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Thu, 1 Feb 2018 23:07:37 +0100 Subject: [PATCH 038/202] FIX: makes composer-actions toggling whisper instead of replying --- .../components/composer-action-title.hbs | 1 - .../components/composer-actions.js.es6 | 35 ++++++------------- config/locales/client.en.yml | 9 ++--- .../acceptance/composer-actions-test.js.es6 | 26 ++++---------- 4 files changed, 19 insertions(+), 52 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs b/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs index fcb2bacfa0..3688355a92 100644 --- a/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs +++ b/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs @@ -4,7 +4,6 @@ {{composer-actions composerModel=model options=model.replyOptions - whispering=model.whisper canWhisper=canWhisper action=model.action}} {{/if}} diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 b/app/assets/javascripts/select-kit/components/composer-actions.js.es6 index 6eb218d45b..2ca9ad9902 100644 --- a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 +++ b/app/assets/javascripts/select-kit/components/composer-actions.js.es6 @@ -28,8 +28,8 @@ export default DropdownSelectBoxComponent.extend({ return content; }, - @computed("options", "canWhisper", "whispering", "composerModel.post.username") - content(options, canWhisper, whispering, postUsername) { + @computed("options", "canWhisper", "composerModel.post.username") + content(options, canWhisper, postUsername) { let items = [ { name: I18n.t("composer.composer_actions.reply_as_new_topic.label"), @@ -58,21 +58,12 @@ export default DropdownSelectBoxComponent.extend({ } if (canWhisper) { - if (whispering) { - items.push({ - name: I18n.t("composer.composer_actions.reply_as_not_whisper.label"), - description: I18n.t("composer.composer_actions.reply_as_not_whisper.desc"), - icon: "eye", - id: "reply_as_not_whisper" - }); - } else { - items.push({ - name: I18n.t("composer.composer_actions.reply_as_whisper.label"), - description: I18n.t("composer.composer_actions.reply_as_whisper.desc"), - icon: "eye-slash", - id: "reply_as_whisper" - }); - } + items.push({ + name: I18n.t("composer.composer_actions.toggle_whisper.label"), + description: I18n.t("composer.composer_actions.toggle_whisper.desc"), + icon: "eye-slash", + id: "toggle_whisper" + }); } return items; @@ -92,14 +83,8 @@ export default DropdownSelectBoxComponent.extend({ actions: { onSelect(value) { switch(value) { - case "reply_as_whisper": - this.set("composerModel.whisper", true); - this.get("composerController").save(); - break; - - case "reply_as_not_whisper": - this.set("composerModel.whisper", false); - this.get("composerController").save(); + case "toggle_whisper": + this.set("composerModel.whisper", !this.get("composerModel.whisper")); break; case "reply_to_topic": diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 158923c3f2..cbd757d039 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1301,12 +1301,9 @@ en: reply_to_topic: label: Reply to topic desc: Reply to the original post without replying to a specific post - reply_as_whisper: - label: Reply as whisper - desc: This message will only be visible by staff members - reply_as_not_whisper: - label: Reply as not whisper - desc: This message will be visible by anyone + toggle_whisper: + label: Toggle whipser + desc: Whispers will only be visible by staff members notifications: tooltip: diff --git a/test/javascripts/acceptance/composer-actions-test.js.es6 b/test/javascripts/acceptance/composer-actions-test.js.es6 index f8b848389a..3893b2ac99 100644 --- a/test/javascripts/acceptance/composer-actions-test.js.es6 +++ b/test/javascripts/acceptance/composer-actions-test.js.es6 @@ -19,7 +19,7 @@ QUnit.test('replying to post', assert => { assert.equal(composerActions.rowByIndex(0).value(), 'reply_as_new_topic'); assert.equal(composerActions.rowByIndex(1).value(), 'reply_as_private_message'); assert.equal(composerActions.rowByIndex(2).value(), 'reply_to_topic'); - assert.equal(composerActions.rowByIndex(3).value(), 'reply_as_whisper'); + assert.equal(composerActions.rowByIndex(3).value(), 'toggle_whisper'); }); }); @@ -51,32 +51,18 @@ QUnit.test('replying to post - reply_to_topic', assert => { }); }); -QUnit.test('replying to post - reply_as_whisper', assert => { +QUnit.test('replying to post - toggle_whisper', assert => { const composerActions = selectKit('.composer-actions'); visit('/t/internationalization-localization/280'); click('article#post_3 button.reply'); fillIn('.d-editor-input', 'test replying as whisper to topic when intially not a whisper'); - composerActions.expand().selectRowByValue('reply_as_whisper'); + composerActions.expand().selectRowByValue('toggle_whisper'); andThen(() => { - assert.ok(exists(find('.topic-post:last .post-info.whisper'))); - assert.equal(find('.topic-post:last .cooked p').html().trim(), 'test replying as whisper to topic when intially not a whisper'); - }); -}); - -QUnit.test('replying to post - reply_as_not_whisper', assert => { - const composerActions = selectKit('.composer-actions'); - - visit('/t/internationalization-localization/280'); - click('article#post_3 button.reply'); - fillIn('.d-editor-input', 'test replying as not a whisper to topic when intially a whisper'); - selectKit('.toolbar-popup-menu-options').expand().selectRowByValue('toggleWhisper'); - composerActions.expand().selectRowByValue('reply_as_not_whisper'); - - andThen(() => { - assert.notOk(exists(find('.topic-post:last .post-info.whisper'))); - assert.equal(find('.topic-post:last .cooked p').html().trim(), 'test replying as not a whisper to topic when intially a whisper'); + assert.ok( + find('.composer-fields .whisper').text().indexOf(I18n.t("composer.whisper")) > 0 + ); }); }); From 8ff41045550ba872d02590d7c44394ede1a7c89f Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 30 Jan 2018 16:31:29 -0500 Subject: [PATCH 039/202] Many enhancements to the flagging / suspending interface. --- .../admin/components/flagged-post.js.es6 | 23 +--------- .../components/penalty-post-action.js.es6 | 32 +++++++++++++ .../modals/admin-silence-user.js.es6 | 42 ++++++----------- .../modals/admin-suspend-user.js.es6 | 45 ++++++------------ .../admin/mixins/penalty-controller.js.es6 | 41 +++++++++++++++++ .../admin/services/admin-tools.js.es6 | 6 ++- .../templates/components/flagged-post.hbs | 15 ------ .../components/penalty-post-action.hbs | 16 +++++++ .../templates/modal/admin-silence-user.hbs | 6 +++ .../templates/modal/admin-suspend-user.hbs | 7 +++ .../discourse/lib/ajax-error.js.es6 | 2 + .../admin-agree-flag-dropdown.js.es6 | 38 +++++++++++++++ .../stylesheets/common/admin/suspend.scss | 10 ++++ app/controllers/admin/users_controller.rb | 24 ++++++++++ config/locales/client.en.yml | 12 ++++- lib/flag_query.rb | 1 + .../admin/users_controller_spec.rb | 46 +++++++++++++------ .../acceptance/admin-flags-test.js.es6 | 9 ---- 18 files changed, 255 insertions(+), 120 deletions(-) create mode 100644 app/assets/javascripts/admin/components/penalty-post-action.js.es6 create mode 100644 app/assets/javascripts/admin/mixins/penalty-controller.js.es6 create mode 100644 app/assets/javascripts/admin/templates/components/penalty-post-action.hbs diff --git a/app/assets/javascripts/admin/components/flagged-post.js.es6 b/app/assets/javascripts/admin/components/flagged-post.js.es6 index aaa4759e82..8aff3d2a2d 100644 --- a/app/assets/javascripts/admin/components/flagged-post.js.es6 +++ b/app/assets/javascripts/admin/components/flagged-post.js.es6 @@ -4,8 +4,6 @@ import computed from 'ember-addons/ember-computed-decorators'; export default Ember.Component.extend({ adminTools: Ember.inject.service(), expanded: false, - suspended: false, - tagName: 'div', classNameBindings: [ ':flagged-post', @@ -21,12 +19,7 @@ export default Ember.Component.extend({ }, removeAfter(promise) { - return promise.then(() => { - this.attrs.removePost(); - }).catch(error => { - if (error._discourse_displayed) { return; } - bootbox.alert(I18n.t("admin.flags.error")); - }); + return promise.then(() => this.attrs.removePost()); }, _spawnModal(name, model, modalClass) { @@ -36,7 +29,7 @@ export default Ember.Component.extend({ actions: { removeAfter(promise) { - this.removeAfter(promise); + return this.removeAfter(promise); }, disagree() { @@ -58,18 +51,6 @@ export default Ember.Component.extend({ filter: 'post', post_id: this.get('flaggedPost.id') }); - }, - - showSuspendModal() { - let post = this.get('flaggedPost'); - let user = post.get('user'); - this.get('adminTools').showSuspendModal( - user, - { - post, - successCallback: result => this.set('suspended', result.suspended) - } - ); } } }); diff --git a/app/assets/javascripts/admin/components/penalty-post-action.js.es6 b/app/assets/javascripts/admin/components/penalty-post-action.js.es6 new file mode 100644 index 0000000000..d89c69a32d --- /dev/null +++ b/app/assets/javascripts/admin/components/penalty-post-action.js.es6 @@ -0,0 +1,32 @@ +import computed from 'ember-addons/ember-computed-decorators'; + +const ACTIONS = ['delete', 'edit', 'none']; +export default Ember.Component.extend({ + postAction: null, + postEdit: null, + + @computed + penaltyActions() { + return ACTIONS.map(id => { + return { id, name: I18n.t(`admin.user.penalty_post_${id}`) }; + }); + }, + + editing: Ember.computed.equal('postAction', 'edit'), + + actions: { + penaltyChanged() { + let postAction = this.get('postAction'); + + // If we switch to edit mode, jump to the edit textarea + if (postAction === 'edit') { + Ember.run.scheduleOnce('afterRender', () => { + let $elem = this.$(); + let body = $elem.closest('.modal-body'); + body.scrollTop(body.height()); + $elem.find('.post-editor').focus(); + }); + } + } + } +}); diff --git a/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6 index 9f1aef916f..2e12a2196d 100644 --- a/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6 +++ b/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6 @@ -1,26 +1,14 @@ -import ModalFunctionality from 'discourse/mixins/modal-functionality'; import computed from 'ember-addons/ember-computed-decorators'; import { popupAjaxError } from 'discourse/lib/ajax-error'; +import PenaltyController from 'admin/mixins/penalty-controller'; -export default Ember.Controller.extend(ModalFunctionality, { +export default Ember.Controller.extend(PenaltyController, { silenceUntil: null, - reason: null, - message: null, silencing: false, - user: null, - post: null, - successCallback: null, onShow() { - this.setProperties({ - silenceUntil: null, - reason: null, - message: null, - silencing: false, - loadingUser: true, - post: null, - successCallback: null, - }); + this.resetModal(); + this.setProperties({ silenceUntil: null, silencing: false }); }, @computed('silenceUntil', 'reason', 'silencing') @@ -33,18 +21,16 @@ export default Ember.Controller.extend(ModalFunctionality, { if (this.get('submitDisabled')) { return; } this.set('silencing', true); - this.get('user').silence({ - silenced_till: this.get('silenceUntil'), - reason: this.get('reason'), - message: this.get('message'), - post_id: this.get('post.id') - }).then(result => { - this.send('closeModal'); - let callback = this.get('successCallback'); - if (callback) { - callback(result); - } - }).catch(popupAjaxError).finally(() => this.set('silencing', false)); + this.penalize(() => { + return this.get('user').silence({ + silenced_till: this.get('silenceUntil'), + reason: this.get('reason'), + message: this.get('message'), + post_id: this.get('post.id'), + post_action: this.get('postAction'), + post_edit: this.get('postEdit') + }); + }).finally(() => this.set('silencing', false)); } } }); diff --git a/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6 index efcd142670..f66a1eec69 100644 --- a/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6 +++ b/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6 @@ -1,26 +1,13 @@ -import ModalFunctionality from 'discourse/mixins/modal-functionality'; import computed from 'ember-addons/ember-computed-decorators'; -import { popupAjaxError } from 'discourse/lib/ajax-error'; +import PenaltyController from 'admin/mixins/penalty-controller'; -export default Ember.Controller.extend(ModalFunctionality, { +export default Ember.Controller.extend(PenaltyController, { suspendUntil: null, - reason: null, - message: null, suspending: false, - user: null, - post: null, - successCallback: null, onShow() { - this.setProperties({ - suspendUntil: null, - reason: null, - message: null, - suspending: false, - loadingUser: true, - post: null, - successCallback: null, - }); + this.resetModal(); + this.setProperties({ suspendUntil: null, suspending: false }); }, @computed('suspendUntil', 'reason', 'suspending') @@ -33,19 +20,17 @@ export default Ember.Controller.extend(ModalFunctionality, { if (this.get('submitDisabled')) { return; } this.set('suspending', true); - this.get('user').suspend({ - suspend_until: this.get('suspendUntil'), - reason: this.get('reason'), - message: this.get('message'), - post_id: this.get('post.id') - }).then(result => { - this.send('closeModal'); - let callback = this.get('successCallback'); - if (callback) { - callback(result); - } - }).catch(popupAjaxError).finally(() => this.set('suspending', false)); + + this.penalize(() => { + return this.get('user').suspend({ + suspend_until: this.get('suspendUntil'), + reason: this.get('reason'), + message: this.get('message'), + post_id: this.get('post.id'), + post_action: this.get('postAction'), + post_edit: this.get('postEdit') + }); + }).finally(() => this.set('suspending', false)); } } - }); diff --git a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6 b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6 new file mode 100644 index 0000000000..8b5bbb0629 --- /dev/null +++ b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6 @@ -0,0 +1,41 @@ +import ModalFunctionality from 'discourse/mixins/modal-functionality'; +import { popupAjaxError } from 'discourse/lib/ajax-error'; + +export default Ember.Mixin.create(ModalFunctionality, { + reason: null, + message: null, + postEdit: null, + postAction: null, + user: null, + post: null, + successCallback: null, + + resetModal() { + this.setProperties({ + reason: null, + message: null, + loadingUser: true, + post: null, + postEdit: null, + postAction: 'delete', + before: null, + successCallback: null + }); + }, + + penalize(cb) { + let before = this.get('before'); + let promise = before ? before() : Ember.RSVP.resolve(); + + return promise + .then(() => cb()) + .then(result => { + this.send('closeModal'); + let callback = this.get('successCallback'); + if (callback) { + callback(result); + } + }) + .catch(popupAjaxError); + } +}); diff --git a/app/assets/javascripts/admin/services/admin-tools.js.es6 b/app/assets/javascripts/admin/services/admin-tools.js.es6 index a6a56d0f14..9f9bec8b03 100644 --- a/app/assets/javascripts/admin/services/admin-tools.js.es6 +++ b/app/assets/javascripts/admin/services/admin-tools.js.es6 @@ -52,7 +52,10 @@ export default Ember.Service.extend({ modalClass: `${type}-user-modal` }); if (opts.post) { - controller.set('post', opts.post); + controller.setProperties({ + post: opts.post, + postEdit: opts.post.get('raw') + }); } return (user.adminUserView ? @@ -62,6 +65,7 @@ export default Ember.Service.extend({ controller.setProperties({ user: loadedUser, loadingUser: false, + before: opts.before, successCallback: opts.successCallback }); }); diff --git a/app/assets/javascripts/admin/templates/components/flagged-post.hbs b/app/assets/javascripts/admin/templates/components/flagged-post.hbs index 04b953c451..37631f1442 100644 --- a/app/assets/javascripts/admin/templates/components/flagged-post.hbs +++ b/app/assets/javascripts/admin/templates/components/flagged-post.hbs @@ -68,12 +68,6 @@ {{flag-user-lists flaggedPost=flaggedPost showResolvedBy=showResolvedBy}} - {{#if suspended}} -
    - {{i18n "admin.flags.suspended_for_post"}} -
    - {{/if}} -
    {{#if canAct}} {{admin-agree-flag-dropdown @@ -106,15 +100,6 @@ {{admin-delete-flag-dropdown post=flaggedPost removeAfter=(action "removeAfter")}} - - {{#unless suspended}} - {{d-button - class="btn-danger suspend-user" - icon="ban" - label="admin.flags.suspend_user" - title="admin.flags.suspend_user_title" - action=(action "showSuspendModal")}} - {{/unless}} {{/if}} {{d-button diff --git a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs new file mode 100644 index 0000000000..1c8ffe56d8 --- /dev/null +++ b/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs @@ -0,0 +1,16 @@ +
    + + {{combo-box value=postAction content=penaltyActions onSelect=(action "penaltyChanged")}} +
    + +{{#if editing}} +
    + {{textarea + value=postEdit + class="post-editor"}} +
    +{{/if}} diff --git a/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs index 6b3b899ac8..b31251a91d 100644 --- a/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs +++ b/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs @@ -12,6 +12,12 @@
    {{silence-details reason=reason message=message}} + {{#if post}} + {{penalty-post-action + post=post + postAction=postAction + postEdit=postEdit}} + {{/if}} {{/conditional-loading-spinner}} diff --git a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs index 4c0af11512..6c2e8e1636 100644 --- a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs +++ b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs @@ -13,6 +13,13 @@
    {{suspension-details reason=reason message=message}} + {{#if post}} + {{penalty-post-action + post=post + postAction=postAction + postEdit=postEdit}} + {{/if}} + {{else}}
    {{i18n "admin.user.cant_suspend"}} diff --git a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 b/app/assets/javascripts/discourse/lib/ajax-error.js.es6 index cb155ec258..9666d9c378 100644 --- a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 +++ b/app/assets/javascripts/discourse/lib/ajax-error.js.es6 @@ -54,9 +54,11 @@ export function throwAjaxError(undoCallback) { } export function popupAjaxError(error) { + if (error && error._discourse_displayed) { return; } bootbox.alert(extractError(error)); error._discourse_displayed = true; + // We re-throw in a catch to not swallow the exception throw error; } diff --git a/app/assets/javascripts/select-kit/components/admin-agree-flag-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/admin-agree-flag-dropdown.js.es6 index 55708f10ea..3020529ef6 100644 --- a/app/assets/javascripts/select-kit/components/admin-agree-flag-dropdown.js.es6 +++ b/app/assets/javascripts/select-kit/components/admin-agree-flag-dropdown.js.es6 @@ -55,6 +55,22 @@ export default DropdownSelectBox.extend({ label: I18n.t("admin.flags.agree_flag"), }); + content.push({ + icon: 'ban', + id: 'confirm-agree-suspend', + description: I18n.t('admin.flags.agree_flag_suspend_title'), + action: () => this.send("showSuspendModal"), + label: I18n.t("admin.flags.agree_flag_suspend"), + }); + + content.push({ + icon: 'microphone-slash', + id: 'confirm-agree-silence', + description: I18n.t('admin.flags.agree_flag_silence_title'), + action: () => this.send("showSilenceModal"), + label: I18n.t("admin.flags.agree_flag_silence"), + }); + if (canDeleteSpammer) { content.push({ title: I18n.t("admin.flags.delete_spammer_title"), @@ -79,6 +95,28 @@ export default DropdownSelectBox.extend({ this.attrs.removeAfter(spammerDetails.deleteUser()); }, + showSuspendModal() { + let post = this.get('post'); + let user = post.get('user'); + this.get('adminTools').showSuspendModal(user, { + post, + before: () => { + return this.attrs.removeAfter(post.agreeFlags('suspended')); + } + }); + }, + + showSilenceModal() { + let post = this.get('post'); + let user = post.get('user'); + this.get('adminTools').showSilenceModal(user, { + post, + before: () => { + return this.attrs.removeAfter(post.agreeFlags('silenced')); + } + }); + }, + perform(action) { let flaggedPost = this.get("post"); this.attrs.removeAfter(flaggedPost.agreeFlags(action)); diff --git a/app/assets/stylesheets/common/admin/suspend.scss b/app/assets/stylesheets/common/admin/suspend.scss index efdfb68f79..8e2ab667e1 100644 --- a/app/assets/stylesheets/common/admin/suspend.scss +++ b/app/assets/stylesheets/common/admin/suspend.scss @@ -21,3 +21,13 @@ float: right; } } + +.modal-body { + .penalty-post-edit { + margin-top: 1em; + + textarea { + height: 10em; + } + } +} diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 2095903ab6..13aa89d3ca 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -93,6 +93,8 @@ class Admin::UsersController < Admin::AdminController suspended_at: DateTime.now ) + perform_post_action + render_json_dump( suspension: { suspended: true, @@ -297,6 +299,7 @@ class Admin::UsersController < Admin::AdminController user_history_id: silencer.user_history.id ) end + perform_post_action render_json_dump( silence: { @@ -467,6 +470,27 @@ class Admin::UsersController < Admin::AdminController private + def perform_post_action + return unless params[:post_id].present? && + params[:post_action].present? + + if post = Post.where(id: params[:post_id]).first + case params[:post_action] + when 'delete' + PostDestroyer.new(current_user, post).destroy + when 'edit' + revisor = PostRevisor.new(post) + + # Take what the moderator edited in as gospel + revisor.revise!( + current_user, + { raw: params[:post_edit] }, + skip_validations: true, skip_revision: true + ) + end + end + end + def fetch_user @user = User.find_by(id: params[:user_id]) end diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index cbd757d039..7784265fcf 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -2695,7 +2695,12 @@ en: agree_flag_hide_post_title: "Hide this post and automatically send the user a message urging them to edit it." agree_flag_restore_post: "Agree and Restore Post" agree_flag_restore_post_title: "Restore the post so that all users can see it." - agree_flag: "Agree and Keep Post" + agree_flag_suspend: "Suspend User" + agree_flag_suspend_title: "Agree with flag and suspend the user." + agree_flag_silence: "Silence User" + agree_flag_silence_title: "Agree with flag and silence the user." + + agree_flag: "Keep Post" agree_flag_title: "Agree with flag and keep the post unchanged." ignore_flag: "Ignore" ignore_flag_title: "Remove this flag; it requires no action at this time." @@ -2729,7 +2734,6 @@ en: system: "System" error: "Something went wrong" reply_message: "Reply" - suspended_for_post: "The user was suspended for this post." no_results: "There are no flagged posts." topic_flagged: "This topic has been flagged." show_full: "show full post" @@ -3392,6 +3396,10 @@ en: suspended_until: "(until %{until})" cant_suspend: "This user cannot be suspended." delete_all_posts: "Delete all posts" + penalty_post_actions: "What would you like to do with the associated post?" + penalty_post_delete: "Delete the post" + penalty_post_edit: "Edit the post" + penalty_post_none: "Do nothing" # keys ending with _MF use message format, see https://meta.discourse.org/t/message-format-support-for-localization/7035 for details delete_all_posts_confirm_MF: "You are about to delete {POSTS, plural, one {1 post} other {# posts}} and {TOPICS, plural, one {1 topic} other {# topics}}. Are you sure?" diff --git a/lib/flag_query.rb b/lib/flag_query.rb index 15b1591d3f..cda69b8f91 100644 --- a/lib/flag_query.rb +++ b/lib/flag_query.rb @@ -31,6 +31,7 @@ module FlagQuery posts = SqlBuilder.new(" SELECT p.id, p.cooked, + p.raw, p.user_id, p.topic_id, p.post_number, diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb index 80f9a865a0..e56fa93b3e 100644 --- a/spec/controllers/admin/users_controller_spec.rb +++ b/spec/controllers/admin/users_controller_spec.rb @@ -148,24 +148,42 @@ describe Admin::UsersController do expect(log.details).to match(/because I said so/) end - it "can have an associated post" do - post = Fabricate(:post) - - put( - :suspend, - params: { - user_id: user.id, + context "with an associated post" do + let(:post) { Fabricate(:post) } + let(:suspend_params) do + { user_id: user.id, suspend_until: 5.hours.from_now, reason: "because of this post", post_id: post.id, - format: :json - } - ) - expect(response).to be_success + format: :json } + end - log = UserHistory.where(target_user_id: user.id).order('id desc').first - expect(log).to be_present - expect(log.post_id).to eq(post.id) + it "can have an associated post" do + put(:suspend, params: suspend_params) + expect(response).to be_success + + log = UserHistory.where(target_user_id: user.id).order('id desc').first + expect(log).to be_present + expect(log.post_id).to eq(post.id) + end + + it "can delete an associated post" do + put(:suspend, params: suspend_params.merge(post_action: 'delete')) + post.reload + expect(post.deleted_at).to be_present + expect(response).to be_success + end + + it "can edit an associated post" do + put(:suspend, params: suspend_params.merge( + post_action: 'edit', + post_edit: 'this is the edited content' + )) + post.reload + expect(post.deleted_at).to be_blank + expect(post.raw).to eq("this is the edited content") + expect(response).to be_success + end end it "can send a message to the user" do diff --git a/test/javascripts/acceptance/admin-flags-test.js.es6 b/test/javascripts/acceptance/admin-flags-test.js.es6 index e64e823039..3f38df94b1 100644 --- a/test/javascripts/acceptance/admin-flags-test.js.es6 +++ b/test/javascripts/acceptance/admin-flags-test.js.es6 @@ -104,15 +104,6 @@ QUnit.test("flagged posts - delete + deleteSpammer", assert => { }); }); -QUnit.test("flagged posts - suspend", assert => { - visit("/admin/flags/active"); - click('.suspend-user'); - andThen(() => { - assert.equal(find('.suspend-user-modal:visible').length, 1); - assert.equal(find('.suspend-user-modal .cant-suspend').length, 1); - }); -}); - QUnit.test("topics with flags", assert => { visit("/admin/flags/topics"); andThen(() => { From ce507b7957d3a2c398893e14abec1fb41c6a95a8 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Thu, 1 Feb 2018 23:51:29 +0100 Subject: [PATCH 040/202] FEATURE: display search on large category-drop and tag-drop --- .../javascripts/select-kit/components/category-drop.js.es6 | 5 +++++ app/assets/javascripts/select-kit/components/tag-drop.js.es6 | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/app/assets/javascripts/select-kit/components/category-drop.js.es6 b/app/assets/javascripts/select-kit/components/category-drop.js.es6 index 50e938439b..6cf0052e1f 100644 --- a/app/assets/javascripts/select-kit/components/category-drop.js.es6 +++ b/app/assets/javascripts/select-kit/components/category-drop.js.es6 @@ -36,6 +36,11 @@ export default ComboBoxComponent.extend({ }); }, + @computed("content") + filterable(content) { + return content.length >= 15; + }, + @computed("allCategoriesUrl", "allCategoriesLabel", "noCategoriesUrl", "noCategoriesLabel") collectionHeader(allCategoriesUrl, allCategoriesLabel, noCategoriesUrl, noCategoriesLabel) { let shortcuts = ""; diff --git a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop.js.es6 index a91a6ae773..23092bb6a2 100644 --- a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 +++ b/app/assets/javascripts/select-kit/components/tag-drop.js.es6 @@ -31,6 +31,11 @@ export default ComboBoxComponent.extend({ return true; }, + @computed("content") + filterable(content) { + return content.length >= 15; + }, + computeHeaderContent() { let content = this.baseHeaderComputedContent(); From d31417d3af5b1742bc98f3a8e406281f7cdbf6a4 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 1 Feb 2018 18:03:08 -0500 Subject: [PATCH 041/202] FIX: Remove unused import --- .../admin/controllers/modals/admin-silence-user.js.es6 | 1 - app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 | 1 + app/assets/javascripts/discourse/lib/utilities.js.es6 | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6 index 2e12a2196d..ec55cbdbe8 100644 --- a/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6 +++ b/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6 @@ -1,5 +1,4 @@ import computed from 'ember-addons/ember-computed-decorators'; -import { popupAjaxError } from 'discourse/lib/ajax-error'; import PenaltyController from 'admin/mixins/penalty-controller'; export default Ember.Controller.extend(PenaltyController, { diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 index a284fb3671..b8f04b1e6e 100644 --- a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 +++ b/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 @@ -8,5 +8,6 @@ export default htmlHelper((user, size) => { } const avatarTemplate = Ember.get(user, 'avatar_template'); + return avatarImg({ size, avatarTemplate }); return avatarImg(addExtraUserClasses(user, { size, avatarTemplate })); }); diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6 index 1d24485e0f..37f31b440a 100644 --- a/app/assets/javascripts/discourse/lib/utilities.js.es6 +++ b/app/assets/javascripts/discourse/lib/utilities.js.es6 @@ -49,6 +49,7 @@ export function avatarImg(options, getURL) { getURL = getURL || Discourse.getURLWithCDN; const size = translateSize(options.size); + console.log(size); const url = avatarUrl(options.avatarTemplate, size); // We won't render an invalid url From 0bdd416d0bb64a1bdb710e36c41faa7df872c37e Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 1 Feb 2018 18:16:01 -0500 Subject: [PATCH 042/202] Small title change --- config/locales/client.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 7784265fcf..2726821c85 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -2691,7 +2691,7 @@ en: agree: "Agree" agree_title: "Confirm this flag as valid and correct" - agree_flag_hide_post: "Agree and Hide Post" + agree_flag_hide_post: "Hide Post" agree_flag_hide_post_title: "Hide this post and automatically send the user a message urging them to edit it." agree_flag_restore_post: "Agree and Restore Post" agree_flag_restore_post_title: "Restore the post so that all users can see it." From a4445b0c1e41d3abe116ddef213d1603ffc578ed Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Fri, 2 Feb 2018 00:47:12 +0100 Subject: [PATCH 043/202] FIX: improve dropdown-select-box on mobile --- .../stylesheets/common/select-kit/composer-actions.scss | 9 +++++---- .../mobile/select-kit/dropdown-select-box.scss | 7 +++++++ 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss diff --git a/app/assets/stylesheets/common/select-kit/composer-actions.scss b/app/assets/stylesheets/common/select-kit/composer-actions.scss index a2dace0107..70c37dae9a 100644 --- a/app/assets/stylesheets/common/select-kit/composer-actions.scss +++ b/app/assets/stylesheets/common/select-kit/composer-actions.scss @@ -6,15 +6,16 @@ background: none; outline: none; padding: 0; + margin-right: 5px; .d-icon { border: 1px solid $primary-low; padding: 5px; - margin: 0; + margin: 0!important; + } - &:hover { - background: $primary-low; - } + &:hover { + background: $primary-low; } } } diff --git a/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss new file mode 100644 index 0000000000..64b663b507 --- /dev/null +++ b/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss @@ -0,0 +1,7 @@ +.select-kit { + &.dropdown-select-box { + .select-kit-collection { + max-height: 200px; + } + } +} From 85db6cd2d7c564d72d13ed451df6ece4c99cc917 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Fri, 2 Feb 2018 02:13:06 +0100 Subject: [PATCH 044/202] FIX: makes sure we have a content to filter --- .../javascripts/select-kit/components/category-drop.js.es6 | 2 +- app/assets/javascripts/select-kit/components/tag-drop.js.es6 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/select-kit/components/category-drop.js.es6 b/app/assets/javascripts/select-kit/components/category-drop.js.es6 index 6cf0052e1f..7ff78acaaf 100644 --- a/app/assets/javascripts/select-kit/components/category-drop.js.es6 +++ b/app/assets/javascripts/select-kit/components/category-drop.js.es6 @@ -38,7 +38,7 @@ export default ComboBoxComponent.extend({ @computed("content") filterable(content) { - return content.length >= 15; + return content && content.length >= 15; }, @computed("allCategoriesUrl", "allCategoriesLabel", "noCategoriesUrl", "noCategoriesLabel") diff --git a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop.js.es6 index 23092bb6a2..79e9f017cf 100644 --- a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 +++ b/app/assets/javascripts/select-kit/components/tag-drop.js.es6 @@ -33,7 +33,7 @@ export default ComboBoxComponent.extend({ @computed("content") filterable(content) { - return content.length >= 15; + return content && content.length >= 15; }, computeHeaderContent() { From e5655f0b6bc69fc525584f93194655d7690617ce Mon Sep 17 00:00:00 2001 From: Joshua Rosenfeld Date: Fri, 2 Feb 2018 00:40:10 -0500 Subject: [PATCH 045/202] UX: Add specific classes to ip address rows on user admin --- app/assets/javascripts/admin/templates/user-index.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs index 24122f3877..28b526da55 100644 --- a/app/assets/javascripts/admin/templates/user-index.hbs +++ b/app/assets/javascripts/admin/templates/user-index.hbs @@ -124,7 +124,7 @@
    -
    +
    {{i18n 'user.ip_address.title'}}
    {{model.ip_address}}
    @@ -135,7 +135,7 @@
    -
    +
    {{i18n 'user.registration_ip_address.title'}}
    {{model.registration_ip_address}}
    From cf592fa35da2d282a19f345865cf96549e2f1be1 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Fri, 2 Feb 2018 09:31:47 +0100 Subject: [PATCH 046/202] remove debugging code --- app/assets/javascripts/discourse/lib/utilities.js.es6 | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6 index 37f31b440a..1d24485e0f 100644 --- a/app/assets/javascripts/discourse/lib/utilities.js.es6 +++ b/app/assets/javascripts/discourse/lib/utilities.js.es6 @@ -49,7 +49,6 @@ export function avatarImg(options, getURL) { getURL = getURL || Discourse.getURLWithCDN; const size = translateSize(options.size); - console.log(size); const url = avatarUrl(options.avatarTemplate, size); // We won't render an invalid url From b4aad152678681764489ed517e5473dfda2d510b Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Fri, 2 Feb 2018 10:31:20 +0100 Subject: [PATCH 047/202] FIX: simplify styling of category-name when using category-drop/link --- app/assets/javascripts/discourse/helpers/category-link.js.es6 | 4 ++-- .../javascripts/select-kit/components/category-drop.js.es6 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/helpers/category-link.js.es6 b/app/assets/javascripts/discourse/helpers/category-link.js.es6 index de7f73f579..7735be3d69 100644 --- a/app/assets/javascripts/discourse/helpers/category-link.js.es6 +++ b/app/assets/javascripts/discourse/helpers/category-link.js.es6 @@ -73,9 +73,9 @@ export function categoryBadgeHTML(category, opts) { } if (restricted) { - html += `${iconHTML('lock')}${categoryName}`; + html += `${iconHTML('lock')}${categoryName}`; } else { - html += `${categoryName}`; + html += `${categoryName}`; } html += ""; diff --git a/app/assets/javascripts/select-kit/components/category-drop.js.es6 b/app/assets/javascripts/select-kit/components/category-drop.js.es6 index 7ff78acaaf..83ac00ff1d 100644 --- a/app/assets/javascripts/select-kit/components/category-drop.js.es6 +++ b/app/assets/javascripts/select-kit/components/category-drop.js.es6 @@ -74,9 +74,9 @@ export default ComboBoxComponent.extend({ }).htmlSafe(); } else { if (this.get("noSubcategories")) { - content.label = this.get("noCategoriesLabel"); + content.label = `${this.get("noCategoriesLabel")}`; } else { - content.label = this.get("allCategoriesLabel"); + content.label = `${this.get("allCategoriesLabel")}`; } } From e8559f222c856455f38bf3edb62985b464581acb Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Fri, 2 Feb 2018 19:30:52 +0530 Subject: [PATCH 048/202] FIX: After moving the posts topic timestamp should be updated with newest post --- app/models/post_mover.rb | 16 +++++++++++----- spec/models/post_mover_spec.rb | 7 +++++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb index 42e8ad42b5..75e3cb1676 100644 --- a/app/models/post_mover.rb +++ b/app/models/post_mover.rb @@ -47,7 +47,7 @@ class PostMover notify_users_that_posts_have_moved update_statistics update_user_actions - set_last_post_user_id(destination_topic) + update_last_post_stats if moving_all_posts @original_topic.update_status('closed', true, @user) @@ -204,9 +204,15 @@ class PostMover end end - def set_last_post_user_id(topic) - user_id = topic.posts.last.user_id rescue nil - return if user_id.nil? - topic.update_attribute :last_post_user_id, user_id + def update_last_post_stats + post = destination_topic.posts.where.not(post_type: Post.types[:whisper]).last + if post && post_ids.include?(post.id) + attrs = {} + attrs[:last_posted_at] = post.created_at + attrs[:last_post_user_id] = post.user_id + attrs[:bumped_at] = post.created_at unless post.no_bump + attrs[:updated_at] = 'now()' + destination_topic.update_columns(attrs) + end end end diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb index 3ef6bd2154..d483b354fa 100644 --- a/spec/models/post_mover_spec.rb +++ b/spec/models/post_mover_spec.rb @@ -192,8 +192,11 @@ describe PostMover do new_topic.reload expect(new_topic.posts_count).to eq(2) expect(new_topic.highest_post_number).to eq(2) - expect(new_topic.last_post_user_id).to eq(new_topic.posts.last.user_id) - expect(new_topic.last_posted_at).to be_present + + last_post = new_topic.posts.last + expect(new_topic.last_post_user_id).to eq(last_post.user_id) + expect(new_topic.last_posted_at).to eq(last_post.created_at) + expect(new_topic.bumped_at).to eq(last_post.created_at) p2.reload expect(p2.sort_order).to eq(1) From 68d0d39ab7a07306acdc9d863aa68b77e38bc531 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 2 Feb 2018 16:11:28 -0500 Subject: [PATCH 049/202] FIX: Order the homepage box in the same order as the top menu This is required because "no interface" is the same as showing the first entry. But when the top menu has changed the first entry is no longer the same, so it shows the wrong default. --- .../controllers/preferences/interface.js.es6 | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 index fd688471bc..9eb2960b83 100644 --- a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 +++ b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 @@ -57,16 +57,24 @@ export default Ember.Controller.extend(PreferencesTabController, { }, homeChanged() { - const siteHome = Discourse.SiteSettings.top_menu.split("|")[0].split(",")[0]; + const siteHome = this.siteSettings.top_menu.split("|")[0].split(",")[0]; const userHome = USER_HOMES[this.get('model.user_option.homepage_id')]; + setDefaultHomepage(userHome || siteHome); }, @computed() userSelectableHome() { - return _.map(USER_HOMES, (name, num) => { - return {name: I18n.t('filters.' + name + '.title'), value: Number(num)}; + let homeValues = _.invert(USER_HOMES); + + let result = []; + this.siteSettings.top_menu.split('|').forEach(m => { + let id = homeValues[m]; + if (id) { + result.push({ name: I18n.t(`filters.${m}.title`), value: Number(id) }); + } }); + return result; }, actions: { From 0edd386b4858e7154914da5f60dfa6204a26b522 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Fri, 2 Feb 2018 16:28:34 -0500 Subject: [PATCH 050/202] FEATURE: Vanilla bulk importer --- lib/tasks/import.rake | 5 + script/bulk_import/base.rb | 97 ++++- script/bulk_import/phpbb_postgresql.rb | 48 -- script/bulk_import/vanilla.rb | 577 +++++++++++++++++++++++++ script/bulk_import/vbulletin.rb | 47 -- 5 files changed, 670 insertions(+), 104 deletions(-) create mode 100644 script/bulk_import/vanilla.rb diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake index 9c9110c490..15458e27cc 100644 --- a/lib/tasks/import.rake +++ b/lib/tasks/import.rake @@ -19,6 +19,7 @@ task "import:ensure_consistency" => :environment do update_categories update_users update_groups + update_tag_stats log "Done!" end @@ -419,6 +420,10 @@ def update_groups SQL end +def update_tag_stats + Tag.ensure_consistency! +end + def log(message) puts "[#{DateTime.now.strftime("%Y-%m-%d %H:%M:%S")}] #{message}" end diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb index 0413e56f41..ce9bb45f0e 100644 --- a/script/bulk_import/base.rb +++ b/script/bulk_import/base.rb @@ -1,9 +1,11 @@ require "pg" require "set" require "redcarpet" +require "htmlentities" puts "Loading application..." require_relative "../../config/environment" +require_relative '../import_scripts/base/uploader' module BulkImport; end @@ -12,10 +14,53 @@ class BulkImport::Base NOW ||= "now()".freeze PRIVATE_OFFSET ||= 2**30 + CHARSET_MAP = { + "armscii8" => nil, + "ascii" => Encoding::US_ASCII, + "big5" => Encoding::Big5, + "binary" => Encoding::ASCII_8BIT, + "cp1250" => Encoding::Windows_1250, + "cp1251" => Encoding::Windows_1251, + "cp1256" => Encoding::Windows_1256, + "cp1257" => Encoding::Windows_1257, + "cp850" => Encoding::CP850, + "cp852" => Encoding::CP852, + "cp866" => Encoding::IBM866, + "cp932" => Encoding::Windows_31J, + "dec8" => nil, + "eucjpms" => Encoding::EucJP_ms, + "euckr" => Encoding::EUC_KR, + "gb2312" => Encoding::EUC_CN, + "gbk" => Encoding::GBK, + "geostd8" => nil, + "greek" => Encoding::ISO_8859_7, + "hebrew" => Encoding::ISO_8859_8, + "hp8" => nil, + "keybcs2" => nil, + "koi8r" => Encoding::KOI8_R, + "koi8u" => Encoding::KOI8_U, + "latin1" => Encoding::ISO_8859_1, + "latin2" => Encoding::ISO_8859_2, + "latin5" => Encoding::ISO_8859_9, + "latin7" => Encoding::ISO_8859_13, + "macce" => Encoding::MacCentEuro, + "macroman" => Encoding::MacRoman, + "sjis" => Encoding::SHIFT_JIS, + "swe7" => nil, + "tis620" => Encoding::TIS_620, + "ucs2" => Encoding::UTF_16BE, + "ujis" => Encoding::EucJP_ms, + "utf8" => Encoding::UTF_8, + } + def initialize + charset = ENV["DB_CHARSET"] || "utf8" db = ActiveRecord::Base.connection_config @encoder = PG::TextEncoder::CopyRow.new @raw_connection = PG.connect(dbname: db[:database], host: db[:host_names]&.first, port: db[:port]) + @uploader = ImportScripts::Uploader.new + @html_entities = HTMLEntities.new + @encoding = CHARSET_MAP[charset] @markdown = Redcarpet::Markdown.new( Redcarpet::Render::HTML.new(hard_wrap: true), @@ -27,6 +72,7 @@ class BulkImport::Base def run puts "Starting..." + Rails.logger.level = 3 # :error, so that we don't create log files that are many GB preload_i18n fix_highest_post_numbers load_imported_ids @@ -194,6 +240,10 @@ class BulkImport::Base topic_id user_id created_at updated_at } + TOPIC_TAG_COLUMNS ||= %i{ + topic_id tag_id created_at updated_at + } + def create_groups(rows, &block); create_records(rows, "group", GROUP_COLUMNS, &block); end def create_users(rows, &block) @@ -218,6 +268,7 @@ class BulkImport::Base def create_posts(rows, &block); create_records(rows, "post", POST_COLUMNS, &block); end def create_post_actions(rows, &block); create_records(rows, "post_action", POST_ACTION_COLUMNS, &block); end def create_topic_allowed_users(rows, &block); create_records(rows, "topic_allowed_user", TOPIC_ALLOWED_USER_COLUMNS, &block); end + def create_topic_tags(rows, &block); create_records(rows, "topic_tag", TOPIC_TAG_COLUMNS, &block); end def process_group(group) @groups[group[:imported_id].to_s] = group[:id] = @last_group_id += 1 @@ -386,6 +437,12 @@ class BulkImport::Base topic_allowed_user end + def process_topic_tag(topic_tag) + topic_tag[:created_at] = NOW + topic_tag[:updated_at] = NOW + topic_tag + end + def process_raw(raw) # fix whitespaces raw.gsub!(/(\\r)?\\n/, "\n") @@ -436,6 +493,9 @@ class BulkImport::Base # [IMG]...[/IMG] raw.gsub!(/(?:\s*\[IMG\]\s*)+(.+?)(?:\s*\[\/IMG\]\s*)+/im) { "\n\n#{$1}\n\n" } + # [IMG=url] + raw.gsub!(/\[IMG=([^\]]*)\]/im) { "\n\n#{$1}\n\n" } + # [URL=...]...[/URL] raw.gsub!(/\[URL="?(.+?)"?\](.+?)\[\/URL\]/im) { "[#{$2.strip}](#{$1})" } @@ -462,14 +522,19 @@ class BulkImport::Base raw.gsub!(/\[TD="?.*?"?\](.*?)\[\/TD\]/im, "\\1") # [QUOTE]...[/QUOTE] - raw.gsub!(/\[QUOTE\](.+?)\[\/QUOTE\]/im) { |quote| - quote.gsub!(/\[QUOTE\](.+?)\[\/QUOTE\]/im) { "\n#{$1}\n" } - quote.gsub!(/\n(.+?)/) { "\n> #{$1}" } - } + raw.gsub!(/\[QUOTE="([^\]]+)"\]/i) { "[QUOTE=#{$1}]" } - # [QUOTE=;]...[/QUOTE] - raw.gsub!(/\[QUOTE=([^;]+);(\d+)\](.+?)\[\/QUOTE\]/im) do - imported_username, imported_postid, quote = $1, $2, $3 + # Nested Quotes + raw.gsub!(/(\[\/?QUOTE.*?\])/mi) { |q| "\n#{q}\n" } + + # raw.gsub!(/\[QUOTE\](.+?)\[\/QUOTE\]/im) { |quote| + # quote.gsub!(/\[QUOTE\](.+?)\[\/QUOTE\]/im) { "\n#{$1}\n" } + # quote.gsub!(/\n(.+?)/) { "\n> #{$1}" } + # } + + # [QUOTE=;] + raw.gsub!(/\[QUOTE=([^;\]]+);(\d+)\]/i) do + imported_username, imported_postid = $1, $2 username = @mapped_usernames[imported_username] || imported_username post_id = post_id_from_imported_id(imported_postid) @@ -477,9 +542,9 @@ class BulkImport::Base topic_id = @topic_id_by_post_id[post_id] if post_number && topic_id - "\n[quote=\"#{username}, post:#{post_number}, topic:#{topic_id}\"]\n#{quote}\n[/quote]" + "\n[quote=\"#{username}, post:#{post_number}, topic:#{topic_id}\"]\n" else - "\n[quote=\"#{username}\"]\n#{quote}\n[/quote]\n" + "\n[quote=\"#{username}\"]\n" end end @@ -545,6 +610,10 @@ class BulkImport::Base end end + def create_upload(user_id, path, source_filename) + @uploader.create_upload(user_id, path, source_filename) + end + def fix_name(name) name.scrub! if name.valid_encoding? == false return if name.blank? @@ -610,4 +679,14 @@ class BulkImport::Base Redcarpet::Render::SmartyPants.render(ERB::Util.html_escape(title)).scrub.strip end + def normalize_text(text) + return nil unless text.present? + @html_entities.decode(normalize_charset(text.presence || "").scrub) + end + + def normalize_charset(text) + return text if @encoding == Encoding::UTF_8 + return text && text.encode(@encoding).force_encoding(Encoding::UTF_8) + end + end diff --git a/script/bulk_import/phpbb_postgresql.rb b/script/bulk_import/phpbb_postgresql.rb index 3c171424b4..570944b397 100644 --- a/script/bulk_import/phpbb_postgresql.rb +++ b/script/bulk_import/phpbb_postgresql.rb @@ -7,44 +7,6 @@ class BulkImport::PhpBB < BulkImport::Base SUSPENDED_TILL ||= Date.new(3000, 1, 1) TABLE_PREFIX ||= ENV['TABLE_PREFIX'] || "phpbb_" - CHARSET_MAP = { - "armscii8" => nil, - "ascii" => Encoding::US_ASCII, - "big5" => Encoding::Big5, - "binary" => Encoding::ASCII_8BIT, - "cp1250" => Encoding::Windows_1250, - "cp1251" => Encoding::Windows_1251, - "cp1256" => Encoding::Windows_1256, - "cp1257" => Encoding::Windows_1257, - "cp850" => Encoding::CP850, - "cp852" => Encoding::CP852, - "cp866" => Encoding::IBM866, - "cp932" => Encoding::Windows_31J, - "dec8" => nil, - "eucjpms" => Encoding::EucJP_ms, - "euckr" => Encoding::EUC_KR, - "gb2312" => Encoding::EUC_CN, - "gbk" => Encoding::GBK, - "geostd8" => nil, - "greek" => Encoding::ISO_8859_7, - "hebrew" => Encoding::ISO_8859_8, - "hp8" => nil, - "keybcs2" => nil, - "koi8r" => Encoding::KOI8_R, - "koi8u" => Encoding::KOI8_U, - "latin1" => Encoding::ISO_8859_1, - "latin2" => Encoding::ISO_8859_2, - "latin5" => Encoding::ISO_8859_9, - "latin7" => Encoding::ISO_8859_13, - "macce" => Encoding::MacCentEuro, - "macroman" => Encoding::MacRoman, - "sjis" => Encoding::SHIFT_JIS, - "swe7" => nil, - "tis620" => Encoding::TIS_620, - "ucs2" => Encoding::UTF_16BE, - "ujis" => Encoding::EucJP_ms, - "utf8" => Encoding::UTF_8, - } def initialize super @@ -371,16 +333,6 @@ class BulkImport::PhpBB < BulkImport::Base pm_title end - def normalize_text(text) - return nil unless text.present? - @html_entities.decode(normalize_charset(text.presence || "").scrub) - end - - def normalize_charset(text) - return text if @encoding == Encoding::UTF_8 - return text && text.encode(@encoding).force_encoding(Encoding::UTF_8) - end - def parse_birthday(birthday) return if birthday.blank? date_of_birth = Date.strptime(birthday.gsub(/[^\d-]+/, ""), "%m-%d-%Y") rescue nil diff --git a/script/bulk_import/vanilla.rb b/script/bulk_import/vanilla.rb new file mode 100644 index 0000000000..37b6acf231 --- /dev/null +++ b/script/bulk_import/vanilla.rb @@ -0,0 +1,577 @@ +require_relative "base" +require "mysql2" +require "rake" + +class BulkImport::Vanilla < BulkImport::Base + + VANILLA_DB = "dbname" + TABLE_PREFIX = "GDN_" + ATTACHMENTS_BASE_DIR = "/my/absolute/path/to/from_vanilla/uploads" + BATCH_SIZE = 1000 + CONVERT_HTML = true + + SUSPENDED_TILL ||= Date.new(3000, 1, 1) + + def initialize + super + @htmlentities = HTMLEntities.new + @client = Mysql2::Client.new( + host: "localhost", + username: "root", + database: VANILLA_DB + ) + + @import_tags = false + begin + r = @client.query("select count(*) count from #{TABLE_PREFIX}Tag where countdiscussions > 0") + @import_tags = true if r.first["count"].to_i > 0 + rescue => e + puts "Tags won't be imported. None found. #{e.message}" + end + + @category_mappings = {} + end + + def start + run # will call execute, and then "complete" the migration + + # Now that the migration is complete, do some more work: + + Discourse::Application.load_tasks + Rake::Task["import:ensure_consistency"].invoke + + import_avatars # slow + create_permalinks # TODO: do it bulk style + end + + def execute + if @import_tags + SiteSetting.tagging_enabled = true + SiteSetting.max_tags_per_topic = 10 + SiteSetting.max_tag_length = 100 + end + + # other good ones: + + # SiteSetting.port = 3000 + # SiteSetting.automatic_backups_enabled = false + # SiteSetting.disable_emails = true + # etc. + + import_users + import_user_emails + import_user_profiles + import_user_stats + + import_categories + import_topics + import_tags if @import_tags + import_posts + + import_private_topics + import_topic_allowed_users + import_private_posts + end + + def import_users + puts '', "Importing users..." + + username = nil + total_count = mysql_query("SELECT count(*) count FROM #{TABLE_PREFIX}User;").first['count'] + + users = mysql_stream <<-SQL + SELECT UserID, Name, Title, Location, Email, + DateInserted, DateLastActive, InsertIPAddress, Admin, Banned + FROM #{TABLE_PREFIX}User + WHERE UserID > #{@last_imported_user_id} + AND Deleted = 0 + ORDER BY UserID ASC + SQL + + create_users(users) do |row| + next if row['Email'].blank? + next if row['Name'].blank? + + if ip_address = row['InsertIPAddress']&.split(',').try(:[], 0) + ip_address = nil unless (IPAddr.new(ip_address) rescue false) + end + + u = { + imported_id: row['UserID'], + email: row['Email'], + username: row['Name'], + name: row['Name'], + created_at: row['DateInserted'] == nil ? 0 : Time.zone.at(row['DateInserted']), + registration_ip_address: ip_address, + last_seen_at: row['DateLastActive'] == nil ? 0 : Time.zone.at(row['DateLastActive']), + location: row['Location'], + admin: row['Admin'] > 0 + } + if row["Banned"] > 0 + u[:suspended_at] = Time.zone.at(row['DateInserted']) + u[:suspended_till] = SUSPENDED_TILL + end + u + end + end + + def import_user_emails + puts '', 'Importing user emails...' + + users = mysql_stream <<-SQL + SELECT UserID, Name, Email, DateInserted + FROM #{TABLE_PREFIX}User + WHERE UserID > #{@last_imported_user_id} + AND Deleted = 0 + ORDER BY UserID ASC + SQL + + create_user_emails(users) do |row| + next if row['Email'].blank? + next if row['Name'].blank? + + { + imported_id: row["UserID"], + imported_user_id: row["UserID"], + email: row["Email"], + created_at: Time.zone.at(row["DateInserted"]) + } + end + end + + def import_user_profiles + puts '', 'Importing user profiles...' + + user_profiles = mysql_stream <<-SQL + SELECT UserID, Name, Email, Location, About + FROM #{TABLE_PREFIX}User + WHERE UserID > #{@last_imported_user_id} + AND Deleted = 0 + ORDER BY UserID ASC + SQL + + create_user_profiles(user_profiles) do |row| + next if row['Email'].blank? + next if row['Name'].blank? + + { + user_id: user_id_from_imported_id(row["UserID"]), + location: row["Location"], + bio_raw: row["About"] + } + end + end + + def import_user_stats + puts '', "Importing user stats..." + + users = mysql_stream <<-SQL + SELECT UserID, CountDiscussions, CountComments, DateInserted + FROM #{TABLE_PREFIX}User + WHERE UserID > #{@last_imported_user_id} + AND Deleted = 0 + ORDER BY UserID ASC + SQL + + now = Time.zone.now + + create_user_stats(users) do |row| + next unless @users[row['UserID'].to_s] # shouldn't need this but it can be NULL :< + + { + imported_id: row['UserID'], + imported_user_id: row['UserID'], + new_since: Time.zone.at(row['DateInserted'] || now), + post_count: row['CountComments'] || 0, + topic_count: row['CountDiscussions'] || 0 + } + end + end + + def import_avatars + if ATTACHMENTS_BASE_DIR && File.exists?(ATTACHMENTS_BASE_DIR) + puts "", "importing user avatars" + + start = Time.now + count = 0 + + User.find_each do |u| + count += 1 + print "\r%7d - %6d/sec".freeze % [count, count.to_f / (Time.now - start)] + + next unless u.custom_fields["import_id"] + + r = mysql_query("SELECT photo FROM #{TABLE_PREFIX}User WHERE UserID = #{u.custom_fields['import_id']};").first + next if r.nil? + photo = r["photo"] + next unless photo.present? + + # Possible encoded values: + # 1. cf://uploads/userpics/820/Y0AFUQYYM6QN.jpg + # 2. ~cf/userpics2/cf566487133f1f538e02da96f9a16b18.jpg + # 3. ~cf/userpics/txkt8kw1wozn.jpg + # 4. s3://uploads/xf/22/22690.jpg + + photo_real_filename = nil + parts = photo.squeeze("/").split("/") + if parts[0] =~ /^[a-z0-9]{2}:/ + photo_path = "#{ATTACHMENTS_BASE_DIR}/#{parts[2..-2].join('/')}".squeeze("/") + elsif parts[0] == "~cf" + photo_path = "#{ATTACHMENTS_BASE_DIR}/#{parts[1..-2].join('/')}".squeeze("/") + else + puts "UNKNOWN FORMAT: #{photo}" + next + end + + if !File.exists?(photo_path) + puts "Path to avatar file not found! Skipping. #{photo_path}" + next + end + + photo_real_filename = find_photo_file(photo_path, parts.last) + if photo_real_filename.nil? + puts "Couldn't find file for #{photo}. Skipping." + next + end + + print "." + + upload = create_upload(u.id, photo_real_filename, File.basename(photo_real_filename)) + if upload.persisted? + u.import_mode = false + u.create_user_avatar + u.import_mode = true + u.user_avatar.update(custom_upload_id: upload.id) + u.update(uploaded_avatar_id: upload.id) + else + puts "Error: Upload did not persist for #{u.username} #{photo_real_filename}!" + end + end + end + end + + def find_photo_file(path, base_filename) + base_guess = base_filename.dup + full_guess = File.join(path, base_guess) # often an exact match exists + + return full_guess if File.exists?(full_guess) + + # Otherwise, the file exists but with a prefix: + # The p prefix seems to be the full file, so try to find that one first. + ['p', 't', 'n'].each do |prefix| + full_guess = File.join(path, "#{prefix}#{base_guess}") + return full_guess if File.exists?(full_guess) + end + + # Didn't find it. + nil + end + + def import_categories + puts "", "Importing categories..." + + categories = mysql_query(" + SELECT CategoryID, ParentCategoryID, Name, Description, Sort + FROM #{TABLE_PREFIX}Category + WHERE CategoryID > 0 + ORDER BY Sort, CategoryID + ").to_a + + # Throw the -1 level categories away since they contain no topics. + # Use the next level as root categories. + root_category_ids = Set.new(categories.select { |c| c["ParentCategoryID"] == -1 }.map { |c| c["CategoryID"] }) + + top_level_categories = categories.select { |c| root_category_ids.include?(c["ParentCategoryID"]) } + + # Depth = 2 + create_categories(top_level_categories) do |category| + { + imported_id: category['CategoryID'], + name: CGI.unescapeHTML(category['Name']), + description: category['Description'] ? CGI.unescapeHTML(category['Description']) : nil, + position: category['Sort'] + } + end + + top_level_category_ids = Set.new(top_level_categories.map { |c| c["CategoryID"] }) + + subcategories = categories.select { |c| top_level_category_ids.include?(c["ParentCategoryID"]) } + + # Depth = 3 + create_categories(subcategories) do |category| + { + imported_id: category['CategoryID'], + parent_category_id: category_id_from_imported_id(category['ParentCategoryID']), + name: CGI.unescapeHTML(category['Name']), + description: category['Description'] ? CGI.unescapeHTML(category['Description']) : nil, + position: category['Sort'] + } + end + + subcategory_ids = Set.new(subcategories.map { |c| c['CategoryID'] }) + + # Depth 4 and 5 need to be tags + + categories.each do |c| + next if c['ParentCategoryID'] == -1 + next if top_level_category_ids.include?(c['CategoryID']) + next if subcategory_ids.include?(c['CategoryID']) + + # Find a depth 3 category for topics in this category + parent = c + while !parent.nil? && !subcategory_ids.include?(parent['CategoryID']) + parent = categories.find { |subcat| subcat['CategoryID'] == parent['ParentCategoryID'] } + end + + if parent + tag_name = DiscourseTagging.clean_tag(c['Name']) + @category_mappings[c['CategoryID']] = { + category_id: category_id_from_imported_id(parent['CategoryID']), + tag: Tag.find_by_name(tag_name) || Tag.create(name: tag_name) + } + else + puts '', "Couldn't find a category for #{c['CategoryID']} '#{c['Name']}'!" + end + end + end + + def import_topics + puts "", "Importing topics..." + + topics_sql = "SELECT DiscussionID, CategoryID, Name, Body, DateInserted, InsertUserID, Announce + FROM #{TABLE_PREFIX}Discussion + WHERE DiscussionID > #{@last_imported_topic_id} + ORDER BY DiscussionID ASC" + + create_topics(mysql_stream(topics_sql)) do |row| + { + imported_id: row["DiscussionID"], + title: normalize_text(row["Name"]), + category_id: category_id_from_imported_id(row["CategoryID"]) || + @category_mappings[row["CategoryID"]].try(:[], :category_id), + user_id: user_id_from_imported_id(row["InsertUserID"]), + created_at: Time.zone.at(row['DateInserted']), + pinned_at: row['Announce'] == 0 ? nil : Time.zone.at(row['DateInserted']) + } + end + + puts "", "importing first posts..." + + create_posts(mysql_stream(topics_sql)) do |row| + { + imported_id: "d-" + row['DiscussionID'].to_s, + topic_id: topic_id_from_imported_id(row["DiscussionID"]), + user_id: user_id_from_imported_id(row["InsertUserID"]), + created_at: Time.zone.at(row['DateInserted']), + raw: clean_up(row["Body"]) + } + end + + puts '', 'converting deep categories to tags...' + + create_topic_tags(mysql_stream(topics_sql)) do |row| + next unless mapping = @category_mappings[row['CategoryID']] + + { + tag_id: mapping[:tag].id, + topic_id: topic_id_from_imported_id(row["DiscussionID"]) + } + end + end + + def import_posts + puts "", "Importing posts..." + + posts = mysql_stream( + "SELECT CommentID, DiscussionID, Body, DateInserted, InsertUserID + FROM #{TABLE_PREFIX}Comment + WHERE CommentID > #{@last_imported_post_id} + ORDER BY CommentID ASC") + + create_posts(posts) do |row| + next unless topic_id = topic_id_from_imported_id(row['DiscussionID']) + next if row['Body'].blank? + + { + imported_id: row['CommentID'], + topic_id: topic_id, + user_id: user_id_from_imported_id(row["InsertUserID"]), + created_at: Time.zone.at(row['DateInserted']), + raw: clean_up(row["Body"]) + } + end + end + + def import_tags + puts "", "Importing tags..." + + tag_mapping = {} + + mysql_query("SELECT TagID, Name FROM #{TABLE_PREFIX}Tag").each do |row| + tag_name = DiscourseTagging.clean_tag(row['Name']) + tag = Tag.find_by_name(tag_name) || Tag.create(name: tag_name) + tag_mapping[row['TagID']] = tag.id + end + + tags = mysql_query( + "SELECT TagID, DiscussionID + FROM #{TABLE_PREFIX}TagDiscussion + WHERE DiscussionID > #{@last_imported_topic_id} + ORDER BY DateInserted") + + create_topic_tags(tags) do |row| + next unless topic_id = topic_id_from_imported_id(row['DiscussionID']) + + { + topic_id: topic_id, + tag_id: tag_mapping[row['TagID']] + } + end + end + + def import_private_topics + puts "", "Importing private topics..." + + topics_sql = "SELECT c.ConversationID, c.Subject, m.MessageID, m.Body, c.DateInserted, c.InsertUserID + FROM #{TABLE_PREFIX}Conversation c, #{TABLE_PREFIX}ConversationMessage m + WHERE c.FirstMessageID = m.MessageID + AND c.ConversationID > #{@last_imported_private_topic_id - PRIVATE_OFFSET} + ORDER BY c.ConversationID ASC" + + create_topics(mysql_stream(topics_sql)) do |row| + { + archetype: Archetype.private_message, + imported_id: row["ConversationID"] + PRIVATE_OFFSET, + title: row["Subject"] ? normalize_text(row["Subject"]) : "Conversation #{row["ConversationID"]}", + user_id: user_id_from_imported_id(row["InsertUserID"]), + created_at: Time.zone.at(row['DateInserted']) + } + end + end + + def import_topic_allowed_users + puts "", "importing topic_allowed_users..." + + topic_allowed_users_sql = " + SELECT ConversationID, UserID + FROM #{TABLE_PREFIX}UserConversation + WHERE Deleted = 0 + ORDER BY ConversationID ASC" + + added = 0 + + create_topic_allowed_users(mysql_stream(topic_allowed_users_sql)) do |row| + next unless topic_id = topic_id_from_imported_id(row['ConversationID'] + PRIVATE_OFFSET) + next unless user_id = user_id_from_imported_id(row["UserID"]) + added += 1 + { + topic_id: topic_id, + user_id: user_id, + } + end + + puts '', "Added #{added} topic_allowed_users records." + end + + def import_private_posts + puts "", "importing private replies..." + + private_posts_sql = " + SELECT ConversationID, MessageID, Body, InsertUserID, DateInserted + FROM GDN_ConversationMessage + WHERE ConversationID > #{@last_imported_private_topic_id - PRIVATE_OFFSET} + ORDER BY ConversationID ASC, MessageID ASC" + + create_posts(mysql_stream(private_posts_sql)) do |row| + next unless topic_id = topic_id_from_imported_id(row['ConversationID'] + PRIVATE_OFFSET) + + { + imported_id: row['MessageID'] + PRIVATE_OFFSET, + topic_id: topic_id, + user_id: user_id_from_imported_id(row['InsertUserID']), + created_at: Time.zone.at(row['DateInserted']), + raw: clean_up(row['Body']) + } + end + end + + # TODO: too slow + def create_permalinks + puts '', 'Creating permalinks...', '' + + puts ' User pages...' + + start = Time.now + count = 0 + now = Time.zone.now + + sql = "COPY permalinks (url, created_at, updated_at, external_url) FROM STDIN" + + @raw_connection.copy_data(sql, @encoder) do + User.includes(:_custom_fields).find_each do |u| + count += 1 + ucf = u.custom_fields + if ucf && ucf["import_id"] + vanilla_username = ucf["import_username"] || u.username + @raw_connection.put_copy_data( + ["profile/#{vanilla_username}", now, now, "/users/#{u.username}"] + ) + end + + print "\r%7d - %6d/sec".freeze % [count, count.to_f / (Time.now - start)] if count % 5000 == 0 + end + end + + puts '', '', ' Topics and posts...' + + start = Time.now + count = 0 + + sql = "COPY permalinks (url, topic_id, post_id, created_at, updated_at) FROM STDIN" + + @raw_connection.copy_data(sql, @encoder) do + Post.includes(:_custom_fields).find_each do |post| + count += 1 + pcf = post.custom_fields + if pcf && pcf["import_id"] + topic = post.topic + id = pcf["import_id"].split('-').last + if post.post_number == 1 + slug = Slug.for(topic.title) # probably matches what vanilla would do... + @raw_connection.put_copy_data( + ["discussion/#{id}/#{slug}", topic.id, nil, now, now] + ) + else + @raw_connection.put_copy_data( + ["discussion/comment/#{id}", nil, post.id, now, now] + ) + end + end + + print "\r%7d - %6d/sec".freeze % [count, count.to_f / (Time.now - start)] if count % 5000 == 0 + end + end + end + + def clean_up(raw) + # post id is sometimes prefixed with "c-" + raw.gsub!(/\[QUOTE="([^;]+);c-(\d+)"\]/i) { "[QUOTE=#{$1};#{$2}]" } + + raw + end + + def staff_guardian + @_staff_guardian ||= Guardian.new(Discourse.system_user) + end + + def mysql_stream(sql) + @client.query(sql, stream: true) + end + + def mysql_query(sql) + @client.query(sql) + end + +end + +BulkImport::Vanilla.new.start diff --git a/script/bulk_import/vbulletin.rb b/script/bulk_import/vbulletin.rb index d9d394a716..830c330e93 100644 --- a/script/bulk_import/vbulletin.rb +++ b/script/bulk_import/vbulletin.rb @@ -6,44 +6,6 @@ require "htmlentities" class BulkImport::VBulletin < BulkImport::Base SUSPENDED_TILL ||= Date.new(3000, 1, 1) - CHARSET_MAP = { - "armscii8" => nil, - "ascii" => Encoding::US_ASCII, - "big5" => Encoding::Big5, - "binary" => Encoding::ASCII_8BIT, - "cp1250" => Encoding::Windows_1250, - "cp1251" => Encoding::Windows_1251, - "cp1256" => Encoding::Windows_1256, - "cp1257" => Encoding::Windows_1257, - "cp850" => Encoding::CP850, - "cp852" => Encoding::CP852, - "cp866" => Encoding::IBM866, - "cp932" => Encoding::Windows_31J, - "dec8" => nil, - "eucjpms" => Encoding::EucJP_ms, - "euckr" => Encoding::EUC_KR, - "gb2312" => Encoding::EUC_CN, - "gbk" => Encoding::GBK, - "geostd8" => nil, - "greek" => Encoding::ISO_8859_7, - "hebrew" => Encoding::ISO_8859_8, - "hp8" => nil, - "keybcs2" => nil, - "koi8r" => Encoding::KOI8_R, - "koi8u" => Encoding::KOI8_U, - "latin1" => Encoding::ISO_8859_1, - "latin2" => Encoding::ISO_8859_2, - "latin5" => Encoding::ISO_8859_9, - "latin7" => Encoding::ISO_8859_13, - "macce" => Encoding::MacCentEuro, - "macroman" => Encoding::MacRoman, - "sjis" => Encoding::SHIFT_JIS, - "swe7" => nil, - "tis620" => Encoding::TIS_620, - "ucs2" => Encoding::UTF_16BE, - "ujis" => Encoding::EucJP_ms, - "utf8" => Encoding::UTF_8, - } def initialize super @@ -502,15 +464,6 @@ class BulkImport::VBulletin < BulkImport::Base normalize_text(title).scrub.gsub(/^Re\s*:\s*/i, "") end - def normalize_text(text) - @html_entities.decode(normalize_charset(text.presence || "").scrub) - end - - def normalize_charset(text) - return text if @encoding == Encoding::UTF_8 - return text && text.encode(@encoding).force_encoding(Encoding::UTF_8) - end - def parse_birthday(birthday) return if birthday.blank? date_of_birth = Date.strptime(birthday.gsub(/[^\d-]+/, ""), "%m-%d-%Y") rescue nil From e2629395905214f5e27c3acdf5929f11dacdfdf7 Mon Sep 17 00:00:00 2001 From: Joshua Rosenfeld Date: Fri, 2 Feb 2018 16:31:40 -0500 Subject: [PATCH 051/202] Add .org to default linkified TLDs --- config/site_settings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/site_settings.yml b/config/site_settings.yml index 743560fb29..fb38d28e4e 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -540,7 +540,7 @@ posting: markdown_linkify_tlds: client: true type: list - default: 'com|gov|net' + default: 'com|gov|net|org' enable_rich_text_paste: client: true default: false From 2f195883116b2815b8e0b4c2b105e5776fff3230 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 2 Feb 2018 16:35:32 -0500 Subject: [PATCH 052/202] FIX: If personal messages are disabled, don't show messages for groups --- .../javascripts/discourse/controllers/group-activity.js.es6 | 3 +++ lib/guardian/group_guardian.rb | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/controllers/group-activity.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity.js.es6 index de4bda4dcd..2722bebdd3 100644 --- a/app/assets/javascripts/discourse/controllers/group-activity.js.es6 +++ b/app/assets/javascripts/discourse/controllers/group-activity.js.es6 @@ -6,6 +6,9 @@ export default Ember.Controller.extend({ @computed('model.is_group_user') showGroupMessages(isGroupUser) { + if (!this.siteSettings.enable_personal_messages) { + return false; + } return isGroupUser || (this.currentUser && this.currentUser.admin); } }); diff --git a/lib/guardian/group_guardian.rb b/lib/guardian/group_guardian.rb index 95ec4f2fde..fd18ff797a 100644 --- a/lib/guardian/group_guardian.rb +++ b/lib/guardian/group_guardian.rb @@ -13,6 +13,8 @@ module GroupGuardian end def can_see_group_messages?(group) - is_admin? || group.users.include?(user) + SiteSetting.enable_private_messages? && ( + is_admin? || group.users.include?(user) + ) end end From 80ea2e510781ddc13a2a96b71c7463d000823620 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 2 Feb 2018 17:06:02 -0500 Subject: [PATCH 053/202] FIX: Enable personal messages in tests --- test/javascripts/helpers/site-settings.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js index e24782e70c..8df19c95c9 100644 --- a/test/javascripts/helpers/site-settings.js +++ b/test/javascripts/helpers/site-settings.js @@ -89,6 +89,7 @@ Discourse.SiteSettingsOriginal = { "enable_emoji":true, "emoji_set":"emoji_one", "desktop_category_page_style":"categories_and_latest_topics", - "enable_mentions":true + "enable_mentions":true, + "enable_personal_messages": true }; Discourse.SiteSettings = jQuery.extend(true, {}, Discourse.SiteSettingsOriginal); From 9e690bf238f093537551683b148ac892cc3e298b Mon Sep 17 00:00:00 2001 From: Kris Date: Fri, 2 Feb 2018 19:03:25 -0500 Subject: [PATCH 054/202] UX: Cleaning up category badge alignment (#5561) --- .../stylesheets/common/base/menu-panel.scss | 33 ++++- .../stylesheets/common/base/tagging.scss | 12 +- app/assets/stylesheets/common/base/topic.scss | 33 ++++- .../stylesheets/common/components/badges.scss | 128 +++++++----------- .../common/select-kit/category-drop.scss | 31 ++--- .../stylesheets/desktop/topic-list.scss | 3 - 6 files changed, 122 insertions(+), 118 deletions(-) diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss index e54693bbce..ad27956a56 100644 --- a/app/assets/stylesheets/common/base/menu-panel.scss +++ b/app/assets/stylesheets/common/base/menu-panel.scss @@ -75,22 +75,45 @@ li.category-link { float: left; background-color: transparent; - width: 45%; - margin: 5px 5px 0 8px; - .box {margin-top: 0;} + display: inline-flex; + margin: 0.25em 0.5em; + width: 44%; .badge-notification { color: dark-light-choose($primary-medium, $secondary-medium); background-color: transparent; display: inline; padding: 0; + font-size: $font-down-1; + line-height: $line-height-large; + } + .badge-wrapper { + overflow: hidden; + text-overflow: ellipsis; + display: inline-block; + max-width: 80%; + &.bar, &.bullet { + color: $primary; + } + &.box { + color: $secondary; + + a.badge.badge-notification { + padding-top: 2px; + } + span { + z-index: z("base") * -1; + } + } } } - + // note these topic counts only appear for anons in the category hamburger drop down b.topics-count { color: dark-light-choose($primary-medium, $secondary-medium); font-weight: normal; - font-size: $font-down-2; + font-size: $font-down-1; + } + .box + b.topics-count { + padding-top: 2px; } span.badge-category { diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss index d87997dc27..adeb978f99 100644 --- a/app/assets/stylesheets/common/base/tagging.scss +++ b/app/assets/stylesheets/common/base/tagging.scss @@ -44,7 +44,8 @@ } .topic-category { - margin-top: 5px; + display: flex; + flex-wrap: wrap; .topic-header-extra { display: inline-block; @@ -55,17 +56,14 @@ margin-top: 0; &.bullet .badge-category { - vertical-align: middle; } &.box, &.bullet { - vertical-align: middle; } &.box + .topic-header-extra, &.bullet + .topic-header-extra, &.bar + .topic-header-extra { - vertical-align: middle; } } } @@ -133,7 +131,6 @@ $tag-color: $primary-medium; .d-header .topic-header-extra { .discourse-tags { - display: inline-block; font-size: $font-down-1; } .topic-featured-link { margin-left: 8px; } @@ -176,9 +173,12 @@ $tag-color: $primary-medium; } .mobile-view .topic-list-item .discourse-tags { - display: inline-block; + display: inline-flex; font-size: $font-down-1; margin-top: 0; + .discourse-tag { + margin-right: .2em; + } .discourse-tag.box { position:relative; top: 0; diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss index f23249d122..0230fd49dd 100644 --- a/app/assets/stylesheets/common/base/topic.scss +++ b/app/assets/stylesheets/common/base/topic.scss @@ -45,20 +45,42 @@ } } +.title-wrapper { + display: flex; + flex-wrap: wrap; + width: 90%; + + .btn-small { + margin: 0 6px 0 0; + } + + a.topic-featured-link { + display: inline-block; + } +} + +h1 { + margin: 0 0 4px 0; + width: 90%; +} + +a.badge-category { + margin-top: 5px; +} + + + #topic-title { .title-wrapper { - float: left; + display: flex; + flex-wrap: wrap; width: 90%; .btn-small { margin: 0 6px 0 0; } - .badge-wrapper { - margin-right: 12px; - } - a.topic-featured-link { display: inline-block; } @@ -66,6 +88,7 @@ h1 { margin: 0 0 4px 0; + width: 90%; } a.badge-category { diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss index 940351824e..e4b9cdc1d2 100644 --- a/app/assets/stylesheets/common/components/badges.scss +++ b/app/assets/stylesheets/common/components/badges.scss @@ -20,104 +20,49 @@ font-weight: bold; white-space: nowrap; position: relative; - display: inline-flex; - align-items: center; - + .badge-category { .d-icon { margin-right: 3px; } } - &.bar { //bar category style - line-height: $line-height-medium; - margin-right: 5px; + // ----- Bullet - span.badge-category { - color: $primary; - padding: 3px; - overflow: hidden; - text-overflow: ellipsis; - display: inline-flex; - align-items: center; - justify-content: space-between; - - .extra-info-wrapper & { - color: $header-primary; - } - } - - .badge-category-parent-bg, .badge-category-bg { - display: inline-block; - padding: 1px; - - &:before { - content: "\a0"; - } - } - } - - &.none { // no category style - color: $primary; - margin-right: 5px; - } - - &.bullet { //bullet category style - display: inline-flex; - align-items: center; + &.bullet { margin-right: 12px; - - .extra-info-wrapper & { - margin-top: .25em; - } - span.badge-category { color: $primary; overflow: hidden; text-overflow: ellipsis; - line-height: $line-height-medium; - - #search-dropdown & { - margin-top: -2px; - } - .extra-info-wrapper & { color: $header-primary; } } - .badge-category-parent-bg, .badge-category-bg { - width: 10px; - height: 10px; + width: 9px; + height: 9px; margin-right: 5px; display: inline-block; - line-height: $line-height-small; - - &:before { - content: "\a0"; } - } - - span { - &.badge-category-parent-bg { //subcategory style + .badge-category-parent-bg { // Subcategories + width: 5px; + margin-right: 0; + +.badge-category-bg { width: 5px; - margin-right: 0; - & + .badge-category-bg { - width: 5px; - } } } } + // ----- Box - &.box { //box category style (apply custom widths to the wrapper, not the children) - line-height: $line-height-large; + &.box { margin-right: 5px; - + padding: 2px 4px 1px 4px; + display: inline-flex; span { overflow: hidden; text-overflow: ellipsis; - &.badge-category-bg, &.badge-category-parent-bg { position: absolute; top: 0; @@ -126,7 +71,7 @@ left: 0; } - &.badge-category-parent-bg { //subcategory style + &.badge-category-parent-bg { // Subcategories width: calc(100% - 5px); & + .badge-category-bg { left: 5px; @@ -139,23 +84,52 @@ &.badge-category { position: relative; - padding: 0 5px; - margin: 2px 0; + } + } + + .topic-header-extra { + padding: 2px 4px 1px 4px; + } + } + + // ----- Bar + + &.bar { + margin-right: 5px; + + span.badge-category { + color: $primary; + padding: 3px; + overflow: hidden; + text-overflow: ellipsis; + + .extra-info-wrapper & { + color: $header-primary; + } + } + + .badge-category-parent-bg, .badge-category-bg { // Subcategories + display: inline-block; + padding: 0 1px; + + &:before { + content: "\a0"; } } } + + // ----- No category style + + &.none { + color: $primary; + margin-right: 5px; + } + } -.autocomplete, td.category { - .badge-wrapper { - max-width: 230px; - } -} // Category badge dropdown // -------------------------------------------------- - .list-controls { .category-breadcrumb { a.badge-category { diff --git a/app/assets/stylesheets/common/select-kit/category-drop.scss b/app/assets/stylesheets/common/select-kit/category-drop.scss index 6fe2e3595a..1fdb3dbdb2 100644 --- a/app/assets/stylesheets/common/select-kit/category-drop.scss +++ b/app/assets/stylesheets/common/select-kit/category-drop.scss @@ -17,23 +17,24 @@ } } - .category-drop-header { - padding: 6px 10px; - } - &.bar.has-selection .category-drop-header { - padding: 1.5px 10px; + padding: 4.5px 10px; } &.bullet.has-selection .category-drop-header { - padding: 3.5px 10px; + padding: 6px 10px; span.badge-category { - line-height: $line-height-large; + line-height: $line-height-medium; + } + .selected-name { + .bullet { + line-height: $line-height-medium; + } } } &.box.has-selection .category-drop-header { - padding: 4.5px 10px; + padding: 3px 10px; } &.none.has-selection .category-drop-header { @@ -49,10 +50,6 @@ line-height: $line-height-medium; transition: none; - .badge-category { - display: flex; - align-items: center; - } .badge-wrapper { margin-right: 0; @@ -132,19 +129,9 @@ .badge-wrapper { margin: 0; - display: flex; - flex: 1 1 auto; } } - .select-kit-row .badge-wrapper.box { - padding: 2.5px 0; - } - - .select-kit-row .badge-wrapper.bullet, .select-kit-row .badge-wrapper.none { - margin: 2.5px; - } - &.is-expanded .select-kit-wrapper, .select-kit-wrapper { display: none; } diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss index 347988a558..11bd7c3df1 100644 --- a/app/assets/stylesheets/desktop/topic-list.scss +++ b/app/assets/stylesheets/desktop/topic-list.scss @@ -82,9 +82,6 @@ padding-left: 5px; } } - td.category { - line-height: $line-height-small; - } .posters { // we know there are up to 5 avatars of fixed size From 8bac9c7a0980253b840c6457c8b02594da966f9c Mon Sep 17 00:00:00 2001 From: Kris Date: Fri, 2 Feb 2018 19:28:45 -0500 Subject: [PATCH 055/202] header-extra wrap fix --- app/assets/stylesheets/desktop/topic-post.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index e869ad4dfd..fb7f0ac4be 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -536,6 +536,7 @@ video { .topic-header-extra { margin: 0 0 0 5px; + flex: 1 1 90%; } } From cd798e49d82e3bfd38c903c872051d31f88299ec Mon Sep 17 00:00:00 2001 From: Kris Date: Fri, 2 Feb 2018 19:33:00 -0500 Subject: [PATCH 056/202] header text wrap fix --- app/assets/stylesheets/desktop/topic-post.scss | 2 +- app/assets/stylesheets/desktop/topic.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index fb7f0ac4be..e582d11b4c 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -536,7 +536,6 @@ video { .topic-header-extra { margin: 0 0 0 5px; - flex: 1 1 90%; } } @@ -558,6 +557,7 @@ video { h1 { line-height: $line-height-medium; margin: 0; + width: 100%; } } diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss index 6f0e876dfb..0d6db3227a 100644 --- a/app/assets/stylesheets/desktop/topic.scss +++ b/app/assets/stylesheets/desktop/topic.scss @@ -28,6 +28,7 @@ font-size: $font-up-4; line-height: $line-height-medium; overflow: hidden; + width: 100%; a {color: $primary;} } .topic-statuses { From cd19d546a88586c178a502a14a7677e938939cb1 Mon Sep 17 00:00:00 2001 From: Kane York Date: Fri, 2 Feb 2018 17:45:42 -0800 Subject: [PATCH 057/202] Update default linkify TLDs to top 15 Also kept gov, but moved it to the end because it was in the previous version. --- config/site_settings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/site_settings.yml b/config/site_settings.yml index fb38d28e4e..e8d9d14277 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -540,7 +540,7 @@ posting: markdown_linkify_tlds: client: true type: list - default: 'com|gov|net|org' + default: 'com|net|org|io|co|tv|ru|cn|us|uk|me|de|fr|fi|gov' enable_rich_text_paste: client: true default: false From cf623e65e061551a606c6b397d4089a8ad37bace Mon Sep 17 00:00:00 2001 From: Kris Date: Fri, 2 Feb 2018 21:29:51 -0500 Subject: [PATCH 058/202] tag alignment fix --- app/assets/stylesheets/common/base/tagging.scss | 1 + app/assets/stylesheets/common/base/topic.scss | 1 + app/assets/stylesheets/common/components/badges.scss | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss index adeb978f99..95b2a66a59 100644 --- a/app/assets/stylesheets/common/base/tagging.scss +++ b/app/assets/stylesheets/common/base/tagging.scss @@ -46,6 +46,7 @@ .topic-category { display: flex; flex-wrap: wrap; + align-items: flex-end; .topic-header-extra { display: inline-block; diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss index 0230fd49dd..9604d3101c 100644 --- a/app/assets/stylesheets/common/base/topic.scss +++ b/app/assets/stylesheets/common/base/topic.scss @@ -49,6 +49,7 @@ display: flex; flex-wrap: wrap; width: 90%; + align-items: flex-end; .btn-small { margin: 0 6px 0 0; diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss index e4b9cdc1d2..d7123032ba 100644 --- a/app/assets/stylesheets/common/components/badges.scss +++ b/app/assets/stylesheets/common/components/badges.scss @@ -58,7 +58,7 @@ &.box { margin-right: 5px; - padding: 2px 4px 1px 4px; + padding: 2px 4px 2px 4px; display: inline-flex; span { overflow: hidden; @@ -87,7 +87,7 @@ } } + .topic-header-extra { - padding: 2px 4px 1px 4px; + padding: 2px 4px 2px 4px; } } From 86bf6babf8f3cf7a1117c28dc539525a8596d282 Mon Sep 17 00:00:00 2001 From: Kris Date: Fri, 2 Feb 2018 22:31:55 -0500 Subject: [PATCH 059/202] FIX: Prevent long composer overlapping controls --- .../stylesheets/common/base/compose.scss | 25 ++++++++++++++++--- app/assets/stylesheets/desktop/compose.scss | 6 ++--- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss index 0b78319214..ead057f8a1 100644 --- a/app/assets/stylesheets/common/base/compose.scss +++ b/app/assets/stylesheets/common/base/compose.scss @@ -96,21 +96,38 @@ color: $primary-high; } .reply-details { - max-width: calc(100% - 100px); + max-width: calc(100% - 175px); + flex: 1 1 auto; + white-space: nowrap; } .composer-action-title { display: inline-flex; align-items: center; - justify-content: space-between; + width: auto; + max-width: 100%; + + .avatar { + width: 20px; + } - .topic-link, .user-link, .username { + .topic-link, .user-link { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - max-width: calc(100%-125px); margin-right: 5px; } + .username { + margin-right: 5px; + max-width: 100px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + @media screen and (max-width: 500px) { + display: none; + } + } + .d-icon { margin-right: 5px; } diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss index 5ecc5d7fea..d7fc0fb05f 100644 --- a/app/assets/stylesheets/desktop/compose.scss +++ b/app/assets/stylesheets/desktop/compose.scss @@ -23,16 +23,16 @@ &:not(.private-message) { .d-editor-preview-wrapper { @media screen and (max-width: 955px) { - margin-top: -79px; + margin-top: -77px; } } } .with-tags { .d-editor-preview-wrapper { - margin-top: -79px; + margin-top: -77px; @media screen and (max-width: 900px) { - margin-top: -116px; + margin-top: -105px; } } } From 0776340b29c47a287be7af518cc5419c136dd087 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Sun, 4 Feb 2018 13:24:36 -0500 Subject: [PATCH 060/202] SECURITY: Prevent robots from indexing more routes These routes could contain sensitive material and should never be indexed for content. --- app/views/robots_txt/index.erb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/views/robots_txt/index.erb b/app/views/robots_txt/index.erb index e4c6a446bc..0b6c8922fe 100644 --- a/app/views/robots_txt/index.erb +++ b/app/views/robots_txt/index.erb @@ -16,5 +16,14 @@ Disallow: /search Disallow: /search/ Disallow: /tags Disallow: /tags/ +Disallow: /email/ +Disallow: /session +Disallow: /session/ +Disallow: /admin +Disallow: /admin/ +Disallow: /user-api-key +Disallow: /user-api-key/ +Disallow: /*?api_key* +Disallow: /*?*api_key* <%= server_plugin_outlet "robots_txt_index" %> From 5cd5d5aca5430e3de8d852a6cf20792927d3b174 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Mon, 5 Feb 2018 09:55:58 +0100 Subject: [PATCH 061/202] FIX: prevents a regression where enter wasn't working in inputs --- app/assets/javascripts/discourse/components/text-field.js.es6 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/components/text-field.js.es6 b/app/assets/javascripts/discourse/components/text-field.js.es6 index ae26f6e99f..6e1fabc819 100644 --- a/app/assets/javascripts/discourse/components/text-field.js.es6 +++ b/app/assets/javascripts/discourse/components/text-field.js.es6 @@ -16,7 +16,9 @@ export default Ember.TextField.extend({ } }, - keyUp() { + keyUp(event) { + this._super(event); + if (this.siteSettings.support_mixed_text_direction) { let val = this.value; if (isRTL(val)) { From bd0a8ae7923d2c59c12c9992f1532641014cf5e1 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Mon, 5 Feb 2018 10:51:06 +0100 Subject: [PATCH 062/202] FIX: makes scrollbar always on for small dropdowns --- .../stylesheets/mobile/select-kit/dropdown-select-box.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss index 64b663b507..1853c4e230 100644 --- a/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss +++ b/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss @@ -2,6 +2,7 @@ &.dropdown-select-box { .select-kit-collection { max-height: 200px; + overflow-y: scroll; } } } From ad8c2c08a4a73adf3344304b80cab26d48895f8e Mon Sep 17 00:00:00 2001 From: Kris Date: Mon, 5 Feb 2018 10:42:37 -0500 Subject: [PATCH 063/202] fixing link alignment in titles --- app/assets/stylesheets/common/base/tagging.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss index 95b2a66a59..d9ffccc9ae 100644 --- a/app/assets/stylesheets/common/base/tagging.scss +++ b/app/assets/stylesheets/common/base/tagging.scss @@ -132,6 +132,7 @@ $tag-color: $primary-medium; .d-header .topic-header-extra { .discourse-tags { + display: inline-block; font-size: $font-down-1; } .topic-featured-link { margin-left: 8px; } @@ -202,6 +203,7 @@ $tag-color: $primary-medium; header .discourse-tag {color: $tag-color } .list-tags { + display: inline-block; margin-right: 3px; font-size: $font-down-1; } From a7603b1cfb8188e77633b0686cce8753720c4907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 5 Feb 2018 16:58:57 +0100 Subject: [PATCH 064/202] remove unused file --- spec/jobs/clean_up_digest_keys.rb | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 spec/jobs/clean_up_digest_keys.rb diff --git a/spec/jobs/clean_up_digest_keys.rb b/spec/jobs/clean_up_digest_keys.rb deleted file mode 100644 index d148836a71..0000000000 --- a/spec/jobs/clean_up_digest_keys.rb +++ /dev/null @@ -1,12 +0,0 @@ -module Jobs - - class CleanUpDigestKeys < Jobs::Scheduled - every 1.day - - def execute(args) - # Remove unused digest keys - DigestUnsubscribeKey.where('created_at < ?', 2.months.ago).delete_all - end - end - -end From 130974d58d5359ab7f7d104a58edce0b14e44f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 5 Feb 2018 17:45:47 +0100 Subject: [PATCH 065/202] FIX: automatically unsilence users --- app/jobs/scheduled/unsilence_users.rb | 11 +++++++++++ spec/jobs/unsilence_users_spec.rb | 16 ++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 app/jobs/scheduled/unsilence_users.rb create mode 100644 spec/jobs/unsilence_users_spec.rb diff --git a/app/jobs/scheduled/unsilence_users.rb b/app/jobs/scheduled/unsilence_users.rb new file mode 100644 index 0000000000..c609894fd5 --- /dev/null +++ b/app/jobs/scheduled/unsilence_users.rb @@ -0,0 +1,11 @@ +module Jobs + class UnsilenceUsers < Jobs::Scheduled + every 15.minutes + + def execute(args) + User.where("silenced_till IS NOT NULL AND silenced_till < now()").find_each do |user| + UserSilencer.unsilence(user, Discourse.system_user) + end + end + end +end diff --git a/spec/jobs/unsilence_users_spec.rb b/spec/jobs/unsilence_users_spec.rb new file mode 100644 index 0000000000..3f16350297 --- /dev/null +++ b/spec/jobs/unsilence_users_spec.rb @@ -0,0 +1,16 @@ +require "rails_helper" + +describe Jobs::UnsilenceUsers do + it "unsilence users" do + user = Fabricate(:user) + UserSilencer.silence(user, Discourse.system_user, silenced_till: 2.days.ago) + + user.reload + expect(user.silenced_till).to be + + Jobs::UnsilenceUsers.new.execute({}) + + user.reload + expect(user.silenced_till).to be(nil) + end +end From 8fe61c68a13e5ae8ce1107adadc0c655d2dd1a41 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 5 Feb 2018 11:46:53 -0500 Subject: [PATCH 066/202] FIX: process_post job should update baked_at and baked_version if it rebakes the post --- app/jobs/regular/process_post.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/regular/process_post.rb b/app/jobs/regular/process_post.rb index 88e340501a..6c8b4e7d2f 100644 --- a/app/jobs/regular/process_post.rb +++ b/app/jobs/regular/process_post.rb @@ -17,7 +17,7 @@ module Jobs cooking_options = args[:cooking_options] || {} cooking_options[:topic_id] = post.topic_id recooked = post.cook(post.raw, cooking_options.symbolize_keys) - post.update_column(:cooked, recooked) + post.update_columns(cooked: recooked, baked_at: Time.zone.now, baked_version: Post::BAKED_VERSION) end cp = CookedPostProcessor.new(post, args) From c48761c62886626a80b234b73cb5fe24de406812 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Mon, 5 Feb 2018 18:25:39 +0100 Subject: [PATCH 067/202] s/select-box-kit/select-kit Definitely remove legacy naming. --- .../select-kit/components/select-kit.js.es6 | 2 +- .../select-kit/select-kit-collection.js.es6 | 2 +- .../components/select-kit/select-kit-filter.js.es6 | 2 +- .../components/select-kit/select-kit-header.js.es6 | 2 +- .../components/select-kit/select-kit-row.js.es6 | 2 +- .../stylesheets/common/admin/admin_base.scss | 2 +- .../select-kit/admin-agree-flag-dropdown.scss | 6 ++---- .../select-kit/admin-delete-flag-dropdown.scss | 6 +++--- .../select-kit/categories-admin-dropdown.scss | 6 +++--- .../common/select-kit/category-chooser.scss | 4 ++-- .../stylesheets/common/select-kit/combo-box.scss | 10 +++++----- .../common/select-kit/dropdown-select-box.scss | 10 ++++------ .../select-kit/future-date-input-selector.scss | 2 +- .../common/select-kit/list-setting.scss | 4 ++-- .../common/select-kit/multi-select.scss | 12 ++++++------ .../common/select-kit/notifications-button.scss | 4 ++-- .../common/select-kit/pinned-button.scss | 2 +- .../stylesheets/common/select-kit/select-kit.scss | 14 +++++++------- app/assets/stylesheets/mobile/topic.scss | 12 ++++++------ 19 files changed, 50 insertions(+), 54 deletions(-) diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6 index 732af67d8f..eb7b325524 100644 --- a/app/assets/javascripts/select-kit/components/select-kit.js.es6 +++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6 @@ -14,7 +14,7 @@ import { export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixin, EventsMixin, { pluginApiIdentifiers: ["select-kit"], layoutName: "select-kit/templates/components/select-kit", - classNames: ["select-kit", "select-box-kit"], + classNames: ["select-kit"], classNameBindings: [ "isFocused", "isExpanded", diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js.es6 index 67508609d2..3dd760e985 100644 --- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js.es6 +++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js.es6 @@ -1,5 +1,5 @@ export default Ember.Component.extend({ layoutName: "select-kit/templates/components/select-kit/select-kit-collection", - classNames: ["select-kit-collection", "select-box-kit-collection"], + classNames: ["select-kit-collection"], tagName: "ul" }); diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6 index f60a627de8..fbfed55bc3 100644 --- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6 +++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6 @@ -1,6 +1,6 @@ export default Ember.Component.extend({ layoutName: "select-kit/templates/components/select-kit/select-kit-filter", - classNames: ["select-kit-filter", "select-box-kit-filter"], + classNames: ["select-kit-filter"], classNameBindings: ["isFocused", "isHidden"], isHidden: Ember.computed.not("shouldDisplayFilter") }); diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6 index 3ae115399f..d5e76b4a76 100644 --- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6 +++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6 @@ -2,7 +2,7 @@ import computed from 'ember-addons/ember-computed-decorators'; export default Ember.Component.extend({ layoutName: "select-kit/templates/components/select-kit/select-kit-header", - classNames: ["select-kit-header", "select-box-kit-header"], + classNames: ["select-kit-header"], classNameBindings: ["isFocused"], attributeBindings: [ "tabindex", diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6 index 493b7a32bb..3ac3a2ce8e 100644 --- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6 +++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6 @@ -5,7 +5,7 @@ import UtilsMixin from "select-kit/mixins/utils"; export default Ember.Component.extend(UtilsMixin, { layoutName: "select-kit/templates/components/select-kit/select-kit-row", - classNames: ["select-kit-row", "select-box-kit-row"], + classNames: ["select-kit-row"], tagName: "li", tabIndex: -1, attributeBindings: [ diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index 4fb3d28771..2786a6e61a 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -229,7 +229,7 @@ $mobile-breakpoint: 700px; .select-kit.multi-select { width: 500px; } - .select-box-kit.dropdown-select-box { + .select-kit.dropdown-select-box { width: auto; } diff --git a/app/assets/stylesheets/common/select-kit/admin-agree-flag-dropdown.scss b/app/assets/stylesheets/common/select-kit/admin-agree-flag-dropdown.scss index 9c1e778499..762b99dd44 100644 --- a/app/assets/stylesheets/common/select-kit/admin-agree-flag-dropdown.scss +++ b/app/assets/stylesheets/common/select-kit/admin-agree-flag-dropdown.scss @@ -1,14 +1,12 @@ -.select-box-kit-body, .select-kit { +.select-kit { &.dropdown-select-box { &.admin-agree-flag-dropdown { - .select-box-kit-body { + .select-kit-body { width: 485px; max-width: 485px; } - .select-box-kit-row[data-value="delete-spammer"] .texts .name, .select-kit-row[data-value="delete-spammer"] .texts .name, - .select-box-kit-row[data-value="delete-spammer"] .icons .d-icon, .select-kit-row[data-value="delete-spammer"] .icons .d-icon { color: $danger; } diff --git a/app/assets/stylesheets/common/select-kit/admin-delete-flag-dropdown.scss b/app/assets/stylesheets/common/select-kit/admin-delete-flag-dropdown.scss index ffdf62634b..c76f9e6dd2 100644 --- a/app/assets/stylesheets/common/select-kit/admin-delete-flag-dropdown.scss +++ b/app/assets/stylesheets/common/select-kit/admin-delete-flag-dropdown.scss @@ -1,4 +1,4 @@ -.select-box-kit { +.select-kit { &.dropdown-select-box { width: auto; &.admin-delete-flag-dropdown { @@ -7,8 +7,8 @@ color: white; } - .select-box-kit-row[data-value="delete-spammer"] .texts .name, - .select-box-kit-row[data-value="delete-spammer"] .icons .d-icon { + .select-kit-row[data-value="delete-spammer"] .texts .name, + .select-kit-row[data-value="delete-spammer"] .icons .d-icon { color: $danger; } } diff --git a/app/assets/stylesheets/common/select-kit/categories-admin-dropdown.scss b/app/assets/stylesheets/common/select-kit/categories-admin-dropdown.scss index 9e3326dd0e..915d576837 100644 --- a/app/assets/stylesheets/common/select-kit/categories-admin-dropdown.scss +++ b/app/assets/stylesheets/common/select-kit/categories-admin-dropdown.scss @@ -1,11 +1,11 @@ -.select-box-kit, .select-kit { +.select-kit { &.categories-admin-dropdown { - .select-box-kit-body, .select-kit-body { + .select-kit-body { min-width: auto; width: 250px; } - .select-box-kit-header .d-icon, .select-kit-header .d-icon { + .select-kit-header .d-icon { justify-content: space-between; } } diff --git a/app/assets/stylesheets/common/select-kit/category-chooser.scss b/app/assets/stylesheets/common/select-kit/category-chooser.scss index 503a9bd275..9102b7cf87 100644 --- a/app/assets/stylesheets/common/select-kit/category-chooser.scss +++ b/app/assets/stylesheets/common/select-kit/category-chooser.scss @@ -1,8 +1,8 @@ -.select-box-kit, .select-kit { +.select-kit { &.combo-box { &.category-chooser { width: 300px; - .select-box-kit-row, .select-kit-row { + .select-kit-row { display: -webkit-box; display: -ms-flexbox; display: flex; diff --git a/app/assets/stylesheets/common/select-kit/combo-box.scss b/app/assets/stylesheets/common/select-kit/combo-box.scss index 59db74d3b0..e69bfdcdcd 100644 --- a/app/assets/stylesheets/common/select-kit/combo-box.scss +++ b/app/assets/stylesheets/common/select-kit/combo-box.scss @@ -1,17 +1,17 @@ -.select-box-kit, .select-kit { +.select-kit { &.combo-box { - .select-box-kit-body, .select-kit-body { + .select-kit-body { width: 100%; } - .select-box-kit-row, .select-kit-row { + .select-kit-row { margin: 5px; min-height: 1px; padding: 5px; } - .select-box-kit-filter, .select-kit-filter { + .select-kit-filter { line-height: $line-height-medium; padding: 6px 10px; border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); @@ -22,7 +22,7 @@ } } - .select-box-kit-header, .select-kit-header { + .select-kit-header { background: $secondary; border: 1px solid $primary-medium; padding: 4px 10px; diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss index 375a2e04d8..591360d727 100644 --- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss +++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss @@ -1,4 +1,4 @@ -.select-box-kit, .select-kit { +.select-kit { &.dropdown-select-box { display: -webkit-inline-box; display: -ms-inline-flexbox; @@ -7,15 +7,13 @@ border: none; &.is-expanded { - .select-box-kit-collection, - .select-box-kit-body, .select-kit-collection, .select-kit-body { border-radius: 0; } } - .select-box-kit-body, .select-kit-body { + .select-kit-body { border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); background-clip: padding-box; -webkit-box-shadow: 0 2px 2px rgba(0,0,0,0.4); @@ -24,7 +22,7 @@ width: 300px; } - .select-box-kit-row, .select-kit-row { + .select-kit-row { margin: 0; padding: 10px 5px; @@ -93,7 +91,7 @@ } } - .select-box-kit-collection, .select-kit-collection { + .select-kit-collection { padding: 0; max-height: 100%; } diff --git a/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss b/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss index ea78ae0690..8ca4efde5b 100644 --- a/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss +++ b/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss @@ -1,4 +1,4 @@ -.select-box-kit, .select-kit { +.select-kit { &.combobox { &.future-date-input-selector { min-width: 50%; diff --git a/app/assets/stylesheets/common/select-kit/list-setting.scss b/app/assets/stylesheets/common/select-kit/list-setting.scss index 1f7103ef98..4fd866173f 100644 --- a/app/assets/stylesheets/common/select-kit/list-setting.scss +++ b/app/assets/stylesheets/common/select-kit/list-setting.scss @@ -1,7 +1,7 @@ -.select-box-kit, .select-kit { +.select-kit { &.multi-select { &.list-setting { - .select-box-kit-row.create, .select-kit-row.create { + .select-kit-row.create { .square { width: 12px; height: 12px; diff --git a/app/assets/stylesheets/common/select-kit/multi-select.scss b/app/assets/stylesheets/common/select-kit/multi-select.scss index 61ca932379..de86261025 100644 --- a/app/assets/stylesheets/common/select-kit/multi-select.scss +++ b/app/assets/stylesheets/common/select-kit/multi-select.scss @@ -1,21 +1,21 @@ -.select-box-kit, .select-kit { +.select-kit { &.multi-select { width: 300px; background: $secondary; border-radius: 0; - .select-box-kit-body, .select-kit-body { + .select-kit-body { width: 100%; } - .select-box-kit-row, .select-kit-row { + .select-kit-row { margin: 5px; min-height: 1px; padding: 5px; border-radius: 0; } - .select-box-kit-filter, .select-kit-filter { + .select-kit-filter { border: 0; } @@ -45,7 +45,7 @@ } &.is-expanded { - .select-box-kit-wrapper, .select-kit-wrapper { + .select-kit-wrapper { display: block; border: 1px solid $tertiary; box-shadow: $tertiary 0 0 6px 0px; @@ -57,7 +57,7 @@ box-shadow: none; } - .select-box-kit-body, .select-kit-body { + .select-kit-body { border-radius: 0; } } diff --git a/app/assets/stylesheets/common/select-kit/notifications-button.scss b/app/assets/stylesheets/common/select-kit/notifications-button.scss index 78db012b79..34b447ed30 100644 --- a/app/assets/stylesheets/common/select-kit/notifications-button.scss +++ b/app/assets/stylesheets/common/select-kit/notifications-button.scss @@ -1,12 +1,12 @@ .select-kit { &.dropdown-select-box { &.notifications-button { - .select-box-kit-body, .select-kit-body { + .select-kit-body { min-width: 550px; max-width: 550px; } - .select-box-kit-row, .select-kit-row { + .select-kit-row { .icons { -ms-flex-item-align: start; align-self: flex-start; diff --git a/app/assets/stylesheets/common/select-kit/pinned-button.scss b/app/assets/stylesheets/common/select-kit/pinned-button.scss index 5428e7ef57..9364205007 100644 --- a/app/assets/stylesheets/common/select-kit/pinned-button.scss +++ b/app/assets/stylesheets/common/select-kit/pinned-button.scss @@ -38,7 +38,7 @@ } .pinned-options { - .select-box-kit-body, .select-kit-body { + .select-kit-body { min-width: unset; max-width: unset; width: 550px; diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss index 5c47572a5c..91e7fe922f 100644 --- a/app/assets/stylesheets/common/select-kit/select-kit.scss +++ b/app/assets/stylesheets/common/select-kit/select-kit.scss @@ -2,7 +2,7 @@ z-index: z("dropdown"); } -.select-box-kit, .select-kit { +.select-kit { border: none; min-width: 220px; -webkit-box-sizing: border-box; @@ -70,7 +70,7 @@ opacity: 0.7; } - .select-box-kit-header, .select-kit-header { + .select-kit-header { box-sizing: border-box; overflow: hidden; -webkit-transition: all .25s; @@ -137,14 +137,14 @@ } } - .select-box-kit-body, .select-kit-body { + .select-kit-body { display: none; background: $secondary; -webkit-box-sizing: border-box; box-sizing: border-box; } - .select-box-kit-row, .select-kit-row { + .select-kit-row { cursor: pointer; line-height: $line-height-medium; outline: none; @@ -190,7 +190,7 @@ } } - .select-box-kit-collection, .select-kit-collection { + .select-kit-collection { background: $secondary; overflow-x: hidden; overflow-y: auto; @@ -225,7 +225,7 @@ } } - .select-box-kit-filter, .select-kit-filter { + .select-kit-filter { display: -webkit-box; display: -ms-flexbox; display: flex; @@ -266,7 +266,7 @@ } } - .select-box-kit-wrapper, .select-kit-wrapper { + .select-kit-wrapper { position: absolute; top: 0; left: 0; diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss index c87355ccfd..58a0ece362 100644 --- a/app/assets/stylesheets/mobile/topic.scss +++ b/app/assets/stylesheets/mobile/topic.scss @@ -45,7 +45,7 @@ .topic-status-info { padding-left: 10px; - border-top: 1px solid $primary-low; + border-top: 1px solid $primary-low; padding-top: 10px; h3 { margin: 0; @@ -66,7 +66,7 @@ } #topic-progress-expanded { - border: 1px solid $primary-low; + border: 1px solid $primary-low; padding: 5px; background: $secondary; @@ -199,7 +199,7 @@ sup sup, sub sup, sup sub, sub sub { top: 0; } margin: 6px 6px 0 0; } - .select-box-kit.combo-box.category-chooser { + .select-kit.combo-box.category-chooser { width: 100%; margin-top: 0; } @@ -207,9 +207,9 @@ sup sup, sub sup, sup sub, sub sub { top: 0; } // make mobile timeline top and bottom dates easier to select .topic-timeline { - .start-date, .now-date { - font-size: $font-up-1; - padding: 5px; + .start-date, .now-date { + font-size: $font-up-1; + padding: 5px; } } From e3de3960916aaf9f7849961f142b9b9cac1ff4f5 Mon Sep 17 00:00:00 2001 From: Simon Cossar Date: Mon, 5 Feb 2018 12:05:32 -0800 Subject: [PATCH 068/202] Set text to empty string when null is passed as argument (#5560) --- app/assets/javascripts/discourse/helpers/dir-span.js.es6 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/helpers/dir-span.js.es6 b/app/assets/javascripts/discourse/helpers/dir-span.js.es6 index 6ce29e8f59..3f25802565 100644 --- a/app/assets/javascripts/discourse/helpers/dir-span.js.es6 +++ b/app/assets/javascripts/discourse/helpers/dir-span.js.es6 @@ -2,11 +2,12 @@ import { registerUnbound } from "discourse-common/lib/helpers"; import { isRTL } from 'discourse/lib/text-direction'; function setDir(text) { - if (Discourse.SiteSettings.support_mixed_text_direction) { - let textDir = isRTL(text) ? 'rtl' : 'ltr'; - return `${text}`; + let content = text ? text : ""; + if (content && Discourse.SiteSettings.support_mixed_text_direction) { + let textDir = isRTL(content) ? 'rtl' : 'ltr'; + return `${content}`; } - return text; + return content; } export default registerUnbound('dir-span', function(str) { From 648a11a6a126a3d53b70144b8670ebb6ae405f66 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 5 Feb 2018 15:05:17 -0500 Subject: [PATCH 069/202] FIX: size of tags input field of tag group --- app/assets/stylesheets/common/base/tagging.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss index d9ffccc9ae..6ab19d0eb1 100644 --- a/app/assets/stylesheets/common/base/tagging.scss +++ b/app/assets/stylesheets/common/base/tagging.scss @@ -278,8 +278,9 @@ header .discourse-tag {color: $tag-color } } .group-tags-list .tag-chooser { height: 250px !important; - .select2-choices { + ul.select2-choices { height: 250px !important; // to fight with select2.scss's important + max-height: none; } } .btn {margin-left: 10px;} From eefd226611fcf63b5cfba02beb33c38b6e6fd1f6 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 5 Feb 2018 17:45:25 -0500 Subject: [PATCH 070/202] Add extensibility point to `request_tracker` to skip IP addresses This is useful if you want to run a per IP rate limiter but want to be able to skip some IPs with custom logic. --- lib/middleware/request_tracker.rb | 16 ++++++++++++ .../middleware/request_tracker_spec.rb | 26 ++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb index 6f802ec16f..b2d4d7299c 100644 --- a/lib/middleware/request_tracker.rb +++ b/lib/middleware/request_tracker.rb @@ -6,6 +6,7 @@ require_dependency 'method_profiler' class Middleware::RequestTracker @@detailed_request_loggers = nil + @@ip_skipper = nil # register callbacks for detailed request loggers called on every request # example: @@ -35,7 +36,20 @@ class Middleware::RequestTracker if @@detailed_request_loggers.length == 0 @detailed_request_loggers = nil end + end + # Register a custom `ip_skipper`, a function that will skip rate limiting + # for any IP that returns true. + # + # For example, if you never wanted to rate limit 1.2.3.4 + # + # ``` + # Middleware::RequestTracker.register_ip_skipper do |ip| + # ip == "1.2.3.4" + # end + # ``` + def self.register_ip_skipper(&blk) + @@ip_skipper = blk end def initialize(app, settings = {}) @@ -167,6 +181,8 @@ class Middleware::RequestTracker return false if is_private_ip?(ip) end + return false if @@ip_skipper.try(:call, ip) + limiter10 = RateLimiter.new( nil, "global_ip_limit_10_#{ip}", diff --git a/spec/components/middleware/request_tracker_spec.rb b/spec/components/middleware/request_tracker_spec.rb index e56c708a22..a112d864e6 100644 --- a/spec/components/middleware/request_tracker_spec.rb +++ b/spec/components/middleware/request_tracker_spec.rb @@ -127,6 +127,30 @@ describe Middleware::RequestTracker do expect(status).to eq(429) end + describe "register_ip_skipper" do + before do + Middleware::RequestTracker.register_ip_skipper do |ip| + ip == "1.1.1.2" + end + global_setting :max_reqs_per_ip_per_10_seconds, 1 + global_setting :max_reqs_per_ip_mode, 'block' + end + + it "won't block if the ip is skipped" do + env1 = env("REMOTE_ADDR" => "1.1.1.2") + status, _ = middleware.call(env1) + status, _ = middleware.call(env1) + expect(status).to eq(200) + end + + it "blocks if the ip isn't skipped" do + env1 = env("REMOTE_ADDR" => "1.1.1.1") + status, _ = middleware.call(env1) + status, _ = middleware.call(env1) + expect(status).to eq(429) + end + end + it "does nothing for private IPs if skipped" do global_setting :max_reqs_per_ip_per_10_seconds, 1 global_setting :max_reqs_per_ip_mode, 'warn+block' @@ -206,7 +230,7 @@ describe Middleware::RequestTracker do end after do - Middleware::RequestTracker.register_detailed_request_logger(logger) + Middleware::RequestTracker.unregister_detailed_request_logger(logger) end it "can correctly log detailed data" do From d7e90edeb5e78d23ef217c025d36afe7f43e814b Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 5 Feb 2018 17:54:07 -0500 Subject: [PATCH 071/202] PERF: Tl3Promotions job can limit the number of TL3 candidates by using some simple requirements in the query --- app/jobs/scheduled/tl3_promotions.rb | 19 ++++++++++++++----- spec/jobs/tl3_promotions_spec.rb | 15 +++++++++++++++ 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/app/jobs/scheduled/tl3_promotions.rb b/app/jobs/scheduled/tl3_promotions.rb index 94c3d42fc7..ce78290eae 100644 --- a/app/jobs/scheduled/tl3_promotions.rb +++ b/app/jobs/scheduled/tl3_promotions.rb @@ -21,13 +21,22 @@ module Jobs end # Promotions - User.real.where( - trust_level: TrustLevel[2], - manual_locked_trust_level: nil, - group_locked_trust_level: nil - ).where.not(id: demoted_user_ids).find_each do |u| + User.real.not_suspended.where( + trust_level: TrustLevel[2], + manual_locked_trust_level: nil, + group_locked_trust_level: nil + ).where.not(id: demoted_user_ids) + .joins(:user_stat) + .where("user_stats.days_visited >= ?", SiteSetting.tl3_requires_days_visited) + .where("user_stats.topic_reply_count >= ?", SiteSetting.tl3_requires_topics_replied_to) + .where("user_stats.topics_entered >= ?", SiteSetting.tl3_requires_topics_viewed_all_time) + .where("user_stats.posts_read_count >= ?", SiteSetting.tl3_requires_posts_read_all_time) + .where("user_stats.likes_given >= ?", SiteSetting.tl3_requires_likes_given) + .where("user_stats.likes_received >= ?", SiteSetting.tl3_requires_likes_received) + .find_each do |u| Promotion.new(u).review_tl2 end + end end diff --git a/spec/jobs/tl3_promotions_spec.rb b/spec/jobs/tl3_promotions_spec.rb index bf440918fd..e96d809da9 100644 --- a/spec/jobs/tl3_promotions_spec.rb +++ b/spec/jobs/tl3_promotions_spec.rb @@ -2,10 +2,23 @@ require 'rails_helper' describe Jobs::Tl3Promotions do + def create_qualifying_stats(user) + user.create_user_stat if user.user_stat.nil? + user.user_stat.update_attributes!( + days_visited: 1000, + topic_reply_count: 1000, + topics_entered: 1000, + posts_read_count: 1000, + likes_given: 1000, + likes_received: 1000 + ) + end + subject(:run_job) { described_class.new.execute({}) } it "promotes tl2 user who qualifies for tl3" do _tl2_user = Fabricate(:user, trust_level: TrustLevel[2]) + create_qualifying_stats(_tl2_user) TrustLevel3Requirements.any_instance.stubs(:requirements_met?).returns(true) Promotion.any_instance.expects(:change_trust_level!).with(TrustLevel[3], anything).once run_job @@ -14,6 +27,8 @@ describe Jobs::Tl3Promotions do it "doesn't promote tl1 and tl0 users who have met tl3 requirements" do _tl1_user = Fabricate(:user, trust_level: TrustLevel[1]) _tl0_user = Fabricate(:user, trust_level: TrustLevel[0]) + create_qualifying_stats(_tl1_user) + create_qualifying_stats(_tl0_user) TrustLevel3Requirements.any_instance.expects(:requirements_met?).never Promotion.any_instance.expects(:change_trust_level!).never run_job From df8e43abdd1c0b810d32b1f8987e3adc0d914105 Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Tue, 6 Feb 2018 10:38:15 +1100 Subject: [PATCH 072/202] use lazy & instead of try unregister ip skipper in test raise if called when a skipper is in play --- lib/middleware/request_tracker.rb | 8 +++++++- spec/components/middleware/request_tracker_spec.rb | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb index b2d4d7299c..cee0f5535c 100644 --- a/lib/middleware/request_tracker.rb +++ b/lib/middleware/request_tracker.rb @@ -38,6 +38,11 @@ class Middleware::RequestTracker end end + # used for testing + def self.unregister_ip_skipper + @@ip_skipper = nil + end + # Register a custom `ip_skipper`, a function that will skip rate limiting # for any IP that returns true. # @@ -49,6 +54,7 @@ class Middleware::RequestTracker # end # ``` def self.register_ip_skipper(&blk) + raise "IP skipper is already registered!" if @@ip_skipper @@ip_skipper = blk end @@ -181,7 +187,7 @@ class Middleware::RequestTracker return false if is_private_ip?(ip) end - return false if @@ip_skipper.try(:call, ip) + return false if @@ip_skipper&.call(ip) limiter10 = RateLimiter.new( nil, diff --git a/spec/components/middleware/request_tracker_spec.rb b/spec/components/middleware/request_tracker_spec.rb index a112d864e6..d4455abbb4 100644 --- a/spec/components/middleware/request_tracker_spec.rb +++ b/spec/components/middleware/request_tracker_spec.rb @@ -136,6 +136,10 @@ describe Middleware::RequestTracker do global_setting :max_reqs_per_ip_mode, 'block' end + after do + Middleware::RequestTracker.unregister_ip_skipper + end + it "won't block if the ip is skipped" do env1 = env("REMOTE_ADDR" => "1.1.1.2") status, _ = middleware.call(env1) From 508a8e29abbfe5466547134b6c6c8b8bfcd1eb0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Tue, 6 Feb 2018 01:04:45 +0100 Subject: [PATCH 073/202] update email_reply_trimmer to latest version --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a513adb80e..3fa66d5d30 100644 --- a/Gemfile +++ b/Gemfile @@ -59,7 +59,7 @@ gem 'aws-sdk-s3', require: false gem 'excon', require: false gem 'unf', require: false -gem 'email_reply_trimmer', '0.1.9' +gem 'email_reply_trimmer', '0.1.10' # Forked until https://github.com/toy/image_optim/pull/149 is merged gem 'discourse_image_optim', require: 'image_optim' diff --git a/Gemfile.lock b/Gemfile.lock index b2397688ec..08bec02878 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -91,7 +91,7 @@ GEM image_size (~> 1.5) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - email_reply_trimmer (0.1.9) + email_reply_trimmer (0.1.10) ember-data-source (2.2.1) ember-source (>= 1.8, < 3.0) ember-handlebars-template (0.7.5) @@ -421,7 +421,7 @@ DEPENDENCIES cppjieba_rb discourse-qunit-rails discourse_image_optim - email_reply_trimmer (= 0.1.9) + email_reply_trimmer (= 0.1.10) ember-handlebars-template (= 0.7.5) ember-rails (= 0.18.5) ember-source (= 2.13.3) From e7b732ad95079cb74124052dfdd6115ba93f1e8b Mon Sep 17 00:00:00 2001 From: Kris Date: Mon, 5 Feb 2018 21:36:35 -0500 Subject: [PATCH 074/202] FIX: Desktop/mobile heatmap colors should be the same --- app/assets/stylesheets/common/base/_topic-list.scss | 4 ++++ app/assets/stylesheets/desktop/topic.scss | 9 --------- app/assets/stylesheets/mobile/topic.scss | 4 ---- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss index b35977b652..19e372f95c 100644 --- a/app/assets/stylesheets/common/base/_topic-list.scss +++ b/app/assets/stylesheets/common/base/_topic-list.scss @@ -155,6 +155,10 @@ } +.heatmap-high, .heatmap-high a {color: #fe7a15 !important;} +.heatmap-med, .heatmap-med a {color: #cf7721 !important;} +.heatmap-low, .heatmap-low a {color: #9b764f !important;} + .topic-list.categories { .category .badge-notification { diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss index 0d6db3227a..b4d33b0958 100644 --- a/app/assets/stylesheets/desktop/topic.scss +++ b/app/assets/stylesheets/desktop/topic.scss @@ -179,15 +179,6 @@ } } -.heatmap-high {color: #fe7a15 !important;} -.heatmap-med {color: #cf7721 !important;} -.heatmap-low {color: #9b764f !important;} -.heatmap-high a {color: #fe7a15 !important;} -.heatmap-med a {color: #cf7721 !important;} -.heatmap-low a {color: #9b764f !important;} - - - #topic-filter { background-color: $highlight-medium; padding: 8px; diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss index 58a0ece362..dafbfd69e5 100644 --- a/app/assets/stylesheets/mobile/topic.scss +++ b/app/assets/stylesheets/mobile/topic.scss @@ -172,10 +172,6 @@ .topic-post:last-of-type {padding-bottom: 40px;} -.heatmap-high {color: $danger !important;} -.heatmap-med {color: $danger-medium !important;} -.heatmap-low {color: $danger-low !important;} - sup sup, sub sup, sup sub, sub sub { top: 0; } // inline editing of title on mobile From b1593c018440cad761f6fd527cb12508c205639b Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 6 Feb 2018 14:48:04 +0100 Subject: [PATCH 075/202] FIX: prevents exception when opening new topic on mobile Repro: - Visit https://meta.discourse.org/categories, refresh the page - Navigate to Latest - Click New Topic - Error occurs --- app/assets/javascripts/discourse/mixins/open-composer.js.es6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/mixins/open-composer.js.es6 b/app/assets/javascripts/discourse/mixins/open-composer.js.es6 index 2303281b63..dcb92d1478 100644 --- a/app/assets/javascripts/discourse/mixins/open-composer.js.es6 +++ b/app/assets/javascripts/discourse/mixins/open-composer.js.es6 @@ -7,8 +7,8 @@ export default Ember.Mixin.create({ this.controllerFor('composer').open({ categoryId: controller.get('category.id'), action: Composer.CREATE_TOPIC, - draftKey: controller.get('model.draft_key'), - draftSequence: controller.get('model.draft_sequence') + draftKey: controller.get('model.draft_key') || Composer.CREATE_TOPIC, + draftSequence: controller.get('model.draft_sequence') || 0 }); }, From 884b9d4b78c39eab83f1ef39703a348459ca7764 Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Tue, 6 Feb 2018 12:37:23 -0500 Subject: [PATCH 076/202] PERF: optimize performance of new topics query (home page) This ensures the bypass is always applied to query plan also, add frozen strings --- app/models/topic_tracking_state.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb index a7d48758ba..0e144d991e 100644 --- a/app/models/topic_tracking_state.rb +++ b/app/models/topic_tracking_state.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # this class is used to mirror unread and new status back to end users # in JavaScript there is a mirror class that is kept in-sync using the mssage bus # the allows end users to always know which topics have unread posts in them @@ -175,8 +177,7 @@ class TopicTrackingState sql << report_raw_sql(topic_id: topic_id, skip_new: true, skip_order: true, staff: user.staff?) SqlBuilder.new(sql) - .map_exec(TopicTrackingState, user_id: user.id, topic_id: topic_id) - + .map_exec(TopicTrackingState, user_id: user.id, topic_id: topic_id, min_new_topic_date: Time.at(SiteSetting.min_new_topics_time).to_datetime) end def self.report_raw_sql(opts = nil) @@ -196,7 +197,8 @@ class TopicTrackingState if opts && opts[:skip_new] "1=0" else - TopicQuery.new_filter(Topic, "xxx").where_clause.send(:predicates).join(" AND ").gsub!("'xxx'", treat_as_new_topic_clause) + TopicQuery.new_filter(Topic, "xxx").where_clause.send(:predicates).join(" AND ").gsub!("'xxx'", treat_as_new_topic_clause) + + " AND topics.created_at > :min_new_topic_date" end select = (opts && opts[:select]) || " @@ -208,7 +210,7 @@ class TopicTrackingState c.id AS category_id, tu.notification_level" - sql = < Date: Tue, 6 Feb 2018 15:02:51 -0500 Subject: [PATCH 077/202] UX: Allow history modal to scale down on smaller screens --- app/assets/stylesheets/common/base/history.scss | 1 + app/assets/stylesheets/common/base/modal.scss | 3 ++- app/assets/stylesheets/desktop/history.scss | 1 - app/assets/stylesheets/mobile/history.scss | 7 +++++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/common/base/history.scss b/app/assets/stylesheets/common/base/history.scss index 07f659a6eb..a1faeea65e 100644 --- a/app/assets/stylesheets/common/base/history.scss +++ b/app/assets/stylesheets/common/base/history.scss @@ -13,6 +13,7 @@ #revision-controls { display: inline-block; + margin-bottom: 5px; } .revision-content { diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss index c47c9d4c2d..868eeb3ac0 100644 --- a/app/assets/stylesheets/common/base/modal.scss +++ b/app/assets/stylesheets/common/base/modal.scss @@ -75,12 +75,13 @@ .modal-outer-container { display:table; + table-layout: fixed; width:100%; height:100%; } .modal-inner-container { - max-width: 710px; + max-width: 960px; margin: 0 auto; background-color: $secondary; background-clip: padding-box; diff --git a/app/assets/stylesheets/desktop/history.scss b/app/assets/stylesheets/desktop/history.scss index 81241cb8b4..32466fc77b 100644 --- a/app/assets/stylesheets/desktop/history.scss +++ b/app/assets/stylesheets/desktop/history.scss @@ -3,7 +3,6 @@ .modal.history-modal { .modal-inner-container { - min-width: 960px; min-height: 500px; } #revision-controls { diff --git a/app/assets/stylesheets/mobile/history.scss b/app/assets/stylesheets/mobile/history.scss index aa2413b644..93a2a29e7e 100644 --- a/app/assets/stylesheets/mobile/history.scss +++ b/app/assets/stylesheets/mobile/history.scss @@ -17,4 +17,11 @@ max-width: 95%; height: auto; } + .revision-content { + table { + table-layout: fixed; + width: 100%; + word-wrap: break-word; + } + } } From cdded801c5b2798b07415a181197c4473e3141af Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 6 Feb 2018 22:17:27 +0100 Subject: [PATCH 078/202] FIX: correctly shows link to post number when editing --- .../discourse/components/composer-action-title.js.es6 | 8 ++++---- app/assets/stylesheets/common/base/compose.scss | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/discourse/components/composer-action-title.js.es6 b/app/assets/javascripts/discourse/components/composer-action-title.js.es6 index bc6e0e95bf..2bc6927300 100644 --- a/app/assets/javascripts/discourse/components/composer-action-title.js.es6 +++ b/app/assets/javascripts/discourse/components/composer-action-title.js.es6 @@ -22,20 +22,20 @@ export default Ember.Component.extend({ return this._formatReplyToTopic(opts.topicLink); } case EDIT: - if (opts.userAvatar && opts.userLink && opts.topicLink) { + if (opts.userAvatar && opts.userLink && opts.postLink) { return this._formatEditUserPost( opts.userAvatar, opts.userLink, - opts.topicLink, + opts.postLink, opts.originalUser ); } }; }, - _formatEditUserPost(userAvatar, userLink, topicLink, originalUser) { + _formatEditUserPost(userAvatar, userLink, postLink, originalUser) { let editTitle = ` - ${topicLink.anchor} + ${postLink.anchor} ${userAvatar} ${userLink.anchor} ${iconHTML("mail-forward", { class: "reply-to-glyph" })} diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss index ead057f8a1..9c829becd9 100644 --- a/app/assets/stylesheets/common/base/compose.scss +++ b/app/assets/stylesheets/common/base/compose.scss @@ -105,12 +105,12 @@ align-items: center; width: auto; max-width: 100%; - + .avatar { width: 20px; } - .topic-link, .user-link { + .topic-link, .user-link, .post-link { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; From b2b6dc68a6e08dc3452070d17aa175e94b8196c6 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 6 Feb 2018 17:12:27 -0500 Subject: [PATCH 079/202] FEATURE: a setting to customize the minimum TL to flag a post --- config/locales/server.en.yml | 2 ++ config/site_settings.yml | 3 +++ lib/guardian/post_guardian.rb | 2 +- spec/components/guardian_spec.rb | 8 +++++++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index e1b45e517c..89214a8967 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1291,6 +1291,8 @@ en: min_trust_to_send_email_messages: "The minimum trust level required to send new personal messages via email (to staged users)." + min_trust_to_flag_posts: "The minimum trust level required to flag posts" + newuser_max_links: "How many links a new user can add to a post." newuser_max_images: "How many images a new user can add to a post." newuser_max_attachments: "How many attachments a new user can add to a post." diff --git a/config/site_settings.yml b/config/site_settings.yml index e8d9d14277..d283e027c2 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -894,6 +894,9 @@ trust: min_trust_to_send_email_messages: default: 4 enum: 'TrustLevelSetting' + min_trust_to_flag_posts: + default: 1 + enum: 'TrustLevelSetting' tl1_requires_topics_entered: 5 tl1_requires_read_posts: default: 30 diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb index e5e4e010f8..6986d1099e 100644 --- a/lib/guardian/post_guardian.rb +++ b/lib/guardian/post_guardian.rb @@ -21,7 +21,7 @@ module PostGuardian # we allow flagging for trust level 1 and higher # always allowed for private messages - (is_flag && not(already_did_flagging) && (@user.has_trust_level?(TrustLevel[1]) || post.topic.private_message?)) || + (is_flag && not(already_did_flagging) && (@user.has_trust_level?(TrustLevel[SiteSetting.min_trust_to_flag_posts]) || post.topic.private_message?)) || # not a flagging action, and haven't done it already not(is_flag || already_taken_this_action) && diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb index 0aa745ed9e..5ec7904b35 100644 --- a/spec/components/guardian_spec.rb +++ b/spec/components/guardian_spec.rb @@ -90,11 +90,17 @@ describe Guardian do expect(Guardian.new(user).post_can_act?(post, :like)).to be_truthy end - it "returns false for a new user flagging a standard post as spam" do + it "returns false for a new user flagging as spam" do user.trust_level = TrustLevel[0] expect(Guardian.new(user).post_can_act?(post, :spam)).to be_falsey end + it "returns true for a new user flagging as spam if enabled" do + SiteSetting.min_trust_to_flag_posts = 0 + user.trust_level = TrustLevel[0] + expect(Guardian.new(user).post_can_act?(post, :spam)).to be_truthy + end + it "returns true for a new user flagging a private message as spam" do post = Fabricate(:private_message_post, user: Fabricate(:admin)) user.trust_level = TrustLevel[0] From ce26f48f97e13c1a8b3f8e11ce2f2ef888e565ba Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 6 Feb 2018 17:54:34 -0500 Subject: [PATCH 080/202] FIX: only send up to 100 selected tags in the tag search request to avoid sending a query string that's too long --- .../javascripts/discourse/components/tag-chooser.js.es6 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/components/tag-chooser.js.es6 b/app/assets/javascripts/discourse/components/tag-chooser.js.es6 index 00fc244487..9f962596e4 100644 --- a/app/assets/javascripts/discourse/components/tag-chooser.js.es6 +++ b/app/assets/javascripts/discourse/components/tag-chooser.js.es6 @@ -109,12 +109,15 @@ export default Ember.TextField.extend({ url: Discourse.getURL("/tags/filter/search"), dataType: 'json', data: function (term) { + const selectedTags = self.get('tags'); const d = { q: term, limit: self.siteSettings.max_tag_search_results, - categoryId: self.get('categoryId'), - selected_tags: self.get('tags') + categoryId: self.get('categoryId') }; + if (selectedTags) { + d.selected_tags = selectedTags.slice(0,100); + } if (!self.get('everyTag')) { d.filterForInput = true; } From 1bab15c7574757d3ff363c9cd9823d26b6020413 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 6 Feb 2018 18:07:24 -0500 Subject: [PATCH 081/202] FEATURE: A site setting for a minimum TL to post links --- config/locales/server.en.yml | 2 ++ config/site_settings.yml | 3 +++ lib/validators/post_validator.rb | 15 +++++++++++---- spec/components/validators/post_validator_spec.rb | 2 +- spec/models/post_spec.rb | 10 ++++++++-- 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 89214a8967..a2a6dc88ae 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -215,6 +215,7 @@ en: one: "Sorry, new users can only put one attachment in a post." other: "Sorry, new users can only put %{count} attachments in a post." no_links_allowed: "Sorry, new users can't put links in posts." + links_require_trust: "Sorry, you can't include links in your posts." too_many_links: one: "Sorry, new users can only put one link in a post." other: "Sorry, new users can only put %{count} links in a post." @@ -1292,6 +1293,7 @@ en: min_trust_to_send_email_messages: "The minimum trust level required to send new personal messages via email (to staged users)." min_trust_to_flag_posts: "The minimum trust level required to flag posts" + min_trust_to_post_links: "The minimum trust level required to include links in posts" newuser_max_links: "How many links a new user can add to a post." newuser_max_images: "How many images a new user can add to a post." diff --git a/config/site_settings.yml b/config/site_settings.yml index d283e027c2..f8ff2bb1a8 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -897,6 +897,9 @@ trust: min_trust_to_flag_posts: default: 1 enum: 'TrustLevelSetting' + min_trust_to_post_links: + default: 0 + enum: 'TrustLevelSetting' tl1_requires_topics_entered: 5 tl1_requires_read_posts: default: 30 diff --git a/lib/validators/post_validator.rb b/lib/validators/post_validator.rb index a9b1f468c4..354e0738de 100644 --- a/lib/validators/post_validator.rb +++ b/lib/validators/post_validator.rb @@ -15,7 +15,8 @@ class Validators::PostValidator < ActiveModel::Validator max_mention_validator(record) max_images_validator(record) max_attachments_validator(record) - max_links_validator(record) + can_post_links_validator(record) + newuser_links_validator(record) unique_post_validator(record) end @@ -91,8 +92,14 @@ class Validators::PostValidator < ActiveModel::Validator add_error_if_count_exceeded(post, :no_attachments_allowed, :too_many_attachments, post.attachment_count, SiteSetting.newuser_max_attachments) end + def can_post_links_validator(post) + return if acting_user_is_trusted?(post, SiteSetting.min_trust_to_post_links) || private_message?(post) + + post.errors.add(:base, I18n.t(:links_require_trust)) + end + # Ensure new users can not put too many links in a post - def max_links_validator(post) + def newuser_links_validator(post) return if acting_user_is_trusted?(post) || private_message?(post) add_error_if_count_exceeded(post, :no_links_allowed, :too_many_links, post.link_count, SiteSetting.newuser_max_links) end @@ -113,8 +120,8 @@ class Validators::PostValidator < ActiveModel::Validator private - def acting_user_is_trusted?(post) - post.acting_user.present? && post.acting_user.has_trust_level?(TrustLevel[1]) + def acting_user_is_trusted?(post, level = 1) + post.acting_user.present? && post.acting_user.has_trust_level?(TrustLevel[level]) end def private_message?(post) diff --git a/spec/components/validators/post_validator_spec.rb b/spec/components/validators/post_validator_spec.rb index 008e92fa16..09cf5c2172 100644 --- a/spec/components/validators/post_validator_spec.rb +++ b/spec/components/validators/post_validator_spec.rb @@ -184,7 +184,7 @@ describe Validators::PostValidator do validator.expects(:max_mention_validator).never validator.expects(:max_images_validator).never validator.expects(:max_attachments_validator).never - validator.expects(:max_links_validator).never + validator.expects(:newuser_links_validator).never validator.expects(:unique_post_validator).never validator.validate(post) end diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index 3582aa4db6..866cfe8867 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -352,7 +352,7 @@ describe Post do end - describe "maximum links" do + describe "maximums" do let(:newuser) { Fabricate(:user, trust_level: TrustLevel[0]) } let(:post_one_link) { post_with_body("[sherlock](http://www.bbc.co.uk/programmes/b018ttws)", newuser) } let(:post_two_links) { post_with_body("discourse twitter", newuser) } @@ -391,11 +391,17 @@ describe Post do end end - it "allows multiple images for basic accounts" do + it "allows multiple links for basic accounts" do post_two_links.user.trust_level = TrustLevel[1] expect(post_two_links).to be_valid end + it "doesn't allow allow links if `min_trust_to_post_links` is not met" do + SiteSetting.min_trust_to_post_links = 2 + post_two_links.user.trust_level = TrustLevel[1] + expect(post_one_link).not_to be_valid + end + end end From 016b9cd0e9ecc5dbb062909538f69a75413d54e3 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 6 Feb 2018 20:16:48 -0500 Subject: [PATCH 082/202] FIX: Count the links in the post --- lib/validators/post_validator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/validators/post_validator.rb b/lib/validators/post_validator.rb index 354e0738de..64755e558f 100644 --- a/lib/validators/post_validator.rb +++ b/lib/validators/post_validator.rb @@ -93,7 +93,7 @@ class Validators::PostValidator < ActiveModel::Validator end def can_post_links_validator(post) - return if acting_user_is_trusted?(post, SiteSetting.min_trust_to_post_links) || private_message?(post) + return if post.link_count === 0 || acting_user_is_trusted?(post, SiteSetting.min_trust_to_post_links) || private_message?(post) post.errors.add(:base, I18n.t(:links_require_trust)) end From 8c04893a047f1a3dfcde93b3c580b0d5adc70ef4 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 7 Feb 2018 00:31:05 -0500 Subject: [PATCH 083/202] FIX: Don't throttle local lookups --- lib/auth/default_current_user_provider.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb index a23f028152..8c56dc9d5a 100644 --- a/lib/auth/default_current_user_provider.rb +++ b/lib/auth/default_current_user_provider.rb @@ -48,7 +48,7 @@ class Auth::DefaultCurrentUserProvider if auth_token && auth_token.length == 32 limiter = RateLimiter.new(nil, "cookie_auth_#{request.ip}", COOKIE_ATTEMPTS_PER_MIN , 60) - if limiter.can_perform? + if request.ip == "127.0.0.1" || request.ip == "::1" || limiter.can_perform? @user_token = UserAuthToken.lookup(auth_token, seen: true, user_agent: @env['HTTP_USER_AGENT'], From dab0ec1d6622896d4914da8c65d568ee64d3389a Mon Sep 17 00:00:00 2001 From: scossar Date: Tue, 6 Feb 2018 18:33:02 -0800 Subject: [PATCH 084/202] Add translation key/value for target_user_not_found error message --- config/locales/server.en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index a2a6dc88ae..cc7c109e4d 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -394,6 +394,7 @@ en: cant_send_pm: "Sorry, you cannot send a personal message to that user." no_user_selected: "You must select a valid user." reply_by_email_disabled: "Reply by email has been disabled." + target_user_not_found: "One of the users you are sending this message to could not be found." featured_link: invalid: "is invalid. URL should include http:// or https://." invalid_category: "can't be edited in this category." From 890ffb1eb56c185c5bc2498dd0212d17fa782ead Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Wed, 7 Feb 2018 12:47:01 +0100 Subject: [PATCH 085/202] FIX: overriding _MF translations worked only for English --- app/models/translation_override.rb | 2 +- spec/models/translation_override_spec.rb | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models/translation_override.rb b/app/models/translation_override.rb index ea3859930c..f60b19545c 100644 --- a/app/models/translation_override.rb +++ b/app/models/translation_override.rb @@ -21,7 +21,7 @@ class TranslationOverride < ActiveRecord::Base data = { value: value } if key.end_with?('_MF') - _, filename = JsLocaleHelper.find_message_format_locale(['en'], false) + _, filename = JsLocaleHelper.find_message_format_locale([locale], false) data[:compiled_js] = JsLocaleHelper.compile_message_format(filename, locale, value) end diff --git a/spec/models/translation_override_spec.rb b/spec/models/translation_override_spec.rb index 9929d325f6..7f31c015a6 100644 --- a/spec/models/translation_override_spec.rb +++ b/spec/models/translation_override_spec.rb @@ -46,11 +46,12 @@ describe TranslationOverride do end it "stores js for a message format key" do - TranslationOverride.upsert!('en', 'some.key_MF', '{NUM_RESULTS, plural, one {1 result} other {many} }') + TranslationOverride.upsert!('ru', 'some.key_MF', '{NUM_RESULTS, plural, one {1 result} other {many} }') - ovr = TranslationOverride.where(locale: 'en', translation_key: 'some.key_MF').first + ovr = TranslationOverride.where(locale: 'ru', translation_key: 'some.key_MF').first expect(ovr).to be_present - expect(ovr.compiled_js).to match(/function/) + expect(ovr.compiled_js).to start_with('function') + expect(ovr.compiled_js).to_not match(/Invalid Format/i) end end From 8765279c90e8a24cc75a27661447527f0945bd7a Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Wed, 7 Feb 2018 16:57:08 +0100 Subject: [PATCH 086/202] FIX: Customizing site texts ignored current locale for _MF keys --- .../admin/site_texts_controller.rb | 2 +- .../admin/site_texts_controller_spec.rb | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/site_texts_controller.rb b/app/controllers/admin/site_texts_controller.rb index 8cdb0d9b19..ebb99aa8c5 100644 --- a/app/controllers/admin/site_texts_controller.rb +++ b/app/controllers/admin/site_texts_controller.rb @@ -71,7 +71,7 @@ class Admin::SiteTextsController < Admin::AdminController def record_for(k, value = nil) if k.ends_with?("_MF") - ovr = TranslationOverride.where(translation_key: k).pluck(:value) + ovr = TranslationOverride.where(translation_key: k, locale: I18n.locale).pluck(:value) value = ovr[0] if ovr.present? end diff --git a/spec/controllers/admin/site_texts_controller_spec.rb b/spec/controllers/admin/site_texts_controller_spec.rb index fe3f30def6..7a1676a831 100644 --- a/spec/controllers/admin/site_texts_controller_spec.rb +++ b/spec/controllers/admin/site_texts_controller_spec.rb @@ -125,6 +125,34 @@ describe Admin::SiteTextsController do expect(log.new_value).to eq(original_title) expect(log.action).to eq(UserHistory.actions[:change_site_text]) end + + it 'returns site texts for the correct locale' do + SiteSetting.default_locale = :ru + + ru_title = 'title ru' + ru_mf_text = 'ru {NUM_RESULTS, plural, one {1 result} other {many} }' + + put :update, params: { id: 'title', site_text: { value: ru_title } }, format: :json + put :update, params: { id: 'js.topic.read_more_MF', site_text: { value: ru_mf_text } }, format: :json + + get :show, params: { id: 'title' }, format: :json + json = ::JSON.parse(response.body) + expect(json['site_text']['value']).to eq(ru_title) + + get :show, params: { id: 'js.topic.read_more_MF' }, format: :json + json = ::JSON.parse(response.body) + expect(json['site_text']['value']).to eq(ru_mf_text) + + SiteSetting.default_locale = :en + + get :show, params: { id: 'title' }, format: :json + json = ::JSON.parse(response.body) + expect(json['site_text']['value']).to_not eq(ru_title) + + get :show, params: { id: 'js.topic.read_more_MF' }, format: :json + json = ::JSON.parse(response.body) + expect(json['site_text']['value']).to_not eq(ru_mf_text) + end end end From fb91d24deb690fa99be65627b2217d14bc1140c6 Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Wed, 7 Feb 2018 11:33:15 -0500 Subject: [PATCH 087/202] PERF: add index on user email logs This index makes it much faster to figure out if a user reached email limit on sites where lots of emails are skipped --- ..._add_skipped_created_at_user_id_index_on_email_logs.rb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 db/migrate/20180207161422_add_skipped_created_at_user_id_index_on_email_logs.rb diff --git a/db/migrate/20180207161422_add_skipped_created_at_user_id_index_on_email_logs.rb b/db/migrate/20180207161422_add_skipped_created_at_user_id_index_on_email_logs.rb new file mode 100644 index 0000000000..d8d13ff0ed --- /dev/null +++ b/db/migrate/20180207161422_add_skipped_created_at_user_id_index_on_email_logs.rb @@ -0,0 +1,8 @@ +class AddSkippedCreatedAtUserIdIndexOnEmailLogs < ActiveRecord::Migration[5.1] + def up + execute "CREATE INDEX idx_email_logs_user_created_filtered ON email_logs(user_id, created_at) WHERE skipped = 'f'" + end + def down + execute "DROP INDEX idx_email_logs_user_created_filtered" + end +end From c0ef6ca01c2f3528008e947246a1037d2d6a6291 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 7 Feb 2018 11:35:00 -0500 Subject: [PATCH 088/202] UX: Show the footer on the user summary and preferences pages --- app/assets/javascripts/discourse/routes/discourse.js.es6 | 8 ++++++++ .../javascripts/discourse/routes/preferences-about.js.es6 | 2 ++ .../discourse/routes/preferences-account.js.es6 | 2 ++ .../discourse/routes/preferences-badge-title.js.es6 | 2 ++ .../discourse/routes/preferences-card-badge.js.es6 | 2 ++ .../discourse/routes/preferences-categories.js.es6 | 5 +++++ .../javascripts/discourse/routes/preferences-email.js.es6 | 2 ++ .../javascripts/discourse/routes/preferences-index.js.es6 | 2 ++ .../discourse/routes/preferences-interface.js.es6 | 2 ++ .../discourse/routes/preferences-notifications.js.es6 | 5 +++++ .../discourse/routes/preferences-username.js.es6 | 2 ++ .../javascripts/discourse/routes/preferences.js.es6 | 1 + .../javascripts/discourse/routes/user-summary.js.es6 | 2 ++ 13 files changed, 37 insertions(+) create mode 100644 app/assets/javascripts/discourse/routes/preferences-categories.js.es6 create mode 100644 app/assets/javascripts/discourse/routes/preferences-notifications.js.es6 diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js.es6 index 8b3d3bbc31..169d50cd94 100644 --- a/app/assets/javascripts/discourse/routes/discourse.js.es6 +++ b/app/assets/javascripts/discourse/routes/discourse.js.es6 @@ -1,11 +1,19 @@ import Composer from 'discourse/models/composer'; const DiscourseRoute = Ember.Route.extend({ + showFooter: false, // Set to true to refresh a model without a transition if a query param // changes resfreshQueryWithoutTransition: false, + activate() { + this._super(); + if (this.get('showFooter')) { + this.controllerFor('application').set('showFooter', true); + } + }, + refresh() { if (!this.refreshQueryWithoutTransition) { return this._super(); } diff --git a/app/assets/javascripts/discourse/routes/preferences-about.js.es6 b/app/assets/javascripts/discourse/routes/preferences-about.js.es6 index 12e819af59..e5c86f6fdb 100644 --- a/app/assets/javascripts/discourse/routes/preferences-about.js.es6 +++ b/app/assets/javascripts/discourse/routes/preferences-about.js.es6 @@ -1,6 +1,8 @@ import RestrictedUserRoute from "discourse/routes/restricted-user"; export default RestrictedUserRoute.extend({ + showFooter: true, + model: function() { return this.modelFor('user'); }, diff --git a/app/assets/javascripts/discourse/routes/preferences-account.js.es6 b/app/assets/javascripts/discourse/routes/preferences-account.js.es6 index 2c34c9df2f..bde67c6ce9 100644 --- a/app/assets/javascripts/discourse/routes/preferences-account.js.es6 +++ b/app/assets/javascripts/discourse/routes/preferences-account.js.es6 @@ -1,6 +1,8 @@ import RestrictedUserRoute from "discourse/routes/restricted-user"; export default RestrictedUserRoute.extend({ + showFooter: true, + setupController(controller, user) { controller.reset(); controller.setProperties({ diff --git a/app/assets/javascripts/discourse/routes/preferences-badge-title.js.es6 b/app/assets/javascripts/discourse/routes/preferences-badge-title.js.es6 index 4491aff254..358159f452 100644 --- a/app/assets/javascripts/discourse/routes/preferences-badge-title.js.es6 +++ b/app/assets/javascripts/discourse/routes/preferences-badge-title.js.es6 @@ -2,6 +2,8 @@ import UserBadge from 'discourse/models/user-badge'; import RestrictedUserRoute from "discourse/routes/restricted-user"; export default RestrictedUserRoute.extend({ + showFooter: true, + model: function() { return UserBadge.findByUsername(this.modelFor('user').get('username')); }, diff --git a/app/assets/javascripts/discourse/routes/preferences-card-badge.js.es6 b/app/assets/javascripts/discourse/routes/preferences-card-badge.js.es6 index 8ec81a95d1..b8acd6d729 100644 --- a/app/assets/javascripts/discourse/routes/preferences-card-badge.js.es6 +++ b/app/assets/javascripts/discourse/routes/preferences-card-badge.js.es6 @@ -2,6 +2,8 @@ import UserBadge from 'discourse/models/user-badge'; import RestrictedUserRoute from "discourse/routes/restricted-user"; export default RestrictedUserRoute.extend({ + showFooter: true, + model: function() { return UserBadge.findByUsername(this.modelFor('user').get('username')); }, diff --git a/app/assets/javascripts/discourse/routes/preferences-categories.js.es6 b/app/assets/javascripts/discourse/routes/preferences-categories.js.es6 new file mode 100644 index 0000000000..713d79e420 --- /dev/null +++ b/app/assets/javascripts/discourse/routes/preferences-categories.js.es6 @@ -0,0 +1,5 @@ +import RestrictedUserRoute from "discourse/routes/restricted-user"; + +export default RestrictedUserRoute.extend({ + showFooter: true +}); diff --git a/app/assets/javascripts/discourse/routes/preferences-email.js.es6 b/app/assets/javascripts/discourse/routes/preferences-email.js.es6 index b9c02c3a85..77e80e7576 100644 --- a/app/assets/javascripts/discourse/routes/preferences-email.js.es6 +++ b/app/assets/javascripts/discourse/routes/preferences-email.js.es6 @@ -1,6 +1,8 @@ import RestrictedUserRoute from "discourse/routes/restricted-user"; export default RestrictedUserRoute.extend({ + showFooter: true, + model: function() { return this.modelFor('user'); }, diff --git a/app/assets/javascripts/discourse/routes/preferences-index.js.es6 b/app/assets/javascripts/discourse/routes/preferences-index.js.es6 index 3006f4b853..49964f42cc 100644 --- a/app/assets/javascripts/discourse/routes/preferences-index.js.es6 +++ b/app/assets/javascripts/discourse/routes/preferences-index.js.es6 @@ -1,6 +1,8 @@ import RestrictedUserRoute from "discourse/routes/restricted-user"; export default RestrictedUserRoute.extend({ + showFooter: true, + redirect() { this.transitionTo('preferences.account'); } diff --git a/app/assets/javascripts/discourse/routes/preferences-interface.js.es6 b/app/assets/javascripts/discourse/routes/preferences-interface.js.es6 index f58658956f..729e79dedd 100644 --- a/app/assets/javascripts/discourse/routes/preferences-interface.js.es6 +++ b/app/assets/javascripts/discourse/routes/preferences-interface.js.es6 @@ -1,6 +1,8 @@ import RestrictedUserRoute from "discourse/routes/restricted-user"; export default RestrictedUserRoute.extend({ + showFooter: true, + setupController(controller, user) { controller.setProperties({ model: user diff --git a/app/assets/javascripts/discourse/routes/preferences-notifications.js.es6 b/app/assets/javascripts/discourse/routes/preferences-notifications.js.es6 new file mode 100644 index 0000000000..713d79e420 --- /dev/null +++ b/app/assets/javascripts/discourse/routes/preferences-notifications.js.es6 @@ -0,0 +1,5 @@ +import RestrictedUserRoute from "discourse/routes/restricted-user"; + +export default RestrictedUserRoute.extend({ + showFooter: true +}); diff --git a/app/assets/javascripts/discourse/routes/preferences-username.js.es6 b/app/assets/javascripts/discourse/routes/preferences-username.js.es6 index 09fbc0ec6b..6737345bcd 100644 --- a/app/assets/javascripts/discourse/routes/preferences-username.js.es6 +++ b/app/assets/javascripts/discourse/routes/preferences-username.js.es6 @@ -1,6 +1,8 @@ import RestrictedUserRoute from "discourse/routes/restricted-user"; export default RestrictedUserRoute.extend({ + showFooter: true, + model: function() { return this.modelFor('user'); }, diff --git a/app/assets/javascripts/discourse/routes/preferences.js.es6 b/app/assets/javascripts/discourse/routes/preferences.js.es6 index e1cc50fc5c..1eb3d4b3e1 100644 --- a/app/assets/javascripts/discourse/routes/preferences.js.es6 +++ b/app/assets/javascripts/discourse/routes/preferences.js.es6 @@ -3,6 +3,7 @@ import showModal from 'discourse/lib/show-modal'; import { popupAjaxError } from 'discourse/lib/ajax-error'; export default RestrictedUserRoute.extend({ + model() { return this.modelFor('user'); }, diff --git a/app/assets/javascripts/discourse/routes/user-summary.js.es6 b/app/assets/javascripts/discourse/routes/user-summary.js.es6 index a191c41872..39d4571973 100644 --- a/app/assets/javascripts/discourse/routes/user-summary.js.es6 +++ b/app/assets/javascripts/discourse/routes/user-summary.js.es6 @@ -1,4 +1,6 @@ export default Discourse.Route.extend({ + showFooter: true, + model() { return this.modelFor("user").summary(); }, From 31f5ca618088da24dfd29e180edd178542d5732a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 7 Feb 2018 17:37:51 +0100 Subject: [PATCH 089/202] improve simple press importer --- script/import_scripts/simplepress.rb | 86 +++++++++++++++++++--------- 1 file changed, 60 insertions(+), 26 deletions(-) diff --git a/script/import_scripts/simplepress.rb b/script/import_scripts/simplepress.rb index 62663842bc..d5846a359a 100644 --- a/script/import_scripts/simplepress.rb +++ b/script/import_scripts/simplepress.rb @@ -22,7 +22,8 @@ class ImportScripts::SimplePress < ImportScripts::Base def execute import_users import_categories - import_topics_and_posts + import_topics + import_posts end def import_users @@ -93,12 +94,12 @@ class ImportScripts::SimplePress < ImportScripts::Base end end - def import_topics_and_posts - puts "", "creating topics and posts" + def import_topics + puts "", "creating topics" - total_count = mysql_query("SELECT count(*) count from #{TABLE_PREFIX}posts").first["count"] + total_count = mysql_query("SELECT COUNT(*) count FROM #{TABLE_PREFIX}posts WHERE post_index = 1").first["count"] - topic_first_post_id = {} + @topic_first_post_id = {} batches(BATCH_SIZE) do |offset| results = mysql_query(" @@ -106,14 +107,16 @@ class ImportScripts::SimplePress < ImportScripts::Base p.topic_id topic_id, t.forum_id category_id, t.topic_name title, - p.post_index post_index, + t.topic_opened views, + t.topic_pinned pinned, p.user_id user_id, p.post_content raw, p.post_date post_time FROM #{TABLE_PREFIX}posts p, #{TABLE_PREFIX}topics t WHERE p.topic_id = t.topic_id - ORDER BY p.post_date + AND p.post_index = 1 + ORDER BY p.post_id LIMIT #{BATCH_SIZE} OFFSET #{offset}; ") @@ -123,29 +126,60 @@ class ImportScripts::SimplePress < ImportScripts::Base next if all_records_exist? :posts, results.map { |m| m['id'].to_i } create_posts(results, total: total_count, offset: offset) do |m| - skip = false - mapped = {} + @topic_first_post_id[m['topic_id']] = m['id'] + created_at = Time.zone.at(m['post_time']) + { + id: m['id'], + user_id: user_id_from_imported_user_id(m['user_id']) || -1, + raw: process_simplepress_post(m['raw'], m['id']), + created_at: created_at, + category: category_id_from_imported_category_id(m['category_id']), + title: CGI.unescapeHTML(m['title']), + views: m['views'], + pinned_at: m['pinned'] == 1 ? created_at : nil, + } + end + end + end - mapped[:id] = m['id'] - mapped[:user_id] = user_id_from_imported_user_id(m['user_id']) || -1 - mapped[:raw] = process_simplepress_post(m['raw'], m['id']) - mapped[:created_at] = Time.zone.at(m['post_time']) + def import_posts + puts "", "creating posts" - if m['post_index'] == 1 - mapped[:category] = category_id_from_imported_category_id(m['category_id']) - mapped[:title] = CGI.unescapeHTML(m['title']) - topic_first_post_id[m['topic_id']] = m['id'] + total_count = mysql_query("SELECT count(*) count FROM #{TABLE_PREFIX}posts WHERE post_index <> 1").first["count"] + + batches(BATCH_SIZE) do |offset| + results = mysql_query(" + SELECT p.post_id id, + p.topic_id topic_id, + p.user_id user_id, + p.post_content raw, + p.post_date post_time + FROM #{TABLE_PREFIX}posts p, + #{TABLE_PREFIX}topics t + WHERE p.topic_id = t.topic_id + AND p.post_index <> 1 + ORDER BY p.post_id + LIMIT #{BATCH_SIZE} + OFFSET #{offset}; + ") + + break if results.size < 1 + + next if all_records_exist? :posts, results.map { |m| m['id'].to_i } + + create_posts(results, total: total_count, offset: offset) do |m| + if parent = topic_lookup_from_imported_post_id(@topic_first_post_id[m['topic_id']]) + { + id: m['id'], + user_id: user_id_from_imported_user_id(m['user_id']) || -1, + topic_id: parent[:topic_id], + raw: process_simplepress_post(m['raw'], m['id']), + created_at: Time.zone.at(m['post_time']), + } else - parent = topic_lookup_from_imported_post_id(topic_first_post_id[m['topic_id']]) - if parent - mapped[:topic_id] = parent[:topic_id] - else - puts "Parent post #{first_post_id} doesn't exist. Skipping #{m["id"]}: #{m["title"][0..40]}" - skip = true - end + puts "Parent post #{m['topic_id']} doesn't exist. Skipping #{m["id"]}" + nil end - - skip ? nil : mapped end end end From 209a6cae2c9caa7f400b0427df19e5a29b840ed9 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 7 Feb 2018 11:42:52 -0500 Subject: [PATCH 090/202] FIX: Don't show messages setting if messages are disabled --- .../templates/preferences/notifications.hbs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs index c0441202b4..b51eb6f9a2 100644 --- a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs +++ b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs @@ -26,15 +26,17 @@
    {{i18n 'user.desktop_notifications.each_browser_note'}}
    -
    - +{{#if siteSettings.enable_personal_messages}} +
    + -
    - {{preference-checkbox - labelKey="user.allow_private_messages" - checked=model.user_option.allow_private_messages}} +
    + {{preference-checkbox + labelKey="user.allow_private_messages" + checked=model.user_option.allow_private_messages}} +
    -
    +{{/if}}
    From 6a5dad0b861389207f51c55347a61bb88de869a7 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 7 Feb 2018 11:46:05 -0500 Subject: [PATCH 091/202] FIX: Too much Javascript :) --- lib/validators/post_validator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/validators/post_validator.rb b/lib/validators/post_validator.rb index 64755e558f..40ec3fdee2 100644 --- a/lib/validators/post_validator.rb +++ b/lib/validators/post_validator.rb @@ -93,7 +93,7 @@ class Validators::PostValidator < ActiveModel::Validator end def can_post_links_validator(post) - return if post.link_count === 0 || acting_user_is_trusted?(post, SiteSetting.min_trust_to_post_links) || private_message?(post) + return if post.link_count == 0 || acting_user_is_trusted?(post, SiteSetting.min_trust_to_post_links) || private_message?(post) post.errors.add(:base, I18n.t(:links_require_trust)) end From 3b06e5502b6f36cea2245f770d78cf9a11f89210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Thu, 8 Feb 2018 00:01:11 +0100 Subject: [PATCH 092/202] FIX: ensure we never send elided content via email --- plugins/discourse-details/plugin.rb | 6 +++++- .../spec/components/pretty_text_spec.rb | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/plugins/discourse-details/plugin.rb b/plugins/discourse-details/plugin.rb index 116836d74c..8b537509b9 100644 --- a/plugins/discourse-details/plugin.rb +++ b/plugins/discourse-details/plugin.rb @@ -13,7 +13,7 @@ after_initialize do Email::Styles.register_plugin_style do |fragment| # remove all elided content - fragment.css("details.elided").each { |d| d.remove } + fragment.css("details.elided").each(&:remove) # replace all details with their summary in emails fragment.css("details").each do |details| @@ -28,4 +28,8 @@ after_initialize do end end + on(:reduce_cooked) do |fragment| + fragment.css("details.elided").each(&:remove) + end + end diff --git a/plugins/discourse-details/spec/components/pretty_text_spec.rb b/plugins/discourse-details/spec/components/pretty_text_spec.rb index cd03a2fb6b..338e10f4c3 100644 --- a/plugins/discourse-details/spec/components/pretty_text_spec.rb +++ b/plugins/discourse-details/spec/components/pretty_text_spec.rb @@ -4,9 +4,6 @@ require 'pretty_text' describe PrettyText do it "supports details tag" do - cooked_html = "
    foobar
    " - expect(PrettyText.cook("
    foobar
    ")).to match_html(cooked_html) - cooked_html = <<~HTML
    @@ -14,7 +11,16 @@ describe PrettyText do

    bar

    HTML - expect(PrettyText.cook("[details=foo]\nbar\n[/details]")).to eq(cooked_html.strip) + + expect(cooked_html).to match_html(cooked_html) + expect(PrettyText.cook("[details=foo]\nbar\n[/details]")).to match_html(cooked_html) + end + + it "deletes elided content" do + cooked_html = PrettyText.cook("Hello World\n\n
    42
    ") + mail_html = PrettyText.cook("Hello World") + + expect(PrettyText.format_for_email(cooked_html)).to match_html(mail_html) end end From 190d20863187742f1537dc456131c3fed1e724cb Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Thu, 8 Feb 2018 11:46:55 +0100 Subject: [PATCH 093/202] FEATURE: improves composer-actions toggle menu * only toggles * fix a bug with presence * more tests * do not duplicate `continuing discussion...` text * persist state to allow switching between toggles --- .../components/composer-action-title.hbs | 4 +- .../components/composer-actions.js.es6 | 138 ++++++++++++++---- config/locales/client.en.yml | 3 + .../composer-presence-display.js.es6 | 4 + .../acceptance/composer-actions-test.js.es6 | 75 +++++++++- 5 files changed, 189 insertions(+), 35 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs b/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs index 3688355a92..6075400d90 100644 --- a/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs +++ b/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs @@ -8,4 +8,6 @@ action=model.action}} {{/if}} -{{actionTitle}} + + {{actionTitle}} + diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 b/app/assets/javascripts/select-kit/components/composer-actions.js.es6 index 2ca9ad9902..aef58aed61 100644 --- a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 +++ b/app/assets/javascripts/select-kit/components/composer-actions.js.es6 @@ -1,6 +1,15 @@ import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box"; import { default as computed } from "ember-addons/ember-computed-decorators"; -import { default as Composer, REPLY, EDIT } from "discourse/models/composer"; +import { default as Composer, PRIVATE_MESSAGE, CREATE_TOPIC, REPLY, EDIT } from "discourse/models/composer"; + +// Component can get destroyed and lose state +let _topicSnapshot = null; +let _postSnapshot = null; + +export function _clearSnapshots() { + _topicSnapshot = null; + _postSnapshot = null; +} export default DropdownSelectBoxComponent.extend({ composerController: Ember.inject.controller("composer"), @@ -13,10 +22,27 @@ export default DropdownSelectBoxComponent.extend({ allowAutoSelectFirst: false, showFullTitle: false, + didReceiveAttrs() { + this._super(); + + // if we change topic we want to change both snapshots + if (this.get("composerModel.topic") && (!_topicSnapshot || this.get("composerModel.topic.id") !== _topicSnapshot.get("id"))) { + _topicSnapshot = this.get("composerModel.topic"); + _postSnapshot = this.get("composerModel.post"); + } + + // if we hit reply on a different post we want to change postSnapshot + if (this.get("composerModel.post") && (!_postSnapshot || this.get("composerModel.post.id") !== _postSnapshot.get("id"))) { + _postSnapshot = this.get("composerModel.post"); + } + }, + computeHeaderContent() { let content = this.baseHeaderComputedContent(); switch (this.get("action")) { + case PRIVATE_MESSAGE: + case CREATE_TOPIC: case REPLY: content.icon = "mail-forward"; break; @@ -28,18 +54,32 @@ export default DropdownSelectBoxComponent.extend({ return content; }, - @computed("options", "canWhisper", "composerModel.post.username") - content(options, canWhisper, postUsername) { - let items = [ - { + @computed("options", "canWhisper", "action") + content(options, canWhisper, action) { + let items = []; + + if (action !== CREATE_TOPIC) { + items.push({ name: I18n.t("composer.composer_actions.reply_as_new_topic.label"), description: I18n.t("composer.composer_actions.reply_as_new_topic.desc"), icon: "plus", id: "reply_as_new_topic" - } - ]; + }); + } - if (postUsername && postUsername !== this.currentUser.get("username")) { + if ((action !== REPLY && _postSnapshot) || (action === REPLY && _postSnapshot && !(options.userAvatar && options.userLink))) { + items.push({ + name: I18n.t("composer.composer_actions.reply_to_post.label", { + postNumber: _postSnapshot.get("post_number"), + postUsername: _postSnapshot.get("username") + }), + description: I18n.t("composer.composer_actions.reply_to_post.desc"), + icon: "mail-forward", + id: "reply_to_post" + }); + } + + if (action !== PRIVATE_MESSAGE) { items.push({ name: I18n.t("composer.composer_actions.reply_as_private_message.label"), description: I18n.t("composer.composer_actions.reply_as_private_message.desc"), @@ -48,7 +88,7 @@ export default DropdownSelectBoxComponent.extend({ }); } - if (Ember.get(options, "postLink")) { + if ((action !== REPLY && _topicSnapshot) || (action === REPLY && _topicSnapshot && (options.userAvatar && options.userLink && options.topicLink))) { items.push({ name: I18n.t("composer.composer_actions.reply_to_topic.label"), description: I18n.t("composer.composer_actions.reply_to_topic.desc"), @@ -57,7 +97,8 @@ export default DropdownSelectBoxComponent.extend({ }); } - if (canWhisper) { + // if answered post is a whisper, we can only answer with a whisper so no need for toggle + if (canWhisper && (_postSnapshot && _postSnapshot.post_type !== this.site.post_types.whisper)) { items.push({ name: I18n.t("composer.composer_actions.toggle_whisper.label"), description: I18n.t("composer.composer_actions.toggle_whisper.desc"), @@ -69,46 +110,85 @@ export default DropdownSelectBoxComponent.extend({ return items; }, - _replyFromExisting(options) { - const topicTitle = this.get("composerModel.topic.title"); - let url = this.get("composerModel.post.url") || this.get("composerModel.topic.url"); + _replyFromExisting(options, post, topic) { + const reply = this.get("composerModel.reply"); + let url; + if (post) url = post.get("url"); + if (!post && topic) url = topic.get("url"); + + let topicTitle; + if (topic) topicTitle = topic.get("title"); + + this.get("composerController").close(); this.get("composerController").open(options).then(() => { + if (!url || ! topicTitle) return; + url = `${location.protocol}//${location.host}${url}`; const link = `[${Handlebars.escapeExpression(topicTitle)}](${url})`; - this.get("composerController").get("model").prependText(`${I18n.t("post.continue_discussion", { postLink: link })}`, {new_line: true}); + const continueDiscussion = I18n.t("post.continue_discussion", { postLink: link }); + + if (!reply.includes(continueDiscussion)) { + this.get("composerController") + .get("model") + .prependText(continueDiscussion, {new_line: true}); + } }); }, actions: { onSelect(value) { + let options = { + draftKey: this.get("composerModel.draftKey"), + draftSequence: this.get("composerModel.draftSequence"), + reply: this.get("composerModel.reply") + }; + switch(value) { case "toggle_whisper": this.set("composerModel.whisper", !this.get("composerModel.whisper")); break; + case "reply_to_post": + options.action = Composer.REPLY; + options.post = _postSnapshot; + + this.get("composerController").close(); + this.get("composerController").open(options); + break; + case "reply_to_topic": - this.set("composerModel.post", null); - this.get("composerController").save(); + options.action = Composer.REPLY; + options.topic = _topicSnapshot; + + this.get("composerController").close(); + this.get("composerController").open(options); break; case "reply_as_new_topic": - const replyAsNewTopicOpts = { - action: Composer.CREATE_TOPIC, - draftKey: Composer.REPLY_AS_NEW_TOPIC_KEY, - categoryId: this.get("composerModel.topic.category.id") - }; - this._replyFromExisting(replyAsNewTopicOpts); + options.action = Composer.CREATE_TOPIC; + options.categoryId = this.get("composerModel.topic.category.id"); + + this.get("composerController").close(); + this.get("composerController").open(options); break; case "reply_as_private_message": - const replyAsPrivateMsgOpts = { - action: Composer.PRIVATE_MESSAGE, - archetypeId: "private_message", - draftKey: Composer.REPLY_AS_NEW_PRIVATE_MESSAGE_KEY, - usernames: this.get("composerModel.post.username") - }; - this._replyFromExisting(replyAsPrivateMsgOpts); + let usernames; + + if (_postSnapshot && !_postSnapshot.get("yours")) { + const postUsername = _postSnapshot.get("username"); + if (postUsername) { + usernames = postUsername; + } + } + + options.action = Composer.PRIVATE_MESSAGE; + options.usernames = usernames; + options.archetypeId = "private_message"; + options.draftKey = Composer.NEW_PRIVATE_MESSAGE_KEY; + + this._replyFromExisting(options, _postSnapshot, _topicSnapshot); break; } } diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 2726821c85..e95cd09c44 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1292,6 +1292,9 @@ en: admin_options_title: "Optional staff settings for this topic" composer_actions: + reply_to_post: + label: Reply to post %{postNumber} by %{postUsername} + desc: Reply to a specific post reply_as_new_topic: label: Reply as linked topic desc: Create a new topic diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 index a16c2d2293..14654a0fce 100644 --- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 +++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 @@ -68,6 +68,10 @@ export default Ember.Component.extend({ this.clear(); + if (this.get('action') !== 'reply' || this.get('action') !== 'edit') { + return; + } + this.publish({ response_needed: true, previous: this.get('previousState'), diff --git a/test/javascripts/acceptance/composer-actions-test.js.es6 b/test/javascripts/acceptance/composer-actions-test.js.es6 index 3893b2ac99..f15498e119 100644 --- a/test/javascripts/acceptance/composer-actions-test.js.es6 +++ b/test/javascripts/acceptance/composer-actions-test.js.es6 @@ -20,6 +20,7 @@ QUnit.test('replying to post', assert => { assert.equal(composerActions.rowByIndex(1).value(), 'reply_as_private_message'); assert.equal(composerActions.rowByIndex(2).value(), 'reply_to_topic'); assert.equal(composerActions.rowByIndex(3).value(), 'toggle_whisper'); + assert.equal(composerActions.rowByIndex(4).value(), undefined); }); }); @@ -42,12 +43,13 @@ QUnit.test('replying to post - reply_to_topic', assert => { visit('/t/internationalization-localization/280'); click('article#post_3 button.reply'); - fillIn('.d-editor-input', 'test replying to topic when intially replied to post'); + fillIn('.d-editor-input', 'test replying to topic when initially replied to post'); composerActions.expand().selectRowByValue('reply_to_topic'); andThen(() => { - assert.equal(find('.topic-post:last .cooked p').html().trim(), 'test replying to topic when intially replied to post'); - assert.notOk(exists(find('.topic-post:last .reply-to-tab'))); + assert.equal(find('.action-title .topic-link').text().trim(), 'Internationalization / localization'); + assert.equal(find('.action-title .topic-link').attr("href"), '/t/internationalization-localization/280'); + assert.equal(find('.d-editor-input').val(), 'test replying to topic when initially replied to post'); }); }); @@ -56,7 +58,7 @@ QUnit.test('replying to post - toggle_whisper', assert => { visit('/t/internationalization-localization/280'); click('article#post_3 button.reply'); - fillIn('.d-editor-input', 'test replying as whisper to topic when intially not a whisper'); + fillIn('.d-editor-input', 'test replying as whisper to topic when initially not a whisper'); composerActions.expand().selectRowByValue('toggle_whisper'); andThen(() => { @@ -78,10 +80,73 @@ QUnit.test('replying to post - reply_as_new_topic', assert => { click('#topic-title .submit-edit'); click('article#post_3 button.reply'); + fillIn('.d-editor-input', 'test replying as new topic when initially replied to post'); composerActions.expand().selectRowByValue('reply_as_new_topic'); andThen(() => { assert.equal(categoryChooserReplyArea.header().name(), 'faq'); - assert.ok(find('.d-editor-input').val().indexOf('Continuing the discussion') >= 0); + assert.equal(find('.action-title').text().trim(), I18n.t("topic.create_long")); + assert.equal(find('.d-editor-input').val(), 'test replying as new topic when initially replied to post'); + }); +}); + + +QUnit.test('interactions', assert => { + const composerActions = selectKit('.composer-actions'); + const quote = 'Life is like riding a bicycle.'; + + visit('/t/internationalization-localization/280'); + click('article#post_3 button.reply'); + fillIn('.d-editor-input', quote); + composerActions.expand().selectRowByValue('reply_to_topic'); + + andThen(() => { + assert.equal(find('.action-title').text().trim(), "Internationalization / localization"); + assert.equal(find('.d-editor-input').val(), quote); + }); + + composerActions.expand(); + + andThen(() => { + assert.equal(composerActions.rowByIndex(0).value(), 'reply_as_new_topic'); + assert.equal(composerActions.rowByIndex(1).value(), 'reply_to_post'); + assert.equal(composerActions.rowByIndex(2).value(), 'reply_as_private_message'); + assert.equal(composerActions.rowByIndex(3).value(), 'toggle_whisper'); + assert.equal(composerActions.rowByIndex(4).value(), undefined); + }); + + composerActions.selectRowByValue('reply_to_post').expand(); + + andThen(() => { + assert.ok(exists(find('.action-title img.avatar'))); + assert.equal(find('.action-title .user-link').text().trim(), "codinghorror"); + assert.equal(find('.d-editor-input').val(), quote); + assert.equal(composerActions.rowByIndex(0).value(), 'reply_as_new_topic'); + assert.equal(composerActions.rowByIndex(1).value(), 'reply_as_private_message'); + assert.equal(composerActions.rowByIndex(2).value(), 'reply_to_topic'); + assert.equal(composerActions.rowByIndex(3).value(), 'toggle_whisper'); + assert.equal(composerActions.rowByIndex(4).value(), undefined); + }); + + composerActions.selectRowByValue('reply_as_new_topic').expand(); + + andThen(() => { + assert.equal(find('.action-title').text().trim(), I18n.t("topic.create_long")); + assert.equal(find('.d-editor-input').val(), quote); + assert.equal(composerActions.rowByIndex(0).value(), 'reply_to_post'); + assert.equal(composerActions.rowByIndex(1).value(), 'reply_as_private_message'); + assert.equal(composerActions.rowByIndex(2).value(), 'reply_to_topic'); + assert.equal(composerActions.rowByIndex(3).value(), undefined); + }); + + composerActions.selectRowByValue('reply_as_private_message').expand(); + + andThen(() => { + assert.equal(find('.action-title').text().trim(), I18n.t("topic.private_message")); + assert.ok(find('.d-editor-input').val().indexOf("Continuing the discussion") === 0); + assert.equal(composerActions.rowByIndex(0).value(), 'reply_as_new_topic'); + assert.equal(composerActions.rowByIndex(1).value(), 'reply_to_post'); + assert.equal(composerActions.rowByIndex(2).value(), 'reply_to_topic'); + assert.equal(composerActions.rowByIndex(3).value(), undefined); }); }); From 8ab6689f43fdf57ab303fc1ffa3f1bdd7d6dc46e Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Thu, 8 Feb 2018 12:55:32 +0100 Subject: [PATCH 094/202] FIX: Preserve original date when moving first post --- app/models/post_mover.rb | 1 + spec/models/post_mover_spec.rb | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb index 75e3cb1676..79393fbf5d 100644 --- a/app/models/post_mover.rb +++ b/app/models/post_mover.rb @@ -96,6 +96,7 @@ class PostMover via_email: post.via_email, raw_email: post.raw_email, skip_validations: true, + created_at: post.created_at, guardian: Guardian.new(user) ) diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb index d483b354fa..ded0639fca 100644 --- a/spec/models/post_mover_spec.rb +++ b/spec/models/post_mover_spec.rb @@ -23,7 +23,7 @@ describe PostMover do let(:another_user) { Fabricate(:evil_trout) } let(:category) { Fabricate(:category, user: user) } let!(:topic) { Fabricate(:topic, user: user) } - let!(:p1) { Fabricate(:post, topic: topic, user: user) } + let!(:p1) { Fabricate(:post, topic: topic, user: user, created_at: 3.hours.ago) } let!(:p2) do Fabricate(:post, @@ -401,6 +401,7 @@ describe PostMover do # New first post new_first = new_topic.posts.where(post_number: 1).first expect(new_first.reply_count).to eq(1) + expect(new_first.created_at).to be_within(1.second).of(p1.created_at) # Second post is in a new topic p2.reload From 0ecdf900230eee21beaf54b80428bd18768127ae Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Thu, 8 Feb 2018 13:36:13 +0100 Subject: [PATCH 095/202] FIX: Validations could prevent moving posts --- app/models/post_mover.rb | 3 ++- spec/models/post_mover_spec.rb | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb index 79393fbf5d..7544a87ef1 100644 --- a/app/models/post_mover.rb +++ b/app/models/post_mover.rb @@ -128,7 +128,8 @@ class PostMover update[:reply_to_user_id] = nil end - post.update(update) + post.attributes = update + post.save(validate: false) move_incoming_emails(post, post) move_email_logs(post, post) diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb index ded0639fca..d48520a64e 100644 --- a/spec/models/post_mover_spec.rb +++ b/spec/models/post_mover_spec.rb @@ -499,6 +499,17 @@ describe PostMover do end end + it "skips validations when moving posts" do + p1.update_attribute(:raw, "foo") + p2.update_attribute(:raw, "bar") + + new_topic = topic.move_posts(user, [p1.id, p2.id], title: "new testing topic name") + + expect(new_topic).to be_present + expect(new_topic.posts.by_post_number.first.raw).to eq(p1.raw) + expect(new_topic.posts.by_post_number.last.raw).to eq(p2.raw) + expect(new_topic.posts_count).to eq(2) + end end end end From 8c89f5704dbf4ecc31defba20cb17acec6d64c5d Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Thu, 8 Feb 2018 14:18:53 +0100 Subject: [PATCH 096/202] =?UTF-8?q?FIX:=20makes=20sure=20we=20display=20wh?= =?UTF-8?q?isper=20if=20we=20don=E2=80=99t=20have=20a=20post?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../javascripts/select-kit/components/composer-actions.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 b/app/assets/javascripts/select-kit/components/composer-actions.js.es6 index aef58aed61..5c0fc2277f 100644 --- a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 +++ b/app/assets/javascripts/select-kit/components/composer-actions.js.es6 @@ -98,7 +98,7 @@ export default DropdownSelectBoxComponent.extend({ } // if answered post is a whisper, we can only answer with a whisper so no need for toggle - if (canWhisper && (_postSnapshot && _postSnapshot.post_type !== this.site.post_types.whisper)) { + if (canWhisper && (!_postSnapshot || _postSnapshot && _postSnapshot.post_type !== this.site.post_types.whisper)) { items.push({ name: I18n.t("composer.composer_actions.toggle_whisper.label"), description: I18n.t("composer.composer_actions.toggle_whisper.desc"), From dedeb2deb8fa3d001e5f8a00b560c02e62bc354f Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 8 Feb 2018 12:56:10 -0500 Subject: [PATCH 097/202] FIX: Don't show the link button in the composer if linking is disabled --- .../discourse/components/d-editor.js.es6 | 19 +++++++++++++++---- .../templates/components/composer-editor.hbs | 1 + app/serializers/current_user_serializer.rb | 7 ++++++- lib/guardian/post_guardian.rb | 5 +++++ lib/validators/post_validator.rb | 4 +++- spec/components/guardian_spec.rb | 18 ++++++++++++++++++ 6 files changed, 48 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6 index 010f11bd2b..f5c30f3b52 100644 --- a/app/assets/javascripts/discourse/components/d-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/d-editor.js.es6 @@ -45,7 +45,8 @@ const isInside = (text, regex) => { class Toolbar { - constructor(site) { + constructor(opts) { + const { site, siteSettings } = opts; this.shortcuts = {}; this.groups = [ @@ -74,7 +75,14 @@ class Toolbar { perform: e => e.applySurround('_', '_', 'italic_text') }); - this.addButton({id: 'link', group: 'insertions', shortcut: 'K', action: 'showLinkModal'}); + if (opts.showLink) { + this.addButton({ + id: 'link', + group: 'insertions', + shortcut: 'K', + action: 'showLinkModal' + }); + } this.addButton({ id: 'quote', @@ -108,7 +116,7 @@ class Toolbar { perform: e => e.applyList(i => !i ? "1. " : `${parseInt(i) + 1}. `, 'list_item') }); - if (Discourse.SiteSettings.support_mixed_text_direction) { + if (siteSettings.support_mixed_text_direction) { this.addButton({ id: 'toggle-direction', group: 'extras', @@ -200,6 +208,7 @@ export default Ember.Component.extend({ lastSel: null, _mouseTrap: null, emojiPickerIsActive: false, + showLink: true, @computed('placeholder') placeholderTranslated(placeholder) { @@ -279,7 +288,9 @@ export default Ember.Component.extend({ @computed toolbar() { - const toolbar = new Toolbar(this.site); + const toolbar = new Toolbar( + this.getProperties('site', 'siteSettings', 'showLink') + ); _createCallbacks.forEach(cb => cb(toolbar)); this.sendAction('extraButtons', toolbar); return toolbar; diff --git a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs index 037ee5440f..511961d8f1 100644 --- a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs +++ b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs @@ -11,6 +11,7 @@ validation=validation loading=composer.loading forcePreview=forcePreview + showLink=currentUser.can_post_link composerEvents=true onExpandPopupMenuOptions="onExpandPopupMenuOptions" onPopupMenuAction=onPopupMenuAction diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb index 46fa8fe05c..b96d7f28b3 100644 --- a/app/serializers/current_user_serializer.rb +++ b/app/serializers/current_user_serializer.rb @@ -39,7 +39,12 @@ class CurrentUserSerializer < BasicUserSerializer :seen_notification_id, :primary_group_id, :primary_group_name, - :can_create_topic + :can_create_topic, + :can_post_link + + def can_post_link + scope.can_post_link? + end def can_create_topic scope.can_create_topic?(nil) diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb index 6986d1099e..39f207b597 100644 --- a/lib/guardian/post_guardian.rb +++ b/lib/guardian/post_guardian.rb @@ -1,6 +1,11 @@ #mixin for all guardian methods dealing with post permissions module PostGuardian + def can_post_link? + authenticated? && + @user.has_trust_level?(TrustLevel[SiteSetting.min_trust_to_post_links]) + end + # Can the user act on the post in a particular way. # taken_actions = the list of actions the user has already taken def post_can_act?(post, action_key, opts: {}, can_see_post: nil) diff --git a/lib/validators/post_validator.rb b/lib/validators/post_validator.rb index 40ec3fdee2..37caff0053 100644 --- a/lib/validators/post_validator.rb +++ b/lib/validators/post_validator.rb @@ -93,7 +93,9 @@ class Validators::PostValidator < ActiveModel::Validator end def can_post_links_validator(post) - return if post.link_count == 0 || acting_user_is_trusted?(post, SiteSetting.min_trust_to_post_links) || private_message?(post) + return if post.link_count == 0 || + Guardian.new(post.acting_user).can_post_link? || + private_message?(post) post.errors.add(:base, I18n.t(:links_require_trust)) end diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb index 5ec7904b35..d61502367f 100644 --- a/spec/components/guardian_spec.rb +++ b/spec/components/guardian_spec.rb @@ -26,6 +26,24 @@ describe Guardian do expect { Guardian.new(user) }.not_to raise_error end + describe "can_post_link?" do + it "returns false for anonymous users" do + expect(Guardian.new.can_post_link?).to eq(false) + end + + it "returns true for a regular user" do + expect(Guardian.new(user).can_post_link?).to eq(true) + end + + it "supports customization by site setting" do + user.trust_level = 0 + SiteSetting.min_trust_to_post_links = 0 + expect(Guardian.new(user).can_post_link?).to eq(true) + SiteSetting.min_trust_to_post_links = 1 + expect(Guardian.new(user).can_post_link?).to eq(false) + end + end + describe 'post_can_act?' do let(:post) { build(:post) } let(:user) { build(:user) } From e17e6d2880554749119e93bbe2cd8d38ea12b4e0 Mon Sep 17 00:00:00 2001 From: Kris Date: Thu, 8 Feb 2018 14:10:04 -0500 Subject: [PATCH 098/202] Removing unneeded width --- app/assets/stylesheets/common/base/topic.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss index 9604d3101c..b3f2a8cece 100644 --- a/app/assets/stylesheets/common/base/topic.scss +++ b/app/assets/stylesheets/common/base/topic.scss @@ -62,16 +62,12 @@ h1 { margin: 0 0 4px 0; - width: 90%; } a.badge-category { margin-top: 5px; } - - - #topic-title { .title-wrapper { display: flex; From 69bccb9e32871c40bfd9d17e3fbf1a00692bbe0b Mon Sep 17 00:00:00 2001 From: Kris Date: Thu, 8 Feb 2018 17:04:29 -0500 Subject: [PATCH 099/202] UX: Better alignment of small topic statuses --- .../stylesheets/common/base/topic-post.scss | 44 ++++++++++++------- app/assets/stylesheets/mobile/topic-post.scss | 10 +++++ 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index b10b4d1833..b2c9f640a6 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -385,7 +385,7 @@ blockquote > *:last-child { } .gap { - padding: 0.25em 0 0.5em 4.3em; + padding: 0.25em 0 0.5em 4.6em; color: dark-light-choose($primary-medium, $secondary-high); cursor: pointer; text-transform: uppercase; @@ -420,17 +420,20 @@ blockquote > *:last-child { } .small-action { + display: flex; + align-items: center; max-width: 755px; border-top: 1px solid $primary-low; .topic-avatar { - padding: .67em 0; + align-self: flex-start; + padding: .7em 0; border-top: none; - float: left; + margin-right: 11px; i { font-size: 2em; width: 45px; text-align: center; - color: dark-light-choose($primary-low-mid, $secondary-high); + color: $primary-low-mid; } } @@ -439,27 +442,33 @@ blockquote > *:last-child { } .small-action-desc.timegap { - color: dark-light-choose($primary-medium, $secondary-high); + color: $primary-medium; } .small-action-desc { - padding: 1em; + display: flex; + flex-wrap: wrap; + flex: 1 1 100%; + align-items: center; + padding: 1em 0; text-transform: uppercase; font-weight: bold; font-size: $font-down-1; - color: dark-light-choose($primary-low-mid, $secondary-high); + color: $primary-medium; .custom-message { + flex: 1 1 100%; text-transform: none; - margin: 15px 0 5px; font-weight: normal; font-size: $font-up-1; + order: 12; p { - margin: 5px 0; - line-height: $line-height-large; + margin-bottom: 0; } } - + a.trigger-user-card { + align-self: stretch; + } .avatar { margin-right: 0.8em; float: left; @@ -467,18 +476,21 @@ blockquote > *:last-child { > p { margin: 0; - padding-top: 4px; + line-height: $line-height-medium; + flex: 1 1; + } } button { background: transparent; border: 0; - float: right; - margin-top: -2px; + order: 9; + &:last-of-type { + margin-left: auto; + order: 8; + } } - - clear: both; } .whisper { diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index e507b59fcd..768a59bf81 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -3,6 +3,12 @@ border-top: none; } +.time-gap { + .topic-avatar { + display: none; + } +} + .topic-post article { border-top: 1px solid $primary-low; padding: 15px 0 8px 0; @@ -431,6 +437,10 @@ blockquote { margin-right: 0; } +.gap { + padding: 0.25em 0; +} + .gutter { display: none; } .posts-wrapper { position: relative; } From 5466389f4e2a9b03a7f3ad75803a02fdcd111b5a Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 8 Feb 2018 18:26:56 -0500 Subject: [PATCH 100/202] FIX: Consider oneboxes links wrt to `min_trust_level_to_post_links` --- app/models/post.rb | 8 +++++++- app/models/post_analyzer.rb | 8 +++++++- lib/validators/post_validator.rb | 2 +- spec/models/post_spec.rb | 17 +++++++++++++---- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/app/models/post.rb b/app/models/post.rb index 7a8ce9a573..5863cc49c1 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -222,7 +222,13 @@ class Post < ActiveRecord::Base @post_analyzers[raw_hash] ||= PostAnalyzer.new(raw, topic_id) end - %w{raw_mentions linked_hosts image_count attachment_count link_count raw_links}.each do |attr| + %w{raw_mentions + linked_hosts + image_count + attachment_count + link_count + raw_links + has_oneboxes?}.each do |attr| define_method(attr) do post_analyzer.send(attr) end diff --git a/app/models/post_analyzer.rb b/app/models/post_analyzer.rb index 0d6c2120ae..919b7d4215 100644 --- a/app/models/post_analyzer.rb +++ b/app/models/post_analyzer.rb @@ -13,6 +13,13 @@ class PostAnalyzer @found_oneboxes end + def has_oneboxes? + return false unless @raw.present? + + cooked_stripped + found_oneboxes? + end + # What we use to cook posts def cook(raw, opts = {}) cook_method = opts[:cook_method] @@ -104,7 +111,6 @@ class PostAnalyzer return @raw_links if @raw_links.present? @raw_links = [] - cooked_stripped.css("a[href]").each do |l| # Don't include @mentions in the link count next if l['href'].blank? || link_is_a_mention?(l) diff --git a/lib/validators/post_validator.rb b/lib/validators/post_validator.rb index 37caff0053..18e8d4330d 100644 --- a/lib/validators/post_validator.rb +++ b/lib/validators/post_validator.rb @@ -93,7 +93,7 @@ class Validators::PostValidator < ActiveModel::Validator end def can_post_links_validator(post) - return if post.link_count == 0 || + return if (post.link_count == 0 && !post.has_oneboxes?) || Guardian.new(post.acting_user).can_post_link? || private_message?(post) diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index 866cfe8867..8ec7267968 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -355,6 +355,7 @@ describe Post do describe "maximums" do let(:newuser) { Fabricate(:user, trust_level: TrustLevel[0]) } let(:post_one_link) { post_with_body("[sherlock](http://www.bbc.co.uk/programmes/b018ttws)", newuser) } + let(:post_onebox) { post_with_body("http://www.google.com", newuser) } let(:post_two_links) { post_with_body("discourse twitter", newuser) } let(:post_with_mentions) { post_with_body("hello @#{newuser.username} how are you doing?", newuser) } @@ -396,10 +397,18 @@ describe Post do expect(post_two_links).to be_valid end - it "doesn't allow allow links if `min_trust_to_post_links` is not met" do - SiteSetting.min_trust_to_post_links = 2 - post_two_links.user.trust_level = TrustLevel[1] - expect(post_one_link).not_to be_valid + context "min_trust_to_post_links" do + it "considers oneboxes links" do + SiteSetting.min_trust_to_post_links = 3 + post_onebox.user.trust_level = TrustLevel[2] + expect(post_onebox).not_to be_valid + end + + it "doesn't allow allow links if `min_trust_to_post_links` is not met" do + SiteSetting.min_trust_to_post_links = 2 + post_two_links.user.trust_level = TrustLevel[1] + expect(post_one_link).not_to be_valid + end end end From 6f094ee27ec8b05244c31f8aa2371ddde0110ba3 Mon Sep 17 00:00:00 2001 From: Kris Date: Thu, 8 Feb 2018 20:43:34 -0500 Subject: [PATCH 101/202] extra-info-wrapper titles were too short --- app/assets/stylesheets/desktop/topic-post.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index e582d11b4c..49fb1f8491 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -545,6 +545,7 @@ video { margin: 5px 0 0 0; font-size: $font-up-3; line-height: $line-height-large; + width: 100%; } .topic-statuses { From 5eb7e7d85f2cf744f711abe02ff3010b6948262d Mon Sep 17 00:00:00 2001 From: Kris Date: Thu, 8 Feb 2018 22:59:11 -0500 Subject: [PATCH 102/202] better centering of summary expansion button --- .../discourse-details/assets/stylesheets/details.scss | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/discourse-details/assets/stylesheets/details.scss b/plugins/discourse-details/assets/stylesheets/details.scss index 2ab27809d2..a0265d894e 100644 --- a/plugins/discourse-details/assets/stylesheets/details.scss +++ b/plugins/discourse-details/assets/stylesheets/details.scss @@ -51,21 +51,24 @@ details .lazyYT-container { summary:before { content: '' !important; + display: none; } summary { @include unselectable; + display: flex; + align-items: center; + justify-content: center; + text-align: center; box-sizing: border-box; margin: 0; padding: 0; color: #aaa; background: #f1f1f1; border: 1px solid #ddd; - width: 20px; - display: flex; - text-align: center; - vertical-align: middle; + width: 21px; line-height: 12px; + } summary:hover { From 1e51be923cf7c043a049d2dcf3d3c4192f432b40 Mon Sep 17 00:00:00 2001 From: Kris Date: Fri, 9 Feb 2018 12:43:15 -0500 Subject: [PATCH 103/202] UX: Improving post-link alignment --- app/assets/stylesheets/common/base/topic.scss | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss index b3f2a8cece..2a3acfa00f 100644 --- a/app/assets/stylesheets/common/base/topic.scss +++ b/app/assets/stylesheets/common/base/topic.scss @@ -201,6 +201,9 @@ a.badge-category { margin-top: 1em; padding-top: 1em; border-top: 1px solid $primary-low; + li:last-of-type { + margin-bottom: 1em; + } } .expand-links { @@ -208,9 +211,13 @@ a.badge-category { } .track-link { - padding-left: 0; - display: inline-block; - overflow: hidden; + display: flex; + align-items: center; + span:not(.badge) { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } } ul { @@ -226,9 +233,8 @@ a.badge-category { margin-left: 0.5em; } i { - float: left; font-size: $font-down-2; - margin: 0.3em 0.5em 0 0; + margin: 0 0.5em 0 0; } } } From 91beedd0ca621d4fd8b599bf62a2bb3c24e2e998 Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Sat, 10 Feb 2018 01:18:56 +0530 Subject: [PATCH 104/202] FEATURE: Composer HTML pasting ul tag support for MS Word --- .../discourse/lib/to-markdown.js.es6 | 31 ++++++++++-- test/javascripts/lib/to-markdown-test.js.es6 | 47 +++++++++++++++++++ 2 files changed, 75 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/to-markdown.js.es6 b/app/assets/javascripts/discourse/lib/to-markdown.js.es6 index 3a4ff590dc..692d4350ed 100644 --- a/app/assets/javascripts/discourse/lib/to-markdown.js.es6 +++ b/app/assets/javascripts/discourse/lib/to-markdown.js.es6 @@ -3,6 +3,7 @@ import parseHTML from 'discourse/helpers/parse-html'; const trimLeft = text => text.replace(/^\s+/,""); const trimRight = text => text.replace(/\s+$/,""); const countPipes = text => (text.replace(/\\\|/,"").match(/\|/g) || []).length; +const msoListClasses = ["MsoListParagraphCxSpFirst", "MsoListParagraphCxSpMiddle", "MsoListParagraphCxSpLast"]; class Tag { constructor(name, prefix = "", suffix = "", inline = false) { @@ -207,7 +208,22 @@ class Tag { static li() { return class extends Tag.slice("li", "\n") { decorate(text) { - const indent = this.element.filterParentNames(["ol", "ul"]).slice(1).map(() => "\t").join(""); + let indent = this.element.filterParentNames(["ol", "ul"]).slice(1).map(() => "\t").join(""); + const attrs = this.element.attributes; + + if (msoListClasses.includes(attrs.class)) { + try { + const level = parseInt(attrs.style.match(/level./)[0].replace("level", "")); + indent = Array(level).join("\t") + indent; + } finally { + if (attrs.class === "MsoListParagraphCxSpFirst") { + indent = `\n\n${indent}`; + } else if (attrs.class === "MsoListParagraphCxSpLast") { + text = `${text}\n`; + } + } + } + return super.decorate(`${indent}* ${trimLeft(text)}`); } }; @@ -356,6 +372,13 @@ class Element { this.parentNames = this.parentNames || []; this.previous = previous; this.next = next; + + if (this.name === "p") { + if (msoListClasses.includes(this.attributes.class)) { + this.name = "li"; + this.parentNames.push("ul"); + } + } } tag() { @@ -433,7 +456,7 @@ class Element { } } -function trimUnwantedSpaces(html) { +function trimUnwanted(html) { const body = html.match(/]*>([\s\S]*?)<\/body>/); html = body ? body[1] : html; html = html.replace(/\r|\n| /g, " "); @@ -443,6 +466,8 @@ function trimUnwantedSpaces(html) { html = html.replace(match[0], match[0].replace(/>\s{2,} <")); } + html = html.replace(/[^!]*/g, ""); // to support ms word list tags + return html; } @@ -461,7 +486,7 @@ function putPlaceholders(html) { match = codeRegEx.exec(origHtml); } - const elements = parseHTML(trimUnwantedSpaces(html)); + const elements = parseHTML(trimUnwanted(html)); return { elements, placeholders }; } diff --git a/test/javascripts/lib/to-markdown-test.js.es6 b/test/javascripts/lib/to-markdown-test.js.es6 index 12e136ec26..4a99ab8138 100644 --- a/test/javascripts/lib/to-markdown-test.js.es6 +++ b/test/javascripts/lib/to-markdown-test.js.es6 @@ -239,3 +239,50 @@ QUnit.test("converts ol list tag", assert => { const markdown = `Testing\n\n1. Item 1\n2. Item 2\n 100. Sub Item 1\n 101. Sub Item 2\n3. Item 3`; assert.equal(toMarkdown(html), markdown); }); + +QUnit.test("converts list tag from word", assert => { + const html = `Sample +

    + + + · + + + + + Item 1 + + +

    +

    + + + · + + + + + Item 2 + + +

    +

    + + + · + + + + Item 3

    +

    + + + · + + + + Item 4

    + List`; + const markdown = `Sample\n\n* **Item 1**\n * *Item 2*\n * Item 3\n* Item 4\n\nList`; + assert.equal(toMarkdown(html), markdown); +}); From 597f17bf706ae0372a1ce4ba138f9d5607be8215 Mon Sep 17 00:00:00 2001 From: Kris Date: Fri, 9 Feb 2018 15:41:59 -0500 Subject: [PATCH 105/202] button padding nitpick --- app/assets/stylesheets/common/select-kit/composer-actions.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/common/select-kit/composer-actions.scss b/app/assets/stylesheets/common/select-kit/composer-actions.scss index 70c37dae9a..7dfefaa08a 100644 --- a/app/assets/stylesheets/common/select-kit/composer-actions.scss +++ b/app/assets/stylesheets/common/select-kit/composer-actions.scss @@ -10,7 +10,7 @@ .d-icon { border: 1px solid $primary-low; - padding: 5px; + padding: 4px 5px; margin: 0!important; } From 88a992014b0e5e74b5973fddedd5dc2a98f8533c Mon Sep 17 00:00:00 2001 From: Kris Date: Fri, 9 Feb 2018 15:45:34 -0500 Subject: [PATCH 106/202] Default modals were too wide --- app/assets/stylesheets/common/base/modal.scss | 2 +- app/assets/stylesheets/desktop/history.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss index 868eeb3ac0..2a5b765cd3 100644 --- a/app/assets/stylesheets/common/base/modal.scss +++ b/app/assets/stylesheets/common/base/modal.scss @@ -81,7 +81,7 @@ } .modal-inner-container { - max-width: 960px; + max-width: 700px; margin: 0 auto; background-color: $secondary; background-clip: padding-box; diff --git a/app/assets/stylesheets/desktop/history.scss b/app/assets/stylesheets/desktop/history.scss index 32466fc77b..8481485d10 100644 --- a/app/assets/stylesheets/desktop/history.scss +++ b/app/assets/stylesheets/desktop/history.scss @@ -4,6 +4,7 @@ .modal-inner-container { min-height: 500px; + max-width: 960px; } #revision-controls { float: left; From 56352137caa3011e9a2241e3367a7072f3fb2a0e Mon Sep 17 00:00:00 2001 From: Kris Date: Fri, 9 Feb 2018 16:55:43 -0500 Subject: [PATCH 107/202] UX: Preventing usercard and profile URLs from overflowing --- .../components/user-card-contents.hbs | 2 +- .../javascripts/discourse/templates/user.hbs | 2 +- app/assets/stylesheets/desktop/user-card.scss | 30 ++++++++++++++----- app/assets/stylesheets/desktop/user.scss | 6 ++++ 4 files changed, 31 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs index 31e9c70b27..614c4808d3 100644 --- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs +++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs @@ -103,7 +103,7 @@ {{#if hasLocationOrWebsite}}
    {{#if user.location}} - {{d-icon "map-marker"}} {{user.location}} + {{d-icon "map-marker"}} {{user.location}} {{/if}} {{#if user.website_name}} diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs index 882b312c80..f20660c64a 100644 --- a/app/assets/javascripts/discourse/templates/user.hbs +++ b/app/assets/javascripts/discourse/templates/user.hbs @@ -73,7 +73,7 @@

    {{model.title}}

    {{/if}} {{plugin-outlet name="user-post-names" args=(hash model=model)}} -

    +

    {{#if model.location}}{{d-icon "map-marker"}} {{model.location}}{{/if}} {{#if model.website_name}} {{d-icon "globe"}} diff --git a/app/assets/stylesheets/desktop/user-card.scss b/app/assets/stylesheets/desktop/user-card.scss index e55a5acea5..3d699d3ccf 100644 --- a/app/assets/stylesheets/desktop/user-card.scss +++ b/app/assets/stylesheets/desktop/user-card.scss @@ -165,15 +165,31 @@ $user_card_background: $secondary; } .location-and-website { - clear: left; - margin-top: 5px; - .location {margin-right: 10px;} - .website-name { - a { - text-decoration: underline; - color: $user_card_primary; + display: flex; + width: 100%; + align-items: center; + padding-top: 5px; + .location, .website-name { + display: flex; + flex: 1 1 50%; + max-width: 50%; + overflow: hidden; + align-items: baseline; + i { + margin-right: .25em; } } + .website-name a, .location span { + overflow: hidden; + text-overflow: ellipsis; + color: $user_card_primary; + } + .location { + margin-right: .5em; + } + .website-name a { + text-decoration: underline; + } } .user-card-avatar { diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index 52611d69be..d342a3a83e 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -176,6 +176,12 @@ a[href] { text-decoration: underline; } + .location-and-website { + max-width: 100%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } } .bio { From 2faa4c2f5fe2937382c10caa5a711499cce6f992 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 9 Feb 2018 16:58:04 -0500 Subject: [PATCH 108/202] FIX: Don't show personal messages if disabled as a composer action --- .../select-kit/components/composer-actions.js.es6 | 15 +++++++++++++-- config/locales/client.en.yml | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 b/app/assets/javascripts/select-kit/components/composer-actions.js.es6 index 5c0fc2277f..44c5837974 100644 --- a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 +++ b/app/assets/javascripts/select-kit/components/composer-actions.js.es6 @@ -1,5 +1,5 @@ import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box"; -import { default as computed } from "ember-addons/ember-computed-decorators"; +import computed from "ember-addons/ember-computed-decorators"; import { default as Composer, PRIVATE_MESSAGE, CREATE_TOPIC, REPLY, EDIT } from "discourse/models/composer"; // Component can get destroyed and lose state @@ -79,7 +79,7 @@ export default DropdownSelectBoxComponent.extend({ }); } - if (action !== PRIVATE_MESSAGE) { + if (this.siteSettings.enable_personal_messages && action !== PRIVATE_MESSAGE) { items.push({ name: I18n.t("composer.composer_actions.reply_as_private_message.label"), description: I18n.t("composer.composer_actions.reply_as_private_message.desc"), @@ -107,6 +107,17 @@ export default DropdownSelectBoxComponent.extend({ }); } + // Edge case: If personal messages are disabled, it is possible to have + // no items which stil renders a button that pops up nothing. In this + // case, add an option for what you're currently doing. + if (action === CREATE_TOPIC && items.length === 0) { + items.push({ + name: I18n.t("composer.composer_actions.create_topic.label"), + description: I18n.t("composer.composer_actions.reply_as_new_topic.desc"), + icon: "mail-forward", + id: "create_topic" + }); + } return items; }, diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index e95cd09c44..46f59e9771 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1307,6 +1307,8 @@ en: toggle_whisper: label: Toggle whipser desc: Whispers will only be visible by staff members + create_topic: + label: "New Topic" notifications: tooltip: From 569e57f0a9edde2770531a3b7ac9565ea77bf87d Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 9 Feb 2018 19:09:54 -0500 Subject: [PATCH 109/202] FIX: Delete the invalid auth cookie even if you hit the rate limit --- app/controllers/application_controller.rb | 4 ++++ lib/auth/default_current_user_provider.rb | 8 ++++++-- lib/discourse.rb | 6 +++--- spec/integration/rate_limiting_spec.rb | 15 ++++++++++++++- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 93e05225b2..2ec9882e3a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -159,6 +159,10 @@ class ApplicationController < ActionController::Base end rescue_from Discourse::InvalidAccess do |e| + + if e.opts[:delete_cookie].present? + cookies.delete(e.opts[:delete_cookie]) + end rescue_discourse_actions( :invalid_access, 403, diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb index 8c56dc9d5a..c46ee178b3 100644 --- a/lib/auth/default_current_user_provider.rb +++ b/lib/auth/default_current_user_provider.rb @@ -48,7 +48,7 @@ class Auth::DefaultCurrentUserProvider if auth_token && auth_token.length == 32 limiter = RateLimiter.new(nil, "cookie_auth_#{request.ip}", COOKIE_ATTEMPTS_PER_MIN , 60) - if request.ip == "127.0.0.1" || request.ip == "::1" || limiter.can_perform? + if limiter.can_perform? @user_token = UserAuthToken.lookup(auth_token, seen: true, user_agent: @env['HTTP_USER_AGENT'], @@ -62,7 +62,11 @@ class Auth::DefaultCurrentUserProvider begin limiter.performed! rescue RateLimiter::LimitExceeded - raise Discourse::InvalidAccess + raise Discourse::InvalidAccess.new( + 'Invalid Access', + nil, + delete_cookie: TOKEN_COOKIE + ) end end end diff --git a/lib/discourse.rb b/lib/discourse.rb index 4a558224c6..036836c605 100644 --- a/lib/discourse.rb +++ b/lib/discourse.rb @@ -64,12 +64,12 @@ module Discourse # When they don't have permission to do something class InvalidAccess < StandardError - attr_reader :obj, :custom_message + attr_reader :obj, :custom_message, :opts def initialize(msg = nil, obj = nil, opts = nil) super(msg) - opts ||= {} - @custom_message = opts[:custom_message] if opts[:custom_message] + @opts = opts || {} + @custom_message = opts[:custom_message] if @opts[:custom_message] @obj = obj end end diff --git a/spec/integration/rate_limiting_spec.rb b/spec/integration/rate_limiting_spec.rb index b51439c1e8..b1cc23afce 100644 --- a/spec/integration/rate_limiting_spec.rb +++ b/spec/integration/rate_limiting_spec.rb @@ -2,16 +2,29 @@ require 'rails_helper' -describe 'admin rate limit' do +describe 'rate limiter integration' do before do RateLimiter.enable + RateLimiter.clear_all! end after do RateLimiter.disable end + it "will clear the token cookie if invalid" do + name = Auth::DefaultCurrentUserProvider::TOKEN_COOKIE + + # we try 11 times because the rate limit is 10 + 11.times { + cookies[name] = SecureRandom.hex + get '/categories.json' + expect(response.cookies.has_key?(name)).to eq(true) + expect(response.cookies[name]).to be_nil + } + end + it 'can cleanly limit requests' do #request.set_header("action_dispatch.show_exceptions", true) From b31e6e64fbdcd7f9a4dbf1c7caaf065fed4137da Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 9 Feb 2018 19:42:16 -0500 Subject: [PATCH 110/202] FIX: After deleting a post, staff can recover it --- app/assets/javascripts/discourse/models/post.js.es6 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6 index c6903f71fd..955c301837 100644 --- a/app/assets/javascripts/discourse/models/post.js.es6 +++ b/app/assets/javascripts/discourse/models/post.js.es6 @@ -168,7 +168,8 @@ const Post = RestModel.extend({ this.setProperties({ deleted_at: new Date(), deleted_by: deletedBy, - can_delete: false + can_delete: false, + can_recover: true }); } else { promise = cookAsync(I18n.t("post.deleted_by_author", {count: Discourse.SiteSettings.delete_removed_posts_after})).then(cooked => { From cee33373571c7be8133748477ad5415ea15776dc Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 9 Feb 2018 19:53:58 -0500 Subject: [PATCH 111/202] Don't allow users to auto-hide staff posts --- app/models/post_action.rb | 2 +- spec/models/post_action_spec.rb | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/models/post_action.rb b/app/models/post_action.rb index 617d0c72b3..8bcb64482b 100644 --- a/app/models/post_action.rb +++ b/app/models/post_action.rb @@ -538,7 +538,7 @@ SQL end def self.auto_hide_if_needed(acting_user, post, post_action_type) - return if post.hidden + return if post.hidden || post.user.staff? if post_action_type == :spam && acting_user.has_trust_level?(TrustLevel[3]) && diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb index 9c742835df..b22abb3b19 100644 --- a/spec/models/post_action_spec.rb +++ b/spec/models/post_action_spec.rb @@ -362,6 +362,22 @@ describe PostAction do expect(post.spam_count).to eq(0) end + it "will not auto hide staff posts" do + mod = Fabricate(:moderator) + post = Fabricate(:post, user: mod) + + SiteSetting.flags_required_to_hide_post = 2 + Discourse.stubs(:site_contact_user).returns(admin) + + PostAction.act(eviltrout, post, PostActionType.types[:spam]) + PostAction.act(Fabricate(:walter_white), post, PostActionType.types[:spam]) + + post.reload + + expect(post.hidden).to eq(false) + expect(post.hidden_at).to be_blank + end + it 'should follow the rules for automatic hiding workflow' do post = create_post walterwhite = Fabricate(:walter_white) From 3d22ba35bc6591700584c11c9b71f68feab5913f Mon Sep 17 00:00:00 2001 From: Kris Date: Fri, 9 Feb 2018 17:29:40 -0500 Subject: [PATCH 112/202] usercard website fix --- app/assets/stylesheets/desktop/user-card.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/desktop/user-card.scss b/app/assets/stylesheets/desktop/user-card.scss index 3d699d3ccf..099d1d00f1 100644 --- a/app/assets/stylesheets/desktop/user-card.scss +++ b/app/assets/stylesheets/desktop/user-card.scss @@ -171,7 +171,7 @@ $user_card_background: $secondary; padding-top: 5px; .location, .website-name { display: flex; - flex: 1 1 50%; + flex: 0 1 50%; max-width: 50%; overflow: hidden; align-items: baseline; @@ -182,6 +182,7 @@ $user_card_background: $secondary; .website-name a, .location span { overflow: hidden; text-overflow: ellipsis; + white-space: nowrap; color: $user_card_primary; } .location { From d30c43e8cce1578cacc6e592212c8b2879d0567c Mon Sep 17 00:00:00 2001 From: Kris Date: Sat, 10 Feb 2018 21:27:25 -0500 Subject: [PATCH 113/202] usercard overflow fix --- app/assets/stylesheets/desktop/user-card.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/stylesheets/desktop/user-card.scss b/app/assets/stylesheets/desktop/user-card.scss index 099d1d00f1..8f09dd9fc8 100644 --- a/app/assets/stylesheets/desktop/user-card.scss +++ b/app/assets/stylesheets/desktop/user-card.scss @@ -171,8 +171,7 @@ $user_card_background: $secondary; padding-top: 5px; .location, .website-name { display: flex; - flex: 0 1 50%; - max-width: 50%; + max-width: 90%; overflow: hidden; align-items: baseline; i { From e48ae647f943a3e00ec5a91b6b3eef175c094751 Mon Sep 17 00:00:00 2001 From: "AhmadF.Cheema" Date: Sun, 11 Feb 2018 10:12:24 +0500 Subject: [PATCH 114/202] Fix typo in server.en.yml --- config/locales/server.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index cc7c109e4d..2873098a32 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -957,7 +957,7 @@ en: email_polling_errored_recently: one: "Email polling has generated an error in the past 24 hours. Look at the logs for more details." other: "Email polling has generated %{count} errors in the past 24 hours. Look at the logs for more details." - missing_mailgun_api_key: "The server is configured to send emails via mailgun but you haven't provided an API key used the verify the webhook messages." + missing_mailgun_api_key: "The server is configured to send emails via mailgun but you haven't provided an API key used to verify the webhook messages." bad_favicon_url: "The favicon is failing to load. Check your favicon_url setting in Site Settings." poll_pop3_timeout: "Connection to the POP3 server is timing out. Incoming email could not be retrieved. Please check your POP3 settings and service provider." poll_pop3_auth_error: "Connection to the POP3 server is failing with an authentication error. Please check your POP3 settings." From 87b0cc382b314e6d663059398aa8c169d65fa57a Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 12 Feb 2018 14:03:04 +0800 Subject: [PATCH 115/202] Bump `rails_multisite` to 2.0.3. --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 08bec02878..fbd1313d1f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -275,7 +275,7 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - rails_multisite (2.0.2) + rails_multisite (2.0.3) activerecord (> 4.2, < 6) railties (> 4.2, < 6) railties (5.1.4) @@ -478,7 +478,7 @@ DEPENDENCIES r2 (~> 0.2.5) rack-mini-profiler rack-protection - rails_multisite + rails_multisite (= 2.0.3) railties (~> 5.1) rake rb-fsevent From 5dabcc908121c606bac8a5662a7e69d90614eb3a Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 12 Feb 2018 14:08:02 +0800 Subject: [PATCH 116/202] Fix Gemfile.lock. --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fbd1313d1f..dda6692f0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -478,7 +478,7 @@ DEPENDENCIES r2 (~> 0.2.5) rack-mini-profiler rack-protection - rails_multisite (= 2.0.3) + rails_multisite railties (~> 5.1) rake rb-fsevent From 932a1a1187908d83ff17a56b09251fee340274f2 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 12 Feb 2018 14:26:22 +0800 Subject: [PATCH 117/202] Remove use of deprecated site setting. --- lib/guardian/group_guardian.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/guardian/group_guardian.rb b/lib/guardian/group_guardian.rb index fd18ff797a..492924c92e 100644 --- a/lib/guardian/group_guardian.rb +++ b/lib/guardian/group_guardian.rb @@ -13,7 +13,7 @@ module GroupGuardian end def can_see_group_messages?(group) - SiteSetting.enable_private_messages? && ( + SiteSetting.enable_personal_messages? && ( is_admin? || group.users.include?(user) ) end From 19b411641609af69bfa6fd1a69e2e0ebf7bf896a Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 12 Feb 2018 15:39:21 +0800 Subject: [PATCH 118/202] Bump `rails_multisite` to 2.0.4. --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index dda6692f0c..b4c381a1a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -275,7 +275,7 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - rails_multisite (2.0.3) + rails_multisite (2.0.4) activerecord (> 4.2, < 6) railties (> 4.2, < 6) railties (5.1.4) From 3d5c4580bd5de2676143d26528301e329247e4de Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Mon, 12 Feb 2018 16:27:24 +0100 Subject: [PATCH 119/202] FIX: makes sure we add ellipsis to action-title --- app/assets/stylesheets/common/base/compose.scss | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss index 9c829becd9..491a4044df 100644 --- a/app/assets/stylesheets/common/base/compose.scss +++ b/app/assets/stylesheets/common/base/compose.scss @@ -96,7 +96,7 @@ color: $primary-high; } .reply-details { - max-width: calc(100% - 175px); + max-width: calc(100% - 60px); flex: 1 1 auto; white-space: nowrap; } @@ -110,10 +110,13 @@ width: 20px; } - .topic-link, .user-link, .post-link { + .action-title { + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - white-space: nowrap; + } + + .topic-link, .user-link, .post-link { margin-right: 5px; } From 464475778545a43e0f628e2a775ea78cfcf4ed53 Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Mon, 12 Feb 2018 13:39:52 -0200 Subject: [PATCH 120/202] FEATURE: Style new gfycat onebox --- .../stylesheets/common/base/onebox.scss | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss index 61d92687fe..c692cfceb7 100644 --- a/app/assets/stylesheets/common/base/onebox.scss +++ b/app/assets/stylesheets/common/base/onebox.scss @@ -463,10 +463,22 @@ aside.onebox.stackexchange .onebox-body { .label2 { float: right; } - .site-icon { - width: 16px; - height: 16px; - margin-right: 3px; +} + +.onebox { + &.whitelistedgeneric, + &.gfycat { + .site-icon { + width: 16px; + height: 16px; + margin-right: 3px; + } + } +} + +.onebox.gfycat p { + span.label1 a { + white-space: nowrap; } } From 44f39ddc864556157fb6c9d0670ad29d2000e8f5 Mon Sep 17 00:00:00 2001 From: Kris Date: Mon, 12 Feb 2018 11:52:42 -0500 Subject: [PATCH 121/202] prevent post-link clicks from being squished by long strings --- app/assets/stylesheets/common/base/topic.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss index 2a3acfa00f..5b267622e3 100644 --- a/app/assets/stylesheets/common/base/topic.scss +++ b/app/assets/stylesheets/common/base/topic.scss @@ -231,6 +231,7 @@ a.badge-category { } .clicks { margin-left: 0.5em; + flex: 0 0 auto; } i { font-size: $font-down-2; From 7b7f94d7df25f8e6040746a33e0ab430fcd78836 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 12 Feb 2018 13:09:56 -0500 Subject: [PATCH 122/202] FIX: Using cmd-f to search in a topic wasn't restricting to that topic --- app/assets/javascripts/discourse/widgets/header.js.es6 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6 index 0cfc041914..12cd200c32 100644 --- a/app/assets/javascripts/discourse/widgets/header.js.es6 +++ b/app/assets/javascripts/discourse/widgets/header.js.es6 @@ -230,7 +230,11 @@ export default createWidget('header', { if (state.searchVisible) { const contextType = this.searchContextType(); - if (state.searchContextType !== contextType) { + if (!contextType) { + state.contextEnabled = undefined; + } + + if (state.searchContextType && state.searchContextType !== contextType) { state.contextEnabled = undefined; state.searchContextType = contextType; } From d962d6072e24e1c597fbc7c091a27b9113e10db1 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 12 Feb 2018 13:54:37 -0500 Subject: [PATCH 123/202] FIX: Don't auto select ALL topics, only keyboard chosen ones --- app/assets/javascripts/discourse/widgets/header.js.es6 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6 index 12cd200c32..04fdd8902a 100644 --- a/app/assets/javascripts/discourse/widgets/header.js.es6 +++ b/app/assets/javascripts/discourse/widgets/header.js.es6 @@ -230,11 +230,7 @@ export default createWidget('header', { if (state.searchVisible) { const contextType = this.searchContextType(); - if (!contextType) { - state.contextEnabled = undefined; - } - - if (state.searchContextType && state.searchContextType !== contextType) { + if (state.searchContextType !== contextType) { state.contextEnabled = undefined; state.searchContextType = contextType; } @@ -407,6 +403,10 @@ export default createWidget('header', { this.toggleHamburger(); break; case 'page-search': + let contextType = this.searchContextType(); + if (contextType === 'topic') { + this.state.searchContextType = contextType; + } if (!this.togglePageSearch()) { msg.event.preventDefault(); msg.event.stopPropagation(); From 62876317455a3efd1676a999610f39a9220a7f3f Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 12 Feb 2018 14:56:21 -0500 Subject: [PATCH 124/202] FEATURE: New site setting, `allow staff flags`, false by default For some large communities, it makes sense to disable flagging of staff posts. --- config/locales/server.en.yml | 1 + config/site_settings.yml | 1 + lib/guardian/post_guardian.rb | 3 +++ spec/components/guardian_spec.rb | 14 +++++++++++++- 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 2873098a32..7a97ab4622 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1282,6 +1282,7 @@ en: tl3_links_no_follow: "Do not remove rel=nofollow from links posted by trust level 3 users." min_trust_to_create_topic: "The minimum trust level required to create a new topic." + allow_staff_flags: "If enabled, users can flag posts from staff accounts." min_trust_to_edit_wiki_post: "The minimum trust level required to edit post marked as wiki." diff --git a/config/site_settings.yml b/config/site_settings.yml index f8ff2bb1a8..a10d7446eb 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -900,6 +900,7 @@ trust: min_trust_to_post_links: default: 0 enum: 'TrustLevelSetting' + allow_staff_flags: true tl1_requires_topics_entered: 5 tl1_requires_read_posts: default: 30 diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb index 39f207b597..3c822984f6 100644 --- a/lib/guardian/post_guardian.rb +++ b/lib/guardian/post_guardian.rb @@ -21,6 +21,9 @@ module PostGuardian result = if authenticated? && post && !@user.anonymous? + # post made by staff, but we don't allow staff flags + return false if !SiteSetting.allow_staff_flags? && post.user.staff? + return false if [:notify_user, :notify_moderators].include?(action_key) && !SiteSetting.enable_personal_messages? diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb index d61502367f..cb9ad968ae 100644 --- a/spec/components/guardian_spec.rb +++ b/spec/components/guardian_spec.rb @@ -66,11 +66,23 @@ describe Guardian do expect(Guardian.new(user).post_can_act?(post, :like)).to be_falsey end - it "always allows flagging" do + it "allows flagging archived posts" do post.topic.archived = true expect(Guardian.new(user).post_can_act?(post, :spam)).to be_truthy end + it "allows flagging of staff posts when allow_staff_flags is true" do + SiteSetting.allow_staff_flags = true + staff_post = Fabricate(:post, user: Fabricate(:moderator)) + expect(Guardian.new(user).post_can_act?(staff_post, :spam)).to be_truthy + end + + it "doesn't allow flagging of staff posts when allow_staff_flags is false" do + SiteSetting.allow_staff_flags = false + staff_post = Fabricate(:post, user: Fabricate(:moderator)) + expect(Guardian.new(user).post_can_act?(staff_post, :spam)).to eq(false) + end + it "returns false when liking yourself" do expect(Guardian.new(post.user).post_can_act?(post, :like)).to be_falsey end From e700e3e8821e999e9a989a1d7bc66e4520473031 Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Tue, 13 Feb 2018 01:36:56 +0530 Subject: [PATCH 125/202] FIX: post_destroyed webhook event not fired --- app/jobs/regular/emit_web_hook_event.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/regular/emit_web_hook_event.rb b/app/jobs/regular/emit_web_hook_event.rb index 82832d946d..cc80fcebb2 100644 --- a/app/jobs/regular/emit_web_hook_event.rb +++ b/app/jobs/regular/emit_web_hook_event.rb @@ -33,7 +33,7 @@ module Jobs end def setup_post(args) - post = Post.find_by(id: args[:post_id]) + post = Post.with_deleted.find_by(id: args[:post_id]) return if post.blank? args[:payload] = WebHookPostSerializer.new(post, scope: guardian, root: false).as_json end From 76c309fe6b12c9740131656ef16c2da026d05cba Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 8 Feb 2018 16:36:39 -0500 Subject: [PATCH 126/202] PERF: a faster way to count tags used per category --- app/jobs/onceoff/init_category_tag_stats.rb | 15 ++++ app/jobs/scheduled/ensure_db_consistency.rb | 1 + app/models/category_tag_stat.rb | 61 +++++++++++++ app/models/tag.rb | 18 ++-- app/models/topic.rb | 20 ++++- app/models/topic_tag.rb | 18 ++++ ...0180207163946_create_category_tag_stats.rb | 12 +++ spec/integration/category_tag_spec.rb | 89 +++++++++++++++++++ spec/models/topic_list_spec.rb | 4 +- 9 files changed, 226 insertions(+), 12 deletions(-) create mode 100644 app/jobs/onceoff/init_category_tag_stats.rb create mode 100644 app/models/category_tag_stat.rb create mode 100644 db/migrate/20180207163946_create_category_tag_stats.rb diff --git a/app/jobs/onceoff/init_category_tag_stats.rb b/app/jobs/onceoff/init_category_tag_stats.rb new file mode 100644 index 0000000000..c108ca9163 --- /dev/null +++ b/app/jobs/onceoff/init_category_tag_stats.rb @@ -0,0 +1,15 @@ +module Jobs + class InitCategoryTagStats < Jobs::Onceoff + def execute_onceoff(args) + CategoryTagStat.exec_sql <<~SQL + INSERT INTO category_tag_stats (category_id, tag_id, topic_count) + SELECT topics.category_id, tags.id, COUNT(topics.id) + FROM tags + INNER JOIN topic_tags ON tags.id = topic_tags.tag_id + INNER JOIN topics ON topics.id = topic_tags.topic_id + AND topics.deleted_at IS NULL + GROUP BY tags.id, topics.category_id + SQL + end + end +end diff --git a/app/jobs/scheduled/ensure_db_consistency.rb b/app/jobs/scheduled/ensure_db_consistency.rb index a482631621..03060c5d3e 100644 --- a/app/jobs/scheduled/ensure_db_consistency.rb +++ b/app/jobs/scheduled/ensure_db_consistency.rb @@ -16,6 +16,7 @@ module Jobs CategoryUser.ensure_consistency! UserOption.ensure_consistency! Tag.ensure_consistency! + CategoryTagStat.ensure_consistency! end end end diff --git a/app/models/category_tag_stat.rb b/app/models/category_tag_stat.rb new file mode 100644 index 0000000000..e9c8275d61 --- /dev/null +++ b/app/models/category_tag_stat.rb @@ -0,0 +1,61 @@ +class CategoryTagStat < ActiveRecord::Base + belongs_to :category + belongs_to :tag + + def self.topic_moved(topic, from_category_id, to_category_id) + if from_category_id + self.where(tag_id: topic.tags.map(&:id), category_id: from_category_id) + .where('topic_count > 0') + .update_all('topic_count = topic_count - 1') + end + + if to_category_id + sql = <<~SQL + UPDATE #{self.table_name} + SET topic_count = topic_count + 1 + WHERE tag_id in (:tag_ids) + AND category_id = :category_id + RETURNING tag_id + SQL + + tag_ids = topic.tags.map(&:id) + updated_tag_ids = self.exec_sql(sql, tag_ids: tag_ids, category_id: to_category_id).map { |row| row['tag_id'] } + + (tag_ids - updated_tag_ids).each do |tag_id| + CategoryTagStat.create!(tag_id: tag_id, category_id: to_category_id, topic_count: 1) + end + end + end + + def self.topic_deleted(topic) + topic_moved(topic, topic.category_id, nil) + end + + def self.topic_recovered(topic) + topic_moved(topic, nil, topic.category_id) + end + + def self.ensure_consistency! + self.update_topic_counts + end + + # Recalculate all topic counts if they got out of sync + def self.update_topic_counts + CategoryTagStat.exec_sql <<~SQL + UPDATE category_tag_stats stats + SET topic_count = x.topic_count + FROM ( + SELECT COUNT(topics.id) AS topic_count, + tags.id AS tag_id, + topics.category_id as category_id + FROM tags + INNER JOIN topic_tags ON tags.id = topic_tags.tag_id + INNER JOIN topics ON topics.id = topic_tags.topic_id AND topics.deleted_at IS NULL + GROUP BY tags.id, topics.category_id + ) x + WHERE stats.tag_id = x.tag_id + AND stats.category_id = x.category_id + AND x.topic_count <> stats.topic_count + SQL + end +end diff --git a/app/models/tag.rb b/app/models/tag.rb index 2e8a2c6694..45d900d422 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -59,13 +59,19 @@ class Tag < ActiveRecord::Base scope_category_ids &= ([category.id] + category.subcategories.pluck(:id)) end - tags = DiscourseTagging.filter_allowed_tags( - tags_by_count_query(limit: limit).where("topics.category_id in (?)", scope_category_ids), - nil, # Don't pass guardian. You might not be able to use some tags, but should still be able to see where they've been used. - category: category - ) + return [] if scope_category_ids.empty? - tags.count(COUNT_ARG).map { |name, _| name } + tag_names_with_counts = Tag.exec_sql <<~SQL + SELECT tags.name as tag_name, SUM(stats.topic_count) AS sum_topic_count + FROM category_tag_stats stats + INNER JOIN tags ON stats.tag_id = tags.id AND stats.topic_count > 0 + WHERE stats.category_id in (#{scope_category_ids.join(',')}) + GROUP BY tags.name + ORDER BY sum_topic_count DESC, tag_name ASC + LIMIT #{limit} + SQL + + tag_names_with_counts.map { |row| row['tag_name'] } end def self.include_tags? diff --git a/app/models/topic.rb b/app/models/topic.rb index 3bc8d72b4a..3b3c74b956 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -54,14 +54,20 @@ class Topic < ActiveRecord::Base end def trash!(trashed_by = nil) - update_category_topic_count_by(-1) if deleted_at.nil? + if deleted_at.nil? + update_category_topic_count_by(-1) + CategoryTagStat.topic_deleted(self) if self.tags.present? + end super(trashed_by) update_flagged_posts_count self.topic_embed.trash! if has_topic_embed? end def recover! - update_category_topic_count_by(1) unless deleted_at.nil? + unless deleted_at.nil? + update_category_topic_count_by(1) + CategoryTagStat.topic_recovered(self) if self.tags.present? + end super update_flagged_posts_count unless (topic_embed = TopicEmbed.with_deleted.find_by_topic_id(id)).nil? @@ -122,8 +128,8 @@ class Topic < ActiveRecord::Base has_many :allowed_users, through: :topic_allowed_users, source: :user has_many :queued_posts - has_many :topic_tags, dependent: :destroy - has_many :tags, through: :topic_tags + has_many :topic_tags + has_many :tags, through: :topic_tags, dependent: :destroy # dependent destroy applies to the topic_tags records has_many :tag_users, through: :tags has_one :top_topic @@ -226,6 +232,12 @@ class Topic < ActiveRecord::Base UserActionCreator.log_topic(self) end + after_update do + if saved_changes[:category_id] && self.tags.present? + CategoryTagStat.topic_moved(self, *saved_changes[:category_id]) + end + end + def initialize_default_values self.bumped_at ||= Time.now self.last_post_user_id ||= user_id diff --git a/app/models/topic_tag.rb b/app/models/topic_tag.rb index f8dc3cfee0..2dc203290b 100644 --- a/app/models/topic_tag.rb +++ b/app/models/topic_tag.rb @@ -1,6 +1,24 @@ class TopicTag < ActiveRecord::Base belongs_to :topic belongs_to :tag, counter_cache: "topic_count" + + after_create do + if topic.category_id + if stat = CategoryTagStat.where(tag_id: tag_id, category_id: topic.category_id).first + stat.increment!(:topic_count) + else + CategoryTagStat.create(tag_id: tag_id, category_id: topic.category_id, topic_count: 1) + end + end + end + + after_destroy do + if topic.category_id + if stat = CategoryTagStat.where(tag_id: tag_id, category: topic.category_id).first + stat.topic_count == 1 ? stat.destroy : stat.decrement!(:topic_count) + end + end + end end # == Schema Information diff --git a/db/migrate/20180207163946_create_category_tag_stats.rb b/db/migrate/20180207163946_create_category_tag_stats.rb new file mode 100644 index 0000000000..6ee70da8e7 --- /dev/null +++ b/db/migrate/20180207163946_create_category_tag_stats.rb @@ -0,0 +1,12 @@ +class CreateCategoryTagStats < ActiveRecord::Migration[5.1] + def change + create_table :category_tag_stats do |t| + t.references :category, null: false + t.references :tag, null: false + t.integer :topic_count, default: 0, null: false + end + + add_index :category_tag_stats, [:category_id, :topic_count] + add_index :category_tag_stats, [:category_id, :tag_id], unique: true + end +end diff --git a/spec/integration/category_tag_spec.rb b/spec/integration/category_tag_spec.rb index cbc58c0d8a..36979b45d5 100644 --- a/spec/integration/category_tag_spec.rb +++ b/spec/integration/category_tag_spec.rb @@ -183,3 +183,92 @@ describe "category tag restrictions" do end end end + +describe "tag topic counts per category" do + let(:user) { Fabricate(:user) } + let(:admin) { Fabricate(:admin) } + let(:category) { Fabricate(:category) } + let(:category2) { Fabricate(:category) } + let(:tag1) { Fabricate(:tag) } + let(:tag2) { Fabricate(:tag) } + let(:tag3) { Fabricate(:tag) } + + before do + SiteSetting.tagging_enabled = true + SiteSetting.min_trust_to_create_tag = 0 + SiteSetting.min_trust_level_to_tag_topics = 0 + end + + it "counts when a topic is created with tags" do + expect { + Fabricate(:topic, category: category, tags: [tag1, tag2]) + }.to change { CategoryTagStat.count }.by(2) + expect(CategoryTagStat.where(category: category, tag: tag1).sum(:topic_count)).to eq(1) + expect(CategoryTagStat.where(category: category, tag: tag2).sum(:topic_count)).to eq(1) + end + + it "counts when tag is added to an existing topic" do + topic = Fabricate(:topic, category: category) + post = Fabricate(:post, user: topic.user, topic: topic) + expect(CategoryTagStat.where(category: category).count).to eq(0) + expect { + PostRevisor.new(post).revise!(topic.user, raw: post.raw, tags: [tag1.name, tag2.name]) + }.to change { CategoryTagStat.count }.by(2) + expect(CategoryTagStat.where(category: category, tag: tag1).sum(:topic_count)).to eq(1) + expect(CategoryTagStat.where(category: category, tag: tag2).sum(:topic_count)).to eq(1) + end + + context "topic with 2 tags" do + let(:topic) { Fabricate(:topic, category: category, tags: [tag1, tag2]) } + let(:post) { Fabricate(:post, user: topic.user, topic: topic) } + + it "has correct counts after tag is removed from a topic" do + post + topic2 = Fabricate(:topic, category: category, tags: [tag2]) + expect(CategoryTagStat.where(category: category, tag: tag2).sum(:topic_count)).to eq(2) + PostRevisor.new(post).revise!(topic.user, raw: post.raw, tags: []) + expect(CategoryTagStat.where(category: category, tag: tag2).sum(:topic_count)).to eq(1) + expect(CategoryTagStat.where(category: category, tag: tag1).sum(:topic_count)).to eq(0) + end + + it "has correct counts after a topic's category changes" do + PostRevisor.new(post).revise!(topic.user, category_id: category2.id, raw: post.raw, tags: [tag1.name, tag2.name]) + expect(CategoryTagStat.where(category: category, tag: tag1).sum(:topic_count)).to eq(0) + expect(CategoryTagStat.where(category: category, tag: tag2).sum(:topic_count)).to eq(0) + expect(CategoryTagStat.where(category: category2, tag: tag1).sum(:topic_count)).to eq(1) + expect(CategoryTagStat.where(category: category2, tag: tag2).sum(:topic_count)).to eq(1) + end + + it "has correct counts after topic's category AND tags changed" do + PostRevisor.new(post).revise!(topic.user, raw: post.raw, tags: [tag2.name, tag3.name], category_id: category2.id) + expect(CategoryTagStat.where(category: category, tag: tag1).sum(:topic_count)).to eq(0) + expect(CategoryTagStat.where(category: category, tag: tag2).sum(:topic_count)).to eq(0) + expect(CategoryTagStat.where(category: category, tag: tag3).sum(:topic_count)).to eq(0) + expect(CategoryTagStat.where(category: category2, tag: tag1).sum(:topic_count)).to eq(0) + expect(CategoryTagStat.where(category: category2, tag: tag2).sum(:topic_count)).to eq(1) + expect(CategoryTagStat.where(category: category2, tag: tag3).sum(:topic_count)).to eq(1) + end + end + + context "topic with one tag" do + let(:topic) { Fabricate(:topic, tags: [tag1], category: category) } + let(:post) { Fabricate(:post, user: topic.user, topic: topic) } + + it "counts after topic becomes uncategorized" do + PostRevisor.new(post).revise!(topic.user, raw: post.raw, tags: [tag1.name], category_id: SiteSetting.uncategorized_category_id) + expect(CategoryTagStat.where(category: Category.find(SiteSetting.uncategorized_category_id), tag: tag1).sum(:topic_count)).to eq(1) + expect(CategoryTagStat.where(category: category, tag: tag1).sum(:topic_count)).to eq(0) + end + + it "updates counts after topic is deleted" do + PostDestroyer.new(admin, post).destroy + expect(CategoryTagStat.where(category: category, tag: tag1).sum(:topic_count)).to eq(0) + end + + it "updates counts after topic is recovered" do + PostDestroyer.new(admin, post).destroy + PostDestroyer.new(admin, post).recover + expect(CategoryTagStat.where(category: category, tag: tag1).sum(:topic_count)).to eq(1) + end + end +end diff --git a/spec/models/topic_list_spec.rb b/spec/models/topic_list_spec.rb index dde096ae0a..d5022065f7 100644 --- a/spec/models/topic_list_spec.rb +++ b/spec/models/topic_list_spec.rb @@ -62,8 +62,8 @@ describe TopicList do let!(:other_tag) { Fabricate(:tag, topics: [topic], name: "use-anywhere") } let(:topic_list) { TopicList.new('latest', topic.user, [topic], category: category.id, category_id: category.id) } - it 'should only return tags allowed in the category' do - expect(topic_list.top_tags).to eq([tag.name]) + it 'should return tags used in the category' do + expect(topic_list.top_tags).to eq([tag.name, other_tag.name].sort) end it "with no category, should return all tags" do From 32116654ec1367d21ad117a0d72ee7b1f233bdf2 Mon Sep 17 00:00:00 2001 From: Kris Date: Mon, 12 Feb 2018 15:16:27 -0500 Subject: [PATCH 127/202] removing duplicate topic-map desktop/mobile styles --- .../stylesheets/common/base/topic-post.scss | 40 ++++++++++++++++++- .../stylesheets/desktop/topic-post.scss | 38 ------------------ app/assets/stylesheets/mobile/topic-post.scss | 36 +---------------- 3 files changed, 40 insertions(+), 74 deletions(-) diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index b2c9f640a6..9614af03bc 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -199,7 +199,10 @@ aside.quote { } .topic-map { - + background: blend-primary-secondary(5%); + border: 1px solid $primary-low; + border-top: none; // would cause double top border + .avatars { > div { float: left; @@ -223,6 +226,41 @@ aside.quote { margin-right: 4px; } + section { + border-top: 1px solid $primary-low; + } + + ul { + margin: 0; + list-style: none; + } + + h3 { + margin-bottom: 4px; + color: dark-light-choose($primary-high, $secondary-low); + line-height: $line-height-large; + font-weight: normal; + font-size: $font-0; + } + + h4 { + margin: 1px 0 2px 0; + color: dark-light-choose($primary-medium, $secondary-medium); + font-weight: normal; + font-size: $font-down-1; + line-height: $line-height-small; + } + + span.domain { + font-size: $font-down-2; + color: dark-light-choose($primary-medium, $secondary-medium); + } + + td { + vertical-align: top; + padding:1px; + } + } .topic-avatar, .avatar-flair-preview, .user-card-avatar, .topic-map .poster { diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 49fb1f8491..dd65265203 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -307,39 +307,6 @@ nav.post-controls { .topic-map { margin: 20px 0; - background: blend-primary-secondary(5%); - border: 1px solid $primary-low; - border-top: none; // would cause double top border - - section { - border-top: 1px solid $primary-low; - } - - h3 { - margin-bottom: 4px; - color: dark-light-choose($primary-high, $secondary-low); - line-height: $line-height-large; - font-weight: normal; - font-size: $font-0; - } - - h4 { - margin: 1px 0 2px 0; - color: dark-light-choose($primary-medium, $secondary-medium); - font-weight: normal; - font-size: $font-down-1; - line-height: $line-height-small; - } - - ul { - margin: 0; - list-style: none; - } - - span.domain { - font-size: $font-down-2; - color: dark-light-choose($primary-medium, $secondary-medium); - } .map { .secondary {text-align: center;} @@ -391,11 +358,6 @@ nav.post-controls { } } - td { - vertical-align: top; - padding:1px; - } - .buttons { float: right; .btn { diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index 768a59bf81..3b48e5c91e 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -143,30 +143,10 @@ a.reply-to-tab { } .topic-map { - margin: 10px 0; - background: blend-primary-secondary(5%); - border: 1px solid $primary-low; - border-top: none; // would cause double top border - - section { - border-top: 1px solid $primary-low; - } - - h3 { - margin-bottom: 4px; - margin-top: 0; - color: dark-light-choose($primary-medium, $secondary-medium); - line-height: $line-height-large; - font-weight: normal; - font-size: $font-0; - } h4 { margin: 0 0 3px 0; - color: dark-light-choose($primary-medium, $secondary-medium); - font-weight: normal; - font-size: $font-down-1; line-height: $line-height-medium; } @@ -175,11 +155,6 @@ a.reply-to-tab { margin-right: 10px; } - ul { - margin: 0; - list-style: none; - } - .map-collapsed { .secondary { display: none; @@ -195,7 +170,7 @@ a.reply-to-tab { } } a, .number { - line-height: $line-height-large; + line-height: $line-height-medium; } .number, i { color: dark-light-choose($primary-high, $secondary-low); @@ -226,21 +201,12 @@ a.reply-to-tab { .user {float: left; margin: 0 10px 10px 0;} } - .domain { - color: dark-light-choose($primary-low-mid, $secondary-high); - } - .topic-links { .badge-notification { margin: 1px 5px 2px 0; } } - td { - vertical-align: top; - padding:1px; - } - .buttons { .btn { border: 0; From 4dfe659189f0a6f10eaf5716b51750c6c0757940 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 12 Feb 2018 15:27:05 -0500 Subject: [PATCH 128/202] Rename `allow staff flags` to `allow flagging staff` --- config/locales/server.en.yml | 2 +- config/site_settings.yml | 2 +- lib/guardian/post_guardian.rb | 2 +- spec/components/guardian_spec.rb | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 7a97ab4622..4e2b817c0f 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1282,7 +1282,7 @@ en: tl3_links_no_follow: "Do not remove rel=nofollow from links posted by trust level 3 users." min_trust_to_create_topic: "The minimum trust level required to create a new topic." - allow_staff_flags: "If enabled, users can flag posts from staff accounts." + allow_flagging_staff: "If enabled, users can flag posts from staff accounts." min_trust_to_edit_wiki_post: "The minimum trust level required to edit post marked as wiki." diff --git a/config/site_settings.yml b/config/site_settings.yml index a10d7446eb..64b71a2b34 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -900,7 +900,7 @@ trust: min_trust_to_post_links: default: 0 enum: 'TrustLevelSetting' - allow_staff_flags: true + allow_flagging_staff: true tl1_requires_topics_entered: 5 tl1_requires_read_posts: default: 30 diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb index 3c822984f6..aa92423b57 100644 --- a/lib/guardian/post_guardian.rb +++ b/lib/guardian/post_guardian.rb @@ -22,7 +22,7 @@ module PostGuardian result = if authenticated? && post && !@user.anonymous? # post made by staff, but we don't allow staff flags - return false if !SiteSetting.allow_staff_flags? && post.user.staff? + return false if !SiteSetting.allow_flagging_staff? && post.user.staff? return false if [:notify_user, :notify_moderators].include?(action_key) && !SiteSetting.enable_personal_messages? diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb index cb9ad968ae..77667c4e01 100644 --- a/spec/components/guardian_spec.rb +++ b/spec/components/guardian_spec.rb @@ -71,14 +71,14 @@ describe Guardian do expect(Guardian.new(user).post_can_act?(post, :spam)).to be_truthy end - it "allows flagging of staff posts when allow_staff_flags is true" do - SiteSetting.allow_staff_flags = true + it "allows flagging of staff posts when allow_flagging_staff is true" do + SiteSetting.allow_flagging_staff = true staff_post = Fabricate(:post, user: Fabricate(:moderator)) expect(Guardian.new(user).post_can_act?(staff_post, :spam)).to be_truthy end - it "doesn't allow flagging of staff posts when allow_staff_flags is false" do - SiteSetting.allow_staff_flags = false + it "doesn't allow flagging of staff posts when allow_flagging_staff is false" do + SiteSetting.allow_flagging_staff = false staff_post = Fabricate(:post, user: Fabricate(:moderator)) expect(Guardian.new(user).post_can_act?(staff_post, :spam)).to eq(false) end From 479f7ed18f8f6aa9e13b18e244c063d828715450 Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Mon, 12 Feb 2018 21:41:58 +0100 Subject: [PATCH 129/202] Ignore case when removing mailing list name from subject --- script/import_scripts/mbox/support/indexer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/import_scripts/mbox/support/indexer.rb b/script/import_scripts/mbox/support/indexer.rb index d3980cd725..5d9d91f004 100644 --- a/script/import_scripts/mbox/support/indexer.rb +++ b/script/import_scripts/mbox/support/indexer.rb @@ -199,7 +199,7 @@ module ImportScripts::Mbox # TODO: make the list name (or maybe multiple names) configurable # Strip mailing list name from subject - subject = subject.gsub(/\[#{Regexp.escape(list_name)}\]/, '').strip + subject = subject.gsub(/\[#{Regexp.escape(list_name)}\]/i, '').strip clean_subject(subject) end From 4c9959f795182d3121676098c61ff3dc943bca86 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 12 Feb 2018 17:19:47 -0500 Subject: [PATCH 130/202] FIX: Don't allow silenced users to reach TL3 --- app/models/trust_level3_requirements.rb | 54 ++++++++++--------- spec/models/trust_level3_requirements_spec.rb | 14 ++++- 2 files changed, 41 insertions(+), 27 deletions(-) diff --git a/app/models/trust_level3_requirements.rb b/app/models/trust_level3_requirements.rb index 6307e563b0..37785e32a3 100644 --- a/app/models/trust_level3_requirements.rb +++ b/app/models/trust_level3_requirements.rb @@ -26,36 +26,40 @@ class TrustLevel3Requirements def requirements_met? return false if trust_level_locked - !@user.suspended? && - days_visited >= min_days_visited && - num_topics_replied_to >= min_topics_replied_to && - topics_viewed >= min_topics_viewed && - posts_read >= min_posts_read && - num_flagged_posts <= max_flagged_posts && - num_flagged_by_users <= max_flagged_by_users && - topics_viewed_all_time >= min_topics_viewed_all_time && - posts_read_all_time >= min_posts_read_all_time && - num_likes_given >= min_likes_given && - num_likes_received >= min_likes_received && - num_likes_received_users >= min_likes_received_users && - num_likes_received_days >= min_likes_received_days + + (!@user.suspended?) && + (!@user.silenced?) && + days_visited >= min_days_visited && + num_topics_replied_to >= min_topics_replied_to && + topics_viewed >= min_topics_viewed && + posts_read >= min_posts_read && + num_flagged_posts <= max_flagged_posts && + num_flagged_by_users <= max_flagged_by_users && + topics_viewed_all_time >= min_topics_viewed_all_time && + posts_read_all_time >= min_posts_read_all_time && + num_likes_given >= min_likes_given && + num_likes_received >= min_likes_received && + num_likes_received_users >= min_likes_received_users && + num_likes_received_days >= min_likes_received_days end def requirements_lost? return false if trust_level_locked + @user.suspended? || - days_visited < min_days_visited * LOW_WATER_MARK || - num_topics_replied_to < min_topics_replied_to * LOW_WATER_MARK || - topics_viewed < min_topics_viewed * LOW_WATER_MARK || - posts_read < min_posts_read * LOW_WATER_MARK || - num_flagged_posts > max_flagged_posts || - num_flagged_by_users > max_flagged_by_users || - topics_viewed_all_time < min_topics_viewed_all_time || - posts_read_all_time < min_posts_read_all_time || - num_likes_given < min_likes_given * LOW_WATER_MARK || - num_likes_received < min_likes_received * LOW_WATER_MARK || - num_likes_received_users < min_likes_received_users * LOW_WATER_MARK || - num_likes_received_days < min_likes_received_days * LOW_WATER_MARK + @user.silenced? || + days_visited < min_days_visited * LOW_WATER_MARK || + num_topics_replied_to < min_topics_replied_to * LOW_WATER_MARK || + topics_viewed < min_topics_viewed * LOW_WATER_MARK || + posts_read < min_posts_read * LOW_WATER_MARK || + num_flagged_posts > max_flagged_posts || + num_flagged_by_users > max_flagged_by_users || + topics_viewed_all_time < min_topics_viewed_all_time || + posts_read_all_time < min_posts_read_all_time || + num_likes_given < min_likes_given * LOW_WATER_MARK || + num_likes_received < min_likes_received * LOW_WATER_MARK || + num_likes_received_users < min_likes_received_users * LOW_WATER_MARK || + num_likes_received_days < min_likes_received_days * LOW_WATER_MARK end def time_period diff --git a/spec/models/trust_level3_requirements_spec.rb b/spec/models/trust_level3_requirements_spec.rb index 1c99fd9ee9..b98641a325 100644 --- a/spec/models/trust_level3_requirements_spec.rb +++ b/spec/models/trust_level3_requirements_spec.rb @@ -357,7 +357,12 @@ describe TrustLevel3Requirements do end it "are not met if suspended" do - user.stubs(:suspended?).returns(true) + user.suspended_till = 3.weeks.from_now + expect(tl3_requirements.requirements_met?).to eq(false) + end + + it "are not met if silenced" do + user.silenced_till = 3.weeks.from_now expect(tl3_requirements.requirements_met?).to eq(false) end @@ -372,7 +377,12 @@ describe TrustLevel3Requirements do end it "are lost if suspended" do - user.stubs(:suspended?).returns(true) + user.suspended_till = 4.weeks.from_now + expect(tl3_requirements.requirements_lost?).to eq(true) + end + + it "are lost if silenced" do + user.silenced_till = 4.weeks.from_now expect(tl3_requirements.requirements_lost?).to eq(true) end end From ae15faeb341b726235a707fe88384a8553ba1aef Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 12 Feb 2018 18:27:08 -0500 Subject: [PATCH 131/202] FIX: Allow links from one relative uri to another --- .../javascripts/discourse/lib/url.js.es6 | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6 index 2fe1b79a8b..332d6a98fc 100644 --- a/app/assets/javascripts/discourse/lib/url.js.es6 +++ b/app/assets/javascripts/discourse/lib/url.js.es6 @@ -5,6 +5,11 @@ import { defaultHomepage } from 'discourse/lib/utilities'; const rewrites = []; const TOPIC_REGEXP = /\/t\/([^\/]+)\/(\d+)\/?(\d+)?/; +function redirectTo(url) { + document.location = url; + return true; +} + // We can add links here that have server side responses but not client side. const SERVER_SIDE_ONLY = [ /^\/assets\//, @@ -162,15 +167,23 @@ const DiscourseURL = Ember.Object.extend({ if (Em.isEmpty(path)) { return; } if (Discourse.get('requiresRefresh')) { - document.location.href = Discourse.getURL(path); - return; + return redirectTo(Discourse.getURL(path)); } const pathname = path.replace(/(https?\:)?\/\/[^\/]+/, ''); + let baseUri = Discourse.BaseUri; + + // If we have a baseUri and an absolute URL, make sure the baseUri + // is the same. Otherwise we could be switching forums. + if (baseUri && + path.indexOf('http') === 0 && + pathname.indexOf(baseUri) !== 0) { + return redirectTo(path); + } + const serverSide = SERVER_SIDE_ONLY.some(r => { if (pathname.match(r)) { - document.location = path; - return true; + return redirectTo(path); } }); @@ -178,8 +191,7 @@ const DiscourseURL = Ember.Object.extend({ // Protocol relative URLs if (path.indexOf('//') === 0) { - document.location = path; - return; + return redirectTo(path); } // Scroll to the same page, different anchor @@ -193,19 +205,19 @@ const DiscourseURL = Ember.Object.extend({ path = path.replace(/(https?\:)?\/\/[^\/]+/, ''); // Rewrite /my/* urls - if (path.indexOf(Discourse.BaseUri + '/my/') === 0) { + let myPath = `${baseUri}/my/`; + if (path.indexOf(myPath) === 0) { const currentUser = Discourse.User.current(); if (currentUser) { - path = path.replace(Discourse.BaseUri + '/my/', userPath(currentUser.get('username_lower') + "/")); + path = path.replace(myPath, userPath(currentUser.get('username_lower') + "/")); } else { - document.location.href = "/404"; - return; + return redirectTo('/404'); } } // handle prefixes if (path.match(/^\//)) { - let rootURL = (Discourse.BaseUri === undefined ? "/" : Discourse.BaseUri); + let rootURL = (baseUri === undefined ? "/" : baseUri); rootURL = rootURL.replace(/\/$/, ''); path = path.replace(rootURL, ''); } From 3e835047daecf9ec79fdad7bee78b152f30a3108 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 13 Feb 2018 08:53:36 +0800 Subject: [PATCH 132/202] Remove "already initialized" constant warning. --- lib/middleware/request_tracker.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb index cee0f5535c..f0ce009a6c 100644 --- a/lib/middleware/request_tracker.rb +++ b/lib/middleware/request_tracker.rb @@ -166,7 +166,7 @@ class Middleware::RequestTracker log_request_info(env, result, info) unless env["discourse.request_tracker.skip"] end - PRIVATE_IP = /^(127\.)|(192\.168\.)|(10\.)|(172\.1[6-9]\.)|(172\.2[0-9]\.)|(172\.3[0-1]\.)|(::1$)|([fF][cCdD])/ + PRIVATE_IP ||= /^(127\.)|(192\.168\.)|(10\.)|(172\.1[6-9]\.)|(172\.2[0-9]\.)|(172\.3[0-1]\.)|(::1$)|([fF][cCdD])/ def is_private_ip?(ip) ip = IPAddr.new(ip) rescue nil From 5f8f691e2bc329fdff76baf7dfb4fc97c8a676ed Mon Sep 17 00:00:00 2001 From: Kris Date: Mon, 12 Feb 2018 21:09:40 -0500 Subject: [PATCH 133/202] FIX: Border issue with group inputs on high resolution displays --- app/assets/stylesheets/common/base/compose.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss index 491a4044df..2fbb1cc73a 100644 --- a/app/assets/stylesheets/common/base/compose.scss +++ b/app/assets/stylesheets/common/base/compose.scss @@ -405,6 +405,7 @@ div.ac-wrap { box-shadow: none; border: 0; margin: 0; + background: transparent; } } From b34b1b6fe384b7ee3a0896079476ef5c77c05804 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 13 Feb 2018 13:28:29 +1100 Subject: [PATCH 134/202] FIX: invite to message was not allowing groups Previously we were incorrectly checking mentionable instead of messageable Also fix edge case where multiple groups sharing a name mean that exact match override is not working Also cleans up params sent to user selector --- .../discourse/components/user-selector.js.es6 | 28 +++++++++++------ .../discourse/controllers/invite.js.es6 | 5 ++++ .../discourse/lib/user-search.js.es6 | 9 +++--- .../discourse/templates/modal/invite.hbs | 30 +++++++------------ app/controllers/users_controller.rb | 1 + test/javascripts/lib/user-search-test.js.es6 | 6 +++- 6 files changed, 45 insertions(+), 34 deletions(-) diff --git a/app/assets/javascripts/discourse/components/user-selector.js.es6 b/app/assets/javascripts/discourse/components/user-selector.js.es6 index 830a74d708..3c9aefe6fb 100644 --- a/app/assets/javascripts/discourse/components/user-selector.js.es6 +++ b/app/assets/javascripts/discourse/components/user-selector.js.es6 @@ -16,20 +16,30 @@ export default TextField.extend({ didInsertElement(opts) { this._super(); + + const bool = (n => { + const val = this.get(n); + return val === true || val === "true"; + }); + var self = this, selected = [], groups = [], currentUser = this.currentUser, - includeMentionableGroups = this.get('includeMentionableGroups') === 'true', - includeMessageableGroups = this.get('includeMessageableGroups') === 'true', - includeGroups = this.get('includeGroups') === 'true', - allowedUsers = this.get('allowedUsers') === 'true'; + includeMentionableGroups = bool('includeMentionableGroups'), + includeMessageableGroups = bool('includeMessageableGroups'), + includeGroups = bool('includeGroups'), + allowedUsers = bool('allowedUsers'), + excludeCurrentUser = bool('excludeCurrentUser'), + single = bool('single'), + allowAny = bool('allowAny'), + disabled = bool('disabled'); function excludedUsernames() { // hack works around some issues with allowAny eventing - const usernames = self.get('single') ? [] : selected; + const usernames = single ? [] : selected; - if (currentUser && self.get('excludeCurrentUser')) { + if (currentUser && excludeCurrentUser) { return usernames.concat([currentUser.get('username')]); } return usernames; @@ -37,9 +47,9 @@ export default TextField.extend({ this.$().val(this.get('usernames')).autocomplete({ template: findRawTemplate('user-selector-autocomplete'), - disabled: this.get('disabled'), - single: this.get('single'), - allowAny: this.get('allowAny'), + disabled: disabled, + single: single, + allowAny: allowAny, updateData: (opts && opts.updateData) ? opts.updateData : false, dataSource(term) { diff --git a/app/assets/javascripts/discourse/controllers/invite.js.es6 b/app/assets/javascripts/discourse/controllers/invite.js.es6 index 71509d9e13..178bb02234 100644 --- a/app/assets/javascripts/discourse/controllers/invite.js.es6 +++ b/app/assets/javascripts/discourse/controllers/invite.js.es6 @@ -158,6 +158,11 @@ export default Ember.Controller.extend(ModalFunctionality, { return Group.findAll({ term: term, ignore_automatic: true }); }, + @computed('isPrivateTopic', 'isMessage') + includeMentionableGroups(isPrivateTopic, isMessage) { + return !isPrivateTopic && !isMessage; + }, + @computed('isMessage', 'emailOrUsername', 'invitingExistingUserToTopic') successMessage(isMessage, emailOrUsername, invitingExistingUserToTopic) { if (this.get('hasGroups')) { diff --git a/app/assets/javascripts/discourse/lib/user-search.js.es6 b/app/assets/javascripts/discourse/lib/user-search.js.es6 index 29ad228a05..ceed4404e7 100644 --- a/app/assets/javascripts/discourse/lib/user-search.js.es6 +++ b/app/assets/javascripts/discourse/lib/user-search.js.es6 @@ -69,10 +69,11 @@ function organizeResults(r, options) { if (r.groups) { r.groups.every(function(g) { - if (results.length > limit && options.term.toLowerCase() !== g.name.toLowerCase()) return false; - if (exclude.indexOf(g.name) === -1) { - groups.push(g); - results.push(g); + if (options.term.toLowerCase() === g.name.toLowerCase() || results.length < limit) { + if (exclude.indexOf(g.name) === -1) { + groups.push(g); + results.push(g); + } } return true; }); diff --git a/app/assets/javascripts/discourse/templates/modal/invite.hbs b/app/assets/javascripts/discourse/templates/modal/invite.hbs index 7ed29ae7dd..4c27a8ee28 100644 --- a/app/assets/javascripts/discourse/templates/modal/invite.hbs +++ b/app/assets/javascripts/discourse/templates/modal/invite.hbs @@ -14,26 +14,16 @@ {{else}} {{#if allowExistingMembers}} - {{#if isPrivateTopic}} - {{user-selector single="true" - allowAny=true - excludeCurrentUser="true" - usernames=emailOrUsername - allowedUsers="true" - topicId=topicId - placeholderKey=placeholderKey - autocomplete="off"}} - {{else}} - {{user-selector - single="true" - allowAny=true - excludeCurrentUser="true" - includeMentionableGroups="true" - hasGroups=hasGroups - usernames=emailOrUsername - placeholderKey=placeholderKey - autocomplete="off"}} - {{/if}} + {{user-selector + single=true + allowAny=true + excludeCurrentUser=true + includeMentionableGroups=includeMentionableGroups + includeMessageableGroups=isMessage + hasGroups=hasGroups + usernames=emailOrUsername + placeholderKey=placeholderKey + autocomplete="off"}} {{else}} {{text-field value=emailOrUsername placeholderKey="topic.invite_reply.email_placeholder"}} {{/if}} diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 72e706e86c..b26f1a5312 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -751,6 +751,7 @@ class UsersController < ApplicationController if include_groups || groups groups = Group.search_groups(term, groups: groups) groups = groups.where(visibility_level: Group.visibility_levels[:public]) if include_groups + groups = groups.order('groups.name asc') to_render[:groups] = groups.map do |m| { name: m.name, full_name: m.full_name } diff --git a/test/javascripts/lib/user-search-test.js.es6 b/test/javascripts/lib/user-search-test.js.es6 index 9cdb830221..98b5938859 100644 --- a/test/javascripts/lib/user-search-test.js.es6 +++ b/test/javascripts/lib/user-search-test.js.es6 @@ -47,6 +47,10 @@ QUnit.module("lib:user-search", { } ], groups: [ + { + "name": "bob", + "usernames": [] + }, { "name": "team", "usernames": [] @@ -61,4 +65,4 @@ QUnit.test("it places groups unconditionally for exact match", assert => { return userSearch({term: 'Team'}).then((results)=>{ assert.equal(results[results.length-1]["name"], "team"); }); -}); \ No newline at end of file +}); From 074d590abdba5a7658d4ff106068b5f8ead07860 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 13 Feb 2018 16:19:43 +1100 Subject: [PATCH 135/202] FIX: stop counting offline page as a page view --- app/assets/javascripts/service-worker.js.erb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/service-worker.js.erb b/app/assets/javascripts/service-worker.js.erb index 43fb85a33e..7202c6b6f0 100644 --- a/app/assets/javascripts/service-worker.js.erb +++ b/app/assets/javascripts/service-worker.js.erb @@ -11,7 +11,11 @@ const CURRENT_CACHES = { const OFFLINE_URL = 'offline.html'; function createCacheBustedRequest(url) { - var request = new Request(url, {cache: 'reload'}); + var headers = new Headers({ + 'Discourse-Track-View': '0' + }); + + var request = new Request(url, {cache: 'reload', headers: headers}); // See https://fetch.spec.whatwg.org/#concept-request-mode // This is not yet supported in Chrome as of M48, so we need to explicitly check to see // if the cache: 'reload' option had any effect. @@ -22,7 +26,7 @@ function createCacheBustedRequest(url) { // If {cache: 'reload'} didn't have any effect, append a cache-busting URL parameter instead. var bustedUrl = new URL(url, self.location.href); bustedUrl.search += (bustedUrl.search ? '&' : '') + 'cachebust=' + Date.now(); - return new Request(bustedUrl); + return new Request(bustedUrl, {headers: headers}); } self.addEventListener('install', function(event) { From 14d0450bef79a63adba0da65cf422f0d5c1f4ef0 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 13 Feb 2018 16:23:36 +1100 Subject: [PATCH 136/202] FEATURE: Only load service worker for Android TBD an interface for plugin to enable service workers on desktop if they need them --- .../register-service-worker.js.es6 | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6 b/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6 index 7c16106dda..281d44554b 100644 --- a/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6 +++ b/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6 @@ -2,11 +2,27 @@ export default { name: 'register-service-worker', initialize() { - const isSecure = (document.location.protocol === 'https:') || - (location.hostname === "localhost"); + // only allow service worker on android for now + if (!/(android)/i.test(navigator.userAgent)) { - if (isSecure && ('serviceWorker' in navigator)) { - navigator.serviceWorker.register(`${Discourse.BaseUri}/service-worker.js`); + // remove old service worker + if ('serviceWorker' in navigator && navigator.serviceWorker.getRegistrations) { + navigator.serviceWorker.getRegistrations().then((registrations) => { + for(let registration of registrations) { + registration.unregister(); + }; + }); + } + + } else { + + const isSecure = (document.location.protocol === 'https:') || + (location.hostname === "localhost"); + + + if (isSecure && ('serviceWorker' in navigator)) { + navigator.serviceWorker.register(`${Discourse.BaseUri}/service-worker.js`); + } } } }; From cc3cf6588bf067ae2282e844e95ae0521447675f Mon Sep 17 00:00:00 2001 From: Muhlis Cahyono Date: Tue, 13 Feb 2018 13:38:26 +0700 Subject: [PATCH 137/202] FEATURE: Notification API Endpoints for Admins * create/update/delete notification api with external url * remove external url feature * Fix Travis CI build error (add new line) * Fix Travis CI build error --- app/controllers/notifications_controller.rb | 31 +++ config/routes.rb | 13 +- .../notifications_controller_spec.rb | 214 +++++++++++++----- 3 files changed, 194 insertions(+), 64 deletions(-) diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb index e86545c01b..42ef8a9b3c 100644 --- a/app/controllers/notifications_controller.rb +++ b/app/controllers/notifications_controller.rb @@ -3,6 +3,8 @@ require_dependency 'notification_serializer' class NotificationsController < ApplicationController requires_login + before_action :ensure_admin, only: [:create, :update, :destroy] # only admin can create/edit/delete notification + before_action :set_notification, only: [:update, :destroy] def index user = @@ -64,4 +66,33 @@ class NotificationsController < ApplicationController render json: success_json end + def create + @notification = Notification.create!(notification_params) + render_notification + end + + def update + @notification.update!(notification_params) + render_notification + end + + def destroy + @notification.destroy! + render json: success_json + end + + private + + def set_notification + @notification = Notification.find(params[:id]) + end + + def notification_params + params.permit(:notification_type, :user_id, :data, :read, :topic_id, :post_number, :post_action_id) + end + + def render_notification + render_json_dump(NotificationSerializer.new(@notification, scope: guardian, root: false)) + end + end diff --git a/config/routes.rb b/config/routes.rb index 23d6447d86..0f51c44a17 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -489,11 +489,14 @@ Discourse::Application.routes.draw do end end - get 'notifications' => 'notifications#index' - put 'notifications/mark-read' => 'notifications#mark_read' - # creating an alias cause the api was extended to mark a single notification - # this allows us to cleanly target it - put 'notifications/read' => 'notifications#mark_read' + resources :notifications, except: :show do + collection do + put 'mark-read' => 'notifications#mark_read' + # creating an alias cause the api was extended to mark a single notification + # this allows us to cleanly target it + put 'read' => 'notifications#mark_read' + end + end match "/auth/:provider/callback", to: "users/omniauth_callbacks#complete", via: [:get, :post] match "/auth/failure", to: "users/omniauth_callbacks#failure", via: [:get, :post] diff --git a/spec/controllers/notifications_controller_spec.rb b/spec/controllers/notifications_controller_spec.rb index 677e4868f9..d322abd848 100644 --- a/spec/controllers/notifications_controller_spec.rb +++ b/spec/controllers/notifications_controller_spec.rb @@ -1,83 +1,179 @@ require 'rails_helper' +def create_notification(user_id, resp_code, matcher) + notification_count = Notification.count + post :create, params: { notification_type: Notification.types[:mentioned], user_id: user_id, data: { message: 'tada' }.to_json }, format: :json + expect(response.status).to eq(resp_code) + expect(Notification.count).send(matcher, eq(notification_count)) +end + +def update_notification(topic_id, resp_code, matcher) + notification = Fabricate(:notification) + post :update, params: { id: notification.id, topic_id: topic_id }, format: :json + expect(response.status).to eq(resp_code) + notification.reload + expect(notification.topic_id).send(matcher, eq(topic_id)) +end + +def delete_notification(resp_code, matcher) + notification = Fabricate(:notification) + notification_count = Notification.count + delete :destroy, params: { id: notification.id }, format: :json + expect(response.status).to eq(resp_code) + expect(Notification.count).send(matcher, eq(notification_count)) +end + describe NotificationsController do context 'when logged in' do - let!(:user) { log_in } - describe '#index' do - it 'should succeed for recent' do - get :index, params: { recent: true } - expect(response).to be_success - end + context 'as normal user' do - it 'should succeed for history' do - get :index - expect(response).to be_success - end + let!(:user) { log_in } - it 'should mark notifications as viewed' do - _notification = Fabricate(:notification, user: user) - expect(user.reload.unread_notifications).to eq(1) - expect(user.reload.total_unread_notifications).to eq(1) - get :index, params: { recent: true }, format: :json - expect(user.reload.unread_notifications).to eq(0) - expect(user.reload.total_unread_notifications).to eq(1) - end + describe '#index' do + it 'should succeed for recent' do + get :index, params: { recent: true } + expect(response).to be_success + end - it 'should not mark notifications as viewed if silent param is present' do - _notification = Fabricate(:notification, user: user) - expect(user.reload.unread_notifications).to eq(1) - expect(user.reload.total_unread_notifications).to eq(1) - get :index, params: { recent: true, silent: true } - expect(user.reload.unread_notifications).to eq(1) - expect(user.reload.total_unread_notifications).to eq(1) - end + it 'should succeed for history' do + get :index + expect(response).to be_success + end - context 'when username params is not valid' do - it 'should raise the right error' do - get :index, params: { username: 'somedude' }, format: :json + it 'should mark notifications as viewed' do + _notification = Fabricate(:notification, user: user) + expect(user.reload.unread_notifications).to eq(1) + expect(user.reload.total_unread_notifications).to eq(1) + get :index, params: { recent: true }, format: :json + expect(user.reload.unread_notifications).to eq(0) + expect(user.reload.total_unread_notifications).to eq(1) + end - expect(response).to_not be_success - expect(response.status).to eq(404) + it 'should not mark notifications as viewed if silent param is present' do + _notification = Fabricate(:notification, user: user) + expect(user.reload.unread_notifications).to eq(1) + expect(user.reload.total_unread_notifications).to eq(1) + get :index, params: { recent: true, silent: true } + expect(user.reload.unread_notifications).to eq(1) + expect(user.reload.total_unread_notifications).to eq(1) + end + + context 'when username params is not valid' do + it 'should raise the right error' do + get :index, params: { username: 'somedude' }, format: :json + + expect(response).to_not be_success + expect(response.status).to eq(404) + end end end + + it 'should succeed' do + put :mark_read, format: :json + expect(response).to be_success + end + + it "can update a single notification" do + notification = Fabricate(:notification, user: user) + notification2 = Fabricate(:notification, user: user) + put :mark_read, params: { id: notification.id }, format: :json + expect(response).to be_success + + notification.reload + notification2.reload + + expect(notification.read).to eq(true) + expect(notification2.read).to eq(false) + end + + it "updates the `read` status" do + _notification = Fabricate(:notification, user: user) + expect(user.reload.unread_notifications).to eq(1) + expect(user.reload.total_unread_notifications).to eq(1) + put :mark_read, format: :json + user.reload + expect(user.reload.unread_notifications).to eq(0) + expect(user.reload.total_unread_notifications).to eq(0) + end + + describe '#create' do + it "can't create notification" do + create_notification(user.id, 403, :to) + end + end + + describe '#update' do + it "can't update notification" do + update_notification(8, 403, :to_not) + end + end + + describe '#destroy' do + it "can't delete notification" do + delete_notification(403, :to) + end + end + end - it 'should succeed' do - put :mark_read, format: :json - expect(response).to be_success + context 'as admin' do + + let!(:admin) { log_in(:admin) } + + describe '#create' do + it "can create notification" do + create_notification(admin.id, 200, :to_not) + expect(::JSON.parse(response.body)["id"]).to_not eq(nil) + end + end + + describe '#update' do + it "can update notification" do + update_notification(8, 200, :to) + expect(::JSON.parse(response.body)["topic_id"]).to eq(8) + end + end + + describe '#destroy' do + it "can delete notification" do + delete_notification(200, :to_not) + end + end + end - it "can update a single notification" do - notification = Fabricate(:notification, user: user) - notification2 = Fabricate(:notification, user: user) - put :mark_read, params: { id: notification.id }, format: :json - expect(response).to be_success - - notification.reload - notification2.reload - - expect(notification.read).to eq(true) - expect(notification2.read).to eq(false) - end - - it "updates the `read` status" do - _notification = Fabricate(:notification, user: user) - expect(user.reload.unread_notifications).to eq(1) - expect(user.reload.total_unread_notifications).to eq(1) - put :mark_read, format: :json - user.reload - expect(user.reload.unread_notifications).to eq(0) - expect(user.reload.total_unread_notifications).to eq(0) - end end context 'when not logged in' do - it 'should raise an error' do - get :index, params: { recent: true }, format: :json - expect(response.status).to eq(403) + + describe '#index' do + it 'should raise an error' do + get :index, params: { recent: true }, format: :json + expect(response.status).to eq(403) + end end + + describe '#create' do + it "can't create notification" do + user = Fabricate(:user) + create_notification(user.id, 403, :to) + end + end + + describe '#update' do + it "can't update notification" do + update_notification(8, 403, :to_not) + end + end + + describe '#destroy' do + it "can't delete notification" do + delete_notification(403, :to) + end + end + end end From e924de71e7d20f82f57d7746afa12b62969f6276 Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Tue, 13 Feb 2018 12:23:47 +0530 Subject: [PATCH 138/202] Spec test to make sure we do not skip trashed post --- spec/jobs/emit_web_hook_event_spec.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/spec/jobs/emit_web_hook_event_spec.rb b/spec/jobs/emit_web_hook_event_spec.rb index fbc1cf13ec..b7e1cca39d 100644 --- a/spec/jobs/emit_web_hook_event_spec.rb +++ b/spec/jobs/emit_web_hook_event_spec.rb @@ -67,6 +67,16 @@ describe Jobs::EmitWebHookEvent do end.not_to raise_error end + it 'should not skip trashed post' do + stub_request(:post, "https://meta.discourse.org/webhook_listener") + .to_return(body: 'OK', status: 200) + + expect do + post.trash! + subject.execute(web_hook_id: post_hook.id, event_type: 'post', post_id: post.id) + end.to change(WebHookEvent, :count).by(1) + end + it 'sets up proper request headers' do stub_request(:post, "https://meta.discourse.org/webhook_listener") .to_return(headers: { test: 'string' }, body: 'OK', status: 200) From 1c27d93dcffb11231721df5503d094dbf6755a1a Mon Sep 17 00:00:00 2001 From: Maja Komel Date: Tue, 13 Feb 2018 07:58:38 +0100 Subject: [PATCH 139/202] anonymous shadow users are approved on creation if must_approve_users is enabled (#5569) --- app/services/anonymous_shadow_creator.rb | 3 +++ spec/services/anonymous_shadow_creator_spec.rb | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/app/services/anonymous_shadow_creator.rb b/app/services/anonymous_shadow_creator.rb index 7cb27438a6..fc602b8255 100644 --- a/app/services/anonymous_shadow_creator.rb +++ b/app/services/anonymous_shadow_creator.rb @@ -13,6 +13,7 @@ class AnonymousShadowCreator return unless user return unless SiteSetting.allow_anonymous_posting return if user.trust_level < SiteSetting.anonymous_posting_min_trust_level + return if SiteSetting.must_approve_users? && !user.approved? if (shadow_id = user.custom_fields["shadow_id"].to_i) > 0 shadow = User.find_by(id: shadow_id) @@ -40,6 +41,8 @@ class AnonymousShadowCreator active: true, trust_level: 1, manual_locked_trust_level: 1, + approved: true, + approved_at: 1.day.ago, created_at: 1.day.ago # bypass new user restrictions ) diff --git a/spec/services/anonymous_shadow_creator_spec.rb b/spec/services/anonymous_shadow_creator_spec.rb index 2ec4ea90a7..0cc425b946 100644 --- a/spec/services/anonymous_shadow_creator_spec.rb +++ b/spec/services/anonymous_shadow_creator_spec.rb @@ -16,6 +16,11 @@ describe AnonymousShadowCreator do expect(AnonymousShadowCreator.get(Fabricate.build(:user, trust_level: 0))).to eq(nil) end + it "returns no shadow if must_approve_users is true and user is not approved" do + SiteSetting.must_approve_users = true + expect(AnonymousShadowCreator.get(Fabricate.build(:user, approved: false))).to eq(nil) + end + it "returns a new shadow once time expires" do SiteSetting.anonymous_account_duration_minutes = 1 From f9280617d01818e709de14df4fd47d51610d2dc4 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 13 Feb 2018 15:58:13 +0800 Subject: [PATCH 140/202] Remove redundant comment. --- app/controllers/notifications_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb index 42ef8a9b3c..f20e6b9b13 100644 --- a/app/controllers/notifications_controller.rb +++ b/app/controllers/notifications_controller.rb @@ -3,7 +3,7 @@ require_dependency 'notification_serializer' class NotificationsController < ApplicationController requires_login - before_action :ensure_admin, only: [:create, :update, :destroy] # only admin can create/edit/delete notification + before_action :ensure_admin, only: [:create, :update, :destroy] before_action :set_notification, only: [:update, :destroy] def index From 03b3e57a44da228bca7296bd752e26447956e1d6 Mon Sep 17 00:00:00 2001 From: Erick Guan Date: Thu, 20 Apr 2017 17:17:24 +0200 Subject: [PATCH 141/202] FEATURE: login by a link from email Co-authored-by: tgxworld --- .../controllers/forgot-password.js.es6 | 80 +++++----- .../templates/modal/forgot-password.hbs | 14 +- app/controllers/session_controller.rb | 85 ++++++++--- app/controllers/users_controller.rb | 38 ++++- app/mailers/user_notifications.rb | 71 ++++++--- app/views/session/email_login.html.erb | 17 +++ config/locales/client.en.yml | 10 ++ config/locales/server.en.yml | 17 +++ config/routes.rb | 2 + config/site_settings.yml | 5 +- ...enable_local_logins_via_email_validator.rb | 14 ++ ...e_local_logins_via_email_validator_spec.rb | 47 ++++++ spec/controllers/session_controller_spec.rb | 27 ++-- spec/mailers/user_notifications_spec.rb | 22 +++ spec/requests/session_controller_spec.rb | 141 ++++++++++++++++++ spec/requests/users_controller_spec.rb | 61 ++++++++ .../acceptance/forgot-password-test.js.es6 | 90 +++++++++++ 17 files changed, 640 insertions(+), 101 deletions(-) create mode 100644 app/views/session/email_login.html.erb create mode 100644 lib/validators/enable_local_logins_via_email_validator.rb create mode 100644 spec/components/validators/enable_local_logins_via_email_validator_spec.rb create mode 100644 spec/requests/session_controller_spec.rb create mode 100644 test/javascripts/acceptance/forgot-password-test.js.es6 diff --git a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6 b/app/assets/javascripts/discourse/controllers/forgot-password.js.es6 index 4311368186..7e385fb302 100644 --- a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6 +++ b/app/assets/javascripts/discourse/controllers/forgot-password.js.es6 @@ -20,48 +20,54 @@ export default Ember.Controller.extend(ModalFunctionality, { }, actions: { - submit() { - if (this.get('submitDisabled')) return false; - - this.set('disabled', true); - - ajax('/session/forgot_password', { - data: { login: this.get('accountEmailOrUsername').trim() }, - type: 'POST' - }).then(data => { - const escaped = escapeExpression(this.get('accountEmailOrUsername')); - const isEmail = this.get('accountEmailOrUsername').match(/@/); - let key = 'forgot_password.complete_' + (isEmail ? 'email' : 'username'); - let extraClass; - - if (data.user_found === true) { - key += '_found'; - this.set('accountEmailOrUsername', ''); - this.set('offerHelp', I18n.t(key, {email: escaped, username: escaped})); - } else { - if (data.user_found === false) { - key += '_not_found'; - extraClass = 'error'; - } - - this.flash(I18n.t(key, {email: escaped, username: escaped}), extraClass); - } - }).catch(e => { - this.flash(extractError(e), 'error'); - }).finally(() => { - setTimeout(() => this.set('disabled', false), 1000); - }); - - return false; - }, - ok() { this.send('closeModal'); }, help() { this.setProperties({ offerHelp: I18n.t('forgot_password.help'), helpSeen: true }); - } - } + }, + resetPassword() { + return this._submit('/session/forgot_password', 'forgot_password.complete'); + }, + + emailLogin() { + return this._submit('/u/email-login', 'email_login.complete'); + } + }, + + _submit(route, translationKey) { + if (this.get('submitDisabled')) return false; + this.set('disabled', true); + + ajax(route, { + data: { login: this.get('accountEmailOrUsername').trim() }, + type: 'POST' + }).then(data => { + const escaped = escapeExpression(this.get('accountEmailOrUsername')); + const isEmail = this.get('accountEmailOrUsername').match(/@/); + let key = `${translationKey}_${isEmail ? 'email' : 'username'}`; + let extraClass; + + if (data.user_found === true) { + key += '_found'; + this.set('accountEmailOrUsername', ''); + this.set('offerHelp', I18n.t(key, { email: escaped, username: escaped })); + } else { + if (data.user_found === false) { + key += '_not_found'; + extraClass = 'error'; + } + + this.flash(I18n.t(key, { email: escaped, username: escaped }), extraClass); + } + }).catch(e => { + this.flash(extractError(e), 'error'); + }).finally(() => { + this.set('disabled', false); + }); + + return false; + }, }); diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs index c739f77197..8b42f88739 100644 --- a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs +++ b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs @@ -9,10 +9,16 @@ {{/d-modal-body}}
    {{#unless offerHelp}} - {{d-button action="submit" - label="forgot_password.reset" - disabled=submitDisabled - class="btn-primary"}} + {{d-button action="resetPassword" + label="forgot_password.reset" + disabled=submitDisabled + class="btn-primary"}} + {{#if siteSettings.enable_local_logins_via_email}} + {{d-button action="emailLogin" + label="email_login.label" + disabled=submitDisabled + class="email-login"}} + {{/if}} {{else}} {{d-button class="btn-large btn-primary" label="forgot_password.button_ok" diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb index e96566fd25..079ba724ef 100644 --- a/app/controllers/session_controller.rb +++ b/app/controllers/session_controller.rb @@ -7,9 +7,10 @@ class SessionController < ApplicationController render body: nil, status: 500 end - before_action :check_local_login_allowed, only: %i(create forgot_password) + before_action :check_local_login_allowed, only: %i(create forgot_password email_login) + before_action :rate_limit_login, only: %i(create email_login) skip_before_action :redirect_to_login_if_required - skip_before_action :preload_json, :check_xhr, only: ['sso', 'sso_login', 'become', 'sso_provider', 'destroy'] + skip_before_action :preload_json, :check_xhr, only: %i(sso sso_login become sso_provider destroy email_login) ACTIVATE_USER_KEY = "activate_user" @@ -187,9 +188,6 @@ class SessionController < ApplicationController end def create - RateLimiter.new(nil, "login-hr-#{request.remote_ip}", SiteSetting.max_logins_per_ip_per_hour, 1.hour).performed! - RateLimiter.new(nil, "login-min-#{request.remote_ip}", SiteSetting.max_logins_per_ip_per_minute, 1.minute).performed! - params.require(:login) params.require(:password) @@ -208,7 +206,7 @@ class SessionController < ApplicationController # If the site requires user approval and the user is not approved yet if login_not_approved_for?(user) - login_not_approved + render json: login_not_approved return end @@ -220,20 +218,31 @@ class SessionController < ApplicationController return end - if user.suspended? - failed_to_login(user) - return + if payload = login_error_check(user) + render json: payload + else + (user.active && user.email_confirmed?) ? login(user) : not_activated(user) end + end - if ScreenedIpAddress.should_block?(request.remote_ip) - return not_allowed_from_ip_address(user) + def email_login + raise Discourse::NotFound if !SiteSetting.enable_local_logins_via_email + + if EmailToken.valid_token_format?(params[:token]) && (user = EmailToken.confirm(params[:token])) + if login_not_approved_for?(user) + @error = login_not_approved[:error] + return render layout: 'no_ember' + elsif payload = login_error_check(user) + @error = payload[:error] + return render layout: 'no_ember' + else + log_on_user(user) + redirect_to path("/") + end + else + @error = I18n.t('email_login.invalid_token') + return render layout: 'no_ember' end - - if ScreenedIpAddress.block_admin_login?(user, request.remote_ip) - return admin_not_allowed_from_ip_address(user) - end - - (user.active && user.email_confirmed?) ? login(user) : not_activated(user) end def forgot_password @@ -291,6 +300,18 @@ class SessionController < ApplicationController private + def login_error_check(user) + return failed_to_login(user) if user.suspended? + + if ScreenedIpAddress.should_block?(request.remote_ip) + return not_allowed_from_ip_address(user) + end + + if ScreenedIpAddress.block_admin_login?(user, request.remote_ip) + return admin_not_allowed_from_ip_address(user) + end + end + def login_not_approved_for?(user) SiteSetting.must_approve_users? && !user.approved? && !user.admin? end @@ -300,7 +321,7 @@ class SessionController < ApplicationController end def login_not_approved - render json: { error: I18n.t("login.not_approved") } + { error: I18n.t("login.not_approved") } end def not_activated(user) @@ -314,19 +335,21 @@ class SessionController < ApplicationController end def not_allowed_from_ip_address(user) - render json: { error: I18n.t("login.not_allowed_from_ip_address", username: user.username) } + { error: I18n.t("login.not_allowed_from_ip_address", username: user.username) } end def admin_not_allowed_from_ip_address(user) - render json: { error: I18n.t("login.admin_not_allowed_from_ip_address", username: user.username) } + { error: I18n.t("login.admin_not_allowed_from_ip_address", username: user.username) } end def failed_to_login(user) message = user.suspend_reason ? "login.suspended_with_reason" : "login.suspended" - render json: { - error: I18n.t(message, date: I18n.l(user.suspended_till, format: :date_only), - reason: Rack::Utils.escape_html(user.suspend_reason)), + { + error: I18n.t(message, + date: I18n.l(user.suspended_till, format: :date_only), + reason: Rack::Utils.escape_html(user.suspend_reason) + ), reason: 'suspended' } end @@ -342,6 +365,22 @@ class SessionController < ApplicationController end end + def rate_limit_login + RateLimiter.new( + nil, + "login-hr-#{request.remote_ip}", + SiteSetting.max_logins_per_ip_per_hour, + 1.hour + ).performed! + + RateLimiter.new( + nil, + "login-min-#{request.remote_ip}", + SiteSetting.max_logins_per_ip_per_minute, + 1.minute + ).performed! + end + def render_sso_error(status:, text:) @sso_error = text render status: status, layout: 'no_ember' diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b26f1a5312..613215df52 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -18,7 +18,7 @@ class UsersController < ApplicationController skip_before_action :check_xhr, only: [ :show, :badges, :password_reset, :update, :account_created, :activate_account, :perform_account_activation, :user_preferences_redirect, :avatar, - :my_redirect, :toggle_anon, :admin_login, :confirm_admin + :my_redirect, :toggle_anon, :admin_login, :confirm_admin, :email_login ] before_action :respond_to_suspicious_request, only: [:create] @@ -37,6 +37,7 @@ class UsersController < ApplicationController :update_activation_email, :password_reset, :confirm_email_token, + :email_login, :admin_login, :confirm_admin] @@ -563,6 +564,7 @@ class UsersController < ApplicationController elsif params[:token].present? if EmailToken.valid_token_format?(params[:token]) @user = EmailToken.confirm(params[:token]) + if @user&.admin? log_on_user(@user) return redirect_to path("/") @@ -580,6 +582,40 @@ class UsersController < ApplicationController render layout: false end + def email_login + raise Discourse::NotFound if !SiteSetting.enable_local_logins_via_email + return redirect_to path("/") if current_user + + expires_now + params.require(:login) + + RateLimiter.new(nil, "email-login-hour-#{request.remote_ip}", 6, 1.hour).performed! + RateLimiter.new(nil, "email-login-min-#{request.remote_ip}", 3, 1.minute).performed! + user = User.human_users.find_by_username_or_email(params[:login]) + user_presence = user.present? && !user.staged + + if user + RateLimiter.new(nil, "email-login-hour-#{user.id}", 6, 1.hour).performed! + RateLimiter.new(nil, "email-login-min-#{user.id}", 3, 1.minute).performed! + + if user_presence + email_token = user.email_tokens.create!(email: user.email) + + Jobs.enqueue(:critical_user_email, + type: :email_login, + user_id: user.id, + email_token: email_token.token + ) + end + end + + json = { result: "ok" } + json[:user_found] = user_presence unless SiteSetting.hide_email_address_taken + render json: json + rescue RateLimiter::LimitExceeded + render_json_error(I18n.t("rate_limiter.slow_down")) + end + def toggle_anon user = AnonymousShadowCreator.get_master(current_user) || AnonymousShadowCreator.get(current_user) diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb index 17260a5d8e..f5d8e537ec 100644 --- a/app/mailers/user_notifications.rb +++ b/app/mailers/user_notifications.rb @@ -12,10 +12,11 @@ class UserNotifications < ActionMailer::Base include Email::BuildEmailHelper def signup(user, opts = {}) - build_email(user.email, - template: "user_notifications.signup", - locale: user_locale(user), - email_token: opts[:email_token]) + build_user_email_token_by_template( + "user_notifications.signup", + user, + opts[:email_token] + ) end def signup_after_approval(user, opts = {}) @@ -33,38 +34,51 @@ class UserNotifications < ActionMailer::Base end def confirm_old_email(user, opts = {}) - build_email(user.email, - template: "user_notifications.confirm_old_email", - locale: user_locale(user), - email_token: opts[:email_token]) + build_user_email_token_by_template( + "user_notifications.confirm_old_email", + user, + opts[:email_token] + ) end def confirm_new_email(user, opts = {}) - build_email(user.email, - template: "user_notifications.confirm_new_email", - locale: user_locale(user), - email_token: opts[:email_token]) + build_user_email_token_by_template( + "user_notifications.confirm_new_email", + user, + opts[:email_token] + ) end def forgot_password(user, opts = {}) - build_email(user.email, - template: user.has_password? ? "user_notifications.forgot_password" : "user_notifications.set_password", - locale: user_locale(user), - email_token: opts[:email_token]) + build_user_email_token_by_template( + user.has_password? ? "user_notifications.forgot_password" : "user_notifications.set_password", + user, + opts[:email_token] + ) + end + + def email_login(user, opts = {}) + build_user_email_token_by_template( + "user_notifications.email_login", + user, + opts[:email_token] + ) end def admin_login(user, opts = {}) - build_email(user.email, - template: "user_notifications.admin_login", - locale: user_locale(user), - email_token: opts[:email_token]) + build_user_email_token_by_template( + "user_notifications.admin_login", + user, + opts[:email_token] + ) end def account_created(user, opts = {}) - build_email(user.email, - template: "user_notifications.account_created", - locale: user_locale(user), - email_token: opts[:email_token]) + build_user_email_token_by_template( + "user_notifications.account_created", + user, + opts[:email_token] + ) end def account_silenced(user, opts = nil) @@ -532,6 +546,15 @@ class UserNotifications < ActionMailer::Base private + def build_user_email_token_by_template(template, user, email_token) + build_email( + user.email, + template: template, + locale: user_locale(user), + email_token: email_token + ) + end + def build_summary_for(user) @site_name = SiteSetting.email_prefix.presence || SiteSetting.title # used by I18n @user = user diff --git a/app/views/session/email_login.html.erb b/app/views/session/email_login.html.erb new file mode 100644 index 0000000000..7bd6cf03fd --- /dev/null +++ b/app/views/session/email_login.html.erb @@ -0,0 +1,17 @@ +<%if @error%> +
    + <%= @error %> +
    +<%end%> + +<% content_for :title do %><%=t "email_login.title" %><% end %> + +<%- content_for(:no_ember_head) do %> + + <%= preload_script "ember_jquery" %> + <%= render_google_universal_analytics_code %> +<%- end %> + +<%- content_for(:head) do %> + +<%- end %> diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 46f59e9771..49d0be51dc 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1083,6 +1083,16 @@ en: help: "Email not arriving? Be sure to check your spam folder first.

    Not sure which email address you used? Enter an email address and we’ll let you know if it exists here.

    If you no longer have access to the email address on your account, please contact our helpful staff.

    " button_ok: "OK" button_help: "Help" + + email_login: + label: "Login With Email" + complete_username: "If an account matches the username %{username}, you should receive an email with a magic login link shortly." + complete_email: "If an account matches %{email}, you should receive an email with a magic login link shortly." + complete_username_found: "We found an account that matches the username %{username}, you should receive an email with a magic login link shortly." + complete_email_found: "We found an account that matches %{email}, you should receive an email with a magic login link shortly." + complete_username_not_found: "No account matches the username %{username}" + complete_email_not_found: "No account matches %{email}" + login: title: "Log In" username: "User" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 4e2b817c0f..d5ef33a877 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -648,6 +648,10 @@ en: success: "You successfully changed your password and are now logged in." success_unapproved: "You successfully changed your password." + email_login: + invalid_token: "Sorry, that email login link is too old. Select the Log In button and use 'I forgot my password' to get a new link." + title: "Email login" + change_email: confirmed: "Your email has been updated." please_continue: "Continue to %{site_name}" @@ -1149,6 +1153,7 @@ en: sso_allows_all_return_paths: "Do not restrict the domain for return_paths provided by SSO (by default return path must be on current site)" enable_local_logins: "Enable local username and password login based accounts. (Note: this must be enabled for invites to work)" + enable_local_logins_via_email: "Email user logins via email." allow_new_registrations: "Allow new user registrations. Uncheck this to prevent anyone from creating a new account." enable_signup_cta: "Show a notice to returning anonymous users prompting them to sign up for an account." enable_yahoo_logins: "Enable Yahoo authentication" @@ -1640,6 +1645,7 @@ en: staged_users_disabled: "You must first enable 'staged users' before enabling this setting." reply_by_email_disabled: "You must first enable 'reply by email' before enabling this setting." sso_url_is_empty: "You must set a 'sso url' before enabling this setting." + enable_local_logins_disabled: "You must first enable 'enable local logins' before enabling this setting." search: within_post: "#%{post_number} by %{username}" @@ -2772,6 +2778,17 @@ en: Click the following link to choose a new password: %{base_url}/u/password-reset/%{email_token} + email_login: + title: "Email login link" + subject_template: "[%{email_prefix}] Email login link" + text_body_template: | + Somebody asked to login your account on [%{site_name}](%{base_url}). + + If it was not you, you can safely ignore this email. + + Click the following link to login: + %{base_url}/session/email-login/%{email_token} + set_password: title: "Set Password" subject_template: "[%{email_prefix}] Set Password" diff --git a/config/routes.rb b/config/routes.rb index 0f51c44a17..11edecf0f9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -301,6 +301,7 @@ Discourse::Application.routes.draw do get "session/sso_provider" => "session#sso_provider" get "session/current" => "session#current" get "session/csrf" => "session#csrf" + get "session/email-login/:token" => "session#email_login" get "composer_messages" => "composer_messages#index" post "composer/parse_html" => "composer#parse_html" @@ -330,6 +331,7 @@ Discourse::Application.routes.draw do put "#{root_path}/update-activation-email" => "users#update_activation_email" get "#{root_path}/hp" => "users#get_honeypot_value" + post "#{root_path}/email-login" => "users#email_login" get "#{root_path}/admin-login" => "users#admin_login" put "#{root_path}/admin-login" => "users#admin_login" get "#{root_path}/admin-login/:token" => "users#admin_login" diff --git a/config/site_settings.yml b/config/site_settings.yml index 64b71a2b34..55163cd323 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -240,6 +240,10 @@ login: enable_local_logins: client: true default: true + enable_local_logins_via_email: + client: true + default: false + validator: "EnableLocalLoginsViaEmailValidator" allow_new_registrations: client: true default: true @@ -331,7 +335,6 @@ login: default: 1440 min: 1 max: 175200 - users: min_username_length: client: true diff --git a/lib/validators/enable_local_logins_via_email_validator.rb b/lib/validators/enable_local_logins_via_email_validator.rb new file mode 100644 index 0000000000..0537f3697e --- /dev/null +++ b/lib/validators/enable_local_logins_via_email_validator.rb @@ -0,0 +1,14 @@ +class EnableLocalLoginsViaEmailValidator + def initialize(opts = {}) + @opts = opts + end + + def valid_value?(val) + return true if val == 'f' + SiteSetting.enable_local_logins + end + + def error_message + I18n.t('site_settings.errors.enable_local_logins_disabled') + end +end diff --git a/spec/components/validators/enable_local_logins_via_email_validator_spec.rb b/spec/components/validators/enable_local_logins_via_email_validator_spec.rb new file mode 100644 index 0000000000..289ce4911d --- /dev/null +++ b/spec/components/validators/enable_local_logins_via_email_validator_spec.rb @@ -0,0 +1,47 @@ +require 'rails_helper' + +RSpec.describe EnableLocalLoginsViaEmailValidator do + subject { described_class.new } + + describe '#valid_value?' do + describe "when 'enable_local_logins' is false" do + before do + SiteSetting.enable_local_logins = false + end + + describe 'when val is false' do + it 'should be valid' do + expect(subject.valid_value?('f')).to eq(true) + end + end + + describe 'when value is true' do + it 'should not be valid' do + expect(subject.valid_value?('t')).to eq(false) + + expect(subject.error_message).to eq(I18n.t( + 'site_settings.errors.enable_local_logins_disabled' + )) + end + end + end + + describe "when 'enable_local_logins' is true" do + before do + SiteSetting.enable_local_logins = true + end + + describe 'when val is false' do + it 'should be valid' do + expect(subject.valid_value?('f')).to eq(true) + end + end + + describe 'when value is true' do + it 'should be valid' do + expect(subject.valid_value?('t')).to eq(true) + end + end + end + end +end diff --git a/spec/controllers/session_controller_spec.rb b/spec/controllers/session_controller_spec.rb index cc535e7222..96b58c5483 100644 --- a/spec/controllers/session_controller_spec.rb +++ b/spec/controllers/session_controller_spec.rb @@ -8,7 +8,7 @@ describe SessionController do end end - describe 'become' do + describe '#become' do let!(:user) { Fabricate(:user) } it "does not work when not in development mode" do @@ -26,7 +26,7 @@ describe SessionController do end end - describe '.sso_login' do + describe '#sso_login' do before do @sso_url = "http://somesite.com/discourse_sso" @@ -410,7 +410,7 @@ describe SessionController do end end - describe '.sso_provider' do + describe '#sso_provider' do before do SiteSetting.enable_sso_provider = true SiteSetting.enable_sso = false @@ -470,7 +470,7 @@ describe SessionController do end end - describe '.create' do + describe '#create' do let(:user) { Fabricate(:user) } @@ -515,7 +515,9 @@ describe SessionController do login: user.username, password: 'sssss' }, format: :json - expect(::JSON.parse(response.body)['error']).to be_present + expect(::JSON.parse(response.body)['error']).to eq( + I18n.t("login.incorrect_username_email_or_password") + ) end end @@ -526,7 +528,9 @@ describe SessionController do login: user.username, password: ('s' * (User.max_password_length + 1)) }, format: :json - expect(::JSON.parse(response.body)['error']).to be_present + expect(::JSON.parse(response.body)['error']).to eq( + I18n.t("login.incorrect_username_email_or_password") + ) end end @@ -536,14 +540,15 @@ describe SessionController do user.suspended_at = Time.now user.save! StaffActionLogger.new(user).log_user_suspend(user, "banned") + post :create, params: { login: user.username, password: 'myawesomepassword' }, format: :json - error = ::JSON.parse(response.body)['error'] - expect(error).to be_present - expect(error).to match(/banned/) - expect(error).not_to match(//) + expect(JSON.parse(response.body)['error']).to eq(I18n.t('login.suspended_with_reason', + date: I18n.l(user.suspended_till, format: :date_only), + reason: Rack::Utils.escape_html(user.suspend_reason) + )) end end @@ -881,7 +886,7 @@ describe SessionController do end end - describe '.current' do + describe '#current' do context "when not logged in" do it "retuns 404" do get :current, format: :json diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb index 9e3327aa92..81cca74798 100644 --- a/spec/mailers/user_notifications_spec.rb +++ b/spec/mailers/user_notifications_spec.rb @@ -79,6 +79,28 @@ describe UserNotifications do end + describe '.email_login' do + let(:email_token) { user.email_tokens.create!(email: user.email).token } + subject { UserNotifications.email_login(user, email_token: email_token) } + + it "generates the right email" do + expect(subject.to).to eq([user.email]) + expect(subject.from).to eq([SiteSetting.notification_email]) + + expect(subject.subject).to eq(I18n.t( + 'user_notifications.email_login.subject_template', + email_prefix: SiteSetting.title + )) + + expect(subject.body.to_s).to match(I18n.t( + 'user_notifications.email_login.text_body_template', + site_name: SiteSetting.title, + base_url: Discourse.base_url, + email_token: email_token + )) + end + end + describe '.digest' do subject { UserNotifications.digest(user) } diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb new file mode 100644 index 0000000000..951968984f --- /dev/null +++ b/spec/requests/session_controller_spec.rb @@ -0,0 +1,141 @@ +require 'rails_helper' + +RSpec.describe SessionController do + let(:email_token) { Fabricate(:email_token) } + let(:user) { email_token.user } + + describe '#email_login' do + before do + SiteSetting.enable_local_logins_via_email = true + end + + context 'missing token' do + it 'returns the right response' do + get "/session/email-login" + expect(response.status).to eq(404) + end + end + + context 'invalid token' do + it 'returns the right response' do + get "/session/email-login/adasdad" + + expect(response).to be_success + + expect(CGI.unescapeHTML(response.body)).to match( + I18n.t('email_login.invalid_token') + ) + end + + context 'when token has expired' do + it 'should return the right response' do + email_token.update!(created_at: 999.years.ago) + + get "/session/email-login/#{email_token.token}" + + expect(response).to be_success + + expect(CGI.unescapeHTML(response.body)).to match( + I18n.t('email_login.invalid_token') + ) + end + end + end + + context 'valid token' do + it 'returns success' do + get "/session/email-login/#{email_token.token}" + + expect(response).to redirect_to("/") + end + + it 'fails when local logins via email is disabled' do + SiteSetting.enable_local_logins_via_email = false + + get "/session/email-login/#{email_token.token}" + + expect(response.status).to eq(404) + end + + it 'fails when local logins is disabled' do + SiteSetting.enable_local_logins = false + + get "/session/email-login/#{email_token.token}" + + expect(response.status).to eq(500) + end + + it "doesn't log in the user when not approved" do + SiteSetting.must_approve_users = true + + get "/session/email-login/#{email_token.token}" + + expect(response.status).to eq(200) + + expect(CGI.unescapeHTML(response.body)).to include( + I18n.t("login.not_approved") + ) + end + + context "when admin IP address is not valid" do + before do + Fabricate(:screened_ip_address, + ip_address: "111.111.11.11", + action_type: ScreenedIpAddress.actions[:allow_admin] + ) + + SiteSetting.use_admin_ip_whitelist = true + user.update!(admin: true) + end + + it 'returns the right response' do + get "/session/email-login/#{email_token.token}" + + expect(response.status).to eq(200) + + expect(CGI.unescapeHTML(response.body)).to include( + I18n.t("login.admin_not_allowed_from_ip_address", username: user.username) + ) + end + end + + context "when IP address is blocked" do + let(:permitted_ip_address) { '111.234.23.11' } + + before do + Fabricate(:screened_ip_address, + ip_address: permitted_ip_address, + action_type: ScreenedIpAddress.actions[:block] + ) + end + + it 'returns the right response' do + ActionDispatch::Request.any_instance.stubs(:remote_ip).returns(permitted_ip_address) + + get "/session/email-login/#{email_token.token}" + + expect(response.status).to eq(200) + + expect(CGI.unescapeHTML(response.body)).to include( + I18n.t("login.not_allowed_from_ip_address", username: user.username) + ) + end + end + + it "fails when user is suspended" do + user.update!( + suspended_till: 2.days.from_now, + suspended_at: Time.zone.now + ) + + get "/session/email-login/#{email_token.token}" + + expect(response.status).to eq(200) + + expect(CGI.unescapeHTML(response.body)).to include(I18n.t("login.suspended", + date: I18n.l(user.suspended_till, format: :date_only) + )) + end + end + end +end diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb index d3351e59e1..ba41c482ec 100644 --- a/spec/requests/users_controller_spec.rb +++ b/spec/requests/users_controller_spec.rb @@ -340,4 +340,65 @@ RSpec.describe UsersController do expect(response).to redirect_to("/u/#{user.username_lower}/preferences") end end + + describe '#email_login' do + before do + SiteSetting.queue_jobs = true + SiteSetting.enable_local_logins_via_email = true + end + + it "enqueues the right email" do + post "/u/email-login.json", params: { login: user.email } + + expect(response).to be_success + expect(JSON.parse(response.body)['user_found']).to eq(true) + + job_args = Jobs::CriticalUserEmail.jobs.last["args"].first + + expect(job_args["user_id"]).to eq(user.id) + expect(job_args["type"]).to eq("email_login") + expect(job_args["email_token"]).to eq(user.email_tokens.last.token) + end + + describe 'when enable_local_logins_via_email is disabled' do + before do + SiteSetting.enable_local_logins_via_email = false + end + + it 'should return the right response' do + post "/u/email-login.json", params: { login: user.email } + + expect(response.status).to eq(404) + end + end + + describe 'when username or email is not valid' do + it 'should not enqueue the email to login' do + post "/u/email-login.json", params: { login: '@random' } + + expect(response).to be_success + expect(JSON.parse(response.body)['user_found']).to eq(false) + expect(Jobs::CriticalUserEmail.jobs).to eq([]) + end + end + + describe 'when hide_email_address_taken is true' do + it 'should return the right response' do + SiteSetting.hide_email_address_taken = true + post "/u/email-login.json", params: { login: user.email } + + expect(response).to be_success + expect(JSON.parse(response.body).has_key?('user_found')).to eq(false) + end + end + + describe "when user is already logged in" do + it 'should redirect to the root path' do + sign_in(user) + post "/u/email-login.json", params: { login: user.email } + + expect(response).to redirect_to("/") + end + end + end end diff --git a/test/javascripts/acceptance/forgot-password-test.js.es6 b/test/javascripts/acceptance/forgot-password-test.js.es6 new file mode 100644 index 0000000000..d3a868cb1f --- /dev/null +++ b/test/javascripts/acceptance/forgot-password-test.js.es6 @@ -0,0 +1,90 @@ +import { acceptance } from "helpers/qunit-helpers"; + +let userFound = false; + +acceptance("Forgot password", { + settings: { + enable_local_logins_via_email: true + }, + beforeEach() { + const response = object => { + return [ + 200, + { "Content-Type": "application/json" }, + object + ]; + }; + + server.post('/u/email-login', () => { // eslint-disable-line no-undef + return response({ "user_found": userFound }); + }); + } +}); + +QUnit.test("logging in via email", assert => { + visit("/"); + click("header .login-button"); + + andThen(() => { + assert.ok(exists('.login-modal'), "it shows the login modal"); + }); + + click('#forgot-password-link'); + + fillIn("#username-or-email", 'someuser'); + click('.email-login'); + + andThen(() => { + assert.equal( + find(".alert-error").html(), + I18n.t('email_login.complete_username_not_found', { username: 'someuser' }), + 'it should display the right error message' + ); + }); + + fillIn("#username-or-email", 'someuser@gmail.com'); + click('.email-login'); + + andThen(() => { + assert.equal( + find(".alert-error").html(), + I18n.t('email_login.complete_email_not_found', { email: 'someuser@gmail.com' }), + 'it should display the right error message' + ); + }); + + fillIn("#username-or-email", 'someuser'); + + andThen(() => { + userFound = true; + }); + + click('.email-login'); + + andThen(() => { + assert.equal( + find(".modal-body").html().trim(), + I18n.t('email_login.complete_username_found', { username: 'someuser' }), + 'it should display the right message' + ); + }); + + visit("/"); + click("header .login-button"); + + andThen(() => { + assert.ok(exists('.login-modal'), "it shows the login modal"); + }); + + click('#forgot-password-link'); + fillIn("#username-or-email", 'someuser@gmail.com'); + click('.email-login'); + + andThen(() => { + assert.equal( + find(".modal-body").html().trim(), + I18n.t('email_login.complete_email_found', { email: 'someuser@gmail.com' }), + 'it should display the right message' + ); + }); +}); From 0a95d2a21f4f4ce99ac6ed8c353a64709168182a Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Tue, 13 Feb 2018 14:39:25 +0530 Subject: [PATCH 142/202] FIX: Upload fails silently if it is bigger than max allowed size --- app/assets/javascripts/discourse/lib/utilities.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6 index 1d24485e0f..671e3ca799 100644 --- a/app/assets/javascripts/discourse/lib/utilities.js.es6 +++ b/app/assets/javascripts/discourse/lib/utilities.js.es6 @@ -369,7 +369,7 @@ export function displayErrorForUpload(data) { if (data.jqXHR.responseJSON.message) { bootbox.alert(data.jqXHR.responseJSON.message); } else { - bootbox.alert(data.jqXHR.responseJSON.join("\n")); + bootbox.alert(data.jqXHR.responseJSON.errors.join("\n")); } return; } From 6bfc25d895692c7f4302e4b73e0f36838dbfa751 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 13 Feb 2018 17:23:12 +0100 Subject: [PATCH 143/202] FEATURE: new {{mini-tag-chooser}} replaces {{tag-chooser}} in composer --- .../discourse/templates/composer.hbs | 2 +- .../components/mini-tag-chooser.js.es6 | 224 ++++++++++++++++++ .../select-kit/components/multi-select.js.es6 | 18 +- .../select-kit/components/select-kit.js.es6 | 24 +- .../components/single-select.js.es6 | 19 +- .../select-kit/mixins/events.js.es6 | 2 + .../templates/components/select-kit.hbs | 2 + .../select-kit/select-kit-filter.hbs | 8 +- .../stylesheets/common/base/compose.scss | 4 +- .../common/select-kit/mini-tag-chooser.scss | 81 +++++++ 10 files changed, 360 insertions(+), 24 deletions(-) create mode 100644 app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 create mode 100644 app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs index beb60b375a..99745222cc 100644 --- a/app/assets/javascripts/discourse/templates/composer.hbs +++ b/app/assets/javascripts/discourse/templates/composer.hbs @@ -65,7 +65,7 @@
    {{/if}} {{#if canEditTags}} - {{tag-chooser tags=model.tags tabIndex="4" categoryId=model.categoryId}} + {{mini-tag-chooser tags=model.tags tabindex="4" categoryId=model.categoryId}} {{/if}} diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 new file mode 100644 index 0000000000..deaae9d01b --- /dev/null +++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 @@ -0,0 +1,224 @@ +import ComboBox from "select-kit/components/combo-box"; +import { ajax } from "discourse/lib/ajax"; +import { popupAjaxError } from 'discourse/lib/ajax-error'; +import { default as computed } from "ember-addons/ember-computed-decorators"; +import renderTag from "discourse/lib/render-tag"; +const { get, isEmpty, isPresent, run } = Ember; + +export default ComboBox.extend({ + allowContentReplacement: true, + pluginApiIdentifiers: ["mini-tag-chooser"], + classNames: ["mini-tag-chooser"], + classNameBindings: ["noTags"], + verticalOffset: 3, + filterable: true, + noTags: Ember.computed.empty("computedTags"), + allowAny: true, + + init() { + this._super(); + + this.set("termMatchesForbidden", false); + + this.set("templateForRow", (rowComponent) => { + const tag = rowComponent.get("computedContent"); + return renderTag(get(tag, "value"), { + count: get(tag, "originalContent.count"), + noHref: true + }); + }); + }, + + @computed("tags") + computedTags(tags) { + return Ember.makeArray(tags); + }, + + validateCreate(term) { + const filterRegexp = new RegExp(this.site.tags_filter_regexp, "g"); + term = term.replace(filterRegexp, "").trim().toLowerCase(); + + if (!term.length || this.get("termMatchesForbidden")) { + return false; + } + + if (this.get("siteSettings.max_tag_length") < term.length) { + return false; + } + + return true; + }, + + validateSelect() { + return this.get("computedTags").length < this.get("siteSettings.max_tags_per_topic") && + this.site.get("can_create_tag"); + }, + + didRender() { + this._super(); + + this.$().on("click.mini-tag-chooser", ".selected-tag", (event) => { + event.stopImmediatePropagation(); + this.send("removeTag", $(event.target).attr("data-value")); + }); + }, + + willDestroyElement() { + this._super(); + + $(".select-kit-body").off("click.mini-tag-chooser"); + + const searchDebounce = this.get("searchDebounce"); + if (isPresent(searchDebounce)) { run.cancel(searchDebounce); } + }, + + didPressEscape(event) { + const $lastSelectedTag = $(".selected-tag.selected:last"); + + if ($lastSelectedTag && this.get("isExpanded")) { + $lastSelectedTag.removeClass("selected"); + this._destroyEvent(event); + } else { + this._super(event); + } + }, + + didPressBackspace() { + if (!this.get("isExpanded")) { + this.expand(); + return; + } + + const $lastSelectedTag = $(".selected-tag:last"); + + if (!isEmpty(this.get("filter"))) { + $lastSelectedTag.removeClass("is-highlighted"); + return; + } + + if (!$lastSelectedTag.length) return; + + if (!$lastSelectedTag.hasClass("is-highlighted")) { + $lastSelectedTag.addClass("is-highlighted"); + } else { + this.send("removeTag", $lastSelectedTag.attr("data-value")); + } + }, + + @computed("tags.[]", "filter") + collectionHeader(tags, filter) { + if (!Ember.isEmpty(tags)) { + let output = ""; + + if (tags.length >= 20) { + tags = tags.filter(t => t.indexOf(filter) >= 0); + } + + tags.map((tag) => { + output += ` + + `; + }); + + return `
    ${output}
    `; + } + }, + + computeHeaderContent() { + let content = this.baseHeaderComputedContent(); + + if (isEmpty(this.get("computedTags"))) { + content.label = I18n.t("tagging.choose_for_topic"); + } else { + content.label = this.get("computedTags").join(","); + } + + return content; + }, + + actions: { + removeTag(tag) { + let tags = this.get("computedTags"); + delete tags[tags.indexOf(tag)]; + this.set("tags", tags.filter(t => t)); + this.set("content", []); + this.set("searchDebounce", run.debounce(this, this._searchTags, 200)); + }, + + onExpand() { + this.set("searchDebounce", run.debounce(this, this._searchTags, 200)); + }, + + onFilter(filter) { + filter = isEmpty(filter) ? null : filter; + this.set("searchDebounce", run.debounce(this, this._searchTags, filter, 200)); + }, + + onSelect(tag) { + if (isEmpty(this.get("computedTags"))) { + this.set("tags", Ember.makeArray(tag)); + } else { + this.set("tags", this.get("computedTags").concat(tag)); + } + + this.set("content", []); + this.set("searchDebounce", run.debounce(this, this._searchTags, 200)); + } + }, + + muateAttributes() { + this.set("value", null); + }, + + _searchTags(query) { + this.startLoading(); + + const selectedTags = Ember.makeArray(this.get("computedTags")).filter(t => t); + + const self = this; + + const sortTags = this.siteSettings.tags_sort_alphabetically; + + const data = { + q: query, + limit: this.siteSettings.max_tag_search_results, + categoryId: this.get("categoryId") + }; + + if (selectedTags) { + data.selected_tags = selectedTags.slice(0, 100); + } + + ajax(Discourse.getURL("/tags/filter/search"), { + quietMillis: 200, + cache: true, + dataType: "json", + data, + }).then(json => { + let results = json.results; + + self.set("termMatchesForbidden", json.forbidden ? true : false); + + if (sortTags) { + results = results.sort((a, b) => a.id > b.id); + } + + const content = results.map((result) => { + return { + id: result.text, + name: result.text, + count: result.count + }; + }).filter(c => !selectedTags.includes(c.id)); + + self.set("content", content); + self.stopLoading(); + this.autoHighlight(); + }).catch(error => { + self.stopLoading(); + popupAjaxError(error); + }); + } +}); diff --git a/app/assets/javascripts/select-kit/components/multi-select.js.es6 b/app/assets/javascripts/select-kit/components/multi-select.js.es6 index beec884459..e3e0ad9a13 100644 --- a/app/assets/javascripts/select-kit/components/multi-select.js.es6 +++ b/app/assets/javascripts/select-kit/components/multi-select.js.es6 @@ -252,10 +252,6 @@ export default SelectKitComponent.extend({ this.autoHighlight(); }, - validateComputedContentItem(computedContentItem) { - return !this.get("computedValues").includes(computedContentItem.value); - }, - actions: { clearSelection() { this.send("deselect", this.get("selectedComputedContents")); @@ -263,7 +259,8 @@ export default SelectKitComponent.extend({ }, create(computedContentItem) { - if (this.validateComputedContentItem(computedContentItem)) { + if (!this.get("computedValues").includes(computedContentItem.value) && + this.validateCreate(computedContentItem.value)) { this.get("computedContent").pushObject(computedContentItem); this._boundaryActionHandler("onCreate"); this.send("select", computedContentItem); @@ -274,9 +271,14 @@ export default SelectKitComponent.extend({ select(computedContentItem) { this.willSelect(computedContentItem); - this.get("computedValues").pushObject(computedContentItem.value); - Ember.run.next(() => this.mutateAttributes()); - Ember.run.schedule("afterRender", () => this.didSelect(computedContentItem)); + + if (this.validateSelect(computedContentItem)) { + this.get("computedValues").pushObject(computedContentItem.value); + Ember.run.next(() => this.mutateAttributes()); + Ember.run.schedule("afterRender", () => this.didSelect(computedContentItem)); + } else { + this._boundaryActionHandler("onSelectFailure"); + } }, deselect(rowComputedContentItems) { diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6 index eb7b325524..ab9852b154 100644 --- a/app/assets/javascripts/select-kit/components/select-kit.js.es6 +++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6 @@ -16,6 +16,7 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi layoutName: "select-kit/templates/components/select-kit", classNames: ["select-kit"], classNameBindings: [ + "isLoading", "isFocused", "isExpanded", "isDisabled", @@ -30,6 +31,7 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi isExpanded: false, isFocused: false, isHidden: false, + isLoading: false, renderedBodyOnce: false, renderedFilterOnce: false, tabindex: 0, @@ -41,6 +43,7 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi autoFilterable: false, filterable: false, filter: "", + previousFilter: null, filterPlaceholder: "select_kit.filter_placeholder", filterIcon: "search", headerIcon: null, @@ -118,6 +121,10 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi return this.baseComputedContentItem(contentItem, options); }, + validateCreate() { return true; }, + + validateSelect() { return true; }, + baseComputedContentItem(contentItem, options) { let originalContent; options = options || {}; @@ -163,7 +170,7 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi @computed("filter", "computedContent") shouldDisplayCreateRow(filter, computedContent) { if (computedContent.map(c => c.value).includes(filter)) return false; - if (this.get("allowAny") && filter.length > 0) return true; + if (this.get("allowAny") && filter.length > 0 && this.validateCreate(filter)) return true; return false; }, @@ -184,7 +191,7 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi @computed("filter") templateForCreateRow() { return (rowComponent) => { - return I18n.t("select_box.create", { + return I18n.t("select_kit.create", { content: rowComponent.get("computedContent.name") }); }; @@ -238,6 +245,16 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi this.setProperties({ filter: "" }); }, + startLoading() { + this.set("isLoading", true); + this._boundaryActionHandler("onStartLoading"); + }, + + stopLoading() { + this.set("isLoading", false); + this._boundaryActionHandler("onStopLoading"); + }, + _setCollectionHeaderComputedContent() { const collectionHeaderComputedContent = applyCollectionHeaderCallbacks( this.get("pluginApiIdentifiers"), @@ -283,9 +300,12 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi }, filterComputedContent(filter) { + if (filter === this.get("previousFilter")) return; + this.setProperties({ highlightedValue: null, renderedFilterOnce: true, + previousFilter: filter, filter }); this.autoHighlight(); diff --git a/app/assets/javascripts/select-kit/components/single-select.js.es6 b/app/assets/javascripts/select-kit/components/single-select.js.es6 index af7c1e035a..d442a9e2ae 100644 --- a/app/assets/javascripts/select-kit/components/single-select.js.es6 +++ b/app/assets/javascripts/select-kit/components/single-select.js.es6 @@ -145,10 +145,6 @@ export default SelectKitComponent.extend({ }); }, - validateComputedContentItem(computedContentItem) { - return this.get("computedValue") !== computedContentItem.value; - }, - actions: { clearSelection() { this.send("deselect", this.get("selectedComputedContent")); @@ -156,7 +152,8 @@ export default SelectKitComponent.extend({ }, create(computedContentItem) { - if (this.validateComputedContentItem(computedContentItem)) { + if (this.get("computedValue") !== computedContentItem.value && + this.validateCreate(computedContentItem.value)) { this.get("computedContent").pushObject(computedContentItem); this._boundaryActionHandler("onCreate"); this.send("select", computedContentItem); @@ -166,10 +163,14 @@ export default SelectKitComponent.extend({ }, select(rowComputedContentItem) { - this.willSelect(rowComputedContentItem); - this.set("computedValue", rowComputedContentItem.value); - this.mutateAttributes(); - run.schedule("afterRender", () => this.didSelect(rowComputedContentItem)); + if (this.validateSelect(rowComputedContentItem)) { + this.willSelect(rowComputedContentItem); + this.set("computedValue", rowComputedContentItem.value); + this.mutateAttributes(); + run.schedule("afterRender", () => this.didSelect(rowComputedContentItem)); + } else { + this._boundaryActionHandler("onSelectFailure"); + } }, deselect(rowComputedContentItem) { diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6 index 87d4df2561..45edf38577 100644 --- a/app/assets/javascripts/select-kit/mixins/events.js.es6 +++ b/app/assets/javascripts/select-kit/mixins/events.js.es6 @@ -108,6 +108,7 @@ export default Ember.Mixin.create({ .on("keydown.select-kit", (event) => { const keyCode = event.keyCode || event.which; + if (keyCode === this.keys.BACKSPACE) this.backspaceFromFilter(event); if (keyCode === this.keys.TAB) this.tabFromFilter(event); if (keyCode === this.keys.ESC) this.escapeFromFilter(event); if (keyCode === this.keys.ENTER) this.enterFromFilter(event); @@ -207,6 +208,7 @@ export default Ember.Mixin.create({ upAndDownFromFilter(event) { this.didPressUpAndDownArrows(event); }, backspaceFromHeader(event) { this.didPressBackspace(event); }, + backspaceFromFilter(event) { this.didPressBackspace(event); }, enterFromHeader(event) { this.didPressEnter(event); }, enterFromFilter(event) { this.didPressEnter(event); }, diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit.hbs b/app/assets/javascripts/select-kit/templates/components/select-kit.hbs index 20bc4ca19f..5e6e936db4 100644 --- a/app/assets/javascripts/select-kit/templates/components/select-kit.hbs +++ b/app/assets/javascripts/select-kit/templates/components/select-kit.hbs @@ -6,6 +6,7 @@ computedContent=headerComputedContent deselect=(action "deselect") toggle=(action "toggle") + isLoading=isLoading filterComputedContent=(action "filterComputedContent") clearSelection=(action "clearSelection") options=headerComponentOptions @@ -14,6 +15,7 @@
    {{component filterComponent filter=filter + isLoading=isLoading icon=filterIcon shouldDisplayFilter=shouldDisplayFilter placeholder=(i18n filterPlaceholder) diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-filter.hbs b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-filter.hbs index 6815973db3..e7d1e96a7e 100644 --- a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-filter.hbs +++ b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-filter.hbs @@ -10,6 +10,10 @@ value=filter }} -{{#if icon}} - {{d-icon icon class="filter-icon"}} +{{#if isLoading}} + {{loading-spinner size="small"}} +{{else}} + {{#if icon}} + {{d-icon icon class="filter-icon"}} + {{/if}} {{/if}} diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss index 2fbb1cc73a..1a93bad72d 100644 --- a/app/assets/stylesheets/common/base/compose.scss +++ b/app/assets/stylesheets/common/base/compose.scss @@ -221,9 +221,9 @@ flex-basis: 50%; } - .tag-chooser { + .mini-tag-chooser { flex: 1 1 25%; - margin: 0 0 5px 10px; + margin: 0 0 5px 5px; background: $secondary; @media all and (max-width: 900px) { margin: 0; diff --git a/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss b/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss new file mode 100644 index 0000000000..25f4441ffa --- /dev/null +++ b/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss @@ -0,0 +1,81 @@ +.select-kit { + &.combo-box { + &.mini-tag-chooser { + margin-bottom: 5px; + margin-left: 5px; + + &.is-expanded { + .select-kit-header { + border: 1px solid $tertiary; + -webkit-box-shadow: $tertiary 0 0 6px 0px; + box-shadow: $tertiary 0 0 6px 0px; + } + } + + &.no-tags { + .select-kit-header .selected-name { + color: $primary-medium; + } + } + + .select-kit-body { + max-width: 500px; + width: 500px; + border: 1px solid $primary-low; + } + + .select-kit-filter { + border-top: 0; + } + + .select-kit-wrapper { + display: none; + } + + .select-kit-row { + &.is-selected { + background: none; + } + + &.is-highlighted.is-selected { + background: $tertiary-low; + } + + .discourse-tag-count { + margin-left: 5px; + } + } + + .select-kit-collection { + .collection-header { + max-height: 125px; + overflow-y: auto; + + .selected-tags { + display: flex; + padding: 3px; + flex-wrap: wrap; + border-bottom: 1px solid $primary-low; + } + + .selected-tag { + background: $primary-low; + border-radius: 2px; + padding: 2px 4px; + margin: 2px; + border: 0; + + &.is-highlighted { + box-shadow: 0 0 2px $danger, 0 1px 0 rgba(0,0,0,0.05); + } + + &:before { + content: '\f00d'; + font-family: 'FontAwesome'; + } + } + } + } + } + } +} From 7d501058d7e0aec2d29775e7d781afa393478a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Tue, 13 Feb 2018 17:32:38 +0100 Subject: [PATCH 144/202] FIX: don't grant new user of the month badge to suspended users or based on deleted topics/posts --- app/jobs/scheduled/grant_new_user_of_the_month_badges.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb index 86d3a3a1d9..5a2803b720 100644 --- a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb +++ b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb @@ -64,12 +64,16 @@ module Jobs LEFT OUTER JOIN topics AS t ON t.id = p.topic_id WHERE u.active AND u.id > 0 + AND u.id NOT IN (#{current_owners.join(',')}) AND NOT u.staged AND NOT u.admin AND NOT u.moderator - AND t.archetype <> '#{Archetype.private_message}' + AND u.suspended_at IS NULL + AND u.suspended_till IS NULL AND u.created_at >= CURRENT_TIMESTAMP - '1 month'::INTERVAL - AND u.id NOT IN (#{current_owners.join(',')}) + AND t.archetype <> '#{Archetype.private_message}' + AND t.deleted_at IS NULL + AND p.deleted_at IS NULL GROUP BY u.id HAVING COUNT(DISTINCT p.id) > 1 AND COUNT(DISTINCT p.topic_id) > 1 From 20e44b3c1477a97626194f7bf00a6e19a9402695 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 13 Feb 2018 11:39:20 -0500 Subject: [PATCH 145/202] Revert "FIX: 404 page when clicking a badge notification from before changing username" --- .../javascripts/discourse/routes/badges-show.js.es6 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/routes/badges-show.js.es6 b/app/assets/javascripts/discourse/routes/badges-show.js.es6 index 16e166c6b5..e5d1aae23c 100644 --- a/app/assets/javascripts/discourse/routes/badges-show.js.es6 +++ b/app/assets/javascripts/discourse/routes/badges-show.js.es6 @@ -30,9 +30,20 @@ export default Discourse.Route.extend({ afterModel(model, transition) { const username = transition.queryParams && transition.queryParams.username; - return UserBadge.findByBadgeId(model.get("id"), {username}).then(userBadges => { + const userBadgesGrant = UserBadge.findByBadgeId(model.get("id"), {username}).then(userBadges => { this.userBadgesGrant = userBadges; }); + + const userBadgesAll = UserBadge.findByUsername(username).then(userBadges => { + this.userBadgesAll = userBadges; + }); + + const promises = { + userBadgesGrant, + userBadgesAll, + }; + + return Ember.RSVP.hash(promises); }, titleToken() { From 20123271d2a4e903e348a65bdb8a1bae9fca95ac Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 13 Feb 2018 17:48:00 +0100 Subject: [PATCH 146/202] FIX: override backspaceFromFilter only if defined --- .../select-kit/components/mini-tag-chooser.js.es6 | 4 ++++ app/assets/javascripts/select-kit/mixins/events.js.es6 | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 index deaae9d01b..0de5b95894 100644 --- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 +++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 @@ -83,6 +83,10 @@ export default ComboBox.extend({ } }, + backspaceFromFilter(event) { + this.didPressBackspace(event); + }, + didPressBackspace() { if (!this.get("isExpanded")) { this.expand(); diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6 index 45edf38577..253a766479 100644 --- a/app/assets/javascripts/select-kit/mixins/events.js.es6 +++ b/app/assets/javascripts/select-kit/mixins/events.js.es6 @@ -108,7 +108,9 @@ export default Ember.Mixin.create({ .on("keydown.select-kit", (event) => { const keyCode = event.keyCode || event.which; - if (keyCode === this.keys.BACKSPACE) this.backspaceFromFilter(event); + if (keyCode === this.keys.BACKSPACE && typeof this.backspaceFromFilter === "function") { + this.backspaceFromFilter(event) + }; if (keyCode === this.keys.TAB) this.tabFromFilter(event); if (keyCode === this.keys.ESC) this.escapeFromFilter(event); if (keyCode === this.keys.ENTER) this.enterFromFilter(event); @@ -208,7 +210,6 @@ export default Ember.Mixin.create({ upAndDownFromFilter(event) { this.didPressUpAndDownArrows(event); }, backspaceFromHeader(event) { this.didPressBackspace(event); }, - backspaceFromFilter(event) { this.didPressBackspace(event); }, enterFromHeader(event) { this.didPressEnter(event); }, enterFromFilter(event) { this.didPressEnter(event); }, From d525a644d28f4008ec5df955599de636a14a730c Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 13 Feb 2018 18:12:30 +0100 Subject: [PATCH 147/202] fix linting --- app/assets/javascripts/select-kit/mixins/events.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6 index 253a766479..b5abd5dd03 100644 --- a/app/assets/javascripts/select-kit/mixins/events.js.es6 +++ b/app/assets/javascripts/select-kit/mixins/events.js.es6 @@ -109,7 +109,7 @@ export default Ember.Mixin.create({ const keyCode = event.keyCode || event.which; if (keyCode === this.keys.BACKSPACE && typeof this.backspaceFromFilter === "function") { - this.backspaceFromFilter(event) + this.backspaceFromFilter(event); }; if (keyCode === this.keys.TAB) this.tabFromFilter(event); if (keyCode === this.keys.ESC) this.escapeFromFilter(event); From ed114177e76bd996a12c9c64ad7d6e7eb5a19353 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 13 Feb 2018 19:41:03 +0100 Subject: [PATCH 148/202] Mini tag chooser tweaks --- .../select-kit/components/mini-tag-chooser.js.es6 | 13 ++++++++++++- config/locales/client.en.yml | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 index 0de5b95894..abce533ffc 100644 --- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 +++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 @@ -14,6 +14,17 @@ export default ComboBox.extend({ filterable: true, noTags: Ember.computed.empty("computedTags"), allowAny: true, + caretUpIcon: Ember.computed.alias("caretIcon"), + caretDownIcon: Ember.computed.alias("caretIcon"), + + @computed("computedTags", "siteSettings.max_tags_per_topic") + caretIcon(computedTags, maxTagsPerTopic) { + if (computedTags.length >= maxTagsPerTopic) { + return null; + } + + return "plus"; + }, init() { this._super(); @@ -136,7 +147,7 @@ export default ComboBox.extend({ if (isEmpty(this.get("computedTags"))) { content.label = I18n.t("tagging.choose_for_topic"); } else { - content.label = this.get("computedTags").join(","); + content.label = this.get("computedTags").join(", "); } return content; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 49d0be51dc..fa7006c6ca 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1183,7 +1183,7 @@ en: default_header_text: Select... no_content: No matches found filter_placeholder: Search... - create: "Create {{content}}" + create: "Create: '{{content}}'" emoji_picker: filter_placeholder: Search for emoji From 734851384869f2886cae4ecfc73f221dec86c379 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 13 Feb 2018 15:33:15 -0500 Subject: [PATCH 149/202] FIX: Include post in staff action logs when silencing a user --- app/controllers/admin/users_controller.rb | 3 ++- app/services/staff_action_logger.rb | 13 +++++----- app/services/user_silencer.rb | 6 +++-- .../admin/users_controller_spec.rb | 25 +++++++++++++++++++ spec/services/user_silencer_spec.rb | 2 +- 5 files changed, 39 insertions(+), 10 deletions(-) diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 13aa89d3ca..d948d5f5f0 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -289,7 +289,8 @@ class Admin::UsersController < Admin::AdminController silenced_till: params[:silenced_till], reason: params[:reason], message_body: message, - keep_posts: true + keep_posts: true, + post_id: params[:post_id] ) if silencer.silence && message.present? Jobs.enqueue( diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb index 6261e65580..b5a64c3f2f 100644 --- a/app/services/staff_action_logger.rb +++ b/app/services/staff_action_logger.rb @@ -289,13 +289,14 @@ class StaffActionLogger def log_silence_user(user, opts = {}) raise Discourse::InvalidParameters.new(:user) unless user - UserHistory.create( - params(opts).merge( - action: UserHistory.actions[:silence_user], - target_user_id: user.id, - details: opts[:details] - ) + create_args = params(opts).merge( + action: UserHistory.actions[:silence_user], + target_user_id: user.id, + details: opts[:details] ) + create_args[:post_id] = opts[:post_id] if opts[:post_id] + + UserHistory.create(create_args) end def log_unsilence_user(user, opts = {}) diff --git a/app/services/user_silencer.rb b/app/services/user_silencer.rb index 5db360637b..a9fff88dd0 100644 --- a/app/services/user_silencer.rb +++ b/app/services/user_silencer.rb @@ -33,10 +33,12 @@ class UserSilencer SystemMessage.create(@user, message_type) if @by_user + log_params = { context: context, details: details } + log_params[:post_id] = @opts[:post_id].to_i if @opts[:post_id] + @user_history = StaffActionLogger.new(@by_user).log_silence_user( @user, - context: context, - details: details + log_params ) end diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb index e56fa93b3e..1936233f70 100644 --- a/spec/controllers/admin/users_controller_spec.rb +++ b/spec/controllers/admin/users_controller_spec.rb @@ -615,6 +615,31 @@ describe Admin::UsersController do expect(@reg_user).to be_silenced end + it "can have an associated post" do + silence_post = Fabricate(:post, user: @reg_user) + + put :silence, params: { + user_id: @reg_user.id, + post_id: silence_post.id, + post_action: 'edit', + post_edit: "this is the new contents for the post" + }, format: :json + expect(response).to be_success + + silence_post.reload + expect(silence_post.raw).to eq("this is the new contents for the post") + + log = UserHistory.where( + target_user_id: @reg_user.id, + action: UserHistory.actions[:silence_user] + ).first + expect(log).to be_present + expect(log.post_id).to eq(silence_post.id) + + @reg_user.reload + expect(@reg_user).to be_silenced + end + it "will set a length of time if provided" do future_date = 1.month.from_now.to_date put( diff --git a/spec/services/user_silencer_spec.rb b/spec/services/user_silencer_spec.rb index 188bd0435f..73bab2e19f 100644 --- a/spec/services/user_silencer_spec.rb +++ b/spec/services/user_silencer_spec.rb @@ -60,7 +60,7 @@ describe UserSilencer do end it "logs it with context" do - SystemMessage.stubs(:create).returns(Fabricate.build(:post)) + SystemMessage.stubs(:create) expect { UserSilencer.silence(user, Fabricate(:admin)) }.to change { UserHistory.count }.by(1) From 713993d15048864946a46e74bf3f21549b6f0c1b Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 13 Feb 2018 15:58:32 -0500 Subject: [PATCH 150/202] UX: Link post ids in staff action logs to the post --- .../admin/components/staff-actions.js.es6 | 22 +++++++++++++++++++ .../admin/models/staff-action-log.js.es6 | 11 +++++++--- .../templates/logs/staff-action-logs.hbs | 4 ++-- 3 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 app/assets/javascripts/admin/components/staff-actions.js.es6 diff --git a/app/assets/javascripts/admin/components/staff-actions.js.es6 b/app/assets/javascripts/admin/components/staff-actions.js.es6 new file mode 100644 index 0000000000..9e742526af --- /dev/null +++ b/app/assets/javascripts/admin/components/staff-actions.js.es6 @@ -0,0 +1,22 @@ +import DiscourseURL from 'discourse/lib/url'; + +export default Ember.Component.extend({ + classNames: ['table', 'staff-actions'], + + willDestroyElement() { + this.$().off('click.discourse-staff-logs'); + }, + + didInsertElement() { + this._super(); + + this.$().on('click.discourse-staff-logs', '[data-link-post-id]', e => { + let postId = $(e.target).attr('data-link-post-id'); + + this.store.find('post', postId).then(p => { + DiscourseURL.routeTo(p.get('url')); + }); + return false; + }); + } +}); diff --git a/app/assets/javascripts/admin/models/staff-action-log.js.es6 b/app/assets/javascripts/admin/models/staff-action-log.js.es6 index e60d815f7c..5c84e5c394 100644 --- a/app/assets/javascripts/admin/models/staff-action-log.js.es6 +++ b/app/assets/javascripts/admin/models/staff-action-log.js.es6 @@ -1,6 +1,7 @@ import { ajax } from 'discourse/lib/ajax'; import AdminUser from 'admin/models/admin-user'; import { escapeExpression } from 'discourse/lib/utilities'; +import getUrl from 'discourse-common/lib/get-url'; const StaffActionLog = Discourse.Model.extend({ showFullDetails: false, @@ -10,7 +11,7 @@ const StaffActionLog = Discourse.Model.extend({ }.property('action_name'), formattedDetails: function() { - var formatted = ""; + let formatted = ""; formatted += this.format('email', 'email'); formatted += this.format('admin.logs.ip_address', 'ip_address'); formatted += this.format('admin.logs.topic_id', 'topic_id'); @@ -26,9 +27,13 @@ const StaffActionLog = Discourse.Model.extend({ return formatted; }.property('ip_address', 'email', 'topic_id', 'post_id', 'category_id'), - format: function(label, propertyName) { + format(label, propertyName) { if (this.get(propertyName)) { - return ('' + I18n.t(label) + ': ' + escapeExpression(this.get(propertyName)) + '
    '); + let value = escapeExpression(this.get(propertyName)); + if (propertyName === 'post_id') { + value = `${value}`; + } + return `${I18n.t(label)}: ${value}
    `; } else { return ''; } diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs index 5df150c79f..3445abf8df 100644 --- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs +++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs @@ -39,7 +39,7 @@
    -
    +{{#staff-actions}}
    {{i18n 'admin.logs.staff_actions.staff_user'}}
    {{i18n 'admin.logs.action'}}
    @@ -86,4 +86,4 @@ {{i18n 'search.no_results'}} {{/each}} {{/conditional-loading-spinner}} -
    +{{/staff-actions}} From 556ab8480ed044da616bb8a81bad134dcc0d947e Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 13 Feb 2018 16:06:40 -0500 Subject: [PATCH 151/202] FIX: ESlint --- app/assets/javascripts/admin/models/staff-action-log.js.es6 | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/admin/models/staff-action-log.js.es6 b/app/assets/javascripts/admin/models/staff-action-log.js.es6 index 5c84e5c394..78d39869cf 100644 --- a/app/assets/javascripts/admin/models/staff-action-log.js.es6 +++ b/app/assets/javascripts/admin/models/staff-action-log.js.es6 @@ -1,7 +1,6 @@ import { ajax } from 'discourse/lib/ajax'; import AdminUser from 'admin/models/admin-user'; import { escapeExpression } from 'discourse/lib/utilities'; -import getUrl from 'discourse-common/lib/get-url'; const StaffActionLog = Discourse.Model.extend({ showFullDetails: false, From 22f0b0096d33d918f7a4505a653b410e168d435c Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 13 Feb 2018 17:13:32 -0500 Subject: [PATCH 152/202] FEATURE: show avatar flair on user profile page --- .../javascripts/discourse/templates/user.hbs | 11 ++++++++++- .../stylesheets/common/base/topic-post.scss | 6 +++--- app/assets/stylesheets/common/base/user.scss | 16 ++++++++++++++++ app/assets/stylesheets/mobile/user.scss | 7 +++++++ 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs index f20660c64a..a585892676 100644 --- a/app/assets/javascripts/discourse/templates/user.hbs +++ b/app/assets/javascripts/discourse/templates/user.hbs @@ -39,7 +39,16 @@
    - {{bound-avatar model "huge"}} +
      {{#if model.can_send_private_message_to_user}} diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index 9614af03bc..baee2ab77a 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -263,7 +263,7 @@ aside.quote { } -.topic-avatar, .avatar-flair-preview, .user-card-avatar, .topic-map .poster { +.topic-avatar, .avatar-flair-preview, .user-card-avatar, .topic-map .poster, .user-profile-avatar { .avatar-flair { display: flex; align-items: center; @@ -275,7 +275,7 @@ aside.quote { right: -6px; } } -.topic-avatar .avatar-flair, .avatar-flair-preview .avatar-flair { +.topic-avatar .avatar-flair, .avatar-flair-preview .avatar-flair, .collapsed-info .user-profile-avatar .avatar-flair { background-size: 20px 20px; width: 20px; height: 20px; @@ -288,7 +288,7 @@ aside.quote { right: -8px; } } -.user-card-avatar .avatar-flair { +.user-card-avatar .avatar-flair, .user-profile-avatar .avatar-flair { background-size: 40px 40px; width: 40px; height: 40px; diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss index 5efd7ed9ca..1d0343cb56 100644 --- a/app/assets/stylesheets/common/base/user.scss +++ b/app/assets/stylesheets/common/base/user.scss @@ -120,6 +120,15 @@ } } } + + .user-profile-avatar { + position: relative; + float: left; + .avatar-flair { + bottom: 8px; + right: 16px; + } + } } .controls { @@ -176,6 +185,13 @@ } } } + + .user-profile-avatar { + .avatar-flair { + bottom: 8px; + right: 2px; + } + } } } diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss index fccb2542ef..7a652d9904 100644 --- a/app/assets/stylesheets/mobile/user.scss +++ b/app/assets/stylesheets/mobile/user.scss @@ -127,6 +127,10 @@ max-width: 700px; } } + + .user-profile-avatar .avatar-flair { + right: 2px; + } } .controls { @@ -177,6 +181,9 @@ } } } + .user-profile-avatar .avatar-flair { + bottom: 12px; + } } } From 5a56746610e218993fb18718cf0bdbc87b182b07 Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Wed, 14 Feb 2018 00:28:16 +0100 Subject: [PATCH 153/202] FIX: Embedded topic was not found when URL contained query string --- app/models/topic_embed.rb | 2 +- spec/models/topic_embed_spec.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb index 8e3071ea4c..2f2b26e195 100644 --- a/app/models/topic_embed.rb +++ b/app/models/topic_embed.rb @@ -183,7 +183,7 @@ class TopicEmbed < ActiveRecord::Base def self.topic_id_for_embed(embed_url) embed_url = normalize_url(embed_url).sub(/^https?\:\/\//, '') - TopicEmbed.where("embed_url ~* '^https?://#{embed_url}$'").pluck(:topic_id).first + TopicEmbed.where("embed_url ~* '^https?://#{Regexp.escape(embed_url)}$'").pluck(:topic_id).first end def self.first_paragraph_from(html) diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb index 447e8ff667..1f00c699ec 100644 --- a/spec/models/topic_embed_spec.rb +++ b/spec/models/topic_embed_spec.rb @@ -72,6 +72,11 @@ describe TopicEmbed do expect(TopicEmbed.topic_id_for_embed('http://example.com/post/24')).to eq(nil) expect(TopicEmbed.topic_id_for_embed('http://example.com/post')).to eq(nil) end + + it "finds the topic id when the embed_url contains a query string" do + topic_embed = Fabricate(:topic_embed, embed_url: "http://example.com/post/248?key=foo") + expect(TopicEmbed.topic_id_for_embed('http://example.com/post/248?key=foo')).to eq(topic_embed.topic_id) + end end describe '.find_remote' do From 548db91c76fd295a7369a27c75d5a614d68a0190 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Wed, 14 Feb 2018 00:30:09 +0100 Subject: [PATCH 154/202] FIX: displays an error when reaching tags limit --- .../components/mini-tag-chooser.js.es6 | 44 ++++++++++++++----- .../select-kit/components/select-kit.js.es6 | 9 ++-- .../templates/components/select-kit.hbs | 4 +- .../select-kit/select-kit-collection.hbs | 34 +++++++------- .../common/select-kit/select-kit.scss | 5 +++ config/locales/client.en.yml | 1 + 6 files changed, 67 insertions(+), 30 deletions(-) diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 index abce533ffc..9f12c5c58f 100644 --- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 +++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 @@ -14,16 +14,33 @@ export default ComboBox.extend({ filterable: true, noTags: Ember.computed.empty("computedTags"), allowAny: true, + maximumSelectionSize: Ember.computed.alias("siteSettings.max_tags_per_topic"), caretUpIcon: Ember.computed.alias("caretIcon"), caretDownIcon: Ember.computed.alias("caretIcon"), - @computed("computedTags", "siteSettings.max_tags_per_topic") - caretIcon(computedTags, maxTagsPerTopic) { - if (computedTags.length >= maxTagsPerTopic) { - return null; + @computed("limitReached", "maximumSelectionSize") + maxContentRow(limitReached, count) { + if (limitReached) { + return I18n.t("select_kit.max_content_reached", { count }); + } + }, + + mutateAttributes() { + this.set("value", null); + }, + + @computed("limitReached") + caretIcon(limitReached) { + return limitReached ? null : "plus"; + }, + + @computed("computedTags.[]", "maximumSelectionSize") + limitReached(computedTags, maximumSelectionSize) { + if (computedTags.length >= maximumSelectionSize) { + return true; } - return "plus"; + return false; }, init() { @@ -46,6 +63,10 @@ export default ComboBox.extend({ }, validateCreate(term) { + if (this.get("limitReached")) { + return false; + } + const filterRegexp = new RegExp(this.site.tags_filter_regexp, "g"); term = term.replace(filterRegexp, "").trim().toLowerCase(); @@ -65,6 +86,10 @@ export default ComboBox.extend({ this.site.get("can_create_tag"); }, + filterComputedContent(computedContent) { + return computedContent; + }, + didRender() { this._super(); @@ -143,13 +168,16 @@ export default ComboBox.extend({ computeHeaderContent() { let content = this.baseHeaderComputedContent(); + const joinedTags = this.get("computedTags").join(", "); if (isEmpty(this.get("computedTags"))) { content.label = I18n.t("tagging.choose_for_topic"); } else { - content.label = this.get("computedTags").join(", "); + content.label = joinedTags; } + content.title = content.name = content.value = joinedTags; + return content; }, @@ -183,10 +211,6 @@ export default ComboBox.extend({ } }, - muateAttributes() { - this.set("value", null); - }, - _searchTags(query) { this.startLoading(); diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6 index ab9852b154..b8bdf5c667 100644 --- a/app/assets/javascripts/select-kit/components/select-kit.js.es6 +++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6 @@ -37,7 +37,6 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi tabindex: 0, none: null, highlightedValue: null, - noContentLabel: "select_kit.no_content", valueAttribute: "id", nameProperty: "name", autoFilterable: false, @@ -70,6 +69,8 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi allowContentReplacement: false, collectionHeader: null, allowAutoSelectFirst: true, + maximumSelectionSize: null, + maxContentRow: null, init() { this._super(); @@ -155,8 +156,10 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi }, @computed("filter", "filteredComputedContent.[]") - shouldDisplayNoContentRow(filter, filteredComputedContent) { - return filter.length > 0 && filteredComputedContent.length === 0; + noContentRow(filter, filteredComputedContent) { + if (filter.length > 0 && filteredComputedContent.length === 0) { + return I18n.t("select_kit.no_content"); + } }, @computed("filter", "filterable", "autoFilterable", "renderedFilterOnce") diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit.hbs b/app/assets/javascripts/select-kit/templates/components/select-kit.hbs index 5e6e936db4..cd92fb8312 100644 --- a/app/assets/javascripts/select-kit/templates/components/select-kit.hbs +++ b/app/assets/javascripts/select-kit/templates/components/select-kit.hbs @@ -40,11 +40,11 @@ select=(action "select") highlight=(action "highlight") create=(action "create") - noContentLabel=noContentLabel highlightedValue=highlightedValue computedValue=computedValue - shouldDisplayNoContentRow=shouldDisplayNoContentRow rowComponentOptions=rowComponentOptions + noContentRow=noContentRow + maxContentRow=maxContentRow }} {{/if}}
    diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs index bb02559029..35d46789dd 100644 --- a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs +++ b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs @@ -30,22 +30,26 @@ }} {{/if}} -{{#each filteredComputedContent as |computedContent|}} - {{component rowComponent - computedContent=computedContent - highlightedValue=highlightedValue - computedValue=computedValue - templateForRow=templateForRow - select=select - highlight=highlight - options=rowComponentOptions - }} -{{/each}} - -{{#if shouldDisplayNoContentRow}} - {{#if noContentLabel}} +{{#if maxContentRow}} +
  • + {{maxContentRow}} +
    • +{{else}} + {{#if noContentRow}}
  • - {{i18n noContentLabel}} + {{noContentRow}}
    • + {{else}} + {{#each filteredComputedContent as |computedContent|}} + {{component rowComponent + computedContent=computedContent + highlightedValue=highlightedValue + computedValue=computedValue + templateForRow=templateForRow + select=select + highlight=highlight + options=rowComponentOptions + }} + {{/each}} {{/if}} {{/if}} diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss index 91e7fe922f..b5c1597ef3 100644 --- a/app/assets/stylesheets/common/select-kit/select-kit.scss +++ b/app/assets/stylesheets/common/select-kit/select-kit.scss @@ -165,6 +165,11 @@ white-space: nowrap; } + &.max-content { + white-space: nowrap; + color: $danger; + } + .name { margin: 0; overflow: hidden; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index fa7006c6ca..383e300706 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1184,6 +1184,7 @@ en: no_content: No matches found filter_placeholder: Search... create: "Create: '{{content}}'" + max_content_reached: "You can only select {{count}} items." emoji_picker: filter_placeholder: Search for emoji From f028ffaf29d871c54d3a50e25cae077e0ed7c591 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 14 Feb 2018 10:39:44 +1100 Subject: [PATCH 155/202] SECURITY: correct local onebox category checks Also removes ugly "source_topic_id" from cooked posts Patch was authored by @zogstrip Signed-off-by: Sam --- .../components/composer-editor.js.es6 | 2 +- .../components/composer-title.js.es6 | 8 +- .../engines/discourse-markdown/quotes.js.es6 | 1 - .../javascripts/pretty-text/oneboxer.js.es6 | 15 +- app/controllers/onebox_controller.rb | 8 +- app/models/post_analyzer.rb | 2 +- lib/cooked_post_processor.rb | 14 +- lib/discourse.rb | 8 +- lib/onebox/engine/discourse_local_onebox.rb | 129 -------------- lib/oneboxer.rb | 136 +++++++++++---- spec/components/cooked_post_processor_spec.rb | 3 +- .../engine/discourse_local_onebox_spec.rb | 161 ------------------ spec/components/oneboxer_spec.rb | 71 ++++++++ spec/controllers/onebox_controller_spec.rb | 54 ++++-- 14 files changed, 251 insertions(+), 361 deletions(-) delete mode 100644 lib/onebox/engine/discourse_local_onebox.rb delete mode 100644 spec/components/onebox/engine/discourse_local_onebox_spec.rb diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6 index 6b3ca5b400..b0623158e4 100644 --- a/app/assets/javascripts/discourse/components/composer-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6 @@ -372,7 +372,7 @@ export default Ember.Component.extend({ post.set('refreshedPost', true); } - $oneboxes.each((_, o) => load(o, refresh, ajax, this.currentUser.id)); + $oneboxes.each((_, o) => load({ elem: o, refresh, ajax, categoryId: this.get('composer.category.id') })); }, _warnMentionedGroups($preview) { diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6 index 2a828a9483..86acf45c77 100644 --- a/app/assets/javascripts/discourse/components/composer-title.js.es6 +++ b/app/assets/javascripts/discourse/components/composer-title.js.es6 @@ -80,7 +80,13 @@ export default Ember.Component.extend({ const link = document.createElement('a'); link.href = this.get('composer.title'); - let loadOnebox = load(link, false, ajax, this.currentUser.id, true); + const loadOnebox = load({ + elem: link, + refresh: false, + ajax, + synchronous: true, + categoryId: this.get('composer.category.id'), + }); if (loadOnebox && loadOnebox.then) { loadOnebox.then( () => { diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6 index 3a0523bef6..27873269ee 100644 --- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6 +++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6 @@ -105,7 +105,6 @@ const rule = { let title = topicInfo.title; - if (options.enableEmoji) { title = performEmojiUnescape(topicInfo.title, { getURL: options.getURL, emojiSet: options.emojiSet diff --git a/app/assets/javascripts/pretty-text/oneboxer.js.es6 b/app/assets/javascripts/pretty-text/oneboxer.js.es6 index 245c87cbca..90538994b7 100644 --- a/app/assets/javascripts/pretty-text/oneboxer.js.es6 +++ b/app/assets/javascripts/pretty-text/oneboxer.js.es6 @@ -43,16 +43,15 @@ function loadNext(ajax) { let timeoutMs = 150; let removeLoading = true; - const { url, refresh, $elem, userId } = loadingQueue.shift(); + const { url, refresh, $elem, categoryId } = loadingQueue.shift(); // Retrieve the onebox return ajax("/onebox", { dataType: 'html', - data: { url, refresh }, + data: { url, refresh, category_id: categoryId }, cache: true }).then(html => { let $html = $(html); - localCache[normalize(url)] = $html; $elem.replaceWith($html); applySquareGenericOnebox($html, normalize(url)); @@ -60,7 +59,7 @@ function loadNext(ajax) { if (result && result.jqXHR && result.jqXHR.status === 429) { timeoutMs = 2000; removeLoading = false; - loadingQueue.unshift({ url, refresh, $elem, userId }); + loadingQueue.unshift({ url, refresh, $elem, categoryId }); } else { failedCache[normalize(url)] = true; } @@ -75,14 +74,14 @@ function loadNext(ajax) { // Perform a lookup of a onebox based an anchor $element. // It will insert a loading indicator and remove it when the loading is complete or fails. -export function load(e, refresh, ajax, userId, synchronous) { - const $elem = $(e); +export function load({ elem , refresh = true, ajax, synchronous = false, categoryId }) { + const $elem = $(elem); // If the onebox has loaded or is loading, return if ($elem.data('onebox-loaded')) return; if ($elem.hasClass('loading-onebox')) return; - const url = e.href; + const url = elem.href; // Unless we're forcing a refresh... if (!refresh) { @@ -99,7 +98,7 @@ export function load(e, refresh, ajax, userId, synchronous) { $elem.addClass('loading-onebox'); // Add to the loading queue - loadingQueue.push({ url, refresh, $elem, userId }); + loadingQueue.push({ url, refresh, $elem, categoryId }); // Load next url in queue if (synchronous) { diff --git a/app/controllers/onebox_controller.rb b/app/controllers/onebox_controller.rb index 7c0d16af32..dea29ce536 100644 --- a/app/controllers/onebox_controller.rb +++ b/app/controllers/onebox_controller.rb @@ -14,13 +14,19 @@ class OneboxController < ApplicationController return render(body: nil, status: 429) if Oneboxer.is_previewing?(current_user.id) user_id = current_user.id + category_id = params[:category_id].to_i invalidate = params[:refresh] == 'true' url = params[:url] hijack do Oneboxer.preview_onebox!(user_id) - preview = Oneboxer.preview(url, invalidate_oneboxes: invalidate) + preview = Oneboxer.preview(url, + invalidate_oneboxes: invalidate, + user_id: user_id, + category_id: category_id + ) + preview.strip! if preview.present? Oneboxer.onebox_previewed!(user_id) diff --git a/app/models/post_analyzer.rb b/app/models/post_analyzer.rb index 919b7d4215..ddcfa2fd0c 100644 --- a/app/models/post_analyzer.rb +++ b/app/models/post_analyzer.rb @@ -31,7 +31,7 @@ class PostAnalyzer cooked = PrettyText.cook(raw, opts) end - result = Oneboxer.apply(cooked, topic_id: @topic_id) do |url, _| + result = Oneboxer.apply(cooked) do |url| @found_oneboxes = true Oneboxer.invalidate(url) if opts[:invalidate_oneboxes] Oneboxer.cached_onebox(url) diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb index e9637755f0..263d139e72 100644 --- a/lib/cooked_post_processor.rb +++ b/lib/cooked_post_processor.rb @@ -368,15 +368,13 @@ class CookedPostProcessor end def post_process_oneboxes - args = { - post_id: @post.id, - invalidate_oneboxes: !!@opts[:invalidate_oneboxes], - } - - # apply oneboxes - Oneboxer.apply(@doc, topic_id: @post.topic_id) do |url| + Oneboxer.apply(@doc) do |url| @has_oneboxes = true - Oneboxer.onebox(url, args) + Oneboxer.onebox(url, + invalidate_oneboxes: !!@opts[:invalidate_oneboxes], + user_id: @post&.user_id, + category_id: @post&.topic&.category_id + ) end oneboxed_images.each do |img| diff --git a/lib/discourse.rb b/lib/discourse.rb index 036836c605..45b6416c6b 100644 --- a/lib/discourse.rb +++ b/lib/discourse.rb @@ -236,15 +236,11 @@ module Discourse end def self.route_for(uri) - - uri = URI(uri) rescue nil unless (uri.is_a?(URI)) + uri = URI(uri) rescue nil unless uri.is_a?(URI) return unless uri path = uri.path || "" - if (uri.host == Discourse.current_hostname && - path.start_with?(Discourse.base_uri)) || - !uri.host - + if !uri.host || (uri.host == Discourse.current_hostname && path.start_with?(Discourse.base_uri)) path.slice!(Discourse.base_uri) return Rails.application.routes.recognize_path(path) end diff --git a/lib/onebox/engine/discourse_local_onebox.rb b/lib/onebox/engine/discourse_local_onebox.rb deleted file mode 100644 index b4add001ac..0000000000 --- a/lib/onebox/engine/discourse_local_onebox.rb +++ /dev/null @@ -1,129 +0,0 @@ -module Onebox - module Engine - class DiscourseLocalOnebox - include Engine - - # Use this onebox before others - def self.priority - 1 - end - - def self.===(other) - url = other.to_s - return false unless url[Discourse.base_url] - - route = Discourse.route_for(url) - - !!(route[:controller] =~ /topics|uploads|users/) - rescue ActionController::RoutingError - false - end - - def to_html - uri = URI(@url) - path = uri.path || "" - route = Discourse.route_for(uri) - - case route[:controller] - when "uploads" then upload_html(path) - when "topics" then topic_html(route) - when "users" then user_html(route) - end - end - - private - - def upload_html(path) - case File.extname(path) - when /^\.(mov|mp4|webm|ogv)$/i - "" - when /^\.(mp3|ogg|wav|m4a)$/i - "" - end - end - - def topic_html(route) - link = "#{@url}" - source_topic_id = @url[/[&?]source_topic_id=(\d+)/, 1].to_i - source_topic = Topic.find_by(id: source_topic_id) if source_topic_id > 0 - - if route[:post_number].present? && route[:post_number].to_i > 1 - post = Post.find_by(topic_id: route[:topic_id], post_number: route[:post_number]) - return link unless can_see_post?(post, source_topic) - - topic = post.topic - slug = Slug.for(topic.title) - excerpt = post.excerpt(SiteSetting.post_onebox_maxlength) - excerpt.gsub!(/[\r\n]+/, " ") - excerpt.gsub!("[/quote]", "[quote]") # don't break my quote - - quote = "[quote=\"#{post.user.username}, topic:#{topic.id}, slug:#{slug}, post:#{post.post_number}\"]\n#{excerpt}\n[/quote]" - - args = {} - args[:topic_id] = source_topic_id if source_topic_id > 0 - - PrettyText.cook(quote, args) - else - topic = Topic.find_by(id: route[:topic_id]) - return link unless can_see_topic?(topic, source_topic) - - first_post = topic.ordered_posts.first - - args = { - topic_id: topic.id, - avatar: PrettyText.avatar_img(topic.user.avatar_template, "tiny"), - original_url: @url, - title: PrettyText.unescape_emoji(CGI::escapeHTML(topic.title)), - category_html: CategoryBadge.html_for(topic.category), - quote: first_post.excerpt(SiteSetting.post_onebox_maxlength), - } - - template = File.read("#{Rails.root}/lib/onebox/templates/discourse_topic_onebox.hbs") - Mustache.render(template, args) - end - end - - def user_html(route) - link = "#{@url}" - username = route[:username] || '' - user = User.find_by(username_lower: username.downcase) - - if user - args = { - user_id: user.id, - username: user.username, - avatar: PrettyText.avatar_img(user.avatar_template, "extra_large"), - name: user.name, - bio: user.user_profile.bio_excerpt(230), - location: user.user_profile.location, - joined: I18n.t('joined'), - created_at: user.created_at.strftime(I18n.t('datetime_formats.formats.date_only')), - website: user.user_profile.website, - website_name: UserSerializer.new(user).website_name, - original_url: @url - } - - template = File.read("#{Rails.root}/lib/onebox/templates/discourse_user_onebox.hbs") - Mustache.render(template, args) - else - return link - end - end - - def can_see_post?(post, source_topic) - return false if post.nil? || post.hidden || post.trashed? || post.topic.nil? - Guardian.new.can_see_post?(post) || same_category?(post.topic.category, source_topic) - end - - def can_see_topic?(topic, source_topic) - return false if topic.nil? || topic.trashed? || topic.private_message? - Guardian.new.can_see_topic?(topic) || same_category?(topic.category, source_topic) - end - - def same_category?(category, source_topic) - source_topic.try(:category_id) == category.try(:id) - end - - end - end -end diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb index 121984f680..64e1ee8b3c 100644 --- a/lib/oneboxer.rb +++ b/lib/oneboxer.rb @@ -28,13 +28,13 @@ module Oneboxer def self.preview(url, options = nil) options ||= {} invalidate(url) if options[:invalidate_oneboxes] - onebox_raw(url)[:preview] + onebox_raw(url, options)[:preview] end def self.onebox(url, options = nil) options ||= {} invalidate(url) if options[:invalidate_oneboxes] - onebox_raw(url)[:onebox] + onebox_raw(url, options)[:onebox] end def self.cached_onebox(url) @@ -76,41 +76,22 @@ module Oneboxer doc end - def self.append_source_topic_id(url, topic_id) - # hack urls to create proper expansions - if url =~ Regexp.new("^#{Discourse.base_url.gsub(".", "\\.")}.*$", true) - uri = URI.parse(url) rescue nil - if uri && uri.path - route = Rails.application.routes.recognize_path(uri.path) rescue nil - if route && route[:controller] == 'topics' - url += (url =~ /\?/ ? "&" : "?") + "source_topic_id=#{topic_id}" - end - end - end - url - end - def self.apply(string_or_doc, args = nil) doc = string_or_doc doc = Nokogiri::HTML::fragment(doc) if doc.is_a?(String) changed = false each_onebox_link(doc) do |url, element| - if args && args[:topic_id] - url = append_source_topic_id(url, args[:topic_id]) - end - onebox, _preview = yield(url, element) + onebox, _ = yield(url, element) if onebox parsed_onebox = Nokogiri::HTML::fragment(onebox) next unless parsed_onebox.children.count > 0 # special logic to strip empty p elements - if element.parent && - element.parent.node_name && - element.parent.node_name.downcase == "p" && - element.parent.children.count == 1 + if element&.parent&.node_name&.downcase == "p" && element&.parent&.children&.count == 1 element = element.parent end + changed = true element.swap parsed_onebox.to_html end @@ -149,7 +130,104 @@ module Oneboxer "onebox__#{url}" end - def self.onebox_raw(url) + def self.onebox_raw(url, opts = {}) + local_onebox(url, opts) || external_onebox(url) + rescue => e + # no point warning here, just cause we have an issue oneboxing a url + # we can later hunt for failed oneboxes by searching logs if needed + Rails.logger.info("Failed to onebox #{url} #{e} #{e.backtrace}") + # return a blank hash, so rest of the code works + blank_onebox + end + + def self.local_onebox(url, opts = {}) + return unless route = Discourse.route_for(url) + + html = + case route[:controller] + when "uploads" then local_upload_html(url) + when "topics" then local_topic_html(url, route, opts) + when "users" then local_user_html(url, route) + end + + html = html.presence || "#{url}" + { onebox: html, preview: html } + end + + def self.local_upload_html(url) + case File.extname(URI(url).path || "") + when /^\.(mov|mp4|webm|ogv)$/i + "" + when /^\.(mp3|ogg|wav|m4a)$/i + "" + end + end + + def self.local_topic_html(url, route, opts) + return unless current_user = User.find_by(id: opts[:user_id]) + return unless current_category = Category.find_by(id: opts[:category_id]) + return unless Guardian.new(current_user).can_see_category?(current_category) + + if route[:post_number].to_i > 1 + post = Post.find_by(topic_id: route[:topic_id], post_number: route[:post_number]) + + return unless post.present? && !post.hidden + return unless current_category.id == post.topic.category_id || Guardian.new.can_see_post?(post) + + topic = post.topic + excerpt = post.excerpt(SiteSetting.post_onebox_maxlength) + excerpt.gsub!(/[\r\n]+/, " ") + excerpt.gsub!("[/quote]", "[quote]") # don't break my quote + + quote = "[quote=\"#{post.user.username}, topic:#{topic.id}, post:#{post.post_number}\"]\n#{excerpt}\n[/quote]" + + PrettyText.cook(quote) + else + return unless topic = Topic.find_by(id: route[:topic_id]) + return unless current_category.id == topic.category_id || Guardian.new.can_see_topic?(topic) + + first_post = topic.ordered_posts.first + + args = { + topic_id: topic.id, + avatar: PrettyText.avatar_img(topic.user.avatar_template, "tiny"), + original_url: url, + title: PrettyText.unescape_emoji(CGI::escapeHTML(topic.title)), + category_html: CategoryBadge.html_for(topic.category), + quote: first_post.excerpt(SiteSetting.post_onebox_maxlength), + } + + template = File.read("#{Rails.root}/lib/onebox/templates/discourse_topic_onebox.hbs") + Mustache.render(template, args) + end + end + + def self.local_user_html(url, route) + username = route[:username] || "" + + if user = User.find_by(username_lower: username.downcase) + args = { + user_id: user.id, + username: user.username, + avatar: PrettyText.avatar_img(user.avatar_template, "extra_large"), + name: user.name, + bio: user.user_profile.bio_excerpt(230), + location: user.user_profile.location, + joined: I18n.t('joined'), + created_at: user.created_at.strftime(I18n.t('datetime_formats.formats.date_only')), + website: user.user_profile.website, + website_name: UserSerializer.new(user).website_name, + original_url: url + } + + template = File.read("#{Rails.root}/lib/onebox/templates/discourse_user_onebox.hbs") + Mustache.render(template, args) + else + nil + end + end + + def self.external_onebox(url) Rails.cache.fetch(onebox_cache_key(url), expires_in: 1.day) do fd = FinalDestination.new(url, ignore_redirects: ignore_redirects, force_get_hosts: force_get_hosts) uri = fd.resolve @@ -169,14 +247,8 @@ module Oneboxer r = Onebox.preview(uri.to_s, options) - { onebox: r.to_s, preview: r.try(:placeholder_html).to_s } + { onebox: r.to_s, preview: r&.placeholder_html.to_s } end - rescue => e - # no point warning here, just cause we have an issue oneboxing a url - # we can later hunt for failed oneboxes by searching logs if needed - Rails.logger.info("Failed to onebox #{url} #{e} #{e.backtrace}") - # return a blank hash, so rest of the code works - blank_onebox end end diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb index d2b90f5e4d..618b69a349 100644 --- a/spec/components/cooked_post_processor_spec.rb +++ b/spec/components/cooked_post_processor_spec.rb @@ -479,10 +479,11 @@ describe CookedPostProcessor do before do Oneboxer.expects(:onebox) - .with("http://www.youtube.com/watch?v=9bZkp7q19f0", post_id: 123, invalidate_oneboxes: true) + .with("http://www.youtube.com/watch?v=9bZkp7q19f0", invalidate_oneboxes: true, user_id: nil, category_id: post.topic.category_id) .returns("
    GANGNAM STYLE
    ") cpp.post_process_oneboxes end + it "inserts the onebox without wrapping p" do expect(cpp).to be_dirty expect(cpp.html).to match_html "
    GANGNAM STYLE
    " diff --git a/spec/components/onebox/engine/discourse_local_onebox_spec.rb b/spec/components/onebox/engine/discourse_local_onebox_spec.rb deleted file mode 100644 index efc60b9750..0000000000 --- a/spec/components/onebox/engine/discourse_local_onebox_spec.rb +++ /dev/null @@ -1,161 +0,0 @@ -require 'rails_helper' - -describe Onebox::Engine::DiscourseLocalOnebox do - - before { SiteSetting.external_system_avatars_enabled = false } - - def build_link(url) - %|#{url}| - end - - context "for a link to a post" do - let(:post) { Fabricate(:post) } - let(:post2) { Fabricate(:post, topic: post.topic, post_number: 2) } - - it "returns a link if post isn't found" do - url = "#{Discourse.base_url}/t/not-exist/3/2" - expect(Onebox.preview(url).to_s).to eq(build_link(url)) - end - - it "returns a link if not allowed to see the post" do - url = "#{Discourse.base_url}#{post2.url}" - Guardian.any_instance.expects(:can_see_post?).returns(false) - expect(Onebox.preview(url).to_s).to eq(build_link(url)) - end - - it "returns a link if post is hidden" do - hidden_post = Fabricate(:post, topic: post.topic, post_number: 2, hidden: true, hidden_reason_id: Post.hidden_reasons[:flag_threshold_reached]) - url = "#{Discourse.base_url}#{hidden_post.url}" - expect(Onebox.preview(url).to_s).to eq(build_link(url)) - end - - it "returns some onebox goodness if post exists and can be seen" do - url = "#{Discourse.base_url}#{post2.url}?source_topic_id=#{post2.topic_id + 1}" - html = Onebox.preview(url).to_s - expect(html).to include(post2.excerpt) - expect(html).to include(post2.topic.title) - - url = "#{Discourse.base_url}#{post2.url}/?source_topic_id=#{post2.topic_id + 1}" - html = Onebox.preview(url).to_s - expect(html).to include(post2.excerpt) - expect(html).to include(post2.topic.title) - - html = Onebox.preview("#{Discourse.base_url}#{post2.url}").to_s - expect(html).to include(post2.user.username) - expect(html).to include(post2.excerpt) - end - end - - context "for a link to a topic" do - let(:post) { Fabricate(:post) } - let(:topic) { post.topic } - - it "returns a link if topic isn't found" do - url = "#{Discourse.base_url}/t/not-found/123" - expect(Onebox.preview(url).to_s).to eq(build_link(url)) - end - - it "returns a link if not allowed to see the topic" do - url = topic.url - Guardian.any_instance.expects(:can_see_topic?).returns(false) - expect(Onebox.preview(url).to_s).to eq(build_link(url)) - end - - it "replaces emoji in the title" do - topic.update_column(:title, "Who wants to eat a :hamburger:") - expect(Onebox.preview(topic.url).to_s).to match(/hamburger\.png/) - end - - it "returns some onebox goodness if topic exists and can be seen" do - html = Onebox.preview(topic.url).to_s - expect(html).to include(topic.ordered_posts.first.user.username) - expect(html).to include("
    ") - - html = Onebox.preview("#{topic.url}/?u=codinghorror").to_s - expect(html).to include(topic.ordered_posts.first.user.username) - expect(html).to include("
    ") - end - end - - context "for a link to a user profile" do - let(:user) { Fabricate(:user) } - - it "returns a link if user isn't found" do - url = "#{Discourse.base_url}/u/none" - expect(Onebox.preview(url).to_s).to eq(build_link(url)) - end - - it "returns some onebox goodness if user exists" do - html = Onebox.preview("#{Discourse.base_url}/u/#{user.username}").to_s - expect(html).to include(user.username) - expect(html).to include(user.name) - expect(html).to include(user.created_at.strftime("%B %-d, %Y")) - expect(html).to include('

    - - - {{text-field value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off" autofocus="autofocus"}} - {{text-field value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off" autofocus="autofocus"}}
    - - - {{password-field value=loginPassword type="password" id="login-account-password" maxlength="200" capsLockOn=capsLockOn}}   - - {{i18n 'forgot_password.action'}} - {{password-field value=loginPassword type="password" id="login-account-password" maxlength="200" capsLockOn=capsLockOn}}{{i18n 'forgot_password.action'}}
    diff --git a/app/assets/javascripts/admin/templates/groups-type.hbs b/app/assets/javascripts/admin/templates/groups-type.hbs index a1fa829897..47bbb1c51e 100644 --- a/app/assets/javascripts/admin/templates/groups-type.hbs +++ b/app/assets/javascripts/admin/templates/groups-type.hbs @@ -1,6 +1,6 @@
    {{#if sortedGroups}} -
    +

    {{i18n 'admin.groups.edit'}}

      {{#each sortedGroups as |group|}} @@ -25,7 +25,7 @@
    {{/if}} -
    +
    {{outlet}}
    diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs index 167f4ffa1d..52faf9b433 100644 --- a/app/assets/javascripts/admin/templates/user-badges.hbs +++ b/app/assets/javascripts/admin/templates/user-badges.hbs @@ -1,9 +1,9 @@
    -
    +
    +
    {{#conditional-loading-spinner condition=loading}} diff --git a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs index 1561a95670..1a848710a3 100644 --- a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs +++ b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs @@ -1,10 +1,10 @@
    -
    +
    +
    diff --git a/app/assets/javascripts/admin/templates/users-list.hbs b/app/assets/javascripts/admin/templates/users-list.hbs index 398732685b..645fc83c1f 100644 --- a/app/assets/javascripts/admin/templates/users-list.hbs +++ b/app/assets/javascripts/admin/templates/users-list.hbs @@ -1,5 +1,5 @@
    -
    +
    +
    {{#unless siteSettings.enable_sso}} {{d-button action="sendInvites" title="admin.invite.button_title" icon="user-plus" label="admin.invite.button_text"}} diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs index 539101bdaf..a7b6c0705b 100644 --- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs +++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs @@ -1,6 +1,6 @@ {{#d-modal-body id="keyboard-shortcuts-help"}}
    -
    +

    {{i18n 'keyboard_shortcuts_help.jump_to.title'}}

    • {{{i18n 'keyboard_shortcuts_help.jump_to.home'}}}
      • @@ -24,7 +24,7 @@
    • {{{i18n 'keyboard_shortcuts_help.navigation.next_prev'}}}
    -
    +

    {{i18n 'keyboard_shortcuts_help.application.title'}}

    • {{{i18n 'keyboard_shortcuts_help.application.hamburger_menu'}}}
      • @@ -46,7 +46,7 @@
    • {{{i18n 'keyboard_shortcuts_help.actions.quote_post'}}}
    -
    +

    {{i18n 'keyboard_shortcuts_help.actions.title'}}

    • {{{i18n 'keyboard_shortcuts_help.actions.bookmark_topic'}}}
      • diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs index 5f8dc6d18a..c02499e76b 100644 --- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs +++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs @@ -5,13 +5,13 @@

      {{i18n 'user.invited.title'}}

      {{#if model.can_see_invite_details}} -
      -
      +
      +
      +
      {{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}} diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index 2786a6e61a..670d93d894 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -130,14 +130,23 @@ $mobile-breakpoint: 700px; } } -.content-list li a span.count { - font-size: $font-down-1; - float: right; - margin-right: 10px; - background-color: $primary-low; - padding: 2px 5px; - border-radius: 5px; - color: $primary; +.content-list { + width: 27%; + float: left; + li a span.count { + font-size: $font-down-1; + float: right; + margin-right: 10px; + background-color: $primary-low; + padding: 2px 5px; + border-radius: 5px; + color: $primary; + } +} + +.content-body { + float: left; + width: 60%; } .admin-content { @@ -259,6 +268,10 @@ $mobile-breakpoint: 700px; background-color: $primary-low; padding: 10px 10px 3px 0; @include clearfix; + nav { + float: left; + margin-left: 12px; + } .nav.nav-pills { li.active { a { diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss index 9a23fb7d73..97a589ca74 100644 --- a/app/assets/stylesheets/common/admin/customize.scss +++ b/app/assets/stylesheets/common/admin/customize.scss @@ -220,3 +220,7 @@ margin-top: 20px; } } + +.custom_emoji { + width: 27%; +} diff --git a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss index 04045f843f..13010953fe 100644 --- a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss +++ b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss @@ -15,8 +15,12 @@ } #keyboard-shortcuts-help { - .span6 { - width:32%; + div.row { + width: 100%; + div { + float: left; + width:32%; + } } ul { list-style: none; diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss index 5f718e9502..8dce9693b5 100644 --- a/app/assets/stylesheets/desktop/discourse.scss +++ b/app/assets/stylesheets/desktop/discourse.scss @@ -351,46 +351,6 @@ input { @include clearfix; } -.span { - &4 { - width: 196px; - margin-right: 12px; - float: left; - } - - &6 { - width: 27.027%; - float: left; - } - - &8 { - width: 404px; - float: left; - } - - &10 { - width: 508px; - float: left; - } - - &13 { - width: 59.8198%; - float: left; - } - - &15 { - /* intentionally no width set here, do not add one */ - margin-left: 12px; - float: left; - } - - &24 { - width: 1236px; - float: left; - color: amarillo; - } -} - .offset { &2 { margin-left: 116px; diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index d342a3a83e..0fb3e102f9 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -109,12 +109,6 @@ } } -.user-invite-controls { - background-color: $primary-low; - padding: 5px 10px 0 0; - height: 35px; -} - .user-invite-search { clear: both; margin: 15px 0px -15px 0px; From dffdff91a6a82dcc38f0ea2141976e1e51a4e320 Mon Sep 17 00:00:00 2001 From: Kris Date: Wed, 14 Feb 2018 13:39:30 -0500 Subject: [PATCH 169/202] Fix avatar flair alignment on mobile user profiles --- app/assets/stylesheets/common/base/user.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss index 1d0343cb56..8c39904e93 100644 --- a/app/assets/stylesheets/common/base/user.scss +++ b/app/assets/stylesheets/common/base/user.scss @@ -124,6 +124,7 @@ .user-profile-avatar { position: relative; float: left; + height: 100%; .avatar-flair { bottom: 8px; right: 16px; From c3606fdef6689604fa660b87563b50169b1fd0a6 Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Wed, 14 Feb 2018 17:43:13 -0200 Subject: [PATCH 170/202] Update onebox --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3fa66d5d30..ced4bbd2dc 100644 --- a/Gemfile +++ b/Gemfile @@ -36,7 +36,7 @@ gem 'redis-namespace' gem 'active_model_serializers', '~> 0.8.3' -gem 'onebox', '1.8.36' +gem 'onebox', '1.8.38' gem 'http_accept_language', '~>2.0.5', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 08bec02878..36dde5f8f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -232,7 +232,7 @@ GEM omniauth-twitter (1.3.0) omniauth-oauth (~> 1.1) rack - onebox (1.8.36) + onebox (1.8.38) fast_blank (>= 1.0.0) htmlentities (~> 4.3) moneta (~> 1.0) @@ -469,7 +469,7 @@ DEPENDENCIES omniauth-oauth2 omniauth-openid omniauth-twitter - onebox (= 1.8.36) + onebox (= 1.8.38) openid-redis-store pg (~> 0.21.0) pry-nav From a3e5a316740dea89836fe66c6b32c0a0a1692426 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 14 Feb 2018 15:29:01 -0500 Subject: [PATCH 171/202] FIX: Allow 404 pages to use the current theme --- app/controllers/application_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2d468017c2..653ba952fc 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -192,7 +192,9 @@ class ApplicationController < ActionController::Base render_json_error message, type: type, status: status_code else begin + # 404 pages won't have the session and theme_keys without these: current_user + handle_theme rescue Discourse::InvalidAccess return render plain: message, status: status_code end From b4aa0b096ee0ceb596db7904ce508edb01f27885 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 14 Feb 2018 15:46:04 -0500 Subject: [PATCH 172/202] FIX: Couldn't like staff when `allow_flagging_staff` was set --- lib/guardian/post_guardian.rb | 4 +++- spec/components/guardian_spec.rb | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb index aa92423b57..4344e5fd34 100644 --- a/lib/guardian/post_guardian.rb +++ b/lib/guardian/post_guardian.rb @@ -22,7 +22,9 @@ module PostGuardian result = if authenticated? && post && !@user.anonymous? # post made by staff, but we don't allow staff flags - return false if !SiteSetting.allow_flagging_staff? && post.user.staff? + return false if is_flag && + (!SiteSetting.allow_flagging_staff?) && + post.user.staff? return false if [:notify_user, :notify_moderators].include?(action_key) && !SiteSetting.enable_personal_messages? diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb index 77667c4e01..0fc91d7b79 100644 --- a/spec/components/guardian_spec.rb +++ b/spec/components/guardian_spec.rb @@ -83,6 +83,12 @@ describe Guardian do expect(Guardian.new(user).post_can_act?(staff_post, :spam)).to eq(false) end + it "allows liking of staff when allow_flagging_staff is false" do + SiteSetting.allow_flagging_staff = false + staff_post = Fabricate(:post, user: Fabricate(:moderator)) + expect(Guardian.new(user).post_can_act?(staff_post, :like)).to eq(true) + end + it "returns false when liking yourself" do expect(Guardian.new(post.user).post_can_act?(post, :like)).to be_falsey end From 96e5a7da46b75827ecc989483ced6f262b0d3bf7 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 15 Feb 2018 07:46:33 +0800 Subject: [PATCH 173/202] Prefer `success_Json` over custom success JSON payload. --- app/controllers/session_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb index 079ba724ef..8b0e0f243c 100644 --- a/app/controllers/session_controller.rb +++ b/app/controllers/session_controller.rb @@ -261,7 +261,7 @@ class SessionController < ApplicationController Jobs.enqueue(:critical_user_email, type: :forgot_password, user_id: user.id, email_token: email_token.token) end - json = { result: "ok" } + json = success_json unless SiteSetting.hide_email_address_taken json[:user_found] = user_presence end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 613215df52..4d0726d865 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -609,7 +609,7 @@ class UsersController < ApplicationController end end - json = { result: "ok" } + json = success_json json[:user_found] = user_presence unless SiteSetting.hide_email_address_taken render json: json rescue RateLimiter::LimitExceeded From a03e7cee634eea35cbd6e83aae25fa2d708861af Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 14 Feb 2018 20:33:13 -0500 Subject: [PATCH 174/202] FIX: Group posts had the wrong paths in subfolders --- .../javascripts/discourse/components/group-post.js.es6 | 6 ++++++ .../discourse/templates/components/group-post.hbs | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/discourse/components/group-post.js.es6 diff --git a/app/assets/javascripts/discourse/components/group-post.js.es6 b/app/assets/javascripts/discourse/components/group-post.js.es6 new file mode 100644 index 0000000000..51e67b8490 --- /dev/null +++ b/app/assets/javascripts/discourse/components/group-post.js.es6 @@ -0,0 +1,6 @@ +import computed from 'ember-addons/ember-computed-decorators'; + +export default Ember.Component.extend({ + @computed('post.url') + postUrl: Discourse.getURL +}); diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs index 9f51a1584f..a6d3d6b101 100644 --- a/app/assets/javascripts/discourse/templates/components/group-post.hbs +++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs @@ -7,7 +7,7 @@
      - {{{post.topic.fancyTitle}}} + {{{post.topic.fancyTitle}}}
      {{category-link post.category}}
      {{#if post.user.name}} From c89b42c488a0f09f64dc205726ea3448295fd0e0 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 15 Feb 2018 13:11:22 +1100 Subject: [PATCH 175/202] PERF: only require the rss library if used Before: Total allocated: 257909321 bytes (2514134 objects) Total retained: 39681579 bytes (343387 objects) allocated memory by gem ----------------------------------- 42875979 rss retained memory by gem ----------------------------------- 2080188 rss retained objects by gem ----------------------------------- 13052 rss After: Total allocated: 210562047 bytes (2252030 objects) Total retained: 37433816 bytes (328635 objects) ---- So, 2 less megabytes on boot and 13000 objects stuck in ruby heaps forever. --- Gemfile.lock | 2 +- app/jobs/scheduled/poll_feed.rb | 14 +++++++++++--- script/boot_mem.rb | 21 +++++++++++++++++++++ 3 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 script/boot_mem.rb diff --git a/Gemfile.lock b/Gemfile.lock index 332ac6f5af..7029f5d7ce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -165,7 +165,7 @@ GEM lru_redux (1.1.0) mail (2.6.6) mime-types (>= 1.16, < 4) - memory_profiler (0.9.8) + memory_profiler (0.9.10) message_bus (2.1.2) rack (>= 1.1.3) metaclass (0.0.4) diff --git a/app/jobs/scheduled/poll_feed.rb b/app/jobs/scheduled/poll_feed.rb index 2f885c69a2..8c5b6c4531 100644 --- a/app/jobs/scheduled/poll_feed.rb +++ b/app/jobs/scheduled/poll_feed.rb @@ -3,9 +3,6 @@ # require 'digest/sha1' require 'excon' -require 'rss' -require_dependency 'feed_item_accessor' -require_dependency 'feed_element_installer' require_dependency 'final_destination' require_dependency 'post_creator' require_dependency 'post_revisor' @@ -27,12 +24,23 @@ module Jobs end def poll_feed + ensure_rss_loaded + # defer loading rss feed = Feed.new import_topics(feed.topics) end private + # rss lib is very expensive memory wise, no need to load it till it is needed + def ensure_rss_loaded + return if @@rss_loaded + require 'rss' + require_dependency 'feed_item_accessor' + require_dependency 'feed_element_installer' + @@rss_loaded + end + def not_polled_recently? $redis.set( 'feed-polled-recently', diff --git a/script/boot_mem.rb b/script/boot_mem.rb new file mode 100644 index 0000000000..61da1fa6c6 --- /dev/null +++ b/script/boot_mem.rb @@ -0,0 +1,21 @@ +# simple script to measure memory at boot + +if ENV['RAILS_ENV'] != "production" + exec "RAILS_ENV=production ruby #{__FILE__}" +end + +require 'memory_profiler' + +MemoryProfiler.report do + require File.expand_path("../../config/environment", __FILE__) + + Rails.application.routes.recognize_path('abc') rescue nil + + # load up the yaml for the localization bits, in master process + I18n.t(:posts) + + # load up all models and schema + (ActiveRecord::Base.connection.tables - %w[schema_migrations versions]).each do |table| + table.classify.constantize.first rescue nil + end +end.pretty_print From b5b866aab3b91f086fa06e95b8aab15f4dae667e Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 15 Feb 2018 13:13:31 +1100 Subject: [PATCH 176/202] oops --- app/jobs/scheduled/poll_feed.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/scheduled/poll_feed.rb b/app/jobs/scheduled/poll_feed.rb index 8c5b6c4531..750b20a245 100644 --- a/app/jobs/scheduled/poll_feed.rb +++ b/app/jobs/scheduled/poll_feed.rb @@ -38,7 +38,7 @@ module Jobs require 'rss' require_dependency 'feed_item_accessor' require_dependency 'feed_element_installer' - @@rss_loaded + @@rss_loaded = true end def not_polled_recently? From d8b4627fc8fb3d15d0f5a42e07feccef9b73b33b Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 15 Feb 2018 13:30:34 +1100 Subject: [PATCH 177/202] we have to define this for tests to pass --- app/jobs/scheduled/poll_feed.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/jobs/scheduled/poll_feed.rb b/app/jobs/scheduled/poll_feed.rb index 750b20a245..494fcf2a70 100644 --- a/app/jobs/scheduled/poll_feed.rb +++ b/app/jobs/scheduled/poll_feed.rb @@ -32,6 +32,8 @@ module Jobs private + @@rss_loaded = false + # rss lib is very expensive memory wise, no need to load it till it is needed def ensure_rss_loaded return if @@rss_loaded From 28365f8ae5ed4c57da0afc6841fbbdfc1d96d0eb Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 15 Feb 2018 10:24:39 +0800 Subject: [PATCH 178/202] PERF: Have nginx cache and serve the service worker file. --- .../register-service-worker.js.es6 | 36 +++++++++---------- app/controllers/static_controller.rb | 6 ++-- .../common/_discourse_javascript.html.erb | 3 ++ config/nginx.sample.conf | 2 +- config/routes.rb | 4 ++- 5 files changed, 28 insertions(+), 23 deletions(-) diff --git a/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6 b/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6 index 281d44554b..c539469475 100644 --- a/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6 +++ b/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6 @@ -2,27 +2,27 @@ export default { name: 'register-service-worker', initialize() { - // only allow service worker on android for now - if (!/(android)/i.test(navigator.userAgent)) { - - // remove old service worker - if ('serviceWorker' in navigator && navigator.serviceWorker.getRegistrations) { - navigator.serviceWorker.getRegistrations().then((registrations) => { - for(let registration of registrations) { - registration.unregister(); - }; - }); - } - - } else { - - const isSecure = (document.location.protocol === 'https:') || + window.addEventListener('load', () => { + const isSecured = (document.location.protocol === 'https:') || (location.hostname === "localhost"); + const isSupported= isSecured && ('serviceWorker' in navigator); - if (isSecure && ('serviceWorker' in navigator)) { - navigator.serviceWorker.register(`${Discourse.BaseUri}/service-worker.js`); + if (isSupported) { + if (Discourse.ServiceWorkerURL) { + navigator.serviceWorker + .register(`${Discourse.BaseUri}/${Discourse.ServiceWorkerURL}`) + .catch(error => { + Ember.Logger.info(`Failed to register Service Worker: ${error}`); + }); + } else { + navigator.serviceWorker.getRegistrations().then(registrations => { + for(let registration of registrations) { + registration.unregister(); + }; + }); + } } - } + }); } }; diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb index 03a88119c4..069562e3e3 100644 --- a/app/controllers/static_controller.rb +++ b/app/controllers/static_controller.rb @@ -148,9 +148,9 @@ class StaticController < ApplicationController def service_worker_asset respond_to do |format| format.js do - - # we take 1 hour to give a new service worker to all users - immutable_for 1.hour + # https://github.com/w3c/ServiceWorker/blob/master/explainer.md#updating-a-service-worker + # Maximum cache that the service worker will respect is 24 hours. + immutable_for 24.hours render( plain: Rails.application.assets_manifest.find_sources('service-worker.js').first, diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb index 3ee86fa4d4..39d2fd0abb 100644 --- a/app/views/common/_discourse_javascript.html.erb +++ b/app/views/common/_discourse_javascript.html.erb @@ -44,6 +44,9 @@ Discourse.SiteSettings = ps.get('siteSettings'); Discourse.LetterAvatarVersion = '<%= LetterAvatar.version %>'; Discourse.MarkdownItURL = '<%= asset_url('markdown-it-bundle.js') %>'; + <%- if DiscoursePluginRegistry.service_workers.present? %> + Discourse.ServiceWorkerURL = '<%= Rails.application.assets_manifest.assets['service-worker.js'] %>' + <%- end %> I18n.defaultLocale = '<%= SiteSetting.default_locale %>'; Discourse.start(); Discourse.set('assetVersion','<%= Discourse.assets_digest %>'); diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf index a1f0551589..6253e04146 100644 --- a/config/nginx.sample.conf +++ b/config/nginx.sample.conf @@ -188,7 +188,7 @@ server { # This big block is needed so we can selectively enable # acceleration for backups and avatars # see note about repetition above - location ~ ^/(letter_avatar/|user_avatar|highlight-js|stylesheets|favicon/proxied) { + location ~ ^/(letter_avatar/|user_avatar|highlight-js|stylesheets|favicon/proxied|service-worker-.*.js) { proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/config/routes.rb b/config/routes.rb index 11edecf0f9..a7409d3afd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -696,7 +696,9 @@ Discourse::Application.routes.draw do post "draft" => "draft#update" delete "draft" => "draft#destroy" - get "service-worker" => "static#service_worker_asset", format: :js + if service_worker_asset = Rails.application.assets_manifest.assets['service-worker.js'] + get service_worker_asset => "static#service_worker_asset", format: :js + end get "cdn_asset/:site/*path" => "static#cdn_asset", format: false get "brotli_asset/*path" => "static#brotli_asset", format: false From 94b2c70c0d5fc1f92f38616dac3a87b6f7043936 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 15 Feb 2018 14:35:20 +1100 Subject: [PATCH 179/202] PERF: remove oga gem oga gem is automatically required by the aws gem the oga gem retains about 1mb of memory, aws now uses nokogiri This also removes the html normalize from the pretty text specs that was a fair bit buggy as the polls test shows. --- Gemfile | 3 - Gemfile.lock | 8 -- lib/html_normalize.rb | 151 ---------------------- plugins/poll/spec/lib/pretty_text_spec.rb | 13 +- spec/components/html_normalize_spec.rb | 73 ----------- spec/components/pretty_text_spec.rb | 21 ++- 6 files changed, 14 insertions(+), 255 deletions(-) delete mode 100644 lib/html_normalize.rb delete mode 100644 spec/components/html_normalize_spec.rb diff --git a/Gemfile b/Gemfile index ced4bbd2dc..cf25046564 100644 --- a/Gemfile +++ b/Gemfile @@ -67,9 +67,6 @@ gem 'multi_json' gem 'mustache' gem 'nokogiri' -# this may end up deprecating nokogiri -gem 'oga', require: false - gem 'omniauth' gem 'omniauth-openid' gem 'openid-redis-store' diff --git a/Gemfile.lock b/Gemfile.lock index 7029f5d7ce..09d9ff3bb3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,7 +41,6 @@ GEM annotate (2.7.2) activerecord (>= 3.2, < 6.0) rake (>= 10.4, < 13.0) - ansi (1.5.0) arel (8.0.0) ast (2.3.0) aws-partitions (1.24.0) @@ -200,9 +199,6 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - oga (2.10) - ast - ruby-ll (~> 2.1) oj (3.1.0) omniauth (1.6.1) hashie (>= 3.4.6, < 3.6.0) @@ -334,9 +330,6 @@ GEM rainbow (>= 2.2.2, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-ll (2.1.2) - ansi - ast ruby-openid (2.7.0) ruby-prof (0.16.2) ruby-progressbar (1.9.0) @@ -459,7 +452,6 @@ DEPENDENCIES multi_json mustache nokogiri - oga oj omniauth omniauth-facebook diff --git a/lib/html_normalize.rb b/lib/html_normalize.rb deleted file mode 100644 index 1243a4426a..0000000000 --- a/lib/html_normalize.rb +++ /dev/null @@ -1,151 +0,0 @@ -# frozen_string_literal: true -# -# this class is used to normalize html output for internal comparisons in specs -# -require 'oga' - -class HtmlNormalize - - def self.normalize(html) - parsed = Oga.parse_html(html.strip, strict: true) - if parsed.children.length != 1 - puts parsed.children.count - raise "expecting a single child" - end - new(parsed.children.first).format - end - - SELF_CLOSE = Set.new(%w{area base br col command embed hr img input keygen line meta param source track wbr}) - - BLOCK = Set.new(%w{ - html - body - aside - p - h1 h2 h3 h4 h5 h6 - ol ul - address - blockquote - dl - div - fieldset - form - hr - noscript - table - pre - }) - - def initialize(doc) - @doc = doc - end - - def format - buffer = String.new - dump_node(@doc, 0, buffer) - buffer.strip! - buffer - end - - def inline?(node) - Oga::XML::Text === node || !BLOCK.include?(node.name.downcase) - end - - def dump_node(node, indent = 0, buffer) - - if Oga::XML::Text === node - if node.parent&.name - buffer << node.text - end - return - end - - name = node.name.downcase - - block = BLOCK.include?(name) - - buffer << " " * indent * 2 if block - - buffer << "<" << name - - attrs = node&.attributes - if (attrs && attrs.length > 0) - attrs.sort! { |x, y| x.name <=> y.name } - attrs.each do |a| - buffer << " " - buffer << a.name - if a.value - buffer << "='" - buffer << a.value - buffer << "'" - end - end - end - - buffer << ">" - - if block - buffer << "\n" - end - - children = node.children - children = trim(children) if block - - inline_buffer = nil - - children&.each do |child| - if block && inline?(child) - inline_buffer ||= String.new - dump_node(child, indent + 1, inline_buffer) - else - if inline_buffer - buffer << " " * (indent + 1) * 2 - buffer << inline_buffer.strip - inline_buffer = nil - else - dump_node(child, indent + 1, buffer) - end - end - end - - if inline_buffer - buffer << " " * (indent + 1) * 2 - buffer << inline_buffer.strip - inline_buffer = nil - end - - if block - buffer << "\n" unless buffer[-1] == "\n" - buffer << " " * indent * 2 - end - - unless SELF_CLOSE.include?(name) - buffer << "\n" - end - end - - def trim(nodes) - start = 0 - finish = nodes.length - - nodes.each do |n| - if Oga::XML::Text === n && n.text.blank? - start += 1 - else - break - end - end - - nodes.reverse_each do |n| - if Oga::XML::Text === n && n.text.blank? - finish -= 1 - else - break - end - end - - nodes[start...finish] - end - -end diff --git a/plugins/poll/spec/lib/pretty_text_spec.rb b/plugins/poll/spec/lib/pretty_text_spec.rb index 85ee2c2a00..fedc70eb98 100644 --- a/plugins/poll/spec/lib/pretty_text_spec.rb +++ b/plugins/poll/spec/lib/pretty_text_spec.rb @@ -1,10 +1,9 @@ require 'rails_helper' -require 'html_normalize' describe PrettyText do def n(html) - HtmlNormalize.normalize(html) + html.strip end it 'supports multi choice polls' do @@ -95,14 +94,13 @@ describe PrettyText do cooked = PrettyText.cook md expected = <<~MD -
      +
        -
      1. test 1 :slight_smile: test -
        2. -
      2. test 2
        3. +
      3. test 1 :slight_smile: test
        4. +
      4. test 2
      @@ -110,12 +108,9 @@ describe PrettyText do 0 voters

      -

      - Choose up to 2 options

      - Vote now! Show results
      diff --git a/spec/components/html_normalize_spec.rb b/spec/components/html_normalize_spec.rb deleted file mode 100644 index 7c75d8a15b..0000000000 --- a/spec/components/html_normalize_spec.rb +++ /dev/null @@ -1,73 +0,0 @@ -require 'rails_helper' -require 'html_normalize' - -describe HtmlNormalize do - - def n(html) - HtmlNormalize.normalize(html) - end - - it "handles attributes without values" do - expect(n "").to eq("") - end - - it "handles self closing tags" do - - source = <<-HTML -
      - - boo -
      -HTML - expect(n source).to eq(source.strip) - end - - it "Can handle aside" do - - source = <<~HTML - -HTML - expected = <<~HTML - -HTML - - expect(n expected).to eq(n source) - end - - it "Can normalize attributes" do - - source = "b" - same = "b" - - expect(n source).to eq(n same) - end - - it "Can indent divs nicely" do - source = "
      hello world
      " - expected = <<~HTML -
      -
      -
      - hello world -
      -
      -
      -HTML - - expect(n source).to eq(expected.strip) - end -end diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index 971d7dd600..487ec56968 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -1,6 +1,5 @@ require 'rails_helper' require 'pretty_text' -require 'html_normalize' describe PrettyText do @@ -9,11 +8,11 @@ describe PrettyText do end def n(html) - HtmlNormalize.normalize(html) + html.strip end def cook(*args) - n(PrettyText.cook(*args)) + PrettyText.cook(*args) end let(:wrapped_image) { "
      \nScreen Shot 2014-04-14 at 9.47.10 PM.png966x737 1.47 MB\n
      " } @@ -33,13 +32,13 @@ describe PrettyText do topic = Fabricate(:topic, title: "this is a test topic :slight_smile:") expected = <<~HTML -