diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index 66a9954511..e6cbd79473 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -80,7 +80,7 @@
{{/if}}
{{else}}
{{unbound invite.email}} |
-
{{format-date invite.created_at}} |
+
{{format-date invite.updated_at}} |
{{#if invite.expired}}
{{i18n 'user.invited.expired'}}
diff --git a/app/assets/javascripts/discourse/widgets/connector.js.es6 b/app/assets/javascripts/discourse/widgets/connector.js.es6
index e3c0d9b628..9701f4c80a 100644
--- a/app/assets/javascripts/discourse/widgets/connector.js.es6
+++ b/app/assets/javascripts/discourse/widgets/connector.js.es6
@@ -22,9 +22,7 @@ export default class Connector {
);
}
- const container = Ember.getOwner
- ? Ember.getOwner(mounted)
- : mounted.container;
+ const container = getOwner ? getOwner(mounted) : mounted.container;
let view;
diff --git a/app/assets/javascripts/discourse/widgets/glue.js.es6 b/app/assets/javascripts/discourse/widgets/glue.js.es6
index c3a6af4b80..7d8a2a4561 100644
--- a/app/assets/javascripts/discourse/widgets/glue.js.es6
+++ b/app/assets/javascripts/discourse/widgets/glue.js.es6
@@ -3,6 +3,7 @@ import { scheduleOnce } from "@ember/runloop";
import { diff, patch } from "virtual-dom";
import { queryRegistry } from "discourse/widgets/widget";
import DirtyKeys from "discourse/lib/dirty-keys";
+import ENV from "discourse-common/config/environment";
export default class WidgetGlue {
constructor(name, register, attrs) {
@@ -34,7 +35,7 @@ export default class WidgetGlue {
cancel(this._timeout);
// in test mode return early if store cannot be found
- if (Ember.testing) {
+ if (ENV.environment === "test") {
try {
this.register.lookup("service:store");
} catch (e) {
@@ -53,6 +54,18 @@ export default class WidgetGlue {
}
cleanUp() {
+ const widgets = [];
+ const findWidgets = widget => {
+ widget.vnode.children.forEach(child => {
+ if (child.constructor.name === "CustomWidget") {
+ widgets.push(child);
+ findWidgets(child, widgets);
+ }
+ });
+ };
+ findWidgets(this._tree, widgets);
+ widgets.reverse().forEach(widget => widget.destroy());
+
cancel(this._timeout);
}
}
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6
index 2112dd4f1d..3a51939f33 100644
--- a/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6
+++ b/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6
@@ -1,6 +1,7 @@
import { createWidget } from "discourse/widgets/widget";
import { h } from "virtual-dom";
import { number } from "discourse/lib/formatter";
+import Category from "discourse/models/category";
createWidget("hamburger-category", {
tagName: "li.category-link",
@@ -10,7 +11,7 @@ createWidget("hamburger-category", {
this.tagName += ".subcategory";
}
- this.tagName += ".category-" + Discourse.Category.slugFor(c, "-");
+ this.tagName += ".category-" + Category.slugFor(c, "-");
const results = [
this.attach("category-link", { category: c, allowUncategorized: true })
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
index b11689796a..912594351e 100644
--- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
@@ -173,7 +173,7 @@ export default createWidget("hamburger-menu", {
listCategories() {
const maxCategoriesToDisplay = this.siteSettings
.header_dropdown_category_count;
- let categories = this.site.get("categoriesByCount");
+ let categories = [];
if (this.currentUser) {
const allCategories = this.site
@@ -203,6 +203,10 @@ export default createWidget("hamburger-menu", {
.filter(c => !categories.includes(c))
.sort((a, b) => b.topic_count - a.topic_count)
);
+ } else {
+ categories = this.site
+ .get("categoriesByCount")
+ .filter(c => c.notification_level !== NotificationLevels.MUTED);
}
if (!this.siteSettings.allow_uncategorized_topics) {
@@ -305,7 +309,7 @@ export default createWidget("hamburger-menu", {
if (this.settings.showCategories) {
results.push(this.listCategories());
- results.push(h("hr"));
+ results.push(h("hr.categories-separator"));
}
results.push(
@@ -335,7 +339,7 @@ export default createWidget("hamburger-menu", {
this.sendWidgetAction("toggleHamburger");
} else {
const $window = $(window);
- const windowWidth = parseInt($window.width(), 10);
+ const windowWidth = $window.width();
const $panel = $(".menu-panel");
$panel.addClass("animate");
const panelOffsetDirection = this.site.mobileView ? "left" : "right";
diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6
index c86931260b..e08bab8741 100644
--- a/app/assets/javascripts/discourse/widgets/header.js.es6
+++ b/app/assets/javascripts/discourse/widgets/header.js.es6
@@ -267,7 +267,7 @@ createWidget("header-cloak", {
scheduleRerender() {}
});
-const forceContextEnabled = ["category", "user", "private_messages"];
+const forceContextEnabled = ["category", "user", "private_messages", "tag"];
let additionalPanels = [];
export function attachAdditionalPanel(name, toggle, transformAttrs) {
diff --git a/app/assets/javascripts/discourse/widgets/hooks.js.es6 b/app/assets/javascripts/discourse/widgets/hooks.js.es6
index d4796d5bb9..979c45a82d 100644
--- a/app/assets/javascripts/discourse/widgets/hooks.js.es6
+++ b/app/assets/javascripts/discourse/widgets/hooks.js.es6
@@ -7,6 +7,8 @@ const MOUSE_DOWN_OUTSIDE_ATTRIBUTE_NAME =
const KEY_UP_ATTRIBUTE_NAME = "_discourse_key_up_widget";
const KEY_DOWN_ATTRIBUTE_NAME = "_discourse_key_down_widget";
const DRAG_ATTRIBUTE_NAME = "_discourse_drag_widget";
+const INPUT_ATTRIBUTE_NAME = "_discourse_input_widget";
+const CHANGE_ATTRIBUTE_NAME = "_discourse_change_widget";
function buildHook(attributeName, setAttr) {
return class {
@@ -42,11 +44,19 @@ export const WidgetMouseDownOutsideHook = buildHook(
export const WidgetKeyUpHook = buildHook(KEY_UP_ATTRIBUTE_NAME);
export const WidgetKeyDownHook = buildHook(KEY_DOWN_ATTRIBUTE_NAME);
export const WidgetDragHook = buildHook(DRAG_ATTRIBUTE_NAME);
+export const WidgetInputHook = buildHook(INPUT_ATTRIBUTE_NAME);
+export const WidgetChangeHook = buildHook(CHANGE_ATTRIBUTE_NAME);
-function nodeCallback(node, attrName, cb) {
+function nodeCallback(node, attrName, cb, options = { rerender: true }) {
+ const { rerender } = options;
const widget = findWidget(node, attrName);
+
if (widget) {
- widget.rerenderResult(() => cb(widget));
+ if (rerender) {
+ widget.rerenderResult(() => cb(widget));
+ } else {
+ cb(widget);
+ }
}
}
@@ -168,5 +178,17 @@ WidgetClickHook.setupDocumentCallback = function() {
nodeCallback(e.target, KEY_DOWN_ATTRIBUTE_NAME, w => w.keyDown(e));
});
+ $(document).on("input.discourse-widget", e => {
+ nodeCallback(e.target, INPUT_ATTRIBUTE_NAME, w => w.input(e), {
+ rerender: false
+ });
+ });
+
+ $(document).on("change.discourse-widget", e => {
+ nodeCallback(e.target, CHANGE_ATTRIBUTE_NAME, w => w.change(e), {
+ rerender: false
+ });
+ });
+
_watchingDocument = true;
};
diff --git a/app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js.es6
index 96a3604255..bc4ce3f43f 100644
--- a/app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js.es6
+++ b/app/assets/javascripts/discourse/widgets/liked-consolidated-notification-item.js.es6
@@ -22,7 +22,7 @@ createWidgetFrom(
const description = I18n.t(
"notifications.liked_consolidated_description",
{
- count: parseInt(data.count)
+ count: parseInt(data.count, 10)
}
);
diff --git a/app/assets/javascripts/discourse/widgets/link.js.es6 b/app/assets/javascripts/discourse/widgets/link.js.es6
index 841fda069f..1194e1c8ae 100644
--- a/app/assets/javascripts/discourse/widgets/link.js.es6
+++ b/app/assets/javascripts/discourse/widgets/link.js.es6
@@ -79,7 +79,7 @@ export default createWidget("link", {
const currentUser = this.currentUser;
if (currentUser && attrs.badgeCount) {
- const val = parseInt(currentUser.get(attrs.badgeCount));
+ const val = parseInt(currentUser.get(attrs.badgeCount), 10);
if (val > 0) {
const title = attrs.badgeTitle ? I18n.t(attrs.badgeTitle) : "";
result.push(" ");
diff --git a/app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js.es6
new file mode 100644
index 0000000000..fafa3656f6
--- /dev/null
+++ b/app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js.es6
@@ -0,0 +1,22 @@
+import { createWidgetFrom } from "discourse/widgets/widget";
+import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
+import { userPath } from "discourse/lib/url";
+
+createWidgetFrom(
+ DefaultNotificationItem,
+ "membership-request-consolidated-notification-item",
+ {
+ url() {
+ return userPath(
+ `${this.attrs.username || this.currentUser.username}/messages`
+ );
+ },
+
+ text(notificationName, data) {
+ return I18n.t("notifications.membership_request_consolidated", {
+ group_name: data.group_name,
+ count: parseInt(data.count, 10)
+ });
+ }
+ }
+);
diff --git a/app/assets/javascripts/discourse/widgets/menu-panel.js.es6 b/app/assets/javascripts/discourse/widgets/menu-panel.js.es6
index 69ccea7626..cc8218e8b6 100644
--- a/app/assets/javascripts/discourse/widgets/menu-panel.js.es6
+++ b/app/assets/javascripts/discourse/widgets/menu-panel.js.es6
@@ -19,7 +19,10 @@ createWidget("menu-links", {
const result = [];
result.push(
- h("ul.menu-links.columned", links.map(l => h("li", liOpts, l)))
+ h(
+ "ul.menu-links.columned",
+ links.map(l => h("li", liOpts, l))
+ )
);
result.push(h("div.clearfix"));
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index 780cb20e1f..2039ed446f 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -5,11 +5,12 @@ import { avatarAtts } from "discourse/widgets/actions-summary";
import { h } from "virtual-dom";
import showModal from "discourse/lib/show-modal";
import { Promise } from "rsvp";
+import ENV from "discourse-common/config/environment";
const LIKE_ACTION = 2;
function animateHeart($elem, start, end, complete) {
- if (Ember.testing) {
+ if (ENV.environment === "test") {
return run(this, complete);
}
diff --git a/app/assets/javascripts/discourse/widgets/post-small-action.js.es6 b/app/assets/javascripts/discourse/widgets/post-small-action.js.es6
index ea45f0ed7c..709d70153a 100644
--- a/app/assets/javascripts/discourse/widgets/post-small-action.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-small-action.js.es6
@@ -5,6 +5,7 @@ import { h } from "virtual-dom";
import { avatarFor } from "discourse/widgets/post";
import { userPath } from "discourse/lib/url";
import { autoUpdatingRelativeAge } from "discourse/lib/formatter";
+import { computed } from "@ember/object";
export function actionDescriptionHtml(actionCode, createdAt, username) {
const dt = new Date(createdAt);
@@ -22,7 +23,7 @@ export function actionDescriptionHtml(actionCode, createdAt, username) {
}
export function actionDescription(actionCode, createdAt, username) {
- return Ember.computed(actionCode, createdAt, function() {
+ return computed(actionCode, createdAt, function() {
const ac = this.get(actionCode);
if (ac) {
return actionDescriptionHtml(ac, this.get(createdAt), this.get(username));
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6
index 8eec4318a8..5107da42f0 100644
--- a/app/assets/javascripts/discourse/widgets/post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post.js.es6
@@ -16,6 +16,7 @@ import {
import hbs from "discourse/widgets/hbs-compiler";
import { relativeAgeMediumSpan } from "discourse/lib/formatter";
import { prioritizeNameInUx } from "discourse/lib/settings";
+import { Promise } from "rsvp";
function transformWithCallbacks(post) {
let transformed = transformBasicPost(post);
@@ -709,7 +710,7 @@ export default createWidget("post", {
// only warn once per day
const yesterday = new Date().getTime() - 1000 * 60 * 60 * 24;
- if (lastWarnedLikes && parseInt(lastWarnedLikes) > yesterday) {
+ if (lastWarnedLikes && parseInt(lastWarnedLikes, 10) > yesterday) {
return;
}
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-item.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-item.js.es6
index a37200e595..46b209d1af 100644
--- a/app/assets/javascripts/discourse/widgets/quick-access-item.js.es6
+++ b/app/assets/javascripts/discourse/widgets/quick-access-item.js.es6
@@ -33,11 +33,21 @@ createWidget("quick-access-item", {
return result;
},
- html({ icon, href }) {
+ html({ href, icon }) {
+ let content = this._contentHtml();
+
+ if (href) {
+ let topicId = href.match(/\/t\/.*?\/(\d+)/);
+ if (topicId && topicId[1]) {
+ topicId = escapeExpression(topicId[1]);
+ content = `${content}`;
+ }
+ }
+
return h("a", { attributes: { href } }, [
iconNode(icon),
new RawHtml({
- html: `${this._usernameHtml()}${this._contentHtml()} `
+ html: `${this._usernameHtml()}${content} `
})
]);
},
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-panel.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-panel.js.es6
index 904629b818..6b64ee241a 100644
--- a/app/assets/javascripts/discourse/widgets/quick-access-panel.js.es6
+++ b/app/assets/javascripts/discourse/widgets/quick-access-panel.js.es6
@@ -2,6 +2,7 @@ import Session from "discourse/models/session";
import { createWidget } from "discourse/widgets/widget";
import { h } from "virtual-dom";
import { headerHeight } from "discourse/components/site-header";
+import { Promise } from "rsvp";
const AVERAGE_ITEM_HEIGHT = 55;
diff --git a/app/assets/javascripts/discourse/widgets/quick-access-profile.js.es6 b/app/assets/javascripts/discourse/widgets/quick-access-profile.js.es6
index f2bfc7ffb7..0d77177a25 100644
--- a/app/assets/javascripts/discourse/widgets/quick-access-profile.js.es6
+++ b/app/assets/javascripts/discourse/widgets/quick-access-profile.js.es6
@@ -1,5 +1,6 @@
import QuickAccessPanel from "discourse/widgets/quick-access-panel";
import { createWidgetFrom } from "discourse/widgets/widget";
+import { Promise } from "rsvp";
createWidgetFrom(QuickAccessPanel, "quick-access-profile", {
buildKey: () => "quick-access-profile",
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
index de2ea2ac42..93312553bd 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
@@ -54,7 +54,9 @@ createWidget("search-context", {
if (ctx) {
const description = searchContextDescription(
get(ctx, "type"),
- get(ctx, "user.username") || get(ctx, "category.name")
+ get(ctx, "user.username") ||
+ get(ctx, "category.name") ||
+ get(ctx, "tag.id")
);
result.push(
h("label", [
diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
index 813a390ec5..eedb6cf06e 100644
--- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
@@ -188,11 +188,7 @@ createWidget("timeline-scrollarea", {
if (this.state.position !== result.scrollPosition) {
this.state.position = result.scrollPosition;
- this.sendWidgetAction(
- "updatePosition",
- result.position,
- result.scrollPosition
- );
+ this.sendWidgetAction("updatePosition", current);
}
return result;
@@ -215,7 +211,8 @@ createWidget("timeline-scrollarea", {
position.lastRead > 3 &&
Math.abs(position.lastRead - position.current) > 3 &&
Math.abs(position.lastRead - position.total) > 1 &&
- (position.lastRead && position.lastRead !== position.total);
+ position.lastRead &&
+ position.lastRead !== position.total;
if (hasBackPosition) {
const lastReadTop = Math.round(
@@ -266,7 +263,7 @@ createWidget("timeline-scrollarea", {
const position = this.position();
this.state.scrolledPost = position.current;
- if (position.current === position.scrollPosition) {
+ if (position.current === position.scrollPosition || this.site.mobileView) {
this.sendWidgetAction("jumpToIndex", position.current);
} else {
this.sendWidgetAction("jumpEnd");
@@ -391,7 +388,7 @@ export default createWidget("topic-timeline", {
return { position: null, excerpt: null };
},
- updatePosition(postIdx, scrollPosition) {
+ updatePosition(scrollPosition) {
if (!this.attrs.fullScreen) {
return;
}
@@ -407,8 +404,7 @@ export default createWidget("topic-timeline", {
}
// we have an off by one, stream is zero based,
- // postIdx is 1 based
- stream.excerpt(postIdx - 1).then(info => {
+ stream.excerpt(scrollPosition - 1).then(info => {
if (info && this.state.position === scrollPosition) {
let excerpt = "";
diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js.es6 b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
index cf669d1edc..6f4b5c323c 100644
--- a/app/assets/javascripts/discourse/widgets/user-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
@@ -109,13 +109,16 @@ createWidget("user-menu-links", {
glyphs.push(this.notificationsGlyph());
glyphs.push(this.bookmarksGlyph());
- if (this.siteSettings.enable_personal_messages) {
+ if (this.siteSettings.enable_personal_messages || this.currentUser.staff) {
glyphs.push(this.messagesGlyph());
}
return h("ul.menu-links-row", [
links.map(l => h("li.user", this.linkHtml(l))),
- h("li.glyphs", glyphs.map(l => this.glyphHtml(l)))
+ h(
+ "li.glyphs",
+ glyphs.map(l => this.glyphHtml(l))
+ )
]);
},
@@ -221,7 +224,7 @@ export default createWidget("user-menu", {
this.sendWidgetAction("toggleUserMenu");
} else {
const $window = $(window);
- const windowWidth = parseInt($window.width(), 10);
+ const windowWidth = $window.width();
const $panel = $(".menu-panel");
$panel.addClass("animate");
$panel.css("right", -windowWidth);
diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js.es6
index ed848faa0d..cb75df16ae 100644
--- a/app/assets/javascripts/discourse/widgets/widget.js.es6
+++ b/app/assets/javascripts/discourse/widgets/widget.js.es6
@@ -4,11 +4,14 @@ import {
WidgetKeyUpHook,
WidgetKeyDownHook,
WidgetMouseDownOutsideHook,
- WidgetDragHook
+ WidgetDragHook,
+ WidgetInputHook,
+ WidgetChangeHook
} from "discourse/widgets/hooks";
import { h } from "virtual-dom";
import DecoratorHelper from "discourse/widgets/decorator-helper";
import { Promise } from "rsvp";
+import ENV from "discourse-common/config/environment";
const _registry = {};
@@ -115,8 +118,10 @@ export default class Widget {
this.appEvents = register.lookup("service:app-events");
this.keyValueStore = register.lookup("key-value-store:main");
+ this.init(this.attrs);
+
// Helps debug widgets
- if (Discourse.Environment === "development" || Ember.testing) {
+ if (Discourse.Environment === "development" || ENV.environment === "test") {
const ds = this.defaultState(attrs);
if (typeof ds !== "object") {
throw new Error(`defaultState must return an object`);
@@ -141,6 +146,8 @@ export default class Widget {
return {};
}
+ init() {}
+
destroy() {}
render(prev) {
@@ -370,6 +377,14 @@ export default class Widget {
properties["widget-drag"] = new WidgetDragHook(this);
}
+ if (this.input) {
+ properties["widget-input"] = new WidgetInputHook(this);
+ }
+
+ if (this.change) {
+ properties["widget-change"] = new WidgetChangeHook(this);
+ }
+
const attributes = properties["attributes"] || {};
properties.attributes = attributes;
diff --git a/app/assets/javascripts/ember-addons/decorator-alias.js.es6 b/app/assets/javascripts/ember-addons/decorator-alias.js.es6
index 44d911a1dd..327dc7a2cb 100644
--- a/app/assets/javascripts/ember-addons/decorator-alias.js.es6
+++ b/app/assets/javascripts/ember-addons/decorator-alias.js.es6
@@ -2,7 +2,7 @@ import extractValue from "./utils/extract-value";
export default function decoratorAlias(fn, errorMessage) {
return function(...params) {
- // determine if user called as @computed('blah', 'blah') or @computed
+ // determine if user called as @discourseComputed('blah', 'blah') or @discourseComputed
if (params.length === 0) {
throw new Error(errorMessage);
} else {
diff --git a/app/assets/javascripts/locales/i18n.js b/app/assets/javascripts/locales/i18n.js
index 68657e28b6..ec33b0c523 100644
--- a/app/assets/javascripts/locales/i18n.js
+++ b/app/assets/javascripts/locales/i18n.js
@@ -319,7 +319,8 @@ I18n.enableVerboseLocalization = function() {
if (!_.isEmpty(value)) {
message += ", parameters: " + JSON.stringify(value);
}
- Ember.Logger.info(message);
+ // eslint-disable-next-line no-console
+ console.info(message);
}
return t.apply(I18n, [scope, value]) + " (#" + current + ")";
};
diff --git a/app/assets/javascripts/markdown-it-bundle.js b/app/assets/javascripts/markdown-it-bundle.js
index 2d0ec14ee5..052891aaf5 100644
--- a/app/assets/javascripts/markdown-it-bundle.js
+++ b/app/assets/javascripts/markdown-it-bundle.js
@@ -16,4 +16,5 @@
//= require ./pretty-text/engines/discourse-markdown/text-post-process
//= require ./pretty-text/engines/discourse-markdown/upload-protocol
//= require ./pretty-text/engines/discourse-markdown/inject-line-number
+//= require ./pretty-text/engines/discourse-markdown/resize-controls
//= require ./pretty-text/engines/discourse-markdown/d-wrap
diff --git a/app/assets/javascripts/preload-application-data.js.no-module.es6 b/app/assets/javascripts/preload-application-data.js.no-module.es6
index f78ea11367..8dfab7b145 100644
--- a/app/assets/javascripts/preload-application-data.js.no-module.es6
+++ b/app/assets/javascripts/preload-application-data.js.no-module.es6
@@ -27,13 +27,15 @@
I18n.defaultLocale = setupData.defaultLocale;
Discourse.start();
Discourse.set("assetVersion", setupData.assetVersion);
- Discourse.Session.currentProp(
+
+ let Session = require("discourse/models/session").default;
+ Session.currentProp(
"disableCustomCSS",
setupData.disableCustomCss === "true"
);
if (setupData.safeMode) {
- Discourse.Session.currentProp("safe_mode", setupData.safeMode);
+ Session.currentProp("safe_mode", setupData.safeMode);
}
Discourse.HighlightJSPath = setupData.highlightJsPath;
diff --git a/app/assets/javascripts/preload-store.js.es6 b/app/assets/javascripts/preload-store.js.es6
index b096afd4c1..132588695b 100644
--- a/app/assets/javascripts/preload-store.js.es6
+++ b/app/assets/javascripts/preload-store.js.es6
@@ -4,6 +4,8 @@
@class PreloadStore
**/
+import { Promise } from "rsvp";
+
export default {
data: {},
@@ -19,14 +21,14 @@ export default {
**/
getAndRemove(key, finder) {
if (this.data[key]) {
- var promise = Ember.RSVP.resolve(this.data[key]);
+ let promise = Promise.resolve(this.data[key]);
delete this.data[key];
return promise;
}
if (finder) {
- return new Ember.RSVP.Promise(function(resolve, reject) {
- var result = finder();
+ return new Promise(function(resolve, reject) {
+ let result = finder();
// If the finder returns a promise, we support that too
if (result && result.then) {
@@ -39,7 +41,7 @@ export default {
});
}
- return Ember.RSVP.resolve(null);
+ return Promise.resolve(null);
},
get(key) {
diff --git a/app/assets/javascripts/pretty-text/emoji.js.es6 b/app/assets/javascripts/pretty-text/emoji.js.es6
index 2089902c3b..fec9b725c4 100644
--- a/app/assets/javascripts/pretty-text/emoji.js.es6
+++ b/app/assets/javascripts/pretty-text/emoji.js.es6
@@ -42,10 +42,31 @@ export function buildReplacementsList(emojiReplacements) {
.join("|");
}
-const unicodeRegexp = new RegExp(
- buildReplacementsList(replacements) + "|\\B:[^\\s:]+(?::t\\d)?:?\\B",
- "g"
-);
+let replacementListCache;
+const unicodeRegexpCache = {};
+
+function replacementList() {
+ if (replacementListCache === undefined) {
+ replacementListCache = buildReplacementsList(replacements);
+ }
+
+ return replacementListCache;
+}
+
+function unicodeRegexp(inlineEmoji) {
+ if (unicodeRegexpCache[inlineEmoji] === undefined) {
+ const emojiExpression = inlineEmoji
+ ? "|:[^\\s:]+(?::t\\d)?:?"
+ : "|\\B:[^\\s:]+(?::t\\d)?:?\\B";
+
+ unicodeRegexpCache[inlineEmoji] = new RegExp(
+ replacementList() + emojiExpression,
+ "g"
+ );
+ }
+
+ return unicodeRegexpCache[inlineEmoji];
+}
// add all default emojis
emojis.forEach(code => (emojiHash[code] = true));
@@ -56,12 +77,29 @@ Object.keys(aliases).forEach(name => {
aliases[name].forEach(alias => (aliasHash[alias] = name));
});
+function isReplacableInlineEmoji(string, index, inlineEmoji) {
+ if (inlineEmoji) return true;
+
+ // index depends on regex; when `inlineEmoji` is false, the regex starts
+ // with a `\B` character, so there's no need to subtract from the index
+ const beforeEmoji = string.slice(0, index - (inlineEmoji ? 1 : 0));
+
+ return (
+ beforeEmoji.length === 0 ||
+ /(?:\s|[>.,\/#!$%^&*;:{}=\-_`~()])$/.test(beforeEmoji) ||
+ new RegExp(`(?:${replacementList()})$`).test(beforeEmoji)
+ );
+}
+
export function performEmojiUnescape(string, opts) {
if (!string) {
return;
}
- return string.replace(unicodeRegexp, m => {
+ const inlineEmoji = opts.inlineEmoji;
+ const regexp = unicodeRegexp(inlineEmoji);
+
+ return string.replace(regexp, (m, index) => {
const isEmoticon = opts.enableEmojiShortcuts && !!translations[m];
const isUnicodeEmoticon = !!replacements[m];
let emojiVal;
@@ -78,7 +116,11 @@ export function performEmojiUnescape(string, opts) {
? "emoji emoji-custom"
: "emoji";
- return url && (isEmoticon || hasEndingColon || isUnicodeEmoticon)
+ const isReplacable =
+ (isEmoticon || hasEndingColon || isUnicodeEmoticon) &&
+ isReplacableInlineEmoji(string, index, inlineEmoji);
+
+ return url && isReplacable
? ` `
@@ -89,14 +131,19 @@ export function performEmojiUnescape(string, opts) {
}
export function performEmojiEscape(string, opts) {
- return string.replace(unicodeRegexp, m => {
- if (!!translations[m]) {
- return opts.emojiShortcuts ? `:${translations[m]}:` : m;
- } else if (!!replacements[m]) {
- return `:${replacements[m]}:`;
- } else {
- return m;
+ const inlineEmoji = opts.inlineEmoji;
+ const regexp = unicodeRegexp(inlineEmoji);
+
+ return string.replace(regexp, (m, index) => {
+ if (isReplacableInlineEmoji(string, index, inlineEmoji)) {
+ if (!!translations[m]) {
+ return opts.emojiShortcuts ? `:${translations[m]}:` : m;
+ } else if (!!replacements[m]) {
+ return `:${replacements[m]}:`;
+ }
}
+
+ return m;
});
return string;
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 7bf824de7f..c491468745 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
@@ -145,22 +145,22 @@ function renderImage(tokens, idx, options, env, slf) {
// calculate using percentage
if (match[5] && match[6] && match[6] === "%") {
let percent = parseFloat(match[5]) / 100.0;
- width = parseInt(width * percent);
- height = parseInt(height * percent);
+ width = parseInt(width * percent, 10);
+ height = parseInt(height * percent, 10);
}
// calculate using only given width
if (match[5] && match[6] && match[6] === "x") {
let wr = parseFloat(match[5]) / width;
- width = parseInt(match[5]);
- height = parseInt(height * wr);
+ width = parseInt(match[5], 10);
+ height = parseInt(height * wr, 10);
}
// calculate using only given height
if (match[5] && match[4] && match[4] === "x" && !match[6]) {
let hr = parseFloat(match[5]) / height;
- height = parseInt(match[5]);
- width = parseInt(width * hr);
+ height = parseInt(match[5], 10);
+ width = parseInt(width * hr, 10);
}
if (token.attrIndex("width") === -1) {
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js.es6
index 4e23b196c1..98788ae063 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js.es6
@@ -185,7 +185,10 @@ export function setup(helper) {
if (simpleUrlRegex.test(url)) {
startToken.type = "link_open";
startToken.tag = "a";
- startToken.attrs = [["href", url], ["data-bbcode", "true"]];
+ startToken.attrs = [
+ ["href", url],
+ ["data-bbcode", "true"]
+ ];
startToken.content = "";
startToken.nesting = 1;
@@ -214,7 +217,10 @@ export function setup(helper) {
let email = tagInfo.attrs["_default"] || content;
token = state.push("link_open", "a", 1);
- token.attrs = [["href", "mailto:" + email], ["data-bbcode", "true"]];
+ token.attrs = [
+ ["href", "mailto:" + email],
+ ["data-bbcode", "true"]
+ ];
token = state.push("text", "", 0);
token.content = content;
@@ -228,7 +234,10 @@ export function setup(helper) {
tag: "img",
replace: function(state, tagInfo, content) {
let token = state.push("image", "img", 0);
- token.attrs = [["src", content], ["alt", ""]];
+ token.attrs = [
+ ["src", content],
+ ["alt", ""]
+ ];
token.children = [];
return true;
}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js.es6
index dbe6883606..e9e34ab27e 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js.es6
@@ -8,7 +8,10 @@ function addHashtag(buffer, matches, state) {
if (result) {
token = new state.Token("link_open", "a", 1);
- token.attrs = [["class", "hashtag"], ["href", result[0]]];
+ token.attrs = [
+ ["class", "hashtag"],
+ ["href", result[0]]
+ ];
token.block = false;
buffer.push(token);
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6
index 3203110c94..7358bdaa06 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6
@@ -1,6 +1,5 @@
import { lookupCache } from "pretty-text/oneboxer-cache";
import { cachedInlineOnebox } from "pretty-text/inline-oneboxer";
-
import {
INLINE_ONEBOX_LOADING_CSS_CLASS,
INLINE_ONEBOX_CSS_CLASS
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 e1c9a31bf0..6c2860577a 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
@@ -120,7 +120,8 @@ const rule = {
title = performEmojiUnescape(topicInfo.title, {
getURL: options.getURL,
emojiSet: options.emojiSet,
- enableEmojiShortcuts: options.enableEmojiShortcuts
+ enableEmojiShortcuts: options.enableEmojiShortcuts,
+ inlineEmoji: options.inlineEmoji
});
}
@@ -156,6 +157,7 @@ export function setup(helper) {
opts.enableEmoji = siteSettings.enable_emoji;
opts.emojiSet = siteSettings.emoji_set;
opts.enableEmojiShortcuts = siteSettings.enable_emoji_shortcuts;
+ opts.inlineEmoji = siteSettings.enable_inline_emoji_translation;
});
helper.registerPlugin(md => {
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js.es6
new file mode 100644
index 0000000000..bb8e381d33
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js.es6
@@ -0,0 +1,160 @@
+function isUpload(token) {
+ return token.content.includes("upload://");
+}
+
+function hasMetadata(token) {
+ return token.content.match(/(\d{1,4}x\d{1,4})/);
+}
+
+function buildToken(state, type, tag, klass, nesting) {
+ const token = new state.Token(type, tag, nesting);
+ token.block = true;
+ token.attrs = [["class", klass]];
+ return token;
+}
+
+function wrapImage(tokens, index, state, imgNumber) {
+ const imgToken = tokens[index];
+ let selectedScale = imgToken.content
+ .split(",")
+ .pop()
+ .trim();
+ tokens.splice(
+ index,
+ 0,
+ buildToken(state, "wrap_image_open", "div", "image-wrapper", 1)
+ );
+
+ const newElements = [];
+ const btnWrapper = buildToken(
+ state,
+ "wrap_button_open",
+ "div",
+ "button-wrapper",
+ 1
+ );
+ btnWrapper.attrs.push(["data-image-index", imgNumber]);
+ newElements.push(btnWrapper);
+
+ const minimumScale = 50;
+ const scales = [100, 75, minimumScale];
+ const overwriteScale = !scales.find(scale => `${scale}%` === selectedScale);
+ if (overwriteScale) selectedScale = "100%";
+
+ scales.forEach(scale => {
+ const scaleText = `${scale}%`;
+
+ const btnClass =
+ scaleText === selectedScale ? "scale-btn active" : "scale-btn";
+ const scaleBtn = buildToken(
+ state,
+ "scale_button_open",
+ "span",
+ btnClass,
+ 1
+ );
+ scaleBtn.attrs.push(["data-scale", scale]);
+ newElements.push(scaleBtn);
+
+ let textToken = buildToken(state, "text", "", "", 0);
+ textToken.content = scaleText;
+ newElements.push(textToken);
+
+ newElements.push(buildToken(state, "scale_button_close", "span", "", -1));
+
+ if (scale !== minimumScale) {
+ newElements.push(buildToken(state, "separator", "span", "separator", 1));
+ let separatorToken = buildToken(state, "text", "", "", 0);
+ separatorToken.content = " • ";
+ newElements.push(separatorToken);
+ newElements.push(buildToken(state, "separator_close", "span", "", -1));
+ }
+ });
+ newElements.push(buildToken(state, "wrap_button_close", "div", "", -1));
+
+ newElements.push(buildToken(state, "wrap_image_close", "div", "", -1));
+
+ const afterImageIndex = index + 2;
+ tokens.splice(afterImageIndex, 0, ...newElements);
+}
+
+function removeParagraph(tokens, imageIndex) {
+ if (
+ tokens[imageIndex - 1] &&
+ tokens[imageIndex - 1].type === "paragraph_open"
+ )
+ tokens.splice(imageIndex - 1, 1);
+ if (tokens[imageIndex] && tokens[imageIndex].type === "paragraph_close")
+ tokens.splice(imageIndex, 1);
+}
+
+function updateIndexes(indexes, name) {
+ indexes[name].push(indexes.current);
+ indexes.current++;
+}
+
+function wrapImages(tokens, tokenIndexes, state, imgNumberIndexes) {
+ //We do this in reverse order because it's easier for #wrapImage to manipulate the tokens array.
+ for (let j = tokenIndexes.length - 1; j >= 0; j--) {
+ let index = tokenIndexes[j];
+ removeParagraph(tokens, index);
+ wrapImage(tokens, index, state, imgNumberIndexes.pop());
+ }
+}
+
+function rule(state) {
+ let blockIndexes = [];
+ const indexNumbers = { current: 0, blocks: [], childrens: [] };
+
+ for (let i = 0; i < state.tokens.length; i++) {
+ let blockToken = state.tokens[i];
+ const blockTokenImage = blockToken.tag === "img";
+
+ if (blockTokenImage && isUpload(blockToken) && hasMetadata(blockToken)) {
+ blockIndexes.push(i);
+ updateIndexes(indexNumbers, "blocks");
+ }
+
+ if (!blockToken.children) continue;
+
+ const childrenIndexes = [];
+ for (let j = 0; j < blockToken.children.length; j++) {
+ let token = blockToken.children[j];
+ const childrenImage = token.tag === "img";
+
+ if (childrenImage && isUpload(blockToken) && hasMetadata(token)) {
+ removeParagraph(state.tokens, i);
+ childrenIndexes.push(j);
+ updateIndexes(indexNumbers, "childrens");
+ }
+ }
+
+ wrapImages(
+ blockToken.children,
+ childrenIndexes,
+ state,
+ indexNumbers.childrens
+ );
+ }
+
+ wrapImages(state.tokens, blockIndexes, state, indexNumbers.blocks);
+}
+
+export function setup(helper) {
+ const opts = helper.getOptions();
+ if (opts.previewing) {
+ helper.whiteList([
+ "div.image-wrapper",
+ "div.button-wrapper",
+ "span[class=scale-btn]",
+ "span[class=scale-btn active]",
+ "span.separator",
+ "span.scale-btn[data-scale]",
+ "span.button-wrapper[data-image-index]"
+ ]);
+
+ helper.registerPlugin(md => {
+ md.core.ruler.after("upload-protocol", "resize-controls", rule);
+ });
+ }
+}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js.es6
index 196f52066f..7790998e02 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js.es6
@@ -20,15 +20,12 @@ function rule(state) {
addImage(uploads, blockToken);
}
- if (!blockToken.children) {
- continue;
- }
+ if (!blockToken.children) continue;
for (let j = 0; j < blockToken.children.length; j++) {
let token = blockToken.children[j];
- if (token.tag === "img" || token.tag === "a") {
- addImage(uploads, token);
- }
+
+ if (token.tag === "img" || token.tag === "a") addImage(uploads, token);
}
}
diff --git a/app/assets/javascripts/select-kit/components/admin-group-selector.js.es6 b/app/assets/javascripts/select-kit/components/admin-group-selector.js.es6
index ddc883ee07..2d99404c0a 100644
--- a/app/assets/javascripts/select-kit/components/admin-group-selector.js.es6
+++ b/app/assets/javascripts/select-kit/components/admin-group-selector.js.es6
@@ -1,5 +1,6 @@
import MultiSelectComponent from "select-kit/components/multi-select";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
+
const { makeArray } = Ember;
export default MultiSelectComponent.extend({
@@ -10,7 +11,7 @@ export default MultiSelectComponent.extend({
allowAny: false,
buffer: null,
- @computed("buffer")
+ @discourseComputed("buffer")
values(buffer) {
return buffer === null
? makeArray(this.selected).map(s => this.valueForContentItem(s))
diff --git a/app/assets/javascripts/select-kit/components/category-chooser.js.es6 b/app/assets/javascripts/select-kit/components/category-chooser.js.es6
index a1d453aa2a..8a91e9868e 100644
--- a/app/assets/javascripts/select-kit/components/category-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-chooser.js.es6
@@ -1,5 +1,5 @@
import ComboBoxComponent from "select-kit/components/combo-box";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
import PermissionType from "discourse/models/permission-type";
import Category from "discourse/models/category";
import { categoryBadgeHTML } from "discourse/helpers/category-link";
@@ -53,7 +53,7 @@ export default ComboBoxComponent.extend({
});
},
- @computed("rootNone", "rootNoneLabel")
+ @discourseComputed("rootNone", "rootNoneLabel")
none(rootNone, rootNoneLabel) {
if (
this.siteSettings.allow_uncategorized_topics ||
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 425c2bb038..165818ffb2 100644
--- a/app/assets/javascripts/select-kit/components/category-drop.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-drop.js.es6
@@ -1,8 +1,11 @@
+import { alias, not } from "@ember/object/computed";
import ComboBoxComponent from "select-kit/components/combo-box";
import DiscourseURL from "discourse/lib/url";
-import { default as computed } from "ember-addons/ember-computed-decorators";
+import { default as discourseComputed } from "discourse-common/utils/decorators";
import Category from "discourse/models/category";
import { categoryBadgeHTML } from "discourse/helpers/category-link";
+import Site from "discourse/models/site";
+
const { isEmpty } = Ember;
export default ComboBoxComponent.extend({
@@ -10,20 +13,25 @@ export default ComboBoxComponent.extend({
classNameBindings: ["categoryStyle"],
classNames: "category-drop",
verticalOffset: 3,
- content: Ember.computed.alias("categoriesWithShortcuts"),
+ content: alias("categoriesWithShortcuts"),
rowComponent: "category-row",
headerComponent: "category-drop/category-drop-header",
allowAutoSelectFirst: false,
tagName: "li",
- categoryStyle: Ember.computed.alias("siteSettings.category_style"),
+ categoryStyle: alias("siteSettings.category_style"),
noCategoriesLabel: I18n.t("categories.no_subcategory"),
fullWidthOnMobile: true,
caretDownIcon: "caret-right",
caretUpIcon: "caret-down",
subCategory: false,
- isAsync: Ember.computed.not("subCategory"),
+ isAsync: not("subCategory"),
- @computed("categories", "hasSelection", "subCategory", "noSubcategories")
+ @discourseComputed(
+ "categories",
+ "hasSelection",
+ "subCategory",
+ "noSubcategories"
+ )
categoriesWithShortcuts(
categories,
hasSelection,
@@ -70,12 +78,12 @@ export default ComboBoxComponent.extend({
this.forceValue(this.get("category.id"));
},
- @computed("content")
+ @discourseComputed("content")
filterable(content) {
const contentLength = (content && content.length) || 0;
return (
contentLength >= 15 ||
- (this.isAsync && contentLength < Discourse.Category.list().length)
+ (this.isAsync && contentLength < Category.list().length)
);
},
@@ -107,7 +115,7 @@ export default ComboBoxComponent.extend({
return content;
},
- @computed("parentCategory.name", "subCategory")
+ @discourseComputed("parentCategory.name", "subCategory")
allCategoriesLabel(categoryName, subCategory) {
if (subCategory) {
return I18n.t("categories.all_subcategories", { categoryName });
@@ -115,12 +123,12 @@ export default ComboBoxComponent.extend({
return I18n.t("categories.all");
},
- @computed("parentCategory.url", "subCategory")
+ @discourseComputed("parentCategory.url", "subCategory")
allCategoriesUrl(parentCategoryUrl, subCategory) {
return Discourse.getURL(subCategory ? parentCategoryUrl || "/" : "/");
},
- @computed("parentCategory.url")
+ @discourseComputed("parentCategory.url")
noCategoriesUrl(parentCategoryUrl) {
return Discourse.getURL(`${parentCategoryUrl}/none`);
},
@@ -135,8 +143,8 @@ export default ComboBoxComponent.extend({
categoryURL = Discourse.getURL(this.noCategoriesUrl);
} else {
const category = Category.findById(parseInt(categoryId, 10));
- const slug = Discourse.Category.slugFor(category);
- categoryURL = Discourse.getURL("/c/") + slug;
+ const slug = Category.slugFor(category);
+ categoryURL = Discourse.getURL(`/c/${slug}/${categoryId}`);
}
DiscourseURL.routeTo(categoryURL);
@@ -158,14 +166,11 @@ export default ComboBoxComponent.extend({
return;
}
- let results = Discourse.Category.search(filter);
+ let results = Category.search(filter);
if (!this.siteSettings.allow_uncategorized_topics) {
results = results.filter(result => {
- return (
- result.id !==
- Discourse.Site.currentProp("uncategorized_category_id")
- );
+ return result.id !== Site.currentProp("uncategorized_category_id");
});
}
diff --git a/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js.es6 b/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js.es6
index c04fc30840..c84b7189d0 100644
--- a/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js.es6
@@ -1,6 +1,7 @@
+import { alias } from "@ember/object/computed";
import { isEmpty } from "@ember/utils";
import ComboBoxSelectBoxHeaderComponent from "select-kit/components/combo-box/combo-box-header";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
import Category from "discourse/models/category";
export default ComboBoxSelectBoxHeaderComponent.extend({
@@ -9,9 +10,9 @@ export default ComboBoxSelectBoxHeaderComponent.extend({
classNames: "category-drop-header",
classNameBindings: ["categoryStyleClass"],
- categoryStyleClass: Ember.computed.alias("site.category_style"),
+ categoryStyleClass: alias("site.category_style"),
- @computed("computedContent.value", "computedContent.name")
+ @discourseComputed("computedContent.value", "computedContent.name")
category(value, name) {
if (isEmpty(value)) {
const uncat = Category.findUncategorized();
@@ -23,17 +24,17 @@ export default ComboBoxSelectBoxHeaderComponent.extend({
}
},
- @computed("category.color")
+ @discourseComputed("category.color")
categoryBackgroundColor(categoryColor) {
return categoryColor || "#e9e9e9";
},
- @computed("category.text_color")
+ @discourseComputed("category.text_color")
categoryTextColor(categoryTextColor) {
return categoryTextColor || "#333";
},
- @computed("category", "categoryBackgroundColor", "categoryTextColor")
+ @discourseComputed("category", "categoryBackgroundColor", "categoryTextColor")
categoryStyle(category, categoryBackgroundColor, categoryTextColor) {
const categoryStyle = this.siteSettings.category_style;
diff --git a/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6
index 17c8e4de41..ecc000d8bd 100644
--- a/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6
@@ -1,10 +1,11 @@
+import { or, alias } from "@ember/object/computed";
import NotificationOptionsComponent from "select-kit/components/notifications-button";
export default NotificationOptionsComponent.extend({
pluginApiIdentifiers: ["category-notifications-button"],
classNames: "category-notifications-button",
- isHidden: Ember.computed.or("category.deleted"),
- headerIcon: Ember.computed.alias("iconForSelectedDetails"),
+ isHidden: or("category.deleted"),
+ headerIcon: alias("iconForSelectedDetails"),
i18nPrefix: "category.notifications",
showFullTitle: false,
allowInitialValueMutation: false,
diff --git a/app/assets/javascripts/select-kit/components/category-row.js.es6 b/app/assets/javascripts/select-kit/components/category-row.js.es6
index 8523bfb07e..dee781b294 100644
--- a/app/assets/javascripts/select-kit/components/category-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-row.js.es6
@@ -1,32 +1,34 @@
+import { bool } from "@ember/object/computed";
import { isEmpty } from "@ember/utils";
import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
import Category from "discourse/models/category";
import { categoryBadgeHTML } from "discourse/helpers/category-link";
+import { isNone } from "@ember/utils";
export default SelectKitRowComponent.extend({
layoutName: "select-kit/templates/components/category-row",
classNames: "category-row",
- hideParentCategory: Ember.computed.bool("options.hideParentCategory"),
- allowUncategorized: Ember.computed.bool("options.allowUncategorized"),
- categoryLink: Ember.computed.bool("options.categoryLink"),
+ hideParentCategory: bool("options.hideParentCategory"),
+ allowUncategorized: bool("options.allowUncategorized"),
+ categoryLink: bool("options.categoryLink"),
- @computed("options.displayCategoryDescription")
+ @discourseComputed("options.displayCategoryDescription")
displayCategoryDescription(displayCategoryDescription) {
- if (Ember.isNone(displayCategoryDescription)) {
+ if (isNone(displayCategoryDescription)) {
return true;
}
return displayCategoryDescription;
},
- @computed("descriptionText", "description", "category.name")
+ @discourseComputed("descriptionText", "description", "category.name")
title(descriptionText, description, name) {
return descriptionText || description || name;
},
- @computed("computedContent.value", "computedContent.name")
+ @discourseComputed("computedContent.value", "computedContent.name")
category(value, name) {
if (isEmpty(value)) {
const uncat = Category.findUncategorized();
@@ -38,7 +40,7 @@ export default SelectKitRowComponent.extend({
}
},
- @computed("category", "parentCategory")
+ @discourseComputed("category", "parentCategory")
badgeForCategory(category, parentCategory) {
return categoryBadgeHTML(category, {
link: this.categoryLink,
@@ -47,7 +49,7 @@ export default SelectKitRowComponent.extend({
}).htmlSafe();
},
- @computed("parentCategory")
+ @discourseComputed("parentCategory")
badgeForParentCategory(parentCategory) {
return categoryBadgeHTML(parentCategory, {
link: this.categoryLink,
@@ -55,22 +57,22 @@ export default SelectKitRowComponent.extend({
}).htmlSafe();
},
- @computed("parentCategoryid")
+ @discourseComputed("parentCategoryid")
parentCategory(parentCategoryId) {
return Category.findById(parentCategoryId);
},
- @computed("parentCategoryid")
+ @discourseComputed("parentCategoryid")
hasParentCategory(parentCategoryid) {
- return !Ember.isNone(parentCategoryid);
+ return !isNone(parentCategoryid);
},
- @computed("category")
+ @discourseComputed("category")
parentCategoryid(category) {
return category.get("parent_category_id");
},
- @computed(
+ @discourseComputed(
"category.totalTopicCount",
"category.topic_count",
"options.countSubcategories"
@@ -79,19 +81,19 @@ export default SelectKitRowComponent.extend({
return countSubcats ? totalCount : topicCount;
},
- @computed("displayCategoryDescription", "category.description")
+ @discourseComputed("displayCategoryDescription", "category.description")
shouldDisplayDescription(displayCategoryDescription, description) {
return displayCategoryDescription && description && description !== "null";
},
- @computed("category.description_text")
+ @discourseComputed("category.description_text")
descriptionText(descriptionText) {
if (descriptionText) {
return this._formatCategoryDescription(descriptionText);
}
},
- @computed("category.description")
+ @discourseComputed("category.description")
description(description) {
if (description) {
return this._formatCategoryDescription(description);
diff --git a/app/assets/javascripts/select-kit/components/category-selector.js.es6 b/app/assets/javascripts/select-kit/components/category-selector.js.es6
index f000f00782..11ed11bacd 100644
--- a/app/assets/javascripts/select-kit/components/category-selector.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-selector.js.es6
@@ -34,7 +34,10 @@ export default MultiSelectComponent.extend({
},
mutateValues(values) {
- this.set("categories", values.map(v => Category.findById(v)));
+ this.set(
+ "categories",
+ values.map(v => Category.findById(v))
+ );
},
filterComputedContent(computedContent, computedValues, filter) {
diff --git a/app/assets/javascripts/select-kit/components/color-palettes/color-palettes-row.js.es6 b/app/assets/javascripts/select-kit/components/color-palettes/color-palettes-row.js.es6
index e0ae6b7039..7aa53eb596 100644
--- a/app/assets/javascripts/select-kit/components/color-palettes/color-palettes-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/color-palettes/color-palettes-row.js.es6
@@ -1,13 +1,13 @@
import { escapeExpression } from "discourse/lib/utilities";
import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
-import { default as computed } from "ember-addons/ember-computed-decorators";
+import { default as discourseComputed } from "discourse-common/utils/decorators";
export default SelectKitRowComponent.extend({
layoutName:
"select-kit/templates/components/color-palettes/color-palettes-row",
classNames: "color-palettes-row",
- @computed("computedContent.originalContent.colors")
+ @discourseComputed("computedContent.originalContent.colors")
colors(colors) {
return (colors || []).map(color => `#${escapeExpression(color.hex)}`);
}
diff --git a/app/assets/javascripts/select-kit/components/combo-box.js.es6 b/app/assets/javascripts/select-kit/components/combo-box.js.es6
index 09e8a7c7bd..71928d314f 100644
--- a/app/assets/javascripts/select-kit/components/combo-box.js.es6
+++ b/app/assets/javascripts/select-kit/components/combo-box.js.es6
@@ -1,8 +1,8 @@
import SingleSelectComponent from "select-kit/components/single-select";
import {
on,
- default as computed
-} from "ember-addons/ember-computed-decorators";
+ default as discourseComputed
+} from "discourse-common/utils/decorators";
export default SingleSelectComponent.extend({
pluginApiIdentifiers: ["combo-box"],
@@ -20,7 +20,7 @@ export default SingleSelectComponent.extend({
return content;
},
- @computed("isExpanded", "caretUpIcon", "caretDownIcon")
+ @discourseComputed("isExpanded", "caretUpIcon", "caretDownIcon")
caretIcon(isExpanded, caretUpIcon, caretDownIcon) {
return isExpanded ? caretUpIcon : caretDownIcon;
},
diff --git a/app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js.es6 b/app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js.es6
index 34e642bd7e..4dbe7d22c5 100644
--- a/app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js.es6
+++ b/app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js.es6
@@ -1,14 +1,12 @@
+import { alias, and } from "@ember/object/computed";
import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header";
export default SelectKitHeaderComponent.extend({
layoutName: "select-kit/templates/components/combo-box/combo-box-header",
classNames: "combo-box-header",
- clearable: Ember.computed.alias("options.clearable"),
- caretUpIcon: Ember.computed.alias("options.caretUpIcon"),
- caretDownIcon: Ember.computed.alias("options.caretDownIcon"),
- shouldDisplayClearableButton: Ember.computed.and(
- "clearable",
- "computedContent.hasSelection"
- )
+ clearable: alias("options.clearable"),
+ caretUpIcon: alias("options.caretUpIcon"),
+ caretDownIcon: alias("options.caretDownIcon"),
+ shouldDisplayClearableButton: and("clearable", "computedContent.hasSelection")
});
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 98b1d06410..f42643f03c 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 computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
import {
PRIVATE_MESSAGE,
CREATE_TOPIC,
@@ -76,7 +76,7 @@ export default DropdownSelectBoxComponent.extend({
return content;
},
- @computed("options", "canWhisper", "action")
+ @discourseComputed("options", "canWhisper", "action")
content(options, canWhisper, action) {
let items = [];
@@ -132,7 +132,9 @@ export default DropdownSelectBoxComponent.extend({
(action !== REPLY && _topicSnapshot) ||
(action === REPLY &&
_topicSnapshot &&
- (options.userAvatar && options.userLink && options.topicLink))
+ options.userAvatar &&
+ options.userLink &&
+ options.topicLink)
) {
items.push({
name: I18n.t("composer.composer_actions.reply_to_topic.label"),
diff --git a/app/assets/javascripts/select-kit/components/dropdown-select-box.js.es6 b/app/assets/javascripts/select-kit/components/dropdown-select-box.js.es6
index 1bbf6d510e..77c1927e96 100644
--- a/app/assets/javascripts/select-kit/components/dropdown-select-box.js.es6
+++ b/app/assets/javascripts/select-kit/components/dropdown-select-box.js.es6
@@ -1,5 +1,5 @@
import SingleSelectComponent from "select-kit/components/single-select";
-import { on } from "ember-addons/ember-computed-decorators";
+import { on } from "discourse-common/utils/decorators";
export default SingleSelectComponent.extend({
pluginApiIdentifiers: ["dropdown-select-box"],
diff --git a/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6 b/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6
index 1acccd3067..d83156c018 100644
--- a/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6
+++ b/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6
@@ -1,5 +1,5 @@
import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
export default SelectKitHeaderComponent.extend({
layoutName:
@@ -9,7 +9,7 @@ export default SelectKitHeaderComponent.extend({
classNameBindings: ["btnClassName"],
- @computed("options.showFullTitle")
+ @discourseComputed("options.showFullTitle")
btnClassName(showFullTitle) {
return `btn ${showFullTitle ? "btn-icon-text" : "no-text btn-icon"}`;
}
diff --git a/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-row.js.es6 b/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-row.js.es6
index 187fc460cb..8169762e9a 100644
--- a/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-row.js.es6
@@ -1,3 +1,4 @@
+import { alias } from "@ember/object/computed";
import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
export default SelectKitRowComponent.extend({
@@ -5,7 +6,5 @@ export default SelectKitRowComponent.extend({
"select-kit/templates/components/dropdown-select-box/dropdown-select-box-row",
classNames: "dropdown-select-box-row",
- description: Ember.computed.alias(
- "computedContent.originalContent.description"
- )
+ description: alias("computedContent.originalContent.description")
});
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
index f5167afb20..9fec1611c1 100644
--- a/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
+++ b/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
@@ -1,3 +1,4 @@
+import { equal } from "@ember/object/computed";
import { isEmpty } from "@ember/utils";
import ComboBoxComponent from "select-kit/components/combo-box";
import { CLOSE_STATUS_TYPE } from "discourse/controllers/edit-topic-timer";
@@ -188,8 +189,8 @@ export const FORMAT = "YYYY-MM-DD HH:mmZ";
export default ComboBoxComponent.extend(DatetimeMixin, {
pluginApiIdentifiers: ["future-date-input-selector"],
classNames: ["future-date-input-selector"],
- isCustom: Ember.computed.equal("value", "pick_date_and_time"),
- isBasedOnLastPost: Ember.computed.equal("value", "set_based_on_last_post"),
+ isCustom: equal("value", "pick_date_and_time"),
+ isBasedOnLastPost: equal("value", "set_based_on_last_post"),
rowComponent: "future-date-input-selector/future-date-input-selector-row",
headerComponent:
"future-date-input-selector/future-date-input-selector-header",
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector/mixin.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector/mixin.js.es6
index dd111348de..9aa6cf56fe 100644
--- a/app/assets/javascripts/select-kit/components/future-date-input-selector/mixin.js.es6
+++ b/app/assets/javascripts/select-kit/components/future-date-input-selector/mixin.js.es6
@@ -1,6 +1,7 @@
import { CLOSE_STATUS_TYPE } from "discourse/controllers/edit-topic-timer";
import { timeframeDetails } from "select-kit/components/future-date-input-selector";
import Mixin from "@ember/object/mixin";
+import { isNone } from "@ember/utils";
export default Mixin.create({
_computeIconsForValue(value) {
@@ -14,7 +15,7 @@ export default Mixin.create({
},
_computeDatetimeForValue(value) {
- if (Ember.isNone(value)) {
+ if (isNone(value)) {
return null;
}
diff --git a/app/assets/javascripts/select-kit/components/group-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/group-dropdown.js.es6
index 882bf46cb9..0e6ccfac0f 100644
--- a/app/assets/javascripts/select-kit/components/group-dropdown.js.es6
+++ b/app/assets/javascripts/select-kit/components/group-dropdown.js.es6
@@ -1,18 +1,19 @@
+import { alias } from "@ember/object/computed";
import ComboBoxComponent from "select-kit/components/combo-box";
import DiscourseURL from "discourse/lib/url";
-import { default as computed } from "ember-addons/ember-computed-decorators";
+import { default as discourseComputed } from "discourse-common/utils/decorators";
export default ComboBoxComponent.extend({
pluginApiIdentifiers: ["group-dropdown"],
classNames: "group-dropdown",
- content: Ember.computed.alias("groups"),
+ content: alias("groups"),
tagName: "li",
caretDownIcon: "caret-right",
caretUpIcon: "caret-down",
allowAutoSelectFirst: false,
valueAttribute: "name",
- @computed("content")
+ @discourseComputed("content")
filterable(content) {
return content && content.length >= 10;
},
@@ -27,7 +28,7 @@ export default ComboBoxComponent.extend({
return content;
},
- @computed
+ @discourseComputed
collectionHeader() {
if (
this.siteSettings.enable_group_directory ||
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 c32e15e19a..bc5d8c0b07 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
@@ -1,7 +1,8 @@
+import { empty, alias } from "@ember/object/computed";
import Category from "discourse/models/category";
import ComboBox from "select-kit/components/combo-box";
import TagsMixin from "select-kit/mixins/tags";
-import { default as computed } from "ember-addons/ember-computed-decorators";
+import { default as discourseComputed } from "discourse-common/utils/decorators";
import renderTag from "discourse/lib/render-tag";
import { escapeExpression } from "discourse/lib/utilities";
import { makeArray } from "discourse-common/lib/helpers";
@@ -19,11 +20,11 @@ export default ComboBox.extend(TagsMixin, {
classNameBindings: ["noTags"],
verticalOffset: 3,
filterable: true,
- noTags: Ember.computed.empty("selection"),
+ noTags: empty("selection"),
allowCreate: null,
- allowAny: Ember.computed.alias("allowCreate"),
- caretUpIcon: Ember.computed.alias("caretIcon"),
- caretDownIcon: Ember.computed.alias("caretIcon"),
+ allowAny: alias("allowCreate"),
+ caretUpIcon: alias("caretIcon"),
+ caretDownIcon: alias("caretIcon"),
isAsync: true,
fullWidthOnMobile: true,
@@ -50,12 +51,13 @@ export default ComboBox.extend(TagsMixin, {
parseInt(
this.limit ||
this.maximum ||
- this.get("siteSettings.max_tags_per_topic")
+ this.get("siteSettings.max_tags_per_topic"),
+ 10
)
);
},
- @computed(
+ @discourseComputed(
"computedValue",
"filter",
"collectionComputedContent.[]",
@@ -98,12 +100,12 @@ export default ComboBox.extend(TagsMixin, {
);
},
- @computed("hasReachedMaximum")
+ @discourseComputed("hasReachedMaximum")
caretIcon(hasReachedMaximum) {
return hasReachedMaximum ? null : "plus";
},
- @computed("tags")
+ @discourseComputed("tags")
selection(tags) {
return makeArray(tags).map(c => this.computeContentItem(c));
},
@@ -139,7 +141,7 @@ export default ComboBox.extend(TagsMixin, {
return true;
},
- @computed("tags.[]", "filter", "highlightedSelection.[]")
+ @discourseComputed("tags.[]", "filter", "highlightedSelection.[]")
collectionHeader(tags, filter, highlightedSelection) {
if (!isEmpty(tags)) {
let output = "";
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 2bb2bbb610..40a5dc7f0b 100644
--- a/app/assets/javascripts/select-kit/components/multi-select.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select.js.es6
@@ -1,6 +1,8 @@
import SelectKitComponent from "select-kit/components/select-kit";
-import computed from "ember-addons/ember-computed-decorators";
-import { on } from "ember-addons/ember-computed-decorators";
+import {
+ default as discourseComputed,
+ on
+} from "discourse-common/utils/decorators";
const { get, isNone, isEmpty, makeArray, run } = Ember;
import {
applyOnSelectPluginApiCallbacks,
@@ -67,7 +69,7 @@ export default SelectKitComponent.extend({
});
},
- @computed("filter", "shouldDisplayCreateRow")
+ @discourseComputed("filter", "shouldDisplayCreateRow")
createRowComputedContent(filter, shouldDisplayCreateRow) {
if (shouldDisplayCreateRow) {
let content = this.createContentFromInput(filter);
@@ -75,12 +77,12 @@ export default SelectKitComponent.extend({
}
},
- @computed("filter", "computedValues")
+ @discourseComputed("filter", "computedValues")
shouldDisplayCreateRow(filter, computedValues) {
return this._super() && !computedValues.includes(filter);
},
- @computed
+ @discourseComputed
shouldDisplayFilter() {
return true;
},
@@ -126,7 +128,7 @@ export default SelectKitComponent.extend({
});
},
- @computed("computedAsyncContent.[]", "computedValues.[]")
+ @discourseComputed("computedAsyncContent.[]", "computedValues.[]")
filteredAsyncComputedContent(computedAsyncContent, computedValues) {
computedAsyncContent = computedAsyncContent.filter(c => {
return !computedValues.includes(get(c, "value"));
@@ -139,7 +141,7 @@ export default SelectKitComponent.extend({
return computedAsyncContent;
},
- @computed("computedContent.[]", "computedValues.[]", "filter")
+ @discourseComputed("computedContent.[]", "computedValues.[]", "filter")
filteredComputedContent(computedContent, computedValues, filter) {
computedContent = computedContent.filter(c => {
return !computedValues.includes(get(c, "value"));
@@ -182,7 +184,7 @@ export default SelectKitComponent.extend({
return content;
},
- @computed("filter")
+ @discourseComputed("filter")
templateForCreateRow() {
return rowComponent => {
return I18n.t("select_kit.create", {
@@ -195,7 +197,7 @@ export default SelectKitComponent.extend({
return this._super() && !this.hasReachedMaximum;
},
- @computed("computedValues.[]", "computedContent.[]")
+ @discourseComputed("computedValues.[]", "computedContent.[]")
selection(computedValues, computedContent) {
const selected = [];
@@ -207,7 +209,7 @@ export default SelectKitComponent.extend({
return selected;
},
- @computed("selection.[]")
+ @discourseComputed("selection.[]")
hasSelection(selection) {
return !isEmpty(selection);
},
diff --git a/app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js.es6
index e9b9233448..4224d8d6b4 100644
--- a/app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select/multi-select-filter.js.es6
@@ -1,4 +1,4 @@
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
const { isEmpty } = Ember;
import SelectKitFilterComponent from "select-kit/components/select-kit/select-kit-filter";
@@ -6,7 +6,7 @@ export default SelectKitFilterComponent.extend({
layoutName: "select-kit/templates/components/select-kit/select-kit-filter",
classNames: ["multi-select-filter"],
- @computed("placeholder", "hasSelection")
+ @discourseComputed("placeholder", "hasSelection")
computedPlaceholder(placeholder, hasSelection) {
if (hasSelection) return "";
return isEmpty(placeholder) ? "" : I18n.t(placeholder);
diff --git a/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6
index b16ed0c290..9b6c22f527 100644
--- a/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6
@@ -1,6 +1,7 @@
+import { alias, or } from "@ember/object/computed";
import { makeArray } from "discourse-common/lib/helpers";
-import { on } from "ember-addons/ember-computed-decorators";
-import computed from "ember-addons/ember-computed-decorators";
+import { on } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header";
export default SelectKitHeaderComponent.extend({
@@ -13,13 +14,13 @@ export default SelectKitHeaderComponent.extend({
classNames: "multi-select-header",
layoutName:
"select-kit/templates/components/multi-select/multi-select-header",
- selectedNameComponent: Ember.computed.alias("options.selectedNameComponent"),
+ selectedNameComponent: alias("options.selectedNameComponent"),
- forceEscape: Ember.computed.alias("options.forceEscape"),
+ forceEscape: alias("options.forceEscape"),
- ariaLabel: Ember.computed.or("computedContent.ariaLabel", "title", "names"),
+ ariaLabel: or("computedContent.ariaLabel", "title", "names"),
- title: Ember.computed.or("computedContent.title", "names"),
+ title: or("computedContent.title", "names"),
@on("didRender")
_positionFilter() {
@@ -38,14 +39,14 @@ export default SelectKitHeaderComponent.extend({
$filter.width(availableSpace - parentRightPadding * 4);
},
- @computed("computedContent.selection.[]")
+ @discourseComputed("computedContent.selection.[]")
names(selection) {
return makeArray(selection)
.map(s => s.name)
.join(",");
},
- @computed("computedContent.selection.[]")
+ @discourseComputed("computedContent.selection.[]")
values(selection) {
return makeArray(selection)
.map(s => s.value)
diff --git a/app/assets/javascripts/select-kit/components/multi-select/selected-category.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/selected-category.js.es6
index a24ed6eae3..155506095b 100644
--- a/app/assets/javascripts/select-kit/components/multi-select/selected-category.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select/selected-category.js.es6
@@ -1,12 +1,12 @@
import SelectedNameComponent from "select-kit/components/multi-select/selected-name";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
import { categoryBadgeHTML } from "discourse/helpers/category-link";
export default SelectedNameComponent.extend({
classNames: "selected-category",
layoutName: "select-kit/templates/components/multi-select/selected-category",
- @computed("computedContent.originalContent")
+ @discourseComputed("computedContent.originalContent")
badge(category) {
return categoryBadgeHTML(category, {
allowUncategorized: true,
diff --git a/app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6
index f75e7a708f..3574550c20 100644
--- a/app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6
@@ -1,10 +1,10 @@
import SelectedNameComponent from "select-kit/components/multi-select/selected-name";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
export default SelectedNameComponent.extend({
classNames: "selected-color",
- @computed("name")
+ @discourseComputed("name")
footerContent(name) {
return ``.htmlSafe();
}
diff --git a/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6
index 0c542410fb..ab6a36c36c 100644
--- a/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6
@@ -1,5 +1,7 @@
+import { or, alias } from "@ember/object/computed";
import Component from "@ember/component";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
+import { computed } from "@ember/object";
export default Component.extend({
attributeBindings: [
@@ -16,14 +18,14 @@ export default Component.extend({
tagName: "span",
tabindex: -1,
- @computed("computedContent")
+ @discourseComputed("computedContent")
guid(computedContent) {
return Ember.guidFor(computedContent);
},
- ariaLabel: Ember.computed.or("computedContent.ariaLabel", "title"),
+ ariaLabel: or("computedContent.ariaLabel", "title"),
- @computed("computedContent.title", "name")
+ @discourseComputed("computedContent.title", "name")
title(computedContentTitle, name) {
if (computedContentTitle) return computedContentTitle;
if (name) return name;
@@ -31,17 +33,17 @@ export default Component.extend({
return null;
},
- label: Ember.computed.or("computedContent.label", "title", "name"),
+ label: or("computedContent.label", "title", "name"),
- name: Ember.computed.alias("computedContent.name"),
+ name: alias("computedContent.name"),
- value: Ember.computed.alias("computedContent.value"),
+ value: alias("computedContent.value"),
- isLocked: Ember.computed("computedContent.locked", function() {
+ isLocked: computed("computedContent.locked", function() {
return this.getWithDefault("computedContent.locked", false);
}),
- @computed("computedContent", "highlightedSelection.[]")
+ @discourseComputed("computedContent", "highlightedSelection.[]")
isHighlighted(computedContent, highlightedSelection) {
return highlightedSelection.includes(this.computedContent);
},
diff --git a/app/assets/javascripts/select-kit/components/none-category-row.js.es6 b/app/assets/javascripts/select-kit/components/none-category-row.js.es6
index 8488a93a4a..7d2aa1ef26 100644
--- a/app/assets/javascripts/select-kit/components/none-category-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/none-category-row.js.es6
@@ -1,12 +1,12 @@
import CategoryRowComponent from "select-kit/components/category-row";
import { categoryBadgeHTML } from "discourse/helpers/category-link";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
export default CategoryRowComponent.extend({
layoutName: "select-kit/templates/components/category-row",
classNames: "none category-row",
- @computed("category")
+ @discourseComputed("category")
badgeForCategory(category) {
return categoryBadgeHTML(category, {
link: this.categoryLink,
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 fcfe0c5c8c..172282ba0b 100644
--- a/app/assets/javascripts/select-kit/components/notifications-button.js.es6
+++ b/app/assets/javascripts/select-kit/components/notifications-button.js.es6
@@ -1,9 +1,10 @@
+import { alias } from "@ember/object/computed";
import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
import {
- default as computed,
+ default as discourseComputed,
observes,
on
-} from "ember-addons/ember-computed-decorators";
+} from "discourse-common/utils/decorators";
import { buttonDetails } from "discourse/lib/notification-levels";
import { allLevels } from "discourse/lib/notification-levels";
@@ -20,7 +21,7 @@ export default DropdownSelectBoxComponent.extend({
i18nPrefix: "",
i18nPostfix: "",
- @computed("iconForSelectedDetails")
+ @discourseComputed("iconForSelectedDetails")
headerIcon(iconForSelectedDetails) {
return iconForSelectedDetails;
},
@@ -34,7 +35,7 @@ export default DropdownSelectBoxComponent.extend({
});
},
- iconForSelectedDetails: Ember.computed.alias("selectedDetails.icon"),
+ iconForSelectedDetails: alias("selectedDetails.icon"),
computeHeaderContent() {
let content = this._super(...arguments);
@@ -47,7 +48,7 @@ export default DropdownSelectBoxComponent.extend({
return content;
},
- @computed("computedValue")
+ @discourseComputed("computedValue")
selectedDetails(computedValue) {
return buttonDetails(computedValue);
}
diff --git a/app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js.es6 b/app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js.es6
index d41133b9b6..5d62a82e4b 100644
--- a/app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js.es6
@@ -1,26 +1,30 @@
+import { alias } from "@ember/object/computed";
import DropdownSelectBoxRoxComponent from "select-kit/components/dropdown-select-box/dropdown-select-box-row";
import { buttonDetails } from "discourse/lib/notification-levels";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
import { iconHTML } from "discourse-common/lib/icon-library";
export default DropdownSelectBoxRoxComponent.extend({
classNames: "notifications-button-row",
- i18nPrefix: Ember.computed.alias("options.i18nPrefix"),
- i18nPostfix: Ember.computed.alias("options.i18nPostfix"),
+ i18nPrefix: alias("options.i18nPrefix"),
+ i18nPostfix: alias("options.i18nPostfix"),
- @computed("computedContent.value", "i18nPrefix", "i18nPostfix")
+ @discourseComputed("computedContent.value", "i18nPrefix", "i18nPostfix")
title(value, prefix, postfix) {
const key = buttonDetails(value).key;
return I18n.t(`${prefix}.${key}${postfix}.title`);
},
- @computed("computedContent.name", "computedContent.originalContent.icon")
+ @discourseComputed(
+ "computedContent.name",
+ "computedContent.originalContent.icon"
+ )
icon(contentName, icon) {
return iconHTML(icon, { class: contentName.dasherize() });
},
- @computed("_start")
+ @discourseComputed("_start")
description(_start) {
if (this.site && this.site.mobileView) {
return null;
@@ -29,12 +33,12 @@ export default DropdownSelectBoxRoxComponent.extend({
return Handlebars.escapeExpression(I18n.t(`${_start}.description`));
},
- @computed("_start")
+ @discourseComputed("_start")
name(_start) {
return Handlebars.escapeExpression(I18n.t(`${_start}.title`));
},
- @computed("i18nPrefix", "i18nPostfix", "computedContent.name")
+ @discourseComputed("i18nPrefix", "i18nPostfix", "computedContent.name")
_start(prefix, postfix, contentName) {
return `${prefix}.${contentName}${postfix}`;
}
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 56a2079988..60c6cd476a 100644
--- a/app/assets/javascripts/select-kit/components/period-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/period-chooser.js.es6
@@ -1,15 +1,16 @@
+import { oneWay, alias } from "@ember/object/computed";
import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
-import computed, { on } from "ember-addons/ember-computed-decorators";
+import discourseComputed, { on } from "discourse-common/utils/decorators";
export default DropdownSelectBoxComponent.extend({
classNames: ["period-chooser"],
rowComponent: "period-chooser/period-chooser-row",
headerComponent: "period-chooser/period-chooser-header",
- content: Ember.computed.oneWay("site.periods"),
- value: Ember.computed.alias("period"),
- isHidden: Ember.computed.alias("showPeriods"),
+ content: oneWay("site.periods"),
+ value: alias("period"),
+ isHidden: alias("showPeriods"),
- @computed("isExpanded")
+ @discourseComputed("isExpanded")
caretIcon(isExpanded) {
return isExpanded ? "caret-up" : "caret-down";
},
diff --git a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6
index 18a0b529fa..4cb25af58e 100644
--- a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6
@@ -1,12 +1,12 @@
import DropdownSelectBoxRowComponent from "select-kit/components/dropdown-select-box/dropdown-select-box-row";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
export default DropdownSelectBoxRowComponent.extend({
layoutName:
"select-kit/templates/components/period-chooser/period-chooser-row",
classNames: "period-chooser-row",
- @computed("computedContent")
+ @discourseComputed("computedContent")
title(computedContent) {
return I18n.t(`filters.top.${computedContent.name || "this_week"}`).title;
}
diff --git a/app/assets/javascripts/select-kit/components/pinned-button.js.es6 b/app/assets/javascripts/select-kit/components/pinned-button.js.es6
index 9002d913b3..8332f0f41a 100644
--- a/app/assets/javascripts/select-kit/components/pinned-button.js.es6
+++ b/app/assets/javascripts/select-kit/components/pinned-button.js.es6
@@ -1,5 +1,5 @@
import Component from "@ember/component";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
export default Component.extend({
pluginApiIdentifiers: ["pinned-button"],
@@ -8,7 +8,7 @@ export default Component.extend({
classNameBindings: ["isHidden"],
layoutName: "select-kit/templates/components/pinned-button",
- @computed("topic.pinned_globally", "pinned")
+ @discourseComputed("topic.pinned_globally", "pinned")
reasonText(pinnedGlobally, pinned) {
const globally = pinnedGlobally ? "_globally" : "";
const pinnedKey = pinned ? `pinned${globally}` : "unpinned";
@@ -16,7 +16,7 @@ export default Component.extend({
return I18n.t(key);
},
- @computed("pinned", "topic.deleted", "topic.unpinned")
+ @discourseComputed("pinned", "topic.deleted", "topic.unpinned")
isHidden(pinned, deleted, unpinned) {
return deleted || (!pinned && !unpinned);
}
diff --git a/app/assets/javascripts/select-kit/components/pinned-options.js.es6 b/app/assets/javascripts/select-kit/components/pinned-options.js.es6
index a560bff74d..c96856a804 100644
--- a/app/assets/javascripts/select-kit/components/pinned-options.js.es6
+++ b/app/assets/javascripts/select-kit/components/pinned-options.js.es6
@@ -1,5 +1,5 @@
import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
-import { on } from "ember-addons/ember-computed-decorators";
+import { on } from "discourse-common/utils/decorators";
import { iconHTML } from "discourse-common/lib/icon-library";
export default DropdownSelectBoxComponent.extend({
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 9179e66680..6c2199a5b7 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -1,7 +1,8 @@
+import discourseComputed from "discourse-common/utils/decorators";
import EmberObject from "@ember/object";
import Component from "@ember/component";
const { get, isNone, run, isEmpty, makeArray } = Ember;
-import computed from "ember-addons/ember-computed-decorators";
+
import UtilsMixin from "select-kit/mixins/utils";
import DomHelpersMixin from "select-kit/mixins/dom-helpers";
import EventsMixin from "select-kit/mixins/events";
@@ -223,7 +224,7 @@ export default Component.extend(
return this.computeContentItem(contentItem, options);
},
- @computed(
+ @discourseComputed(
"isAsync",
"isLoading",
"filteredAsyncComputedContent.[]",
@@ -250,28 +251,28 @@ export default Component.extend(
return !this.hasReachedMaximum;
},
- @computed("maximum", "selection.[]")
+ @discourseComputed("maximum", "selection.[]")
hasReachedMaximum(maximum, selection) {
if (!maximum) return false;
selection = makeArray(selection);
return selection.length >= maximum;
},
- @computed("minimum", "selection.[]")
+ @discourseComputed("minimum", "selection.[]")
hasReachedMinimum(minimum, selection) {
if (!minimum) return true;
selection = makeArray(selection);
return selection.length >= minimum;
},
- @computed("shouldFilter", "allowAny")
+ @discourseComputed("shouldFilter", "allowAny")
shouldDisplayFilter(shouldFilter, allowAny) {
if (shouldFilter) return true;
if (allowAny) return true;
return false;
},
- @computed("filter", "collectionComputedContent.[]", "isLoading")
+ @discourseComputed("filter", "collectionComputedContent.[]", "isLoading")
noContentRow(filter, collectionComputedContent, isLoading) {
if (
filter.length > 0 &&
@@ -282,7 +283,7 @@ export default Component.extend(
}
},
- @computed("hasReachedMaximum", "hasReachedMinimum", "isExpanded")
+ @discourseComputed("hasReachedMaximum", "hasReachedMinimum", "isExpanded")
validationMessage(hasReachedMaximum, hasReachedMinimum) {
if (hasReachedMaximum && this.maximum) {
const key = this.maximumLabel || "select_kit.max_content_reached";
@@ -295,14 +296,19 @@ export default Component.extend(
}
},
- @computed("allowAny")
+ @discourseComputed("allowAny")
filterPlaceholder(allowAny) {
return allowAny
? "select_kit.filter_placeholder_with_any"
: "select_kit.filter_placeholder";
},
- @computed("filter", "filterable", "autoFilterable", "renderedFilterOnce")
+ @discourseComputed(
+ "filter",
+ "filterable",
+ "autoFilterable",
+ "renderedFilterOnce"
+ )
shouldFilter(filter, filterable, autoFilterable, renderedFilterOnce) {
if (renderedFilterOnce && filterable) return true;
if (filterable) return true;
@@ -310,7 +316,7 @@ export default Component.extend(
return false;
},
- @computed(
+ @discourseComputed(
"computedValue",
"filter",
"collectionComputedContent.[]",
@@ -331,7 +337,7 @@ export default Component.extend(
return false;
},
- @computed("filter", "shouldDisplayCreateRow")
+ @discourseComputed("filter", "shouldDisplayCreateRow")
createRowComputedContent(filter, shouldDisplayCreateRow) {
if (shouldDisplayCreateRow) {
let content = this.createContentFromInput(filter);
@@ -343,17 +349,17 @@ export default Component.extend(
}
},
- @computed
+ @discourseComputed
templateForRow() {
return () => null;
},
- @computed
+ @discourseComputed
templateForNoneRow() {
return () => null;
},
- @computed("filter")
+ @discourseComputed("filter")
templateForCreateRow() {
return rowComponent => {
return I18n.t("select_kit.create", {
@@ -362,7 +368,7 @@ export default Component.extend(
};
},
- @computed("none")
+ @discourseComputed("none")
noneRowComputedContent(none) {
if (isNone(none)) return null;
@@ -427,7 +433,12 @@ export default Component.extend(
this._boundaryActionHandler("onStopLoading");
},
- @computed("selection.[]", "isExpanded", "filter", "highlightedSelection.[]")
+ @discourseComputed(
+ "selection.[]",
+ "isExpanded",
+ "filter",
+ "highlightedSelection.[]"
+ )
collectionHeaderComputedContent() {
return applyCollectionHeaderCallbacks(
this.pluginApiIdentifiers,
@@ -436,7 +447,7 @@ export default Component.extend(
);
},
- @computed("selection.[]", "isExpanded", "headerIcon")
+ @discourseComputed("selection.[]", "isExpanded", "headerIcon")
headerComputedContent() {
return applyHeaderContentPluginApiCallbacks(
this.pluginApiIdentifiers,
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 9576816708..9212f52fda 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,14 +1,16 @@
+import { not } from "@ember/object/computed";
import Component from "@ember/component";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
+
const { isEmpty } = Ember;
export default Component.extend({
layoutName: "select-kit/templates/components/select-kit/select-kit-filter",
classNames: ["select-kit-filter"],
classNameBindings: ["isFocused", "isHidden"],
- isHidden: Ember.computed.not("shouldDisplayFilter"),
+ isHidden: not("shouldDisplayFilter"),
- @computed("placeholder")
+ @discourseComputed("placeholder")
computedPlaceholder(placeholder) {
return isEmpty(placeholder) ? "" : I18n.t(placeholder);
}
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 807326c990..525c9b6936 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
@@ -1,5 +1,7 @@
+import { alias, none, or } from "@ember/object/computed";
import Component from "@ember/component";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
+
const { isEmpty, makeArray } = Ember;
export default Component.extend({
@@ -15,15 +17,15 @@ export default Component.extend({
"name:data-name"
],
- forceEscape: Ember.computed.alias("options.forceEscape"),
+ forceEscape: alias("options.forceEscape"),
- isNone: Ember.computed.none("computedContent.value"),
+ isNone: none("computedContent.value"),
ariaHasPopup: "true",
- ariaLabel: Ember.computed.or("computedContent.ariaLabel", "sanitizedTitle"),
+ ariaLabel: or("computedContent.ariaLabel", "sanitizedTitle"),
- @computed("computedContent.title", "name")
+ @discourseComputed("computedContent.title", "name")
title(computedContentTitle, name) {
if (computedContentTitle) return computedContentTitle;
if (name) return name;
@@ -33,18 +35,18 @@ export default Component.extend({
// this might need a more advanced solution
// but atm it's the only case we have to handle
- @computed("title")
+ @discourseComputed("title")
sanitizedTitle(title) {
return String(title).replace("…", "");
},
- label: Ember.computed.or("computedContent.label", "title", "name"),
+ label: or("computedContent.label", "title", "name"),
- name: Ember.computed.alias("computedContent.name"),
+ name: alias("computedContent.name"),
- value: Ember.computed.alias("computedContent.value"),
+ value: alias("computedContent.value"),
- @computed("computedContent.icon", "computedContent.icons")
+ @discourseComputed("computedContent.icon", "computedContent.icons")
icons(icon, icons) {
return makeArray(icon)
.concat(icons)
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 5b016fe905..a50db81e0a 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
@@ -1,6 +1,10 @@
+import { alias, or } from "@ember/object/computed";
import Component from "@ember/component";
-import { on } from "ember-addons/ember-computed-decorators";
-import computed from "ember-addons/ember-computed-decorators";
+import {
+ default as discourseComputed,
+ on
+} from "discourse-common/utils/decorators";
+
const { run, isPresent, makeArray, isEmpty } = Ember;
import UtilsMixin from "select-kit/mixins/utils";
@@ -23,11 +27,11 @@ export default Component.extend(UtilsMixin, {
"computedContent.originalContent.classNames"
],
- forceEscape: Ember.computed.alias("options.forceEscape"),
+ forceEscape: alias("options.forceEscape"),
- ariaLabel: Ember.computed.or("computedContent.ariaLabel", "title"),
+ ariaLabel: or("computedContent.ariaLabel", "title"),
- @computed("computedContent.title", "name")
+ @discourseComputed("computedContent.title", "name")
title(computedContentTitle, name) {
if (computedContentTitle) return computedContentTitle;
if (name) return name;
@@ -35,18 +39,18 @@ export default Component.extend(UtilsMixin, {
return null;
},
- @computed("computedContent")
+ @discourseComputed("computedContent")
guid(computedContent) {
return Ember.guidFor(computedContent);
},
- label: Ember.computed.or("computedContent.label", "title", "name"),
+ label: or("computedContent.label", "title", "name"),
- name: Ember.computed.alias("computedContent.name"),
+ name: alias("computedContent.name"),
- value: Ember.computed.alias("computedContent.value"),
+ value: alias("computedContent.value"),
- @computed("templateForRow")
+ @discourseComputed("templateForRow")
template(templateForRow) {
return templateForRow(this);
},
@@ -67,7 +71,7 @@ export default Component.extend(UtilsMixin, {
}
},
- @computed(
+ @discourseComputed(
"computedContent.icon",
"computedContent.icons",
"computedContent.originalContent.icon"
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 5b4f6cd877..14047fbb03 100644
--- a/app/assets/javascripts/select-kit/components/single-select.js.es6
+++ b/app/assets/javascripts/select-kit/components/single-select.js.es6
@@ -1,8 +1,8 @@
import SelectKitComponent from "select-kit/components/select-kit";
import {
- default as computed,
+ default as discourseComputed,
on
-} from "ember-addons/ember-computed-decorators";
+} from "discourse-common/utils/decorators";
const { get, isNone, isEmpty, isPresent, run, makeArray } = Ember;
import {
@@ -115,7 +115,7 @@ export default SelectKitComponent.extend({
return content;
},
- @computed("computedAsyncContent.[]", "computedValue")
+ @discourseComputed("computedAsyncContent.[]", "computedValue")
filteredAsyncComputedContent(computedAsyncContent, computedValue) {
computedAsyncContent = (computedAsyncContent || []).filter(c => {
return computedValue !== get(c, "value");
@@ -128,7 +128,12 @@ export default SelectKitComponent.extend({
return computedAsyncContent;
},
- @computed("computedContent.[]", "computedValue", "filter", "shouldFilter")
+ @discourseComputed(
+ "computedContent.[]",
+ "computedValue",
+ "filter",
+ "shouldFilter"
+ )
filteredComputedContent(
computedContent,
computedValue,
@@ -150,17 +155,17 @@ export default SelectKitComponent.extend({
return computedContent;
},
- @computed("computedValue", "computedContent.[]")
+ @discourseComputed("computedValue", "computedContent.[]")
selection(computedValue, computedContent) {
return computedContent.findBy("value", computedValue);
},
- @computed("selection")
+ @discourseComputed("selection")
hasSelection(selection) {
return selection !== this.noneRowComputedContent && !isNone(selection);
},
- @computed(
+ @discourseComputed(
"computedValue",
"filter",
"collectionComputedContent.[]",
@@ -280,7 +285,11 @@ export default SelectKitComponent.extend({
this
);
- this._boundaryActionHandler("onSelect", computedContentItem.value);
+ this._boundaryActionHandler(
+ "onSelect",
+ computedContentItem.value,
+ computedContentItem.originalContent
+ );
this._boundaryActionHandler("onSelectAny", computedContentItem);
this.autoHighlight();
diff --git a/app/assets/javascripts/select-kit/components/tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
index 3e92b80a88..103a294060 100644
--- a/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
@@ -1,7 +1,8 @@
+import { alias } from "@ember/object/computed";
import MultiSelectComponent from "select-kit/components/multi-select";
import TagsMixin from "select-kit/mixins/tags";
import renderTag from "discourse/lib/render-tag";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
import { makeArray } from "discourse-common/lib/helpers";
const { get, run } = Ember;
@@ -15,7 +16,9 @@ export default MultiSelectComponent.extend(TagsMixin, {
blacklist: null,
attributeBindings: ["categoryId"],
allowCreate: null,
- allowAny: Ember.computed.alias("allowCreate"),
+ allowAny: alias("allowCreate"),
+ excludeSynonyms: false,
+ excludeHasSynonyms: false,
init() {
this._super(...arguments);
@@ -45,22 +48,26 @@ export default MultiSelectComponent.extend(TagsMixin, {
parseInt(
this.limit ||
this.maximum ||
- this.get("siteSettings.max_tags_per_topic")
+ this.get("siteSettings.max_tags_per_topic"),
+ 10
)
);
}
},
mutateValues(values) {
- this.set("tags", values.filter(v => v));
+ this.set(
+ "tags",
+ values.filter(v => v)
+ );
},
- @computed("tags")
+ @discourseComputed("tags")
values(tags) {
return makeArray(tags);
},
- @computed("tags")
+ @discourseComputed("tags")
content(tags) {
return makeArray(tags);
},
@@ -113,6 +120,8 @@ export default MultiSelectComponent.extend(TagsMixin, {
}
if (!this.everyTag) data.filterForInput = true;
+ if (this.excludeSynonyms) data.excludeSynonyms = true;
+ if (this.excludeHasSynonyms) data.excludeHasSynonyms = true;
this.searchTags("/tags/filter/search", data, this._transformJson);
},
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 66958c3452..5de47f178b 100644
--- a/app/assets/javascripts/select-kit/components/tag-drop.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
@@ -1,23 +1,26 @@
+import { computed } from "@ember/object";
+import { alias } from "@ember/object/computed";
import { makeArray } from "discourse-common/lib/helpers";
import ComboBoxComponent from "select-kit/components/combo-box";
import DiscourseURL from "discourse/lib/url";
import TagsMixin from "select-kit/mixins/tags";
-import { default as computed } from "ember-addons/ember-computed-decorators";
+import { default as discourseComputed } from "discourse-common/utils/decorators";
const { isEmpty, run } = Ember;
+import Category from "discourse/models/category";
+import deprecated from "discourse-common/lib/deprecated";
export default ComboBoxComponent.extend(TagsMixin, {
pluginApiIdentifiers: ["tag-drop"],
classNameBindings: ["categoryStyle", "tagClass"],
classNames: "tag-drop",
verticalOffset: 3,
- value: Ember.computed.alias("tagId"),
+ value: alias("tagId"),
headerComponent: "tag-drop/tag-drop-header",
allowAutoSelectFirst: false,
tagName: "li",
- showFilterByTag: Ember.computed.alias("siteSettings.show_filter_by_tag"),
- currentCategory: Ember.computed.or("secondCategory", "firstCategory"),
+ showFilterByTag: alias("siteSettings.show_filter_by_tag"),
tagId: null,
- categoryStyle: Ember.computed.alias("siteSettings.category_style"),
+ categoryStyle: alias("siteSettings.category_style"),
mutateAttributes() {},
fullWidthOnMobile: true,
caretDownIcon: "caret-right",
@@ -25,18 +28,39 @@ export default ComboBoxComponent.extend(TagsMixin, {
allowContentReplacement: true,
isAsync: true,
- @computed("tagId")
+ currentCategory: computed("secondCategory", "firstCategory", {
+ set(key, value) {
+ this.currentCategoryRaw = value;
+ return value;
+ },
+
+ get() {
+ if (this.currentCategoryRaw) {
+ return this.currentCategoryRaw;
+ }
+
+ const result = this.secondCategory || this.firstCategory;
+ if (result) {
+ deprecated(
+ "Setting firstCategory and secondCategory on tag-drop directly is deprecated. Please use currentCategory instead."
+ );
+ return result;
+ }
+ }
+ }),
+
+ @discourseComputed("tagId")
noTagsSelected() {
return this.tagId === "none";
},
- @computed("showFilterByTag", "content")
+ @discourseComputed("showFilterByTag", "content")
isHidden(showFilterByTag, content) {
if (showFilterByTag && !isEmpty(content)) return false;
return true;
},
- @computed("content")
+ @discourseComputed("content")
filterable(content) {
return content && content.length >= 15;
},
@@ -63,12 +87,12 @@ export default ComboBoxComponent.extend(TagsMixin, {
return content;
},
- @computed("tagId")
+ @discourseComputed("tagId")
tagClass(tagId) {
return tagId ? `tag-${tagId}` : "tag_all";
},
- @computed("firstCategory", "secondCategory")
+ @discourseComputed("currentCategory")
allTagsUrl() {
if (this.currentCategory) {
return Discourse.getURL(this.get("currentCategory.url") + "?allTags=1");
@@ -77,26 +101,28 @@ export default ComboBoxComponent.extend(TagsMixin, {
}
},
- @computed("firstCategory", "secondCategory")
- noTagsUrl() {
- var url = "/tags";
- if (this.currentCategory) {
- url += this.get("currentCategory.url");
+ @discourseComputed("currentCategory")
+ noTagsUrl(currentCategory) {
+ let url = "/tags";
+
+ if (currentCategory) {
+ url += `/c/${Category.slugFor(currentCategory)}/${currentCategory.id}`;
}
+
return Discourse.getURL(`${url}/none`);
},
- @computed("tag")
+ @discourseComputed("tag")
allTagsLabel() {
return I18n.t("tagging.selector_all_tags");
},
- @computed("tag")
+ @discourseComputed("tag")
noTagsLabel() {
return I18n.t("tagging.selector_no_tags");
},
- @computed("tagId", "allTagsLabel", "noTagsLabel")
+ @discourseComputed("tagId", "allTagsLabel", "noTagsLabel")
shortcuts(tagId, allTagsLabel, noTagsLabel) {
const shortcuts = [];
@@ -119,7 +145,7 @@ export default ComboBoxComponent.extend(TagsMixin, {
return shortcuts;
},
- @computed("site.top_tags", "shortcuts")
+ @discourseComputed("site.top_tags", "shortcuts")
content(topTags, shortcuts) {
if (this.siteSettings.tags_sort_alphabetically && topTags) {
return shortcuts.concat(topTags.sort());
@@ -142,12 +168,16 @@ export default ComboBoxComponent.extend(TagsMixin, {
results = results.sort((a, b) => a.id > b.id);
return results.map(r => {
- return { id: r.id, name: r.text };
+ return {
+ id: r.id,
+ name: r.text,
+ targetTagId: r.target_tag || r.id
+ };
});
},
actions: {
- onSelect(tagId) {
+ onSelect(tagId, tag) {
let url;
if (tagId === "all-tags") {
@@ -156,10 +186,19 @@ export default ComboBoxComponent.extend(TagsMixin, {
url = Discourse.getURL(this.noTagsUrl);
} else {
url = "/tags";
+
if (this.currentCategory) {
- url += this.get("currentCategory.url");
+ url += `/c/${Category.slugFor(this.currentCategory)}/${
+ this.currentCategory.id
+ }`;
}
- url = Discourse.getURL(`${url}/${tagId.toLowerCase()}`);
+
+ if (tag && tag.targetTagId) {
+ url += `/${tag.targetTagId.toLowerCase()}`;
+ } else {
+ url += `/${tagId.toLowerCase()}`;
+ }
+ url = Discourse.getURL(url);
}
DiscourseURL.routeTo(url);
diff --git a/app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6 b/app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6
index c3cb9d0ef3..2843ee1e0c 100644
--- a/app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6
@@ -1,7 +1,8 @@
import MultiSelectComponent from "select-kit/components/multi-select";
import TagsMixin from "select-kit/mixins/tags";
import renderTag from "discourse/lib/render-tag";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
+
const { get, isEmpty, run, makeArray } = Ember;
export default MultiSelectComponent.extend(TagsMixin, {
@@ -26,15 +27,18 @@ export default MultiSelectComponent.extend(TagsMixin, {
},
mutateValues(values) {
- this.set("tagGroups", values.filter(v => v));
+ this.set(
+ "tagGroups",
+ values.filter(v => v)
+ );
},
- @computed("tagGroups")
+ @discourseComputed("tagGroups")
values(tagGroups) {
return makeArray(tagGroups);
},
- @computed("tagGroups")
+ @discourseComputed("tagGroups")
content(tagGroups) {
return makeArray(tagGroups);
},
diff --git a/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6
index 12aef37fac..c163c3d5d9 100644
--- a/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6
@@ -1,5 +1,5 @@
import NotificationOptionsComponent from "select-kit/components/notifications-button";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
export default NotificationOptionsComponent.extend({
pluginApiIdentifiers: ["tag-notifications-button"],
@@ -16,7 +16,7 @@ export default NotificationOptionsComponent.extend({
return this.notificationLevel;
},
- @computed("iconForSelectedDetails")
+ @discourseComputed("iconForSelectedDetails")
headerIcon(iconForSelectedDetails) {
return iconForSelectedDetails;
}
diff --git a/app/assets/javascripts/select-kit/components/timezone-input.js.es6 b/app/assets/javascripts/select-kit/components/timezone-input.js.es6
index e141839a1d..cc837e1d66 100644
--- a/app/assets/javascripts/select-kit/components/timezone-input.js.es6
+++ b/app/assets/javascripts/select-kit/components/timezone-input.js.es6
@@ -1,5 +1,5 @@
import ComboBoxComponent from "select-kit/components/combo-box";
-import { default as computed } from "ember-addons/ember-computed-decorators";
+import { default as discourseComputed } from "discourse-common/utils/decorators";
export default ComboBoxComponent.extend({
pluginApiIdentifiers: ["timezone-input"],
@@ -9,7 +9,7 @@ export default ComboBoxComponent.extend({
filterable: true,
allowAny: false,
- @computed
+ @discourseComputed
content() {
let timezones;
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 39d8348119..8e25330942 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
@@ -1,13 +1,14 @@
+import { empty } from "@ember/object/computed";
import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
export default DropdownSelectBoxComponent.extend({
pluginApiIdentifiers: ["toolbar-popup-menu-options"],
classNames: ["toolbar-popup-menu-options"],
- isHidden: Ember.computed.empty("computedContent"),
+ isHidden: empty("computedContent"),
showFullTitle: false,
- @computed("title")
+ @discourseComputed("title")
collectionHeader(title) {
return `${title}`;
},
diff --git a/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6
index 178caa43b5..07d665486c 100644
--- a/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6
+++ b/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6
@@ -1,3 +1,4 @@
+import { empty } from "@ember/object/computed";
import ComboBoxComponent from "select-kit/components/combo-box";
export default ComboBoxComponent.extend({
@@ -8,7 +9,7 @@ export default ComboBoxComponent.extend({
allowInitialValueMutation: false,
allowAutoSelectFirst: false,
nameProperty: "label",
- isHidden: Ember.computed.empty("content"),
+ isHidden: empty("content"),
computeHeaderContent() {
const content = this._super(...arguments);
diff --git a/app/assets/javascripts/select-kit/components/topic-notifications-options.js.es6 b/app/assets/javascripts/select-kit/components/topic-notifications-options.js.es6
index e59e5d5d34..1001c7884d 100644
--- a/app/assets/javascripts/select-kit/components/topic-notifications-options.js.es6
+++ b/app/assets/javascripts/select-kit/components/topic-notifications-options.js.es6
@@ -1,8 +1,8 @@
import NotificationOptionsComponent from "select-kit/components/notifications-button";
import {
- default as computed,
+ default as discourseComputed,
on
-} from "ember-addons/ember-computed-decorators";
+} from "discourse-common/utils/decorators";
import { topicLevels } from "discourse/lib/notification-levels";
export default NotificationOptionsComponent.extend({
@@ -12,7 +12,7 @@ export default NotificationOptionsComponent.extend({
i18nPrefix: "topic.notifications",
allowInitialValueMutation: false,
- @computed("topic.archetype")
+ @discourseComputed("topic.archetype")
i18nPostfix(archetype) {
return archetype === "private_message" ? "_pm" : "";
},
diff --git a/app/assets/javascripts/select-kit/components/user-notifications-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/user-notifications-dropdown.js.es6
index 2289b2f667..2551e20b61 100644
--- a/app/assets/javascripts/select-kit/components/user-notifications-dropdown.js.es6
+++ b/app/assets/javascripts/select-kit/components/user-notifications-dropdown.js.es6
@@ -1,7 +1,7 @@
import DropdownSelectBox from "select-kit/components/dropdown-select-box";
import { popupAjaxError } from "discourse/lib/ajax-error";
import showModal from "discourse/lib/show-modal";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
export default DropdownSelectBox.extend({
classNames: ["user-notifications", "user-notifications-dropdown"],
@@ -36,7 +36,7 @@ export default DropdownSelectBox.extend({
return content;
},
- @computed("value")
+ @discourseComputed("value")
headerIcon(value) {
return this.computeContent().find(row => row.id === value).icon;
},
@@ -53,7 +53,7 @@ export default DropdownSelectBox.extend({
});
},
- @computed("user.ignored", "user.muted")
+ @discourseComputed("user.ignored", "user.muted")
value() {
if (this.get("user.ignored")) {
return "changeToIgnored";
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 98e79eba58..42c79a1f44 100644
--- a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
@@ -1,6 +1,6 @@
import { next } from "@ember/runloop";
import { schedule } from "@ember/runloop";
-import { on } from "ember-addons/ember-computed-decorators";
+import { on } from "discourse-common/utils/decorators";
import Mixin from "@ember/object/mixin";
export default Mixin.create({
@@ -187,7 +187,7 @@ export default Mixin.create({
const offsetBottom = this.element.getBoundingClientRect().bottom;
const windowWidth = $(window).width();
- if (this.fullWidthOnMobile && (this.site && this.site.isMobileDevice)) {
+ if (this.fullWidthOnMobile && this.site && this.site.isMobileDevice) {
const margin = 10;
const relativeLeft =
$(this.element).offset().left - $(window).scrollLeft();
diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6
index 739d0925e3..4c54979d1f 100644
--- a/app/assets/javascripts/select-kit/mixins/events.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/events.js.es6
@@ -3,7 +3,7 @@ import { makeArray } from "discourse-common/lib/helpers";
import { isEmpty } from "@ember/utils";
import { throttle } from "@ember/runloop";
import { schedule } from "@ember/runloop";
-import { on } from "ember-addons/ember-computed-decorators";
+import { on } from "discourse-common/utils/decorators";
import Mixin from "@ember/object/mixin";
const { bind } = Ember.run;
diff --git a/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6 b/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
index 68dd1c8839..9386c595cf 100644
--- a/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
@@ -1,8 +1,9 @@
import Mixin from "@ember/object/mixin";
+import { isNone } from "@ember/utils";
let _appendContentCallbacks = {};
function appendContent(pluginApiIdentifiers, contentFunction) {
- if (Ember.isNone(_appendContentCallbacks[pluginApiIdentifiers])) {
+ if (isNone(_appendContentCallbacks[pluginApiIdentifiers])) {
_appendContentCallbacks[pluginApiIdentifiers] = [];
}
@@ -11,7 +12,7 @@ function appendContent(pluginApiIdentifiers, contentFunction) {
let _prependContentCallbacks = {};
function prependContent(pluginApiIdentifiers, contentFunction) {
- if (Ember.isNone(_prependContentCallbacks[pluginApiIdentifiers])) {
+ if (isNone(_prependContentCallbacks[pluginApiIdentifiers])) {
_prependContentCallbacks[pluginApiIdentifiers] = [];
}
@@ -20,7 +21,7 @@ function prependContent(pluginApiIdentifiers, contentFunction) {
let _modifyContentCallbacks = {};
function modifyContent(pluginApiIdentifiers, contentFunction) {
- if (Ember.isNone(_modifyContentCallbacks[pluginApiIdentifiers])) {
+ if (isNone(_modifyContentCallbacks[pluginApiIdentifiers])) {
_modifyContentCallbacks[pluginApiIdentifiers] = [];
}
@@ -29,9 +30,7 @@ function modifyContent(pluginApiIdentifiers, contentFunction) {
let _modifyHeaderComputedContentCallbacks = {};
function modifyHeaderComputedContent(pluginApiIdentifiers, contentFunction) {
- if (
- Ember.isNone(_modifyHeaderComputedContentCallbacks[pluginApiIdentifiers])
- ) {
+ if (isNone(_modifyHeaderComputedContentCallbacks[pluginApiIdentifiers])) {
_modifyHeaderComputedContentCallbacks[pluginApiIdentifiers] = [];
}
@@ -42,7 +41,7 @@ function modifyHeaderComputedContent(pluginApiIdentifiers, contentFunction) {
let _modifyCollectionHeaderCallbacks = {};
function modifyCollectionHeader(pluginApiIdentifiers, contentFunction) {
- if (Ember.isNone(_modifyCollectionHeaderCallbacks[pluginApiIdentifiers])) {
+ if (isNone(_modifyCollectionHeaderCallbacks[pluginApiIdentifiers])) {
_modifyCollectionHeaderCallbacks[pluginApiIdentifiers] = [];
}
@@ -51,7 +50,7 @@ function modifyCollectionHeader(pluginApiIdentifiers, contentFunction) {
let _onSelectNoneCallbacks = {};
function onSelectNone(pluginApiIdentifiers, mutationFunction) {
- if (Ember.isNone(_onSelectNoneCallbacks[pluginApiIdentifiers])) {
+ if (isNone(_onSelectNoneCallbacks[pluginApiIdentifiers])) {
_onSelectNoneCallbacks[pluginApiIdentifiers] = [];
}
@@ -60,7 +59,7 @@ function onSelectNone(pluginApiIdentifiers, mutationFunction) {
let _onSelectCallbacks = {};
function onSelect(pluginApiIdentifiers, mutationFunction) {
- if (Ember.isNone(_onSelectCallbacks[pluginApiIdentifiers])) {
+ if (isNone(_onSelectCallbacks[pluginApiIdentifiers])) {
_onSelectCallbacks[pluginApiIdentifiers] = [];
}
diff --git a/app/assets/javascripts/wizard-application.js b/app/assets/javascripts/wizard-application.js
index d5460545ae..3a409952c1 100644
--- a/app/assets/javascripts/wizard-application.js
+++ b/app/assets/javascripts/wizard-application.js
@@ -1,7 +1,7 @@
//= require_tree ./ember-addons/utils
//= require ./ember-addons/decorator-alias
//= require ./ember-addons/macro-alias
-//= require ./ember-addons/ember-computed-decorators
+//= require ./discourse-common/utils/decorators
//= require_tree ./discourse-common
//= require i18n-patches
//= require_tree ./select-kit
diff --git a/app/assets/javascripts/wizard/components/homepage-preview.js.es6 b/app/assets/javascripts/wizard/components/homepage-preview.js.es6
index f92f7b04f3..c0de35c55a 100644
--- a/app/assets/javascripts/wizard/components/homepage-preview.js.es6
+++ b/app/assets/javascripts/wizard/components/homepage-preview.js.es6
@@ -1,4 +1,4 @@
-import { observes } from "ember-addons/ember-computed-decorators";
+import { observes } from "discourse-common/utils/decorators";
import {
createPreviewComponent,
LOREM,
diff --git a/app/assets/javascripts/wizard/components/image-preview-favicon.js.es6 b/app/assets/javascripts/wizard/components/image-preview-favicon.js.es6
index 91a72ecda7..31df907e58 100644
--- a/app/assets/javascripts/wizard/components/image-preview-favicon.js.es6
+++ b/app/assets/javascripts/wizard/components/image-preview-favicon.js.es6
@@ -1,5 +1,4 @@
-import { observes } from "ember-addons/ember-computed-decorators";
-
+import { observes } from "discourse-common/utils/decorators";
import { createPreviewComponent } from "wizard/lib/preview";
export default createPreviewComponent(371, 124, {
diff --git a/app/assets/javascripts/wizard/components/image-preview-large-icon.js.es6 b/app/assets/javascripts/wizard/components/image-preview-large-icon.js.es6
index 17a605c23a..30ad47db87 100644
--- a/app/assets/javascripts/wizard/components/image-preview-large-icon.js.es6
+++ b/app/assets/javascripts/wizard/components/image-preview-large-icon.js.es6
@@ -1,4 +1,4 @@
-import { observes } from "ember-addons/ember-computed-decorators";
+import { observes } from "discourse-common/utils/decorators";
import { createPreviewComponent } from "wizard/lib/preview";
export default createPreviewComponent(325, 125, {
diff --git a/app/assets/javascripts/wizard/components/image-preview-logo-small.js.es6 b/app/assets/javascripts/wizard/components/image-preview-logo-small.js.es6
index db498c91ee..64ad289234 100644
--- a/app/assets/javascripts/wizard/components/image-preview-logo-small.js.es6
+++ b/app/assets/javascripts/wizard/components/image-preview-logo-small.js.es6
@@ -1,5 +1,4 @@
-import { observes } from "ember-addons/ember-computed-decorators";
-
+import { observes } from "discourse-common/utils/decorators";
import { createPreviewComponent, drawHeader, LOREM } from "wizard/lib/preview";
export default createPreviewComponent(375, 100, {
diff --git a/app/assets/javascripts/wizard/components/image-preview-logo.js.es6 b/app/assets/javascripts/wizard/components/image-preview-logo.js.es6
index f8b5d3f39c..3c37019b50 100644
--- a/app/assets/javascripts/wizard/components/image-preview-logo.js.es6
+++ b/app/assets/javascripts/wizard/components/image-preview-logo.js.es6
@@ -1,5 +1,4 @@
-import { observes } from "ember-addons/ember-computed-decorators";
-
+import { observes } from "discourse-common/utils/decorators";
import { createPreviewComponent, drawHeader } from "wizard/lib/preview";
export default createPreviewComponent(400, 100, {
diff --git a/app/assets/javascripts/wizard/components/invite-list-user.js.es6 b/app/assets/javascripts/wizard/components/invite-list-user.js.es6
index cc07ab1a2d..8cc39470a3 100644
--- a/app/assets/javascripts/wizard/components/invite-list-user.js.es6
+++ b/app/assets/javascripts/wizard/components/invite-list-user.js.es6
@@ -1,10 +1,10 @@
import Component from "@ember/component";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
export default Component.extend({
classNames: ["invite-list-user"],
- @computed("user.role")
+ @discourseComputed("user.role")
roleName(role) {
return this.roles.findBy("id", role).label;
}
diff --git a/app/assets/javascripts/wizard/components/radio-button.js.es6 b/app/assets/javascripts/wizard/components/radio-button.js.es6
index e7ceaa898f..6184362bb5 100644
--- a/app/assets/javascripts/wizard/components/radio-button.js.es6
+++ b/app/assets/javascripts/wizard/components/radio-button.js.es6
@@ -1,6 +1,6 @@
import { next } from "@ember/runloop";
import Component from "@ember/component";
-import { observes, on } from "ember-addons/ember-computed-decorators";
+import { observes, on } from "discourse-common/utils/decorators";
export default Component.extend({
tagName: "label",
diff --git a/app/assets/javascripts/wizard/components/staff-count.js.es6 b/app/assets/javascripts/wizard/components/staff-count.js.es6
index 2e7db93b3c..d37b291037 100644
--- a/app/assets/javascripts/wizard/components/staff-count.js.es6
+++ b/app/assets/javascripts/wizard/components/staff-count.js.es6
@@ -1,7 +1,7 @@
import Component from "@ember/component";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
export default Component.extend({
- @computed("field.value")
+ @discourseComputed("field.value")
showStaffCount: staffCount => staffCount > 1
});
diff --git a/app/assets/javascripts/wizard/components/theme-preview.js.es6 b/app/assets/javascripts/wizard/components/theme-preview.js.es6
index 2a098fb879..768e2e5522 100644
--- a/app/assets/javascripts/wizard/components/theme-preview.js.es6
+++ b/app/assets/javascripts/wizard/components/theme-preview.js.es6
@@ -1,6 +1,5 @@
-import computed from "ember-addons/ember-computed-decorators";
-import { observes } from "ember-addons/ember-computed-decorators";
-
+import discourseComputed from "discourse-common/utils/decorators";
+import { observes } from "discourse-common/utils/decorators";
import {
createPreviewComponent,
darkLightDiff,
@@ -14,7 +13,7 @@ export default createPreviewComponent(305, 165, {
classNameBindings: ["isSelected"],
- @computed("selectedId", "colorsId")
+ @discourseComputed("selectedId", "colorsId")
isSelected(selectedId, colorsId) {
return selectedId === colorsId;
},
diff --git a/app/assets/javascripts/wizard/components/wizard-field-image.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-image.js.es6
index a407bd5046..e97137707d 100644
--- a/app/assets/javascripts/wizard/components/wizard-field-image.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-field-image.js.es6
@@ -1,6 +1,6 @@
import Component from "@ember/component";
import getUrl from "discourse-common/lib/get-url";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
import { getToken } from "wizard/lib/ajax";
import { getOwner } from "discourse-common/lib/get-owner";
import { dasherize } from "@ember/string";
@@ -9,7 +9,7 @@ export default Component.extend({
classNames: ["wizard-image-row"],
uploading: false,
- @computed("field.id")
+ @discourseComputed("field.id")
previewComponent(id) {
const componentName = `image-preview-${dasherize(id)}`;
const exists = getOwner(this).lookup(`component:${componentName}`);
diff --git a/app/assets/javascripts/wizard/components/wizard-field.js.es6 b/app/assets/javascripts/wizard/components/wizard-field.js.es6
index 7636eee0d0..d5491a4ef9 100644
--- a/app/assets/javascripts/wizard/components/wizard-field.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-field.js.es6
@@ -1,17 +1,17 @@
import Component from "@ember/component";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
import { dasherize } from "@ember/string";
export default Component.extend({
classNameBindings: [":wizard-field", "typeClass", "field.invalid"],
- @computed("field.type")
+ @discourseComputed("field.type")
typeClass: type => `${dasherize(type)}-field`,
- @computed("field.id")
+ @discourseComputed("field.id")
fieldClass: id => `field-${dasherize(id)} wizard-focusable`,
- @computed("field.type", "field.id")
+ @discourseComputed("field.type", "field.id")
inputComponentName(type, id) {
return type === "component" ? dasherize(id) : `wizard-field-${type}`;
}
diff --git a/app/assets/javascripts/wizard/components/wizard-step-form.js.es6 b/app/assets/javascripts/wizard/components/wizard-step-form.js.es6
index 7bc7a8446e..461a5a0d18 100644
--- a/app/assets/javascripts/wizard/components/wizard-step-form.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-step-form.js.es6
@@ -1,9 +1,9 @@
import Component from "@ember/component";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
export default Component.extend({
classNameBindings: [":wizard-step-form", "customStepClass"],
- @computed("step.id")
+ @discourseComputed("step.id")
customStepClass: stepId => `wizard-step-${stepId}`
});
diff --git a/app/assets/javascripts/wizard/components/wizard-step.js.es6 b/app/assets/javascripts/wizard/components/wizard-step.js.es6
index a1a3372473..c5008ac2ac 100644
--- a/app/assets/javascripts/wizard/components/wizard-step.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-step.js.es6
@@ -2,9 +2,9 @@ import { scheduleOnce } from "@ember/runloop";
import Component from "@ember/component";
import getUrl from "discourse-common/lib/get-url";
import {
- default as computed,
+ default as discourseComputed,
observes
-} from "ember-addons/ember-computed-decorators";
+} from "discourse-common/utils/decorators";
import { htmlSafe } from "@ember/template";
jQuery.fn.wiggle = function(times, duration) {
@@ -34,16 +34,16 @@ export default Component.extend({
this.autoFocus();
},
- @computed("step.index")
+ @discourseComputed("step.index")
showQuitButton: index => index === 0,
- @computed("step.displayIndex", "wizard.totalSteps")
+ @discourseComputed("step.displayIndex", "wizard.totalSteps")
showNextButton: (current, total) => current < total,
- @computed("step.displayIndex", "wizard.totalSteps")
+ @discourseComputed("step.displayIndex", "wizard.totalSteps")
showDoneButton: (current, total) => current === total,
- @computed(
+ @discourseComputed(
"step.index",
"step.displayIndex",
"wizard.totalSteps",
@@ -53,10 +53,10 @@ export default Component.extend({
return index !== 0 && displayIndex !== total && completed;
},
- @computed("step.index")
+ @discourseComputed("step.index")
showBackButton: index => index > 0,
- @computed("step.banner")
+ @discourseComputed("step.banner")
bannerImage(src) {
if (!src) {
return;
@@ -80,7 +80,7 @@ export default Component.extend({
}
},
- @computed("step.index", "wizard.totalSteps")
+ @discourseComputed("step.index", "wizard.totalSteps")
barStyle(displayIndex, totalSteps) {
let ratio = parseFloat(displayIndex) / parseFloat(totalSteps - 1);
if (ratio < 0) {
diff --git a/app/assets/javascripts/wizard/controllers/application.js.es6 b/app/assets/javascripts/wizard/controllers/application.js.es6
index 58aede12a1..ca6d2d3e9e 100644
--- a/app/assets/javascripts/wizard/controllers/application.js.es6
+++ b/app/assets/javascripts/wizard/controllers/application.js.es6
@@ -1,10 +1,10 @@
import Controller from "@ember/controller";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
export default Controller.extend({
currentStepId: null,
- @computed("currentStepId")
+ @discourseComputed("currentStepId")
showCanvas(currentStepId) {
return currentStepId === "finished";
}
diff --git a/app/assets/javascripts/wizard/lib/ajax.js.es6 b/app/assets/javascripts/wizard/lib/ajax.js.es6
index 64cc9571cc..afb8b23ce2 100644
--- a/app/assets/javascripts/wizard/lib/ajax.js.es6
+++ b/app/assets/javascripts/wizard/lib/ajax.js.es6
@@ -1,5 +1,6 @@
import { run } from "@ember/runloop";
import getUrl from "discourse-common/lib/get-url";
+import { Promise } from "rsvp";
import jQuery from "jquery";
let token;
@@ -13,7 +14,7 @@ export function getToken() {
}
export function ajax(args) {
- return new Ember.RSVP.Promise((resolve, reject) => {
+ return new Promise((resolve, reject) => {
args.headers = { "X-CSRF-Token": getToken() };
args.success = data => run(null, resolve, data);
args.error = xhr => run(null, reject, xhr);
diff --git a/app/assets/javascripts/wizard/lib/preview.js.es6 b/app/assets/javascripts/wizard/lib/preview.js.es6
index d597bfae53..3f4d9fdf10 100644
--- a/app/assets/javascripts/wizard/lib/preview.js.es6
+++ b/app/assets/javascripts/wizard/lib/preview.js.es6
@@ -2,6 +2,7 @@ import { scheduleOnce } from "@ember/runloop";
import Component from "@ember/component";
/*eslint no-bitwise:0 */
import getUrl from "discourse-common/lib/get-url";
+import { Promise } from "rsvp";
export const LOREM = `
Lorem ipsum dolor sit amet,
@@ -56,13 +57,13 @@ export function createPreviewComponent(width, height, obj) {
loadImages() {
const images = this.images();
if (images) {
- return Ember.RSVP.Promise.all(
+ return Promise.all(
Object.keys(images).map(id => {
return loadImage(images[id]).then(img => (this[id] = img));
})
);
}
- return Ember.RSVP.Promise.resolve();
+ return Promise.resolve();
},
reload() {
@@ -270,12 +271,12 @@ export function createPreviewComponent(width, height, obj) {
function loadImage(src) {
if (!src) {
- return Ember.RSVP.Promise.resolve();
+ return Promise.resolve();
}
const img = new Image();
img.src = getUrl(src);
- return new Ember.RSVP.Promise(resolve => (img.onload = () => resolve(img)));
+ return new Promise(resolve => (img.onload = () => resolve(img)));
}
export function parseColor(color) {
diff --git a/app/assets/javascripts/wizard/mixins/valid-state.js.es6 b/app/assets/javascripts/wizard/mixins/valid-state.js.es6
index b2dc3e8954..1f82cccb91 100644
--- a/app/assets/javascripts/wizard/mixins/valid-state.js.es6
+++ b/app/assets/javascripts/wizard/mixins/valid-state.js.es6
@@ -1,4 +1,4 @@
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
export const States = {
UNCHECKED: 0,
@@ -15,13 +15,13 @@ export default {
this.set("_validState", States.UNCHECKED);
},
- @computed("_validState")
+ @discourseComputed("_validState")
valid: state => state === States.VALID,
- @computed("_validState")
+ @discourseComputed("_validState")
invalid: state => state === States.INVALID,
- @computed("_validState")
+ @discourseComputed("_validState")
unchecked: state => state === States.UNCHECKED,
setValid(valid, description) {
diff --git a/app/assets/javascripts/wizard/models/step.js.es6 b/app/assets/javascripts/wizard/models/step.js.es6
index cbc7edca18..7909d39aaf 100644
--- a/app/assets/javascripts/wizard/models/step.js.es6
+++ b/app/assets/javascripts/wizard/models/step.js.es6
@@ -1,15 +1,15 @@
import EmberObject from "@ember/object";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
import ValidState from "wizard/mixins/valid-state";
import { ajax } from "wizard/lib/ajax";
export default EmberObject.extend(ValidState, {
id: null,
- @computed("index")
+ @discourseComputed("index")
displayIndex: index => index + 1,
- @computed("fields.[]")
+ @discourseComputed("fields.[]")
fieldsById(fields) {
const lookup = {};
fields.forEach(field => (lookup[field.get("id")] = field));
diff --git a/app/assets/javascripts/wizard/models/wizard.js.es6 b/app/assets/javascripts/wizard/models/wizard.js.es6
index 569a2d5bf7..e907687e11 100644
--- a/app/assets/javascripts/wizard/models/wizard.js.es6
+++ b/app/assets/javascripts/wizard/models/wizard.js.es6
@@ -1,11 +1,11 @@
import Step from "wizard/models/step";
import WizardField from "wizard/models/wizard-field";
import { ajax } from "wizard/lib/ajax";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
import EmberObject from "@ember/object";
const Wizard = EmberObject.extend({
- @computed("steps.length")
+ @discourseComputed("steps.length")
totalSteps: length => length,
getTitle() {
diff --git a/app/assets/javascripts/wizard/router.js.es6 b/app/assets/javascripts/wizard/router.js.es6
index 5a1596b8cd..05921b0a5d 100644
--- a/app/assets/javascripts/wizard/router.js.es6
+++ b/app/assets/javascripts/wizard/router.js.es6
@@ -1,8 +1,9 @@
import getUrl from "discourse-common/lib/get-url";
+import ENV from "discourse-common/config/environment";
const Router = Ember.Router.extend({
rootURL: getUrl("/wizard/"),
- location: Ember.testing ? "none" : "history"
+ location: ENV.environment === "test" ? "none" : "history"
});
Router.map(function() {
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 9b72049a89..a45e49ac60 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -313,9 +313,7 @@ $mobile-breakpoint: 700px;
}
td.x-value {
max-width: 0;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ @include ellipsis;
}
}
.bar-container {
@@ -861,9 +859,7 @@ table#user-badges {
.value-list {
.value {
padding: 0.125em 0;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
display: flex;
&:last-child {
diff --git a/app/assets/stylesheets/common/admin/admin_report_counters.scss b/app/assets/stylesheets/common/admin/admin_report_counters.scss
index 0496e7dd3b..1731ef65cb 100644
--- a/app/assets/stylesheets/common/admin/admin_report_counters.scss
+++ b/app/assets/stylesheets/common/admin/admin_report_counters.scss
@@ -37,9 +37,7 @@
&.title {
text-align: left;
- text-overflow: ellipsis;
- overflow: hidden;
- white-space: nowrap;
+ @include ellipsis;
.d-icon {
color: $primary-low-mid;
diff --git a/app/assets/stylesheets/common/admin/admin_report_table.scss b/app/assets/stylesheets/common/admin/admin_report_table.scss
index e63330355a..2de64f7326 100644
--- a/app/assets/stylesheets/common/admin/admin_report_table.scss
+++ b/app/assets/stylesheets/common/admin/admin_report_table.scss
@@ -2,9 +2,7 @@
&.two-columns {
.table .admin-report-table-cell:first-child,
.table .admin-report-table-header:first-child {
- text-overflow: ellipsis;
- overflow: hidden;
- white-space: nowrap;
+ @include ellipsis;
text-align: left;
width: 80%;
}
@@ -32,8 +30,7 @@
outline: none;
background: none;
padding: 3px 8px;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
}
&.is-current-sort {
@@ -106,9 +103,7 @@
}
.admin-report-table-cell.term {
- text-overflow: ellipsis;
- overflow: hidden;
- white-space: nowrap;
+ @include ellipsis;
}
}
@@ -132,9 +127,7 @@
.admin-report-table-cell.post,
.admin-report-table-cell.edit_reason {
- text-overflow: ellipsis;
- overflow: hidden;
- white-space: nowrap;
+ @include ellipsis;
}
}
diff --git a/app/assets/stylesheets/common/admin/backups.scss b/app/assets/stylesheets/common/admin/backups.scss
index b5d8658639..a69f7c8003 100644
--- a/app/assets/stylesheets/common/admin/backups.scss
+++ b/app/assets/stylesheets/common/admin/backups.scss
@@ -96,3 +96,18 @@ button.ru {
margin-left: 10px;
}
}
+
+.backup-options {
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ .btn {
+ margin-right: 0.5em;
+ }
+ .backup-message {
+ margin-left: auto;
+ @include breakpoint(mobile-extra-large) {
+ margin: 1.25em 0 0;
+ }
+ }
+}
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 7bc0de21ac..e96f6cf903 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -150,6 +150,9 @@
a.license-url {
display: inline-block;
margin-right: 10px;
+ .d-icon {
+ margin-left: 5px;
+ }
}
.mini-title {
@@ -316,7 +319,9 @@
}
.theme.settings {
- .theme-setting,
+ .theme-setting {
+ min-height: 35px;
+ }
.theme-translation {
padding-bottom: 0;
margin-top: 18px;
@@ -589,7 +594,11 @@
.category,
.external_url,
.post {
- text-overflow: ellipsis;
+ @include ellipsis;
+ max-width: 100px;
+ @include breakpoint(tablet) {
+ max-width: 100%;
+ }
}
&.grid tr.admin-list-item {
diff --git a/app/assets/stylesheets/common/admin/emails.scss b/app/assets/stylesheets/common/admin/emails.scss
index cb71da61aa..4684d98500 100644
--- a/app/assets/stylesheets/common/admin/emails.scss
+++ b/app/assets/stylesheets/common/admin/emails.scss
@@ -15,16 +15,12 @@
}
.username div {
max-width: 180px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
}
.addresses p {
margin: 2px 0;
max-width: 200px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
}
}
diff --git a/app/assets/stylesheets/common/admin/users.scss b/app/assets/stylesheets/common/admin/users.scss
index 87bf9bffa9..29f430a5de 100644
--- a/app/assets/stylesheets/common/admin/users.scss
+++ b/app/assets/stylesheets/common/admin/users.scss
@@ -102,10 +102,8 @@
.admin-users-list {
td.username {
- white-space: nowrap;
+ @include ellipsis;
overflow-wrap: break-word;
- overflow: hidden;
- text-overflow: ellipsis;
}
@media screen and (max-width: 970px) and (min-width: 768px) {
td.username {
diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index ba256cc086..7ad6f5044b 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -7,8 +7,7 @@
.category-name {
display: inline-block;
max-width: 100%;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
vertical-align: text-top;
line-height: $line-height-medium;
}
@@ -109,8 +108,6 @@
color: dark-light-choose($primary-medium, $secondary-high);
.overflow {
max-height: 6em;
- overflow: hidden;
- text-overflow: ellipsis;
}
}
@@ -122,7 +119,6 @@
text-align: center;
color: $primary;
overflow: hidden;
- text-overflow: ellipsis;
}
.subcategories {
@@ -131,9 +127,7 @@
.subcategory {
display: flex;
align-items: center;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
+ @include ellipsis;
margin-right: 1em;
margin-bottom: 0.6em;
.subcategory-image-placeholder {
@@ -142,8 +136,7 @@
}
.subcategory-link {
min-width: 0;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
}
.logo img {
display: inline-block;
@@ -166,7 +159,6 @@
font-size: $font-up-2;
text-align: center;
overflow: hidden;
- text-overflow: ellipsis;
}
.category-box-heading {
@@ -192,7 +184,6 @@
.overflow {
max-height: 3em;
overflow: hidden;
- text-overflow: ellipsis;
}
.d-icon {
margin-right: 0.15em;
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index ff516a3c3a..7dca1ac5ea 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -122,9 +122,7 @@
}
.action-title {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
}
.topic-link,
@@ -136,9 +134,7 @@
.username {
margin-right: 5px;
max-width: 100px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ @include ellipsis;
@media screen and (max-width: 500px) {
display: none;
}
@@ -358,9 +354,7 @@
a {
padding: 5px;
display: block;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
span.username {
color: $primary;
@@ -443,6 +437,9 @@ div.ac-wrap {
margin: 0;
background: transparent;
min-height: unset;
+ &.fullwidth-input {
+ width: 100%;
+ }
}
}
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index cf3869e3df..0c59b17842 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -106,10 +106,8 @@ sup img.emoji {
}
.emoji-picker .info {
- text-overflow: ellipsis;
+ @include ellipsis;
padding-left: 8px;
- white-space: nowrap;
- overflow: hidden;
font-weight: 700;
max-width: 125px;
}
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 603585af54..f95b8ded1e 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -245,9 +245,7 @@
.topic-link {
color: $header_primary;
display: block;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
}
.topic-statuses {
.d-icon {
@@ -275,9 +273,7 @@
flex: 0 1 auto;
min-width: 1px;
.badge-wrapper {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
+ @include ellipsis;
}
}
.badge-wrapper {
@@ -305,9 +301,7 @@
flex: 1 0 0%; // unit on flex-basis is required for IE11
.discourse-tags {
color: $header_primary-high;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
+ @include ellipsis;
.discourse-tag {
display: inline; // tags need to stay inline in order for them to truncate
}
@@ -357,9 +351,7 @@ $mobile-avatar-height: 1.532em;
padding: 0 5px;
border: 1px solid $primary-low;
border-radius: 0.25em;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
+ @include ellipsis;
.icon {
display: flex;
@@ -376,9 +368,7 @@ $mobile-avatar-height: 1.532em;
}
span {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
+ @include ellipsis;
}
}
diff --git a/app/assets/stylesheets/common/base/lightbox.scss b/app/assets/stylesheets/common/base/lightbox.scss
index 20ed8ebea6..b15a724b2a 100644
--- a/app/assets/stylesheets/common/base/lightbox.scss
+++ b/app/assets/stylesheets/common/base/lightbox.scss
@@ -47,9 +47,7 @@ $meta-element-margin: 6px;
.filename {
margin: $meta-element-margin;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
+ @include ellipsis;
}
.d-icon {
@@ -74,3 +72,18 @@ $meta-element-margin: 6px;
.mfp-preloader .spinner {
margin: auto;
}
+
+.discourse-no-touch {
+ @if is-light-color-scheme() {
+ a.lightbox {
+ -webkit-transition: all 0.6s cubic-bezier(0.165, 0.84, 0.44, 1);
+ transition: all 0.6s cubic-bezier(0.165, 0.84, 0.44, 1);
+ }
+
+ a.lightbox:hover {
+ border-radius: 5px;
+ box-shadow: 0 2px 5px 0 rgba($primary, 0.2),
+ 0 2px 10px 0 rgba($primary, 0.2);
+ }
+ }
+}
diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index 00beeeccd6..fa1af85ec7 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -168,3 +168,21 @@ button#new-account-link {
background: transparent;
color: $primary-high;
}
+
+#security-key {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ button {
+ margin-right: 1.5em;
+ }
+ p {
+ margin: 0;
+ font-size: $font-0;
+ }
+ a {
+ display: inline-block;
+ padding: 1em 0.5em 1em 0;
+ color: $tertiary;
+ }
+}
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index a02fccf8b8..c0693508f6 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -115,8 +115,6 @@
line-height: $line-height-large;
}
.badge-wrapper {
- overflow: hidden;
- text-overflow: ellipsis;
&.bar,
&.bullet {
color: $primary;
@@ -143,8 +141,6 @@
span.badge-category {
max-width: 100px;
- overflow: hidden;
- text-overflow: ellipsis;
}
div.discourse-tags {
@@ -225,8 +221,8 @@
.none {
padding-top: 5px;
}
- .spinner-container.visible {
- min-height: 30px;
+ .spinner-container {
+ min-height: 2em;
}
.spinner {
width: 20px;
@@ -341,9 +337,7 @@ div.menu-links-header {
span.d-label {
display: block;
max-width: 130px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ @include ellipsis;
}
@include breakpoint(mobile-medium) {
diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index e44e7d2d7f..c09bfb54b6 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -562,21 +562,18 @@ aside.onebox.twitterstatus .onebox-body {
.outer-box {
position: absolute;
z-index: z("base");
- overflow: hidden;
font-size: $font-down-1;
color: #fff;
background-color: rgba(0, 0, 0, 0.6);
- text-overflow: ellipsis;
- max-width: 100%;
+ @include ellipsis;
+ max-width: 690px;
padding: 5px 0;
.inner-box {
padding-left: 10px;
padding-right: 10px;
overflow: hidden;
- text-overflow: ellipsis;
- word-wrap: normal;
- white-space: nowrap;
+ @include ellipsis;
.album-title {
width: 100%;
diff --git a/app/assets/stylesheets/common/base/reviewables.scss b/app/assets/stylesheets/common/base/reviewables.scss
index e47cb5287f..701bdf440a 100644
--- a/app/assets/stylesheets/common/base/reviewables.scss
+++ b/app/assets/stylesheets/common/base/reviewables.scss
@@ -121,6 +121,17 @@
.category-chooser {
width: 100%;
}
+
+ .d-date-time-input-range {
+ width: inherit;
+ border: none;
+ padding: 0;
+
+ .d-date-input {
+ flex: 1 1 auto;
+ border: 1px solid $primary-medium;
+ }
+ }
}
}
@@ -284,7 +295,6 @@
.reviewed-by {
display: flex;
align-items: center;
- white-space: nowrap;
}
.user-flag-percentage {
@@ -309,8 +319,7 @@
&.user a,
&.reviewed-by a {
max-width: 150px;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
}
}
@@ -327,8 +336,7 @@
padding: 0.5em 1em 0.5em 0;
}
@include breakpoint("mobile-large") {
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
padding-right: 0.5em;
}
}
diff --git a/app/assets/stylesheets/common/base/search-menu.scss b/app/assets/stylesheets/common/base/search-menu.scss
index 0ba64993ba..04d4714463 100644
--- a/app/assets/stylesheets/common/base/search-menu.scss
+++ b/app/assets/stylesheets/common/base/search-menu.scss
@@ -153,9 +153,7 @@
.name,
.slug {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
}
.name {
@@ -207,9 +205,7 @@
.username,
.name {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
}
.username {
diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss
index 38d7340ef6..6f5e4f69dc 100644
--- a/app/assets/stylesheets/common/base/share_link.scss
+++ b/app/assets/stylesheets/common/base/share_link.scss
@@ -54,7 +54,10 @@
.social-link {
margin-right: s(2);
font-size: $font-up-4;
- .d-icon-fab-facebook-square {
+ .d-icon {
+ color: dark-light-choose($tertiary, white);
+ }
+ .d-icon-fab-facebook {
// Adheres to Facebook brand guidelines
color: dark-light-choose($facebook, white);
}
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index 0802a3a8f5..ee88625578 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -5,6 +5,8 @@
.tag-list {
margin-top: 2em;
+ padding-bottom: 1em;
+ border-bottom: 1px solid $primary-low;
}
#list-area .tag-list h3 {
@@ -71,9 +73,7 @@ $tag-color: $primary-medium;
.discourse-tag {
max-width: 14em;
display: inline-block;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
vertical-align: middle;
}
@@ -90,6 +90,10 @@ $tag-color: $primary-medium;
color: $header-primary_high !important;
}
+ &.large {
+ font-size: $font-up-2;
+ }
+
&.box {
background-color: $primary-low;
color: $primary-high;
@@ -106,6 +110,25 @@ $tag-color: $primary-medium;
margin-right: 0;
color: $primary-high;
}
+
+ &.bullet {
+ margin-right: 0.5em;
+ display: inline-flex;
+ align-items: center;
+ &:before {
+ background: $primary-low-mid;
+ margin-right: 5px;
+ position: relative;
+ width: 9px;
+ height: 9px;
+ display: inline-block;
+ content: "";
+ }
+ &.large:before {
+ width: 13px;
+ height: 13px;
+ }
+ }
}
.discourse-tags,
@@ -154,21 +177,6 @@ $tag-color: $primary-medium;
}
}
-.discourse-tag.bullet {
- margin-right: 0.5em;
- display: inline-flex;
- align-items: center;
- &:before {
- background: $primary-low-mid;
- margin-right: 5px;
- position: relative;
- width: 9px;
- height: 9px;
- display: inline-block;
- content: "";
- }
-}
-
header .discourse-tag {
color: $tag-color;
}
@@ -260,3 +268,26 @@ header .discourse-tag {
}
}
}
+
+.tag-info {
+ margin-top: 1em;
+ margin-bottom: 1em;
+
+ .delete-tag {
+ float: right;
+ }
+ .synonyms-list,
+ .add-synonyms,
+ .tag-associations {
+ margin-top: 1em;
+ }
+ .tag-list {
+ border: none;
+ .d-icon {
+ color: $primary-medium;
+ }
+ }
+ .field {
+ margin-bottom: 5px;
+ }
+}
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 03c00c58ed..e1eafd1dc1 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -53,9 +53,7 @@
font-size: $font-0;
margin-right: 8px;
display: inline-block;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
vertical-align: middle;
a {
color: dark-light-choose($primary-high, $secondary-low);
@@ -235,8 +233,6 @@ blockquote {
// !important here otherwise it won't work.
img {
max-width: 100% !important;
- object-fit: cover;
- object-position: top;
}
}
@@ -912,7 +908,10 @@ a.mention-group {
background-color: $tertiary-low;
border-top: 1px solid $primary-low;
display: flex;
- max-width: calc(#{$topic-body-width} + #{$topic-avatar-width} - 0.1em);
+ max-width: calc(
+ #{$topic-body-width} + (#{$topic-body-width-padding} * 2) + #{$topic-avatar-width} -
+ (0.8em * 2)
+ );
padding: 0.8em;
&.old {
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index 88c3c8e1dd..a4f1bdc34b 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -220,9 +220,7 @@ a.badge-category {
display: flex;
align-items: center;
span:not(.badge) {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
+ @include ellipsis;
}
}
ul {
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 872661991c..8fdafe020f 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -143,8 +143,6 @@
dd {
padding: 0;
margin: 0 15px 0 0;
- overflow: hidden;
- text-overflow: ellipsis;
color: $primary;
&.groups {
@@ -182,9 +180,7 @@
h2 {
font-weight: normal;
max-width: 100%;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
}
h3 {
diff --git a/app/assets/stylesheets/common/components/group-members-input.scss b/app/assets/stylesheets/common/components/group-members-input.scss
deleted file mode 100644
index fde660de04..0000000000
--- a/app/assets/stylesheets/common/components/group-members-input.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-.group-members-input {
- .group-members-input-selector {
- margin-top: 10px;
-
- .add {
- margin-top: 7px;
- }
- }
-}
diff --git a/app/assets/stylesheets/common/components/user-card.scss b/app/assets/stylesheets/common/components/user-card.scss
index c1132c06e5..21e15ec0b7 100644
--- a/app/assets/stylesheets/common/components/user-card.scss
+++ b/app/assets/stylesheets/common/components/user-card.scss
@@ -119,9 +119,7 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
h2,
h3 {
margin: 0;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
}
h1,
h2 {
@@ -201,9 +199,7 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
}
.website-name a,
.location span {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ @include ellipsis;
color: $primary;
}
.location {
@@ -226,17 +222,11 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
display: flex;
align-items: flex-start;
.user-badge {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
background: $primary-very-low;
border: 1px solid $primary-low;
color: $primary;
}
- .badge-display-name {
- overflow: hidden;
- text-overflow: ellipsis;
- }
.more-user-badges {
a {
@extend .user-badge;
diff --git a/app/assets/stylesheets/common/components/user-info.scss b/app/assets/stylesheets/common/components/user-info.scss
index fee047c488..b92b452882 100644
--- a/app/assets/stylesheets/common/components/user-info.scss
+++ b/app/assets/stylesheets/common/components/user-info.scss
@@ -24,9 +24,7 @@
}
.name-line {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
}
.username a {
diff --git a/app/assets/stylesheets/common/components/user-stream-item.scss b/app/assets/stylesheets/common/components/user-stream-item.scss
index 817225165f..284d0ba479 100644
--- a/app/assets/stylesheets/common/components/user-stream-item.scss
+++ b/app/assets/stylesheets/common/components/user-stream-item.scss
@@ -66,18 +66,14 @@
}
.title {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
display: block;
}
.name {
font-size: $font-0;
max-width: 400px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
}
.edit-reason {
diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss
index 99f7634547..b2ce6a55f7 100644
--- a/app/assets/stylesheets/common/foundation/mixins.scss
+++ b/app/assets/stylesheets/common/foundation/mixins.scss
@@ -57,6 +57,12 @@ $breakpoints: (
}
}
+@mixin ellipsis {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
+
//
// --------------------------------------------------
diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss
index 0895022002..22da7ac9bc 100644
--- a/app/assets/stylesheets/common/foundation/variables.scss
+++ b/app/assets/stylesheets/common/foundation/variables.scss
@@ -198,11 +198,23 @@ $box-shadow: (
}
}
@function dark-light-choose($light-theme-result, $dark-theme-result) {
- @if dc-color-brightness($primary) < dc-color-brightness($secondary) {
+ @if is-light-color-scheme() {
@return $light-theme-result;
} @else {
@return $dark-theme-result;
}
}
+@function is-light-color-scheme() {
+ @if dc-color-brightness($primary) < dc-color-brightness($secondary) {
+ @return true;
+ } @else {
+ @return false;
+ }
+}
+
+@function is-dark-color-scheme() {
+ @return not is-light-color-scheme();
+}
+
@import "color_transformations";
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 d257494c44..d1ef732cfd 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -78,9 +78,7 @@
font-size: $font-0;
color: $primary;
padding: 0;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ @include ellipsis;
max-width: 100%;
}
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index c0d86c737b..8cb552acb1 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -71,9 +71,7 @@
text-align: left;
flex: 0 1 auto;
padding: 1px 0;
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
+ @include ellipsis;
color: inherit;
}
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index 2fc738478c..8e6e8afc9d 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -80,9 +80,7 @@
color: dark-light-choose($primary-medium, $secondary-high);
}
.title {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
flex: 0 1 auto;
}
.topic-statuses {
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index 7f4db285c2..546f35c34e 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -15,6 +15,10 @@
width: 404px;
}
+ .item + #private-message-users {
+ width: 150px;
+ }
+
.select-kit.is-expanded {
z-index: z("composer", "dropdown") + 1;
}
diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss
index 40b59d5b68..0e2688db34 100644
--- a/app/assets/stylesheets/desktop/login.scss
+++ b/app/assets/stylesheets/desktop/login.scss
@@ -143,21 +143,25 @@
&:before {
content: "";
display: block;
- height: 25px;
position: absolute;
width: 100%;
pointer-events: none;
}
&:after {
bottom: 0;
+ height: 35px;
+ @media screen and (max-height: 650px) {
+ height: 45px;
+ }
background-image: linear-gradient(
to bottom,
rgba($secondary, 0) 0%,
- rgba($secondary, 1) 100%
+ rgba($secondary, 0.9) 100%
);
}
&:before {
top: 0;
+ height: 25px;
background-image: linear-gradient(
to top,
rgba($secondary, 0) 0%,
@@ -167,10 +171,13 @@
form {
box-sizing: border-box;
padding: s(4 6);
- margin-bottom: 5px;
+ margin-bottom: 0;
max-height: 475px;
- @media screen and (max-height: 768px) {
- max-height: calc(60vh - 100px);
+ @media screen and (max-height: 650px) {
+ max-height: calc(65vh - 100px);
+ > *:last-child {
+ margin-bottom: 40px;
+ }
}
overflow-x: hidden;
overflow-y: auto;
@@ -203,6 +210,10 @@
}
}
+ .user-fields {
+ margin-bottom: 20px;
+ }
+
.user-field {
display: flex;
flex-direction: column;
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 0e15c47fa6..03ab18a8b9 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -88,6 +88,9 @@
}
}
+ $td-posters-height: 29px; // min-height of td with avatar glow
+ $td-posters-more-lh: $td-posters-height - 4;
+
.posters {
// we know there are up to 5 avatars of fixed size
// will be overridden by media width queries on narrow displays to 1 avatar's width
@@ -98,10 +101,17 @@
&:last-of-type {
margin-right: 0;
}
+
+ &.posters-more-count {
+ cursor: default;
+ color: dark-light-choose($primary-medium, $secondary-medium);
+ line-height: $td-posters-more-lh;
+ font-size: $font-down-1;
+ }
}
}
td.posters {
- height: 29px; // min-height of td with avatar glow
+ height: $td-posters-height;
}
.posters a:first-child .avatar.latest:not(.single) {
box-shadow: 0 0 3px 1px desaturate($tertiary-medium, 35%);
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 0ec4d3446b..4abaa8d21a 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -495,6 +495,14 @@ video {
max-height: 500px;
}
+.video {
+ // Height determined by aspect-ratio
+ max-height: 500px;
+ > video {
+ max-height: unset;
+ }
+}
+
@-webkit-keyframes fadein {
from {
opacity: 0;
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index b951457984..a7c73db6c5 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -124,16 +124,12 @@
}
h1 {
max-width: 100%;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
}
.location-and-website {
display: flex;
max-width: 100%;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
+ @include ellipsis;
.user-profile-location {
margin-right: 1em;
}
diff --git a/app/assets/stylesheets/mobile/components/user-card.scss b/app/assets/stylesheets/mobile/components/user-card.scss
index 5d87399f9d..0345aaf743 100644
--- a/app/assets/stylesheets/mobile/components/user-card.scss
+++ b/app/assets/stylesheets/mobile/components/user-card.scss
@@ -28,9 +28,7 @@ $avatar_width: 120px;
border-left: 0.5em solid transparent;
}
button {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
}
}
}
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index 2f25202bbc..3919886d80 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -71,9 +71,7 @@
}
.draft-text {
width: calc(100% - 40px);
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
}
}
diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss
index 43e9813f2e..413d753fc6 100644
--- a/app/assets/stylesheets/mobile/header.scss
+++ b/app/assets/stylesheets/mobile/header.scss
@@ -8,9 +8,7 @@
// some protection for text-only site titles
.title {
max-width: 75%;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ @include ellipsis;
-webkit-animation: fadein 0.5s;
animation: fadein 0.5s;
// This acts as a placeholder if for some reason the small logo takes a while
diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss
index a5d2019184..2fd2067bd7 100644
--- a/app/assets/stylesheets/wizard.scss
+++ b/app/assets/stylesheets/wizard.scss
@@ -2,6 +2,7 @@
@import "vendor/sweetalert";
@import "common/foundation/colors";
@import "common/foundation/variables";
+@import "common/foundation/mixins";
@import "common/select-kit/*";
@import "common/components/svg";
@@ -129,7 +130,6 @@ body.wizard {
.wizard-step-colors {
max-height: 465px;
- margin-bottom: 20px;
overflow-y: auto;
.grid {
box-sizing: border-box;
@@ -188,6 +188,7 @@ body.wizard {
.wizard-step-contents {
height: 550px;
+ margin-bottom: 2em;
a {
text-decoration: none;
color: #6699ff;
@@ -515,7 +516,7 @@ body.wizard {
}
.radio-field-choice {
- margin-bottom: 1.5em;
+ margin-bottom: 1.25em;
input {
outline: 0;
@@ -601,9 +602,6 @@ body.wizard {
.wizard-footer {
display: none !important;
}
- .wizard-field {
- margin-bottom: 1em !important;
- }
.wizard-step-description {
margin-bottom: 1em !important;
}
diff --git a/app/controllers/admin/backups_controller.rb b/app/controllers/admin/backups_controller.rb
index 2e4762c05f..9d52e669b5 100644
--- a/app/controllers/admin/backups_controller.rb
+++ b/app/controllers/admin/backups_controller.rb
@@ -204,7 +204,7 @@ class Admin::BackupsController < Admin::AdminController
begin
upload_url = store.generate_upload_url(filename)
rescue BackupRestore::BackupStore::BackupFileExists
- return render_json_error(I18n("backup.file_exists"))
+ return render_json_error(I18n.t("backup.file_exists"))
rescue BackupRestore::BackupStore::StorageError => e
return render_json_error(e)
end
diff --git a/app/controllers/admin/badges_controller.rb b/app/controllers/admin/badges_controller.rb
index 0a1b741fd4..fe67475e26 100644
--- a/app/controllers/admin/badges_controller.rb
+++ b/app/controllers/admin/badges_controller.rb
@@ -125,6 +125,15 @@ class Admin::BadgesController < Admin::AdminController
badge.save!
end
+ if opts[:new].blank?
+ Jobs.enqueue(
+ :bulk_user_title_update,
+ new_title: badge.name,
+ granted_badge_id: badge.id,
+ action: Jobs::BulkUserTitleUpdate::UPDATE_ACTION
+ )
+ end
+
errors
rescue ActiveRecord::RecordInvalid
errors.push(*badge.errors.full_messages)
diff --git a/app/controllers/admin/site_settings_controller.rb b/app/controllers/admin/site_settings_controller.rb
index 689b7bdc43..bc550ba103 100644
--- a/app/controllers/admin/site_settings_controller.rb
+++ b/app/controllers/admin/site_settings_controller.rb
@@ -26,28 +26,6 @@ class Admin::SiteSettingsController < Admin::AdminController
SiteSetting.set_and_log(id, value, current_user)
if update_existing_users
- user_options = {
- default_email_mailing_list_mode: "mailing_list_mode",
- default_email_mailing_list_mode_frequency: "mailing_list_mode_frequency",
- default_email_level: "email_level",
- default_email_messages_level: "email_messages_level",
- default_topics_automatic_unpin: "automatically_unpin_topics",
- default_email_previous_replies: "email_previous_replies",
- default_email_in_reply_to: "email_in_reply_to",
- default_other_enable_quoting: "enable_quoting",
- default_other_enable_defer: "enable_defer",
- default_other_external_links_in_new_tab: "external_links_in_new_tab",
- default_other_dynamic_favicon: "dynamic_favicon",
- default_other_new_topic_duration_minutes: "new_topic_duration_minutes",
- default_other_auto_track_topics_after_msecs: "auto_track_topics_after_msecs",
- default_other_notification_level_when_replying: "notification_level_when_replying",
- default_other_like_notification_frequency: "like_notification_frequency",
- default_email_digest_frequency: "digest_after_minutes",
- default_include_tl0_in_digests: "include_tl0_in_digests",
- default_text_size: "text_size_key",
- default_title_count_mode: "title_count_mode_key"
- }
-
new_value = value || ""
if (user_option = user_options[id.to_sym]).present?
@@ -80,9 +58,7 @@ class Admin::SiteSettingsController < Admin::AdminController
notification_level = NotificationLevels.all[:watching_first_post]
end
- (previous_category_ids - new_category_ids).each do |category_id|
- CategoryUser.where(category_id: category_id, notification_level: notification_level).delete_all
- end
+ CategoryUser.where(category_id: (previous_category_ids - new_category_ids), notification_level: notification_level).delete_all
(new_category_ids - previous_category_ids).each do |category_id|
skip_user_ids = CategoryUser.where(category_id: category_id).pluck(:user_id)
@@ -109,9 +85,7 @@ class Admin::SiteSettingsController < Admin::AdminController
notification_level = NotificationLevels.all[:watching_first_post]
end
- (previous_tag_ids - new_tag_ids).each do |tag_id|
- TagUser.where(tag_id: tag_id, notification_level: notification_level).delete_all
- end
+ TagUser.where(tag_id: (previous_tag_ids - new_tag_ids), notification_level: notification_level).delete_all
(new_tag_ids - previous_tag_ids).each do |tag_id|
skip_user_ids = TagUser.where(tag_id: tag_id).pluck(:user_id)
@@ -128,8 +102,103 @@ class Admin::SiteSettingsController < Admin::AdminController
render body: nil
end
+ def user_count
+ params.require(:site_setting_id)
+ id = params[:site_setting_id]
+ raise Discourse::NotFound unless id.start_with?("default_")
+ new_value = params[id] || ""
+
+ raise_access_hidden_setting(id)
+ previous_value = SiteSetting.send(id) || ""
+ json = {}
+
+ if (user_option = user_options[id.to_sym]).present?
+ if user_option == "text_size_key"
+ previous_value = UserOption.text_sizes[previous_value.to_sym]
+ elsif user_option == "title_count_mode_key"
+ previous_value = UserOption.title_count_modes[previous_value.to_sym]
+ end
+
+ json[:user_count] = UserOption.where(user_option => previous_value).count
+ elsif id.start_with?("default_categories_")
+ previous_category_ids = previous_value.split("|")
+ new_category_ids = new_value.split("|")
+
+ case id
+ when "default_categories_watching"
+ notification_level = NotificationLevels.all[:watching]
+ when "default_categories_tracking"
+ notification_level = NotificationLevels.all[:tracking]
+ when "default_categories_muted"
+ notification_level = NotificationLevels.all[:muted]
+ when "default_categories_watching_first_post"
+ notification_level = NotificationLevels.all[:watching_first_post]
+ end
+
+ user_ids = CategoryUser.where(category_id: previous_category_ids - new_category_ids, notification_level: notification_level).distinct.pluck(:user_id)
+ user_ids += User
+ .joins("CROSS JOIN categories c")
+ .joins("LEFT JOIN category_users cu ON users.id = cu.user_id AND c.id = cu.category_id")
+ .where("c.id IN (?) AND cu.notification_level IS NULL", new_category_ids - previous_category_ids)
+ .distinct
+ .pluck("users.id")
+
+ json[:user_count] = user_ids.uniq.count
+ elsif id.start_with?("default_tags_")
+ previous_tag_ids = Tag.where(name: previous_value.split("|")).pluck(:id)
+ new_tag_ids = Tag.where(name: new_value.split("|")).pluck(:id)
+
+ case id
+ when "default_tags_watching"
+ notification_level = TagUser.notification_levels[:watching]
+ when "default_tags_tracking"
+ notification_level = TagUser.notification_levels[:tracking]
+ when "default_tags_muted"
+ notification_level = TagUser.notification_levels[:muted]
+ when "default_tags_watching_first_post"
+ notification_level = TagUser.notification_levels[:watching_first_post]
+ end
+
+ user_ids = TagUser.where(tag_id: previous_tag_ids - new_tag_ids, notification_level: notification_level).distinct.pluck(:user_id)
+ user_ids += User
+ .joins("CROSS JOIN tags t")
+ .joins("LEFT JOIN tag_users tu ON users.id = tu.user_id AND t.id = tu.tag_id")
+ .where("t.id IN (?) AND tu.notification_level IS NULL", new_tag_ids - previous_tag_ids)
+ .distinct
+ .pluck("users.id")
+
+ json[:user_count] = user_ids.uniq.count
+ end
+
+ render json: json
+ end
+
private
+ def user_options
+ {
+ default_email_mailing_list_mode: "mailing_list_mode",
+ default_email_mailing_list_mode_frequency: "mailing_list_mode_frequency",
+ default_email_level: "email_level",
+ default_email_messages_level: "email_messages_level",
+ default_topics_automatic_unpin: "automatically_unpin_topics",
+ default_email_previous_replies: "email_previous_replies",
+ default_email_in_reply_to: "email_in_reply_to",
+ default_other_enable_quoting: "enable_quoting",
+ default_other_enable_defer: "enable_defer",
+ default_other_external_links_in_new_tab: "external_links_in_new_tab",
+ default_other_dynamic_favicon: "dynamic_favicon",
+ default_other_new_topic_duration_minutes: "new_topic_duration_minutes",
+ default_other_auto_track_topics_after_msecs: "auto_track_topics_after_msecs",
+ default_other_notification_level_when_replying: "notification_level_when_replying",
+ default_other_like_notification_frequency: "like_notification_frequency",
+ default_email_digest_frequency: "digest_after_minutes",
+ default_include_tl0_in_digests: "include_tl0_in_digests",
+ default_text_size: "text_size_key",
+ default_title_count_mode: "title_count_mode_key"
+ }
+ end
+
def raise_access_hidden_setting(id)
# note, as of Ruby 2.3 symbols are GC'd so this is considered safe
if SiteSetting.hidden_settings.include?(id.to_sym)
diff --git a/app/controllers/admin/site_texts_controller.rb b/app/controllers/admin/site_texts_controller.rb
index ef594471d9..69d2665023 100644
--- a/app/controllers/admin/site_texts_controller.rb
+++ b/app/controllers/admin/site_texts_controller.rb
@@ -20,11 +20,15 @@ class Admin::SiteTextsController < Admin::AdminController
extras = {}
query = params[:q] || ""
+
+ locale = params[:locale] || I18n.locale
+ raise Discourse::InvalidParameters.new(:locale) if !I18n.locale_available?(locale)
+
if query.blank? && !overridden
extras[:recommended] = true
- results = self.class.preferred_keys.map { |k| record_for(k) }
+ results = I18n.with_locale(locale) { self.class.preferred_keys.map { |k| record_for(k) } }
else
- results = find_translations(query, overridden)
+ results = I18n.with_locale(locale) { find_translations(query, overridden) }
if results.any?
extras[:regex] = I18n::Backend::DiscourseI18n.create_search_regexp(query, as_string: true)
@@ -41,8 +45,15 @@ class Admin::SiteTextsController < Admin::AdminController
end
end
- extras[:has_more] = true if results.size > 50
- render_serialized(results[0..49], SiteTextSerializer, root: 'site_texts', rest_serializer: true, extras: extras, overridden_keys: overridden_keys)
+ page = params[:page].to_i
+ raise Discourse::InvalidParameters.new(:page) if page < 0
+
+ per_page = 50
+ first = page * per_page
+ last = first + per_page
+
+ extras[:has_more] = true if results.size > last
+ render_serialized(results[first..last - 1], SiteTextSerializer, root: 'site_texts', rest_serializer: true, extras: extras, overridden_keys: overridden_keys)
end
def show
@@ -59,6 +70,15 @@ class Admin::SiteTextsController < Admin::AdminController
if translation_override.errors.empty?
StaffActionLogger.new(current_user).log_site_text_change(id, value, old_value)
+ system_badge_id = Badge.find_system_badge_id_from_translation_key(id)
+ if system_badge_id.present?
+ Jobs.enqueue(
+ :bulk_user_title_update,
+ new_title: value,
+ granted_badge_id: system_badge_id,
+ action: Jobs::BulkUserTitleUpdate::UPDATE_ACTION
+ )
+ end
render_serialized(site_text, SiteTextSerializer, root: 'site_text', rest_serializer: true)
else
render json: failed_json.merge(
@@ -69,10 +89,19 @@ class Admin::SiteTextsController < Admin::AdminController
def revert
site_text = find_site_text
- old_text = I18n.t(site_text[:id])
- TranslationOverride.revert!(I18n.locale, site_text[:id])
+ id = site_text[:id]
+ old_text = I18n.t(id)
+ TranslationOverride.revert!(I18n.locale, id)
site_text = find_site_text
- StaffActionLogger.new(current_user).log_site_text_change(site_text[:id], site_text[:value], old_text)
+ StaffActionLogger.new(current_user).log_site_text_change(id, site_text[:value], old_text)
+ system_badge_id = Badge.find_system_badge_id_from_translation_key(id)
+ if system_badge_id.present?
+ Jobs.enqueue(
+ :bulk_user_title_update,
+ granted_badge_id: system_badge_id,
+ action: Jobs::BulkUserTitleUpdate::RESET_ACTION
+ )
+ end
render_serialized(site_text, SiteTextSerializer, root: 'site_text', rest_serializer: true)
end
diff --git a/app/controllers/admin/staff_action_logs_controller.rb b/app/controllers/admin/staff_action_logs_controller.rb
index 5ab3fbe4d0..117bdf8415 100644
--- a/app/controllers/admin/staff_action_logs_controller.rb
+++ b/app/controllers/admin/staff_action_logs_controller.rb
@@ -35,23 +35,23 @@ class Admin::StaffActionLogsController < Admin::AdminController
diff_fields = {}
- output = +"#{CGI.escapeHTML(cur["name"].to_s)}"
+ output = +"#{CGI.escapeHTML(cur&.dig("name").to_s)}"
diff_fields["name"] = {
- prev: prev["name"].to_s,
- cur: cur["name"].to_s,
+ prev: prev&.dig("name").to_s,
+ cur: cur&.dig("name").to_s,
}
["default", "user_selectable"].each do |f|
diff_fields[f] = {
- prev: (!!prev[f]).to_s,
- cur: (!!cur[f]).to_s
+ prev: (!!prev&.dig(f)).to_s,
+ cur: (!!cur&.dig(f)).to_s
}
end
diff_fields["color scheme"] = {
- prev: prev["color_scheme"]&.fetch("name").to_s,
- cur: cur["color_scheme"]&.fetch("name").to_s,
+ prev: prev&.dig("color_scheme", "name").to_s,
+ cur: cur&.dig("color_scheme", "name").to_s,
}
diff_fields["included themes"] = {
@@ -76,13 +76,13 @@ class Admin::StaffActionLogsController < Admin::AdminController
protected
def child_themes(theme)
- return "" unless children = theme["child_themes"]
+ return "" unless children = theme&.dig("child_themes")
children.map { |row| row["name"] }.join(" ").to_s
end
def load_diff(hash, key, val)
- if f = val["theme_fields"]
+ if f = val&.dig("theme_fields")
f.each do |row|
entry = hash[row["target"] + " " + row["name"]] ||= {}
entry[key] = row["value"]
diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb
index 9c16a0a068..9db615e519 100644
--- a/app/controllers/admin/themes_controller.rb
+++ b/app/controllers/admin/themes_controller.rb
@@ -23,12 +23,24 @@ class Admin::ThemesController < Admin::AdminController
if upload.errors.count > 0
render_json_error upload
else
+ # we assume a user intends to make some media public
+ # if they are uploading it to a theme component
+ mark_upload_insecure(upload) if upload.secure?
render json: { upload_id: upload.id }, status: :created
end
end
end
end
+ def mark_upload_insecure(upload)
+ upload.update_secure_status(secure_override_value: false)
+ StaffActionLogger.new(current_user).log_change_upload_secure_status(
+ upload_id: upload.id,
+ new_value: false
+ )
+ Jobs.enqueue(:rebake_posts_for_upload, id: upload.id)
+ end
+
def generate_key_pair
require 'sshkey'
k = SSHKey.generate
@@ -164,19 +176,11 @@ class Admin::ThemesController < Admin::AdminController
end
if theme_params.key?(:child_theme_ids)
- expected = theme_params[:child_theme_ids].map(&:to_i)
+ add_relative_themes!(:child, theme_params[:child_theme_ids])
+ end
- @theme.child_theme_relation.to_a.each do |child|
- if expected.include?(child.child_theme_id)
- expected.reject! { |id| id == child.child_theme_id }
- else
- child.destroy
- end
- end
-
- Theme.where(id: expected).each do |theme|
- @theme.add_child_theme!(theme)
- end
+ if theme_params.key?(:parent_theme_ids)
+ add_relative_themes!(:parent, theme_params[:parent_theme_ids])
end
set_fields
@@ -248,7 +252,7 @@ class Admin::ThemesController < Admin::AdminController
headers['Content-Length'] = File.size(file_path).to_s
send_data File.read(file_path),
filename: File.basename(file_path),
- content_type: "application/x-gzip"
+ content_type: "application/zip"
ensure
exporter.cleanup!
end
@@ -282,6 +286,26 @@ class Admin::ThemesController < Admin::AdminController
private
+ def add_relative_themes!(kind, ids)
+ expected = ids.map(&:to_i)
+
+ relation = kind == :child ? @theme.child_theme_relation : @theme.parent_theme_relation
+
+ relation.to_a.each do |relative|
+ if kind == :child && expected.include?(relative.child_theme_id)
+ expected.reject! { |id| id == relative.child_theme_id }
+ elsif kind == :parent && expected.include?(relative.parent_theme_id)
+ expected.reject! { |id| id == relative.parent_theme_id }
+ else
+ relative.destroy
+ end
+ end
+
+ Theme.where(id: expected).each do |theme|
+ @theme.add_relative_theme!(kind, theme)
+ end
+ end
+
def update_default_theme
if theme_params.key?(:default)
is_default = theme_params[:default].to_s == "true"
@@ -298,6 +322,7 @@ class Admin::ThemesController < Admin::AdminController
begin
# deep munge is a train wreck, work around it for now
params[:theme][:child_theme_ids] ||= [] if params[:theme].key?(:child_theme_ids)
+ params[:theme][:parent_theme_ids] ||= [] if params[:theme].key?(:parent_theme_ids)
params.require(:theme).permit(
:name,
@@ -309,7 +334,8 @@ class Admin::ThemesController < Admin::AdminController
settings: {},
translations: {},
theme_fields: [:name, :target, :value, :upload_id, :type_id],
- child_theme_ids: []
+ child_theme_ids: [],
+ parent_theme_ids: []
)
end
end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d1682ee19b..f843ddc7e0 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -687,6 +687,25 @@ class ApplicationController < ActionController::Base
request.original_url unless request.original_url =~ /uploads/
end
+ def redirect_to_login
+ dont_cache_page
+
+ if SiteSetting.enable_sso?
+ # save original URL in a session so we can redirect after login
+ session[:destination_url] = destination_url
+ redirect_to path('/session/sso')
+ elsif !SiteSetting.enable_local_logins && Discourse.enabled_authenticators.length == 1 && !cookies[:authentication_data]
+ # Only one authentication provider, direct straight to it.
+ # If authentication_data is present, then we are halfway though registration. Don't redirect offsite
+ cookies[:destination_url] = destination_url
+ redirect_to path("/auth/#{Discourse.enabled_authenticators.first.name}")
+ else
+ # save original URL in a cookie (javascript redirects after login in this case)
+ cookies[:destination_url] = destination_url
+ redirect_to path("/login")
+ end
+ end
+
def redirect_to_login_if_required
return if request.format.json? && is_api?
@@ -715,19 +734,8 @@ class ApplicationController < ActionController::Base
if !current_user && SiteSetting.login_required?
flash.keep
- dont_cache_page
-
- if SiteSetting.enable_sso?
- # save original URL in a session so we can redirect after login
- session[:destination_url] = destination_url
- redirect_to path('/session/sso')
- return
- else
- # save original URL in a cookie (javascript redirects after login in this case)
- cookies[:destination_url] = destination_url
- redirect_to path("/login")
- return
- end
+ redirect_to_login
+ return
end
check_totp = current_user &&
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 5e660f1981..191b2f433e 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -47,8 +47,7 @@ class CategoriesController < ApplicationController
style = SiteSetting.desktop_category_page_style
topic_options = {
per_page: SiteSetting.categories_topics,
- no_definitions: true,
- exclude_category_ids: Category.where(suppress_from_latest: true).pluck(:id)
+ no_definitions: true
}
if style == "categories_and_latest_topics".freeze
@@ -238,8 +237,7 @@ class CategoriesController < ApplicationController
topic_options = {
per_page: SiteSetting.categories_topics,
- no_definitions: true,
- exclude_category_ids: Category.where(suppress_from_latest: true).pluck(:id)
+ no_definitions: true
}
result = CategoryAndTopicLists.new
@@ -283,6 +281,7 @@ class CategoriesController < ApplicationController
if SiteSetting.tagging_enabled
params[:allowed_tags] ||= []
params[:allowed_tag_groups] ||= []
+ params[:required_tag_group_name] ||= ''
end
result = params.permit(
@@ -291,7 +290,6 @@ class CategoriesController < ApplicationController
:email_in,
:email_in_allow_strangers,
:mailinglist_mirror,
- :suppress_from_latest,
:all_topics_wiki,
:parent_category_id,
:auto_close_hours,
diff --git a/app/controllers/extra_locales_controller.rb b/app/controllers/extra_locales_controller.rb
index 4bee444976..e20c81ea42 100644
--- a/app/controllers/extra_locales_controller.rb
+++ b/app/controllers/extra_locales_controller.rb
@@ -9,15 +9,20 @@ class ExtraLocalesController < ApplicationController
:verify_authenticity_token
OVERRIDES_BUNDLE ||= 'overrides'
+ MD5_HASH_LENGTH ||= 32
def show
bundle = params[:bundle]
-
raise Discourse::InvalidAccess.new if !valid_bundle?(bundle)
- if params[:v]&.size == 32
- hash = ExtraLocalesController.bundle_js_hash(bundle)
- immutable_for(1.year) if hash == params[:v]
+ version = params[:v]
+ if version.present?
+ if version.kind_of?(String) && version.length == MD5_HASH_LENGTH
+ hash = ExtraLocalesController.bundle_js_hash(bundle)
+ immutable_for(1.year) if hash == version
+ else
+ raise Discourse::InvalidParameters.new(:v)
+ end
end
render plain: ExtraLocalesController.bundle_js(bundle), content_type: "application/javascript"
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index f0ed98e57d..36e3b7b2da 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -208,20 +208,11 @@ class GroupsController < ApplicationController
guardian.ensure_can_see_group_members!(group)
- limit = (params[:limit] || 20).to_i
+ limit = (params[:limit] || 50).to_i
offset = params[:offset].to_i
- if limit < 0
- raise Discourse::InvalidParameters.new(:limit)
- end
-
- if limit > 1000
- raise Discourse::InvalidParameters.new(:limit)
- end
-
- if offset < 0
- raise Discourse::InvalidParameters.new(:offset)
- end
+ raise Discourse::InvalidParameters.new(:limit) if limit < 0 || limit > 1000
+ raise Discourse::InvalidParameters.new(:offset) if offset < 0
dir = (params[:desc] && !params[:desc].blank?) ? 'DESC' : 'ASC'
order = ""
@@ -278,7 +269,7 @@ class GroupsController < ApplicationController
end
end
- users = users.select('users.*, group_users.created_at as added_at')
+ users = users.joins(:user_option).select('users.*, user_options.timezone, group_users.created_at as added_at')
members = users
.order('NOT group_users.owner')
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index 7a62d95a56..a1bbedc5ce 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -40,7 +40,7 @@ class InvitesController < ApplicationController
def perform_accept_invitation
params.require(:id)
- params.permit(:username, :name, :password, user_custom_fields: {})
+ params.permit(:username, :name, :password, :timezone, user_custom_fields: {})
invite = Invite.find_by(invite_key: params[:id])
if invite.present?
@@ -48,6 +48,7 @@ class InvitesController < ApplicationController
user = invite.redeem(username: params[:username], name: params[:name], password: params[:password], user_custom_fields: params[:user_custom_fields], ip_address: request.remote_ip)
if user.present?
log_on_user(user) if user.active?
+ user.update_timezone_if_missing(params[:timezone])
post_process_invite(user)
end
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index bba2d3c9b6..40c42fab07 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -52,15 +52,7 @@ class ListController < ApplicationController
list_opts = build_topic_list_options
list_opts.merge!(options) if options
user = list_target_user
-
- if params[:category].blank?
- if filter == :latest
- list_opts[:no_definitions] = true
- end
- if [:latest, :categories].include?(filter) && list_opts[:exclude_category_ids].blank?
- list_opts[:exclude_category_ids] = get_excluded_category_ids(list_opts[:category])
- end
- end
+ list_opts[:no_definitions] = true if params[:category].blank? && filter == :latest
list = TopicQuery.new(user, list_opts).public_send("list_#{filter}")
@@ -246,10 +238,6 @@ class ListController < ApplicationController
top_options.merge!(options) if options
top_options[:per_page] = SiteSetting.topics_per_period_in_top_page
- if "top".freeze == current_homepage && top_options[:exclude_category_ids].blank?
- top_options[:exclude_category_ids] = get_excluded_category_ids(top_options[:category])
- end
-
user = list_target_user
list = TopicQuery.new(user, top_options).list_top_for(period)
list.for_period = period
@@ -385,17 +373,14 @@ class ListController < ApplicationController
end
opts = opts.dup
+ if SiteSetting.unicode_usernames && opts[:group_name]
+ opts[:group_name] = URI.encode(opts[:group_name])
+ end
opts.delete(:category) if page_params.include?(:category_slug_path_with_id)
public_send(method, opts.merge(page_params)).sub('.json?', '?')
end
- def get_excluded_category_ids(current_category = nil)
- exclude_category_ids = Category.where(suppress_from_latest: true)
- exclude_category_ids = exclude_category_ids.where.not(id: current_category) if current_category
- exclude_category_ids.pluck(:id)
- end
-
def self.best_period_for(previous_visit_at, category_id = nil)
default_period = ((category_id && Category.where(id: category_id).pluck_first(:default_top_period)) ||
SiteSetting.top_page_default_timeframe).to_sym
diff --git a/app/controllers/metadata_controller.rb b/app/controllers/metadata_controller.rb
index 279cb99345..279bdfea1b 100644
--- a/app/controllers/metadata_controller.rb
+++ b/app/controllers/metadata_controller.rb
@@ -25,7 +25,13 @@ class MetadataController < ApplicationController
private
def default_manifest
- display = Regexp.new(SiteSetting.pwa_display_browser_regex).match(request.user_agent) ? 'browser' : 'standalone'
+ display = "standalone"
+ if request.user_agent
+ regex = Regexp.new(SiteSetting.pwa_display_browser_regex)
+ if regex.match(request.user_agent)
+ display = "browser"
+ end
+ end
manifest = {
name: SiteSetting.title,
diff --git a/app/controllers/onebox_controller.rb b/app/controllers/onebox_controller.rb
index 10c500317b..f656ba3414 100644
--- a/app/controllers/onebox_controller.rb
+++ b/app/controllers/onebox_controller.rb
@@ -19,6 +19,8 @@ class OneboxController < ApplicationController
invalidate = params[:refresh] == 'true'
url = params[:url]
+ return render(body: nil, status: 404) if Oneboxer.recently_failed?(url)
+
hijack do
Oneboxer.preview_onebox!(user_id)
@@ -34,6 +36,7 @@ class OneboxController < ApplicationController
Oneboxer.onebox_previewed!(user_id)
if preview.blank?
+ Oneboxer.cache_failed!(url)
render body: nil, status: 404
else
render plain: preview
diff --git a/app/controllers/post_readers_controller.rb b/app/controllers/post_readers_controller.rb
index fdba0605a2..bc9c3a197b 100644
--- a/app/controllers/post_readers_controller.rb
+++ b/app/controllers/post_readers_controller.rb
@@ -8,16 +8,14 @@ class PostReadersController < ApplicationController
ensure_can_see_readers!(post)
readers = User
+ .real
.where(staged: false)
.where.not(id: post.user_id)
.joins(:topic_users)
.where.not(topic_users: { last_read_post_number: nil })
.where('topic_users.topic_id = ? AND topic_users.last_read_post_number >= ?', post.topic_id, post.post_number)
- if post.whisper?
- non_group_members = post.topic.topic_allowed_users.map(&:user_id)
- readers = readers.where.not(id: non_group_members)
- end
+ readers = readers.where('admin OR moderator') if post.whisper?
readers = readers.map do |r|
{
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index b63d2539fe..c28102530c 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -335,7 +335,7 @@ class PostsController < ApplicationController
params.require(:post_ids)
agree_with_first_reply_flag = (params[:agree_with_first_reply_flag] || true).to_s == "true"
- posts = Post.where(id: post_ids_including_replies)
+ posts = Post.where(id: post_ids_including_replies).order(:id)
raise Discourse::InvalidParameters.new(:post_ids) if posts.blank?
# Make sure we can delete the posts
@@ -478,8 +478,8 @@ class PostsController < ApplicationController
post = find_post_from_params
if params[:notice].present?
- post.custom_fields["notice_type"] = Post.notices[:custom]
- post.custom_fields["notice_args"] = PrettyText.cook(params[:notice], features: { onebox: false })
+ post.custom_fields[Post::NOTICE_TYPE] = Post.notices[:custom]
+ post.custom_fields[Post::NOTICE_ARGS] = PrettyText.cook(params[:notice], features: { onebox: false })
post.save_custom_fields
else
post.delete_post_notices
@@ -671,7 +671,8 @@ class PostsController < ApplicationController
:auto_track,
:typing_duration_msecs,
:composer_open_duration_msecs,
- :visible
+ :visible,
+ :draft_key
]
Post.plugin_permitted_create_params.each do |key, plugin|
diff --git a/app/controllers/reviewables_controller.rb b/app/controllers/reviewables_controller.rb
index 2e9816bab1..ce5c2cd29e 100644
--- a/app/controllers/reviewables_controller.rb
+++ b/app/controllers/reviewables_controller.rb
@@ -20,18 +20,21 @@ class ReviewablesController < ApplicationController
topic_id = params[:topic_id] ? params[:topic_id].to_i : nil
category_id = params[:category_id] ? params[:category_id].to_i : nil
+ custom_keys = Reviewable.custom_filters.map(&:first)
+ additional_filters = JSON.parse(params.fetch(:additional_filters, {}), symbolize_names: true).slice(*custom_keys)
filters = {
status: status,
category_id: category_id,
topic_id: topic_id,
- priority: params[:priority],
- username: params[:username],
- type: params[:type],
- sort_order: params[:sort_order]
+ additional_filters: additional_filters.reject { |_, v| v.blank? }
}
- total_rows = Reviewable.list_for(current_user, filters).count
- reviewables = Reviewable.list_for(current_user, filters.merge(limit: PER_PAGE, offset: offset)).to_a
+ %i[priority username from_date to_date type sort_order].each do |filter_key|
+ filters[filter_key] = params[filter_key]
+ end
+
+ total_rows = Reviewable.list_for(current_user, **filters).count
+ reviewables = Reviewable.list_for(current_user, **filters.merge(limit: PER_PAGE, offset: offset)).to_a
claimed_topics = ReviewableClaimedTopic.claimed_hash(reviewables.map { |r| r.topic_id }.uniq)
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 4fea08f068..3f0914e2dc 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -7,7 +7,7 @@ class SearchController < ApplicationController
before_action :cancel_overloaded_search, only: [:query]
def self.valid_context_types
- %w{user topic category private_messages}
+ %w{user topic category private_messages tag}
end
def show
@@ -169,6 +169,8 @@ class SearchController < ApplicationController
context_obj = Category.find_by(id: search_context[:id].to_i)
elsif 'topic' == search_context[:type]
context_obj = Topic.find_by(id: search_context[:id].to_i)
+ elsif 'tag' == search_context[:type]
+ context_obj = Tag.where_name(search_context[:name]).first
end
type_filter = nil
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index d7d4f45842..a0828685a7 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -320,7 +320,7 @@ class SessionController < ApplicationController
def invalid_security_key(user, err_message = nil)
stage_webauthn_security_key_challenge(user) if !params[:security_key_credential]
- return render json: failed_json.merge(
+ render json: failed_json.merge(
error: err_message || I18n.t("login.invalid_security_key"),
reason: "invalid_security_key",
backup_enabled: user.backup_codes_enabled?
@@ -403,7 +403,7 @@ class SessionController < ApplicationController
end
end
- return render json: { error: I18n.t('email_login.invalid_token') }
+ render json: { error: I18n.t('email_login.invalid_token') }
rescue ::Webauthn::SecurityKeyError => err
invalid_security_key(user, err.message)
end
@@ -540,6 +540,7 @@ class SessionController < ApplicationController
def login(user)
session.delete(ACTIVATE_USER_KEY)
+ user.update_timezone_if_missing(params[:timezone])
log_on_user(user)
if payload = cookies.delete(:sso_payload)
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 8aabc8f3db..55ec294cdf 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -5,6 +5,7 @@ class TagsController < ::ApplicationController
include TopicQueryParams
before_action :ensure_tags_enabled
+ before_action :ensure_visible, only: [:show, :info]
requires_login except: [
:index,
@@ -12,13 +13,16 @@ class TagsController < ::ApplicationController
:tag_feed,
:search,
:check_hashtag,
+ :info,
Discourse.anonymous_filters.map { |f| :"show_#{f}" }
].flatten
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, :personal_messages]
+ :tag_feed, :search, :notifications, :update_notifications, :personal_messages, :info]
+
+ before_action :fetch_tag, only: [:info, :create_synonyms, :destroy_synonym]
def index
@description_meta = I18n.t("tags.title")
@@ -31,21 +35,21 @@ class TagsController < ::ApplicationController
ungrouped_tags = ungrouped_tags.where("tags.topic_count > 0") unless show_all_tags
grouped_tag_counts = TagGroup.visible(guardian).order('name ASC').includes(:tags).map do |tag_group|
- { id: tag_group.id, name: tag_group.name, tags: self.class.tag_counts_json(tag_group.tags) }
+ { id: tag_group.id, name: tag_group.name, tags: self.class.tag_counts_json(tag_group.tags.where(target_tag_id: nil)) }
end
@tags = self.class.tag_counts_json(ungrouped_tags)
@extras = { tag_groups: grouped_tag_counts }
else
tags = show_all_tags ? Tag.all : Tag.where("tags.topic_count > 0")
- unrestricted_tags = DiscourseTagging.filter_visible(tags, guardian)
+ unrestricted_tags = DiscourseTagging.filter_visible(tags.where(target_tag_id: nil), guardian)
categories = Category.where("id IN (SELECT category_id FROM category_tags)")
.where("id IN (?)", guardian.allowed_category_ids)
.includes(:tags)
category_tag_counts = categories.map do |c|
- { id: c.id, tags: self.class.tag_counts_json(c.tags) }
+ { id: c.id, tags: self.class.tag_counts_json(c.tags.where(target_tag_id: nil)) }
end
@tags = self.class.tag_counts_json(unrestricted_tags)
@@ -98,11 +102,13 @@ class TagsController < ::ApplicationController
end
def show
- raise Discourse::NotFound if DiscourseTagging.hidden_tag_names(guardian).include?(params[:tag_id])
-
show_latest
end
+ def info
+ render_serialized(@tag, DetailedTagSerializer, root: :tag_info)
+ end
+
def update
guardian.ensure_can_admin_tags!
@@ -195,29 +201,25 @@ class TagsController < ::ApplicationController
def search
filter_params = {
for_input: params[:filterForInput],
- selected_tags: params[:selected_tags]
+ selected_tags: params[:selected_tags],
+ limit: params[:limit],
+ exclude_synonyms: params[:excludeSynonyms],
+ exclude_has_synonyms: params[:excludeHasSynonyms]
}
if params[:categoryId]
filter_params[:category] = Category.find_by_id(params[:categoryId])
end
- if params[:q]
+ if !params[:q].blank?
clean_name = DiscourseTagging.clean_tag(params[:q])
filter_params[:term] = clean_name
-
- # Prioritize exact matches when ordering
- order_query = Tag.sanitize_sql_for_order(
- ["lower(name) = lower(?) DESC, topic_count DESC", clean_name]
- )
-
- tag_query = Tag.order(order_query).limit(params[:limit])
+ filter_params[:order_search_results] = true
else
- tag_query = Tag.limit(params[:limit])
+ filter_params[:order] = "topic_count DESC"
end
tags_with_counts = DiscourseTagging.filter_allowed_tags(
- tag_query,
guardian,
filter_params
)
@@ -230,19 +232,25 @@ class TagsController < ::ApplicationController
# filter_allowed_tags determined that the tag entered is not allowed
json_response[:forbidden] = params[:q]
- category_names = tag.categories.where(id: guardian.allowed_category_ids).pluck(:name)
- category_names += Category.joins(tag_groups: :tags).where(id: guardian.allowed_category_ids, "tags.id": tag.id).pluck(:name)
-
- if category_names.present?
- category_names.uniq!
- json_response[:forbidden_message] = I18n.t(
- "tags.forbidden.restricted_to",
- count: category_names.count,
- tag_name: tag.name,
- category_names: category_names.join(", ")
- )
+ if filter_params[:exclude_synonyms] && tag.synonym?
+ json_response[:forbidden_message] = I18n.t("tags.forbidden.synonym", tag_name: tag.target_tag.name)
+ elsif filter_params[:exclude_has_synonyms] && tag.synonyms.exists?
+ json_response[:forbidden_message] = I18n.t("tags.forbidden.has_synonyms", tag_name: tag.name)
else
- json_response[:forbidden_message] = I18n.t("tags.forbidden.in_this_category", tag_name: tag.name)
+ category_names = tag.categories.where(id: guardian.allowed_category_ids).pluck(:name)
+ category_names += Category.joins(tag_groups: :tags).where(id: guardian.allowed_category_ids, "tags.id": tag.id).pluck(:name)
+
+ if category_names.present?
+ category_names.uniq!
+ json_response[:forbidden_message] = I18n.t(
+ "tags.forbidden.restricted_to",
+ count: category_names.count,
+ tag_name: tag.name,
+ category_names: category_names.join(", ")
+ )
+ else
+ json_response[:forbidden_message] = I18n.t("tags.forbidden.in_this_category", tag_name: tag.name)
+ end
end
end
@@ -282,14 +290,56 @@ class TagsController < ::ApplicationController
render json: { tags: pm_tags }
end
+ def create_synonyms
+ guardian.ensure_can_admin_tags!
+ value = DiscourseTagging.add_or_create_synonyms_by_name(@tag, params[:synonyms])
+ if value.is_a?(Array)
+ render json: failed_json.merge(
+ failed_tags: value.inject({}) { |h, t| h[t.name] = t.errors.full_messages.first; h }
+ )
+ else
+ render json: success_json
+ end
+ end
+
+ def destroy_synonym
+ guardian.ensure_can_admin_tags!
+ synonym = Tag.where_name(params[:synonym_id]).first
+ raise Discourse::NotFound unless synonym
+ if synonym.target_tag == @tag
+ synonym.update!(target_tag: nil)
+ render json: success_json
+ else
+ render json: failed_json, status: 400
+ end
+ end
+
private
+ def fetch_tag
+ @tag = Tag.find_by_name(params[:tag_id].force_encoding("UTF-8"))
+ raise Discourse::NotFound unless @tag
+ end
+
def ensure_tags_enabled
raise Discourse::NotFound unless SiteSetting.tagging_enabled?
end
+ def ensure_visible
+ raise Discourse::NotFound if DiscourseTagging.hidden_tag_names(guardian).include?(params[:tag_id])
+ end
+
def self.tag_counts_json(tags)
- tags.map { |t| { id: t.name, text: t.name, count: t.topic_count, pm_count: t.pm_topic_count } }
+ target_tags = Tag.where(id: tags.map(&:target_tag_id).compact.uniq).select(:id, :name)
+ tags.map do |t|
+ {
+ id: t.name,
+ text: t.name,
+ count: t.topic_count,
+ pm_count: t.pm_topic_count,
+ target_tag: t.target_tag_id ? target_tags.find { |x| x.id == t.target_tag_id }&.name : nil
+ }
+ end
end
def set_category_from_params
@@ -396,7 +446,6 @@ class TagsController < ::ApplicationController
options = super.merge(
page: params[:page],
topic_ids: param_to_integer_list(:topic_ids),
- exclude_category_ids: params[:exclude_category_ids],
category: @filter_on_category ? @filter_on_category.id : params[:category],
order: params[:order],
ascending: params[:ascending],
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 2c29594e66..e5989bc139 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -327,10 +327,9 @@ class TopicsController < ApplicationController
if category && topic_tags = (params[:tags] || topic.tags.pluck(:name)).reject { |c| c.empty? }
if topic_tags.present?
allowed_tags = DiscourseTagging.filter_allowed_tags(
- Tag.all,
guardian,
category: category
- ).pluck("tags.name")
+ ).map(&:name)
invalid_tags = topic_tags - allowed_tags
@@ -450,7 +449,7 @@ class TopicsController < ApplicationController
topic_status_update = topic.set_or_create_timer(
status_type,
params[:time],
- options
+ **options
)
if topic.save
@@ -848,7 +847,23 @@ class TopicsController < ApplicationController
end
def reset_new
- current_user.user_stat.update_column(:new_since, Time.now)
+ if params[:category_id].present?
+ category_ids = [params[:category_id]]
+ if params[:include_subcategories] == 'true'
+ category_ids = category_ids.concat(Category.where(parent_category_id: params[:category_id]).pluck(:id))
+ end
+ category_ids.each do |category_id|
+ current_user
+ .category_users
+ .where(category_id: category_id)
+ .first_or_initialize
+ .update!(last_seen_at: Time.zone.now)
+ TopicTrackingState.publish_dismiss_new(current_user.id, category_id)
+ end
+ else
+ current_user.user_stat.update_column(:new_since, Time.zone.now)
+ TopicTrackingState.publish_dismiss_new(current_user.id)
+ end
render body: nil
end
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 78fd13c8eb..caa6c8987f 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -5,9 +5,11 @@ require "mini_mime"
class UploadsController < ApplicationController
requires_login except: [:show, :show_short]
- skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required, only: [:show, :show_short]
+ skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required, only: [:show, :show_short, :show_secure]
protect_from_forgery except: :show
+ before_action :is_asset_path, only: [:show, :show_short, :show_secure]
+
def create
# capture current user for block later on
me = current_user
@@ -110,6 +112,17 @@ class UploadsController < ApplicationController
end
end
+ def show_secure
+ # do not serve uploads requested via XHR to prevent XSS
+ return xhr_not_allowed if request.xhr?
+
+ if SiteSetting.secure_media?
+ redirect_to Discourse.store.signed_url_for_path("#{params[:path]}.#{params[:extension]}")
+ else
+ render_404
+ end
+ end
+
def metadata
params.require(:url)
upload = Upload.get_from_url(params[:url])
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5498a9933b..8084793829 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -128,7 +128,7 @@ class UsersController < ApplicationController
end
end
- json_result(user, serializer: UserSerializer, additional_errors: [:user_profile]) do |u|
+ json_result(user, serializer: UserSerializer, additional_errors: [:user_profile, :user_option]) do |u|
updater = UserUpdater.new(current_user, user)
updater.update(attributes.permit!)
end
@@ -195,14 +195,36 @@ class UsersController < ApplicationController
guardian.ensure_can_edit!(user)
user_badge = UserBadge.find_by(id: params[:user_badge_id])
+ previous_title = user.title
if user_badge && user_badge.user == user && user_badge.badge.allow_title?
user.title = user_badge.badge.display_name
- user.user_profile.badge_granted_title = true
user.save!
- user.user_profile.save!
+
+ log_params = {
+ details: "title matching badge id #{user_badge.badge.id}",
+ previous_value: previous_title,
+ new_value: user.title
+ }
+
+ if current_user.staff? && current_user != user
+ StaffActionLogger.new(current_user).log_title_change(user, log_params)
+ else
+ UserHistory.create!(log_params.merge(target_user_id: user.id, action: UserHistory.actions[:change_title]))
+ end
else
user.title = ''
user.save!
+
+ log_params = {
+ revoke_reason: 'user title was same as revoked badge name or custom badge name',
+ previous_value: previous_title
+ }
+
+ if current_user.staff? && current_user != user
+ StaffActionLogger.new(current_user).log_title_revoke(user, log_params)
+ else
+ UserHistory.create!(log_params.merge(target_user_id: user.id, action: UserHistory.actions[:revoke_title]))
+ end
end
render body: nil
@@ -365,7 +387,7 @@ class UsersController < ApplicationController
params[:locale] ||= I18n.locale unless current_user
- new_user_params = user_params
+ new_user_params = user_params.except(:timezone)
user = User.unstage(new_user_params)
user = User.new(new_user_params) if user.nil?
@@ -413,6 +435,7 @@ class UsersController < ApplicationController
if user.save
authentication.finish
activation.finish
+ user.update_timezone_if_missing(params[:timezone])
secure_session[HONEYPOT_KEY] = nil
secure_session[CHALLENGE_KEY] = nil
diff --git a/app/controllers/users_email_controller.rb b/app/controllers/users_email_controller.rb
index f74f60a94a..aaead3bf62 100644
--- a/app/controllers/users_email_controller.rb
+++ b/app/controllers/users_email_controller.rb
@@ -4,8 +4,26 @@ class UsersEmailController < ApplicationController
requires_login only: [:index, :update]
- skip_before_action :check_xhr, only: [:confirm]
- skip_before_action :redirect_to_login_if_required, only: [:confirm]
+ skip_before_action :check_xhr, only: [
+ :confirm_old_email,
+ :show_confirm_old_email,
+ :confirm_new_email,
+ :show_confirm_new_email
+ ]
+
+ skip_before_action :redirect_to_login_if_required, only: [
+ :confirm_old_email,
+ :show_confirm_old_email,
+ :confirm_new_email,
+ :show_confirm_new_email
+ ]
+
+ before_action :require_login, only: [
+ :confirm_old_email,
+ :show_confirm_old_email,
+ :confirm_new_email,
+ :show_confirm_new_email
+ ]
def index
end
@@ -29,38 +47,141 @@ class UsersEmailController < ApplicationController
render_json_error(I18n.t("rate_limiter.slow_down"))
end
- def confirm
- expires_now
+ def confirm_new_email
+ load_change_request(:new)
- token = EmailToken.confirmable(params[:token])
- user = token&.user
+ if @change_request&.change_state != EmailChangeRequest.states[:authorizing_new]
+ @error = I18n.t("change_email.already_done")
+ end
- change_request =
- if user
- user.email_change_requests.where(new_email_token_id: token.id).first
- end
+ redirect_url = path("/u/confirm-new-email/#{params[:token]}")
- if change_request&.change_state == EmailChangeRequest.states[:authorizing_new] &&
- user.totp_enabled? && !user.authenticate_second_factor(params[:second_factor_token], params[:second_factor_method].to_i)
+ if !@error && @user.totp_enabled? && !@user.authenticate_second_factor(params[:second_factor_token], params[:second_factor_method].to_i)
+ RateLimiter.new(nil, "second-factor-min-#{request.remote_ip}", 3, 1.minute).performed!
+ flash[:invalid_second_factor] = true
+ redirect_to redirect_url
+ return
+ end
- @update_result = :invalid_second_factor
- @backup_codes_enabled = true if user.backup_codes_enabled?
-
- if params[:second_factor_token].present?
- RateLimiter.new(nil, "second-factor-min-#{request.remote_ip}", 3, 1.minute).performed!
- @show_invalid_second_factor_error = true
- end
- else
+ if !@error
updater = EmailUpdater.new
- @update_result = updater.confirm(params[:token])
-
- if @update_result == :complete
+ if updater.confirm(params[:token]) == :complete
updater.user.user_stat.reset_bounce_score!
- log_on_user(updater.user)
+ else
+ @error = I18n.t("change_email.already_done")
end
end
+ if @error
+ flash[:error] = @error
+ redirect_to redirect_url
+ else
+ redirect_to "#{redirect_url}?done=true"
+ end
+ end
+
+ def show_confirm_new_email
+ load_change_request(:new)
+
+ if params[:done].to_s == "true"
+ @done = true
+ end
+
+ if @change_request&.change_state != EmailChangeRequest.states[:authorizing_new]
+ @error = I18n.t("change_email.already_done")
+ end
+
+ @show_invalid_second_factor_error = flash[:invalid_second_factor]
+
+ if !@error
+ if @user.totp_enabled?
+ @backup_codes_enabled = @user.backup_codes_enabled?
+ if params[:show_backup].to_s == "true" && @backup_codes_enabled
+ @show_backup_codes = true
+ else
+ @show_second_factor = true
+ end
+ end
+
+ @to_email = @change_request.new_email
+ end
+
render layout: 'no_ember'
end
+ def confirm_old_email
+ load_change_request(:old)
+
+ if @change_request&.change_state != EmailChangeRequest.states[:authorizing_old]
+ @error = I18n.t("change_email.already_done")
+ end
+
+ redirect_url = path("/u/confirm-old-email/#{params[:token]}")
+
+ if !@error
+ updater = EmailUpdater.new
+ if updater.confirm(params[:token]) != :authorizing_new
+ @error = I18n.t("change_email.already_done")
+ end
+ end
+
+ if @error
+ flash[:error] = @error
+ redirect_to redirect_url
+ else
+ redirect_to "#{redirect_url}?done=true"
+ end
+ end
+
+ def show_confirm_old_email
+ load_change_request(:old)
+
+ if @change_request&.change_state != EmailChangeRequest.states[:authorizing_old]
+ @error = I18n.t("change_email.already_done")
+ end
+
+ if params[:done].to_s == "true"
+ @almost_done = true
+ end
+
+ if !@error
+ @from_email = @user.email
+ @to_email = @change_request.new_email
+ end
+
+ render layout: 'no_ember'
+ end
+
+ private
+
+ def load_change_request(type)
+ expires_now
+
+ @token = EmailToken.confirmable(params[:token])
+
+ if @token
+ if type == :old
+ @change_request = @token.user&.email_change_requests.where(old_email_token_id: @token.id).first
+ elsif type == :new
+ @change_request = @token.user&.email_change_requests.where(new_email_token_id: @token.id).first
+ end
+ end
+
+ @user = @token&.user
+
+ if (!@user || !@change_request)
+ @error = I18n.t("change_email.already_done")
+ end
+
+ if current_user.id != @user&.id
+ @error = I18n.t 'change_email.wrong_account_error'
+ end
+ end
+
+ def require_login
+ if !current_user
+ redirect_to_login
+ end
+ end
+
end
diff --git a/app/helpers/user_notifications_helper.rb b/app/helpers/user_notifications_helper.rb
index d7e619f029..0df7aa6926 100644
--- a/app/helpers/user_notifications_helper.rb
+++ b/app/helpers/user_notifications_helper.rb
@@ -47,8 +47,9 @@ module UserNotificationsHelper
return result unless result.blank?
- # If there is no first paragaph, return the first div (onebox)
- doc.css('div').first
+ # If there is no first paragaph with text, return the first paragraph with
+ # something else (an image) or div (a onebox).
+ doc.css('body > p, body > div').first
end
def email_excerpt(html_arg, post = nil)
diff --git a/app/jobs/regular/bulk_invite.rb b/app/jobs/regular/bulk_invite.rb
index 6baa2232d0..a87344f079 100644
--- a/app/jobs/regular/bulk_invite.rb
+++ b/app/jobs/regular/bulk_invite.rb
@@ -84,7 +84,7 @@ module Jobs
end
end
- return topic
+ topic
end
def send_invite(invite)
diff --git a/app/jobs/regular/bulk_user_title_update.rb b/app/jobs/regular/bulk_user_title_update.rb
new file mode 100644
index 0000000000..97d3f68ad5
--- /dev/null
+++ b/app/jobs/regular/bulk_user_title_update.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Jobs
+ class BulkUserTitleUpdate < ::Jobs::Base
+ UPDATE_ACTION = 'update'.freeze
+ RESET_ACTION = 'reset'.freeze
+
+ def execute(args)
+ new_title = args[:new_title]
+ granted_badge_id = args[:granted_badge_id]
+ action = args[:action]
+
+ case action
+ when UPDATE_ACTION
+ update_titles_for_granted_badge(new_title, granted_badge_id)
+ when RESET_ACTION
+ reset_titles_for_granted_badge(granted_badge_id)
+ end
+ end
+
+ private
+
+ ##
+ # If a badge name or a system badge TranslationOverride changes
+ # then we need to set all titles granted based on that badge to
+ # the new name or custom translation
+ def update_titles_for_granted_badge(new_title, granted_badge_id)
+ DB.exec(<<~SQL, granted_title_badge_id: granted_badge_id, title: new_title, updated_at: Time.now)
+ UPDATE users AS u
+ SET title = :title, updated_at = :updated_at
+ FROM user_profiles AS up
+ WHERE up.user_id = u.id AND up.granted_title_badge_id = :granted_title_badge_id
+ SQL
+ end
+
+ ##
+ # Reset granted titles for a badge back to the original
+ # badge name. When a system badge has its TranslationOverride
+ # revoked we want to have all titles based on that translation
+ # for the badge reset.
+ def reset_titles_for_granted_badge(granted_badge_id)
+ DB.exec(<<~SQL, granted_title_badge_id: granted_badge_id, updated_at: Time.now)
+ UPDATE users AS u
+ SET title = badges.name, updated_at = :updated_at
+ FROM user_profiles AS up
+ INNER JOIN badges ON badges.id = up.granted_title_badge_id
+ WHERE up.user_id = u.id AND up.granted_title_badge_id = :granted_title_badge_id
+ SQL
+ end
+ end
+end
diff --git a/app/jobs/regular/notify_category_change.rb b/app/jobs/regular/notify_category_change.rb
index bac94a20e0..fbad7582e4 100644
--- a/app/jobs/regular/notify_category_change.rb
+++ b/app/jobs/regular/notify_category_change.rb
@@ -7,7 +7,7 @@ module Jobs
if post&.topic&.visible?
post_alerter = PostAlerter.new
- post_alerter.notify_post_users(post, User.where(id: args[:notified_user_ids]))
+ post_alerter.notify_post_users(post, User.where(id: args[:notified_user_ids]), include_tag_watchers: false)
post_alerter.notify_first_post_watchers(post, post_alerter.category_watchers(post.topic))
end
end
diff --git a/app/jobs/regular/notify_tag_change.rb b/app/jobs/regular/notify_tag_change.rb
index 4725896cd4..dff6769de9 100644
--- a/app/jobs/regular/notify_tag_change.rb
+++ b/app/jobs/regular/notify_tag_change.rb
@@ -7,6 +7,7 @@ module Jobs
if post&.topic&.visible?
post_alerter = PostAlerter.new
+ post_alerter.notify_post_users(post, User.where(id: args[:notified_user_ids]), include_category_watchers: false)
post_alerter.notify_first_post_watchers(post, post_alerter.tag_watchers(post.topic))
end
end
diff --git a/app/jobs/regular/rebake_posts_for_upload.rb b/app/jobs/regular/rebake_posts_for_upload.rb
new file mode 100644
index 0000000000..a56b433643
--- /dev/null
+++ b/app/jobs/regular/rebake_posts_for_upload.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Jobs
+ class RebakePostsForUpload < ::Jobs::Base
+ def execute(args)
+ upload = Upload.find_by(id: args[:id])
+ return if upload.blank?
+ upload.posts.find_each(&:rebake!)
+ end
+ end
+end
diff --git a/app/jobs/regular/update_private_uploads_acl.rb b/app/jobs/regular/update_private_uploads_acl.rb
index 4437ea9649..661f84437c 100644
--- a/app/jobs/regular/update_private_uploads_acl.rb
+++ b/app/jobs/regular/update_private_uploads_acl.rb
@@ -4,11 +4,11 @@ module Jobs
class UpdatePrivateUploadsAcl < ::Jobs::Base
# only runs when SiteSetting.prevent_anons_from_downloading_files is updated
def execute(args)
- return if !SiteSetting.enable_s3_uploads
+ return if !SiteSetting.Upload.enable_s3_uploads
Upload.find_each do |upload|
- if !FileHelper.is_supported_image?(upload.original_filename)
- Discourse.store.update_upload_ACL(upload)
+ if !FileHelper.is_supported_media?(upload.original_filename)
+ upload.update_secure_status
end
end
end
diff --git a/app/jobs/scheduled/clean_up_inactive_users.rb b/app/jobs/scheduled/clean_up_inactive_users.rb
index a0a4ab5f61..a54e1ee657 100644
--- a/app/jobs/scheduled/clean_up_inactive_users.rb
+++ b/app/jobs/scheduled/clean_up_inactive_users.rb
@@ -30,7 +30,8 @@ module Jobs
User.transaction do
ids.each do |id|
begin
- user = User.find(id)
+ user = User.find_by(id: id)
+ next unless user
destroyer.destroy(user, transaction: false, context: I18n.t("user.destroy_reasons.inactive_user"))
rescue => e
Discourse.handle_job_exception(e,
diff --git a/app/jobs/scheduled/invalidate_inactive_admins.rb b/app/jobs/scheduled/invalidate_inactive_admins.rb
index 8b1468d762..15ac0117c0 100644
--- a/app/jobs/scheduled/invalidate_inactive_admins.rb
+++ b/app/jobs/scheduled/invalidate_inactive_admins.rb
@@ -8,10 +8,14 @@ module Jobs
def execute(_)
return if SiteSetting.invalidate_inactive_admin_email_after_days == 0
+ timestamp = SiteSetting.invalidate_inactive_admin_email_after_days.days.ago
+
User.human_users
.where(admin: true)
.where(active: true)
- .where('last_seen_at < ?', SiteSetting.invalidate_inactive_admin_email_after_days.days.ago)
+ .where('last_seen_at < ?', timestamp)
+ .where("NOT EXISTS ( SELECT 1 from api_keys WHERE api_keys.user_id = users.id AND COALESCE(last_used_at, updated_at) > ? )", timestamp)
+ .where("NOT EXISTS ( SELECT 1 from posts WHERE posts.user_id = users.id AND created_at > ?)", timestamp)
.each do |user|
User.transaction do
diff --git a/app/jobs/scheduled/poll_feed.rb b/app/jobs/scheduled/poll_feed.rb
deleted file mode 100644
index 14411da2a5..0000000000
--- a/app/jobs/scheduled/poll_feed.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-# frozen_string_literal: true
-
-#
-# Creates and Updates Topics based on an RSS or ATOM feed.
-#
-require 'digest/sha1'
-require 'excon'
-
-module Jobs
- class PollFeed < ::Jobs::Scheduled
- every 5.minutes
-
- sidekiq_options retry: false
-
- def execute(args)
- poll_feed if SiteSetting.feed_polling_enabled? &&
- SiteSetting.feed_polling_url.present? &&
- not_polled_recently?
- end
-
- def feed_key
- "feed-modified:#{Digest::SHA1.hexdigest(SiteSetting.feed_polling_url)}"
- end
-
- def poll_feed
- ensure_rss_loaded
- # defer loading rss
- feed = Feed.new
- import_topics(feed.topics)
- end
-
- 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
- require 'rss'
- @@rss_loaded = true
- end
-
- def not_polled_recently?
- $redis.set(
- 'feed-polled-recently',
- "1",
- ex: SiteSetting.feed_polling_frequency_mins.minutes - 10.seconds,
- nx: true
- )
- end
-
- def import_topics(feed_topics)
- feed_topics.each do |topic|
- import_topic(topic)
- end
- end
-
- def import_topic(topic)
- if topic.user
- TopicEmbed.import(topic.user, topic.url, topic.title, CGI.unescapeHTML(topic.content))
- end
- end
-
- class Feed
- def initialize
- @feed_url = SiteSetting.feed_polling_url
- @feed_url = "http://#{@feed_url}" if @feed_url !~ /^https?\:\/\//
- end
-
- def topics
- feed_topics = []
-
- rss = parsed_feed
- return feed_topics unless rss.present?
-
- rss.items.each do |i|
- current_feed_topic = FeedTopic.new(i)
- feed_topics << current_feed_topic if current_feed_topic.content
- end
-
- return feed_topics
- end
-
- private
-
- def parsed_feed
- raw_feed, encoding = fetch_rss
- return nil if raw_feed.nil?
-
- encoded_feed = Encodings.try_utf8(raw_feed, encoding) if encoding
- encoded_feed = Encodings.to_utf8(raw_feed) unless encoded_feed
-
- return nil if encoded_feed.blank?
-
- if SiteSetting.embed_username_key_from_feed.present?
- FeedElementInstaller.install(SiteSetting.embed_username_key_from_feed, encoded_feed)
- end
-
- RSS::Parser.parse(encoded_feed)
- rescue RSS::NotWellFormedError, RSS::InvalidRSSError
- nil
- end
-
- def fetch_rss
- final_destination = FinalDestination.new(@feed_url, verbose: true)
- feed_final_url = final_destination.resolve
- return nil unless final_destination.status == :resolved
-
- response = Excon.new(feed_final_url.to_s).request(method: :get, expects: 200)
- [response.body, detect_charset(response)]
- rescue Excon::Error::HTTPStatus
- nil
- end
-
- def detect_charset(response)
- if response.headers['Content-Type'] =~ /charset\s*=\s*([a-z0-9\-]+)/i
- Encoding.find($1)
- end
- rescue ArgumentError
- nil
- end
- end
-
- class FeedTopic
- def initialize(article_rss_item)
- @accessor = FeedItemAccessor.new(article_rss_item)
- end
-
- def url
- link = @accessor.link
- if url?(link)
- return link
- else
- return @accessor.element_content(:id)
- end
- end
-
- def content
- content = nil
-
- %i[content_encoded content description].each do |content_element_name|
- content ||= @accessor.element_content(content_element_name)
- end
-
- content&.force_encoding('UTF-8')&.scrub
- end
-
- def title
- @accessor.element_content(:title).force_encoding('UTF-8').scrub
- end
-
- def user
- author_user || default_user
- end
-
- private
-
- def url?(link)
- if link.blank? || link !~ /^https?\:\/\//
- return false
- else
- return true
- end
- end
-
- def author_username
- @accessor.element_content(SiteSetting.embed_username_key_from_feed.sub(':', '_'))
- end
-
- def default_user
- find_user(SiteSetting.embed_by_username.downcase)
- end
-
- def author_user
- return nil if !author_username.present?
-
- find_user(author_username)
- end
-
- def find_user(user_name)
- User.where(username_lower: user_name).first
- end
- end
- end
-end
diff --git a/app/jobs/scheduled/version_check.rb b/app/jobs/scheduled/version_check.rb
index d28d943d93..37eebf01f9 100644
--- a/app/jobs/scheduled/version_check.rb
+++ b/app/jobs/scheduled/version_check.rb
@@ -17,8 +17,7 @@ module Jobs
DiscourseUpdates.updated_at = Time.zone.now
DiscourseUpdates.missing_versions = json['versions']
- if GlobalSetting.new_version_emails &&
- SiteSetting.new_version_emails &&
+ if SiteSetting.new_version_emails &&
json['missingVersionsCount'] > (0) &&
prev_missing_versions_count < (json['missingVersionsCount'].to_i)
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index 26d5961424..0be2f2b3e1 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -349,13 +349,26 @@ class UserNotifications < ActionMailer::Base
end
def email_post_markdown(post, add_posted_by = false)
- result = +"#{post.raw}\n\n"
+ result = +"#{post.with_secure_media? ? strip_secure_urls(post.raw) : post.raw}\n\n"
if add_posted_by
result << "#{I18n.t('user_notifications.posted_by', username: post.username, post_date: post.created_at.strftime("%m/%d/%Y"))}\n\n"
end
result
end
+ def strip_secure_urls(raw)
+ urls = Set.new
+ raw.scan(URI.regexp(%w{http https})) { urls << $& }
+
+ urls.each do |url|
+ if (url.start_with?(Discourse.store.s3_upload_host) && FileHelper.is_supported_media?(url))
+ raw = raw.sub(url, "#{I18n.t("emails.secure_media_placeholder")} ")
+ end
+ end
+
+ raw
+ end
+
def self.get_context_posts(post, topic_user, user)
if (user.user_option.email_previous_replies == UserOption.previous_replies_type[:never]) ||
SiteSetting.private_email?
diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb
index 78504482dd..889be79bd9 100644
--- a/app/models/admin_dashboard_data.rb
+++ b/app/models/admin_dashboard_data.rb
@@ -84,7 +84,9 @@ class AdminDashboardData
@problem_messages = [
'dashboard.bad_favicon_url',
'dashboard.poll_pop3_timeout',
- 'dashboard.poll_pop3_auth_error'
+ 'dashboard.poll_pop3_auth_error',
+ 'dashboard.deprecated_api_usage',
+ 'dashboard.update_mail_receiver'
]
add_problem_check :rails_env_check, :host_names_check, :force_https_check,
diff --git a/app/models/api_key.rb b/app/models/api_key.rb
index 198d746b30..91722b3603 100644
--- a/app/models/api_key.rb
+++ b/app/models/api_key.rb
@@ -57,9 +57,11 @@ end
# allowed_ips :inet is an Array
# hidden :boolean default(FALSE), not null
# last_used_at :datetime
+# revoked_at :datetime
+# description :text
#
# Indexes
#
# index_api_keys_on_key (key)
-# index_api_keys_on_user_id (user_id) UNIQUE
+# index_api_keys_on_user_id (user_id)
#
diff --git a/app/models/badge.rb b/app/models/badge.rb
index 3596190a8a..4db471bcbe 100644
--- a/app/models/badge.rb
+++ b/app/models/badge.rb
@@ -169,8 +169,17 @@ class Badge < ActiveRecord::Base
end
def self.display_name(name)
- key = "badges.#{i18n_name(name)}.name"
- I18n.t(key, default: name)
+ I18n.t(i18n_key(name), default: name)
+ end
+
+ def self.i18n_key(name)
+ "badges.#{i18n_name(name)}.name"
+ end
+
+ def self.find_system_badge_id_from_translation_key(translation_key)
+ return unless translation_key.starts_with?('badges.')
+ badge_name_klass = translation_key.split('.').second.camelize
+ "Badge::#{badge_name_klass}".constantize
end
def awarded_for_trust_level?
@@ -208,6 +217,10 @@ class Badge < ActiveRecord::Base
self.class.display_name(name)
end
+ def translation_key
+ self.class.i18n_key(name)
+ end
+
def long_description
key = "badges.#{i18n_name}.long_description"
I18n.t(key, default: self[:long_description] || '', base_uri: Discourse.base_uri)
diff --git a/app/models/category.rb b/app/models/category.rb
index 4e2ec97a93..5af5eabac3 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -3,6 +3,7 @@
class Category < ActiveRecord::Base
self.ignored_columns = %w{
uploaded_meta_id
+ suppress_from_latest
}
include Searchable
@@ -12,7 +13,6 @@ class Category < ActiveRecord::Base
include AnonCacheInvalidator
include HasDestroyedWebHook
- MAX_NESTING = 2 # category + subcategory
REQUIRE_TOPIC_APPROVAL = 'require_topic_approval'
REQUIRE_REPLY_APPROVAL = 'require_reply_approval'
NUM_AUTO_BUMP_DAILY = 'num_auto_bump_daily'
@@ -72,7 +72,6 @@ class Category < ActiveRecord::Base
after_save :clear_url_cache
after_save :index_search
after_save :update_reviewables
- after_save :clear_featured_cache
after_destroy :reset_topic_ids_cache
after_destroy :publish_category_deletion
@@ -329,7 +328,7 @@ class Category < ActiveRecord::Base
# This is used in a validation so has to produce accurate results before the
# record has been saved
- def height_of_ancestors(max_height = MAX_NESTING)
+ def height_of_ancestors(max_height = SiteSetting.max_category_nesting)
parent_id = self.parent_category_id
return max_height if parent_id == id
@@ -357,7 +356,7 @@ class Category < ActiveRecord::Base
# This is used in a validation so has to produce accurate results before the
# record has been saved
- def depth_of_descendants(max_depth = MAX_NESTING)
+ def depth_of_descendants(max_depth = SiteSetting.max_category_nesting)
parent_id = self.parent_category_id
return max_depth if parent_id == id
@@ -390,7 +389,7 @@ class Category < ActiveRecord::Base
errors.add(:base, I18n.t("category.errors.self_parent")) if parent_category_id == id
total_depth = height_of_ancestors + 1 + depth_of_descendants
- errors.add(:base, I18n.t("category.errors.depth")) if total_depth > MAX_NESTING
+ errors.add(:base, I18n.t("category.errors.depth")) if total_depth > SiteSetting.max_category_nesting
end
end
@@ -532,6 +531,7 @@ class Category < ActiveRecord::Base
topic = relation
.visible
.listable_topics
+ .exclude_scheduled_bump_topics
.where(category_id: self.id)
.where('id <> ?', self.topic_id)
.where('bumped_at < ?', 1.day.ago)
@@ -559,7 +559,7 @@ class Category < ActiveRecord::Base
end
def required_tag_group_name=(group_name)
- self.required_tag_group = group_name ? TagGroup.where(name: group_name).first : nil
+ self.required_tag_group = group_name.blank? ? nil : TagGroup.where(name: group_name).first
end
def downcase_email
@@ -656,10 +656,6 @@ class Category < ActiveRecord::Base
@@url_cache.clear
end
- def clear_featured_cache
- CategoryFeaturedTopic.clear_exclude_category_ids
- end
-
def full_slug(separator = "-")
start_idx = "#{Discourse.base_uri}/c/".length
url[start_idx..-1].gsub("/", separator)
@@ -915,12 +911,13 @@ end
# subcategory_list_style :string(50) default("rows_with_featured_topics")
# default_top_period :string(20) default("all")
# mailinglist_mirror :boolean default(FALSE), not null
-# suppress_from_latest :boolean default(FALSE)
# minimum_required_tags :integer default(0), not null
# navigate_to_first_post_after_read :boolean default(FALSE), not null
# search_priority :integer default(0)
# allow_global_tags :boolean default(FALSE), not null
# reviewable_by_group_id :integer
+# required_tag_group_id :integer
+# min_tags_from_required_group :integer default(1), not null
#
# Indexes
#
diff --git a/app/models/category_featured_topic.rb b/app/models/category_featured_topic.rb
index bc3b6ba0a2..2848383605 100644
--- a/app/models/category_featured_topic.rb
+++ b/app/models/category_featured_topic.rb
@@ -38,16 +38,6 @@ class CategoryFeaturedTopic < ActiveRecord::Base
end
end
- @@exclude_category_ids = DistributedCache.new('excluded_category_ids_from_featured')
-
- def self.cached_exclude_category_ids
- @@exclude_category_ids['ids'] ||= Category.where(suppress_from_latest: true).pluck(:id)
- end
-
- def self.clear_exclude_category_ids
- @@exclude_category_ids.clear
- end
-
def self.clear_batch!
Discourse.redis.del(NEXT_CATEGORY_ID_KEY)
end
@@ -59,8 +49,7 @@ class CategoryFeaturedTopic < ActiveRecord::Base
per_page: c.num_featured_topics,
except_topic_ids: [c.topic_id],
visible: true,
- no_definitions: true,
- exclude_category_ids: CategoryFeaturedTopic.cached_exclude_category_ids
+ no_definitions: true
}
# It may seem a bit odd that we are running 2 queries here, when admin
diff --git a/app/models/category_list.rb b/app/models/category_list.rb
index f1f7b6a0d9..bc1d6a4980 100644
--- a/app/models/category_list.rb
+++ b/app/models/category_list.rb
@@ -92,16 +92,12 @@ class CategoryList
@categories = @categories.to_a
- category_user = {}
- default_notification_level = nil
- unless @guardian.anonymous?
- category_user = Hash[*CategoryUser.where(user: @guardian.user).pluck(:category_id, :notification_level).flatten]
- default_notification_level = CategoryUser.notification_levels[:regular]
- end
+ notification_levels = CategoryUser.notification_levels_for(@guardian)
+ default_notification_level = CategoryUser.default_notification_level
allowed_topic_create = Set.new(Category.topic_create_allowed(@guardian).pluck(:id))
@categories.each do |category|
- category.notification_level = category_user[category.id] || default_notification_level
+ category.notification_level = notification_levels[category.id] || default_notification_level
category.permission = CategoryGroup.permission_types[:full] if allowed_topic_create.include?(category.id)
category.has_children = category.subcategories.present?
end
diff --git a/app/models/category_user.rb b/app/models/category_user.rb
index e25f917d32..afcd56ce19 100644
--- a/app/models/category_user.rb
+++ b/app/models/category_user.rb
@@ -197,6 +197,36 @@ class CategoryUser < ActiveRecord::Base
SQL
end
+ def self.default_notification_level
+ SiteSetting.mute_all_categories_by_default ? notification_levels[:muted] : notification_levels[:regular]
+ end
+
+ def self.notification_levels_for(guardian)
+ if guardian.anonymous?
+ notification_levels = [
+ SiteSetting.default_categories_watching.split("|"),
+ SiteSetting.default_categories_tracking.split("|"),
+ SiteSetting.default_categories_watching_first_post.split("|"),
+ ].flatten.map { |id| [id.to_i, self.notification_levels[:regular]] }
+
+ notification_levels += SiteSetting.default_categories_muted.split("|").map { |id| [id.to_i, self.notification_levels[:muted]] }
+ else
+ notification_levels = CategoryUser.where(user: guardian.user).pluck(:category_id, :notification_level)
+ end
+
+ Hash[*notification_levels.flatten]
+ end
+
+ def self.lookup_for(user, category_ids)
+ return {} if user.blank? || category_ids.blank?
+ create_lookup(CategoryUser.where(category_id: category_ids, user_id: user.id))
+ end
+
+ def self.create_lookup(category_users)
+ category_users.each_with_object({}) do |category_user, acc|
+ acc[category_user.category_id] = category_user
+ end
+ end
end
# == Schema Information
@@ -206,10 +236,12 @@ end
# id :integer not null, primary key
# category_id :integer not null
# user_id :integer not null
-# notification_level :integer not null
+# notification_level :integer
+# last_seen_at :datetime
#
# Indexes
#
-# idx_category_users_category_id_user_id (category_id,user_id) UNIQUE
-# idx_category_users_user_id_category_id (user_id,category_id) UNIQUE
+# idx_category_users_category_id_user_id (category_id,user_id) UNIQUE
+# idx_category_users_user_id_category_id (user_id,category_id) UNIQUE
+# index_category_users_on_user_id_and_last_seen_at (user_id,last_seen_at)
#
diff --git a/app/models/developer.rb b/app/models/developer.rb
index 0b0dcd9320..a789dd6dd6 100644
--- a/app/models/developer.rb
+++ b/app/models/developer.rb
@@ -28,3 +28,7 @@ end
# id :integer not null, primary key
# user_id :integer not null
#
+# Indexes
+#
+# index_developers_on_user_id (user_id) UNIQUE
+#
diff --git a/app/models/draft.rb b/app/models/draft.rb
index 2bbc3bcaf6..4f7a03711f 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -282,5 +282,5 @@ end
#
# Indexes
#
-# index_drafts_on_user_id_and_draft_key (user_id,draft_key)
+# index_drafts_on_user_id_and_draft_key (user_id,draft_key) UNIQUE
#
diff --git a/app/models/embedding.rb b/app/models/embedding.rb
index 3b67a41858..1f2be1ee0f 100644
--- a/app/models/embedding.rb
+++ b/app/models/embedding.rb
@@ -12,11 +12,7 @@ class Embedding < OpenStruct
embed_truncate
embed_whitelist_selector
embed_blacklist_selector
- embed_classname_whitelist
- feed_polling_enabled
- feed_polling_url
- feed_polling_frequency_mins
- embed_username_key_from_feed)
+ embed_classname_whitelist)
end
def base_url
diff --git a/app/models/instagram_user_info.rb b/app/models/instagram_user_info.rb
deleted file mode 100644
index 404876aa2a..0000000000
--- a/app/models/instagram_user_info.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class InstagramUserInfo < ActiveRecord::Base
-
- belongs_to :user
-
-end
-
-# == Schema Information
-#
-# Table name: instagram_user_infos
-#
-# id :integer not null, primary key
-# user_id :integer
-# screen_name :string
-# instagram_user_id :integer
-# created_at :datetime not null
-# updated_at :datetime not null
-#
diff --git a/app/models/notification.rb b/app/models/notification.rb
index fa6bb66490..fc0e60805b 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -4,6 +4,8 @@ class Notification < ActiveRecord::Base
belongs_to :user
belongs_to :topic
+ MEMBERSHIP_REQUEST_CONSOLIDATION_WINDOW_HOURS = 24
+
validates_presence_of :data
validates_presence_of :notification_type
@@ -12,19 +14,34 @@ class Notification < ActiveRecord::Base
scope :visible , lambda { joins('LEFT JOIN topics ON notifications.topic_id = topics.id')
.where('topics.id IS NULL OR topics.deleted_at IS NULL') }
- scope :filter_by_display_username_and_type, ->(username, notification_type) {
- where("data::json ->> 'display_username' = ?", username)
- .where(notification_type: notification_type)
- .order(created_at: :desc)
+ scope :filter_by_consolidation_data, ->(notification_type, data) {
+ notifications = where(notification_type: notification_type)
+
+ case notification_type
+ when types[:liked], types[:liked_consolidated]
+ key = "display_username"
+ consolidation_window = SiteSetting.likes_notification_consolidation_window_mins.minutes.ago
+ when types[:private_message]
+ key = "topic_title"
+ consolidation_window = MEMBERSHIP_REQUEST_CONSOLIDATION_WINDOW_HOURS.hours.ago
+ when types[:membership_request_consolidated]
+ key = "group_name"
+ consolidation_window = MEMBERSHIP_REQUEST_CONSOLIDATION_WINDOW_HOURS.hours.ago
+ end
+
+ notifications = notifications.where("created_at > ? AND data::json ->> '#{key}' = ?", consolidation_window, data[key.to_sym]) if data[key&.to_sym].present?
+ notifications = notifications.where("data::json ->> 'username2' IS NULL") if notification_type == types[:liked]
+
+ notifications
}
attr_accessor :skip_send_email
- after_commit :send_email, on: :create
after_commit :refresh_notification_count, on: [:create, :update, :destroy]
after_commit(on: :create) do
DiscourseEvent.trigger(:notification_created, self)
+ send_email unless NotificationConsolidator.new(self).consolidate!
end
def self.ensure_consistency!
@@ -66,7 +83,8 @@ class Notification < ActiveRecord::Base
liked_consolidated: 19,
post_approved: 20,
code_review_commit_approved: 21,
- membership_request_accepted: 22
+ membership_request_accepted: 22,
+ membership_request_consolidated: 23
)
end
diff --git a/app/models/post.rb b/app/models/post.rb
index 66e27fd419..73acc182d5 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -54,11 +54,13 @@ class Post < ActiveRecord::Base
# We can pass several creating options to a post via attributes
attr_accessor :image_sizes, :quoted_post_numbers, :no_bump, :invalidate_oneboxes, :cooking_options, :skip_unique_check, :skip_validation
- LARGE_IMAGES ||= "large_images".freeze
- BROKEN_IMAGES ||= "broken_images".freeze
- DOWNLOADED_IMAGES ||= "downloaded_images".freeze
- MISSING_UPLOADS ||= "missing uploads".freeze
- MISSING_UPLOADS_IGNORED ||= "missing uploads ignored".freeze
+ LARGE_IMAGES ||= "large_images"
+ BROKEN_IMAGES ||= "broken_images"
+ DOWNLOADED_IMAGES ||= "downloaded_images"
+ MISSING_UPLOADS ||= "missing uploads"
+ MISSING_UPLOADS_IGNORED ||= "missing uploads ignored"
+ NOTICE_TYPE ||= "notice_type"
+ NOTICE_ARGS ||= "notice_args"
SHORT_POST_CHARS ||= 1200
@@ -131,7 +133,8 @@ class Post < ActiveRecord::Base
new_user_spam_threshold_reached: 3,
flagged_by_tl3_user: 4,
email_spam_header_found: 5,
- flagged_by_tl4_user: 6)
+ flagged_by_tl4_user: 6,
+ email_authentication_result_header: 7)
end
def self.types
@@ -300,6 +303,15 @@ class Post < ActiveRecord::Base
options[:user_id] = post_user.id if post_user
options[:omit_nofollow] = true if omit_nofollow?
+ if self.with_secure_media?
+ each_upload_url do |url|
+ uri = URI.parse(url)
+ if FileHelper.is_supported_media?(File.basename(uri.path))
+ raw = raw.sub(Discourse.store.s3_upload_host, "#{Discourse.base_url}/secure-media-uploads")
+ end
+ end
+ end
+
cooked = post_analyzer.cook(raw, options)
new_cooked = Plugin::Filter.apply(:after_post_cook, self, cooked)
@@ -413,8 +425,8 @@ class Post < ActiveRecord::Base
end
def delete_post_notices
- self.custom_fields.delete("notice_type")
- self.custom_fields.delete("notice_args")
+ self.custom_fields.delete(Post::NOTICE_TYPE)
+ self.custom_fields.delete(Post::NOTICE_ARGS)
self.save_custom_fields
end
@@ -492,6 +504,11 @@ class Post < ActiveRecord::Base
ReviewableFlaggedPost.pending.find_by(target: self)
end
+ def with_secure_media?
+ return false unless SiteSetting.secure_media?
+ topic&.private_message? || SiteSetting.login_required?
+ end
+
def hide!(post_action_type_id, reason = nil)
return if hidden?
@@ -882,6 +899,13 @@ class Post < ActiveRecord::Base
end
upload_ids |= Upload.where(id: downloaded_images.values).pluck(:id)
+
+ disallowed_uploads = []
+ if SiteSetting.secure_media? && !self.with_secure_media?
+ disallowed_uploads = Upload.where(id: upload_ids, secure: true).pluck(:original_filename)
+ end
+ return disallowed_uploads if disallowed_uploads.count > 0
+
values = upload_ids.map! { |upload_id| "(#{self.id},#{upload_id})" }.join(",")
PostUpload.transaction do
@@ -893,6 +917,12 @@ class Post < ActiveRecord::Base
end
end
+ def update_uploads_secure_status
+ if Discourse.store.external?
+ self.uploads.each { |upload| upload.update_secure_status }
+ end
+ end
+
def downloaded_images
JSON.parse(self.custom_fields[Post::DOWNLOADED_IMAGES].presence || "{}")
rescue JSON::ParserError
@@ -909,6 +939,7 @@ class Post < ActiveRecord::Base
]
fragments ||= Nokogiri::HTML::fragment(self.cooked)
+
links = fragments.css("a/@href", "img/@src").map do |media|
src = media.value
next if src.blank?
diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb
index 2cd39b80ae..facccc8ebd 100644
--- a/app/models/post_mover.rb
+++ b/app/models/post_mover.rb
@@ -126,6 +126,7 @@ class PostMover
move_incoming_emails
move_notifications
update_reply_counts
+ update_quotes
move_first_post_replies
delete_post_replies
copy_first_post_timings
@@ -256,6 +257,18 @@ class PostMover
SQL
end
+ def update_quotes
+ DB.exec <<~SQL
+ UPDATE posts p
+ SET raw = REPLACE(p.raw,
+ ', post:' || mp.old_post_number || ', topic:' || mp.old_topic_id,
+ ', post:' || mp.new_post_number || ', topic:' || mp.new_topic_id),
+ baked_version = NULL
+ FROM moved_posts mp, quoted_posts qp
+ WHERE p.id = qp.post_id AND mp.old_post_id = qp.quoted_post_id
+ SQL
+ end
+
def move_first_post_replies
DB.exec <<~SQL
UPDATE post_replies pr
diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb
index c2cd50fbcf..e278da0ddb 100644
--- a/app/models/remote_theme.rb
+++ b/app/models/remote_theme.rb
@@ -146,7 +146,7 @@ class RemoteTheme < ActiveRecord::Base
importer.all_files.each do |filename|
next unless opts = ThemeField.opts_from_file_path(filename)
value = importer[filename]
- updated_fields << theme.set_field(opts.merge(value: value))
+ updated_fields << theme.set_field(**opts.merge(value: value))
end
# Destroy fields that no longer exist in the remote theme
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 8966621a7e..287d5a5f92 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -98,6 +98,18 @@ class Reviewable < ActiveRecord::Base
%w[ReviewableFlaggedPost ReviewableQueuedPost ReviewableUser]
end
+ def self.custom_filters
+ @reviewable_filters ||= []
+ end
+
+ def self.add_custom_filter(new_filter)
+ custom_filters << new_filter
+ end
+
+ def self.clear_custom_filters!
+ @reviewable_filters = []
+ end
+
def created_new!
self.created_new = true
self.topic = target.topic if topic.blank? && target.is_a?(Post)
@@ -228,7 +240,7 @@ class Reviewable < ActiveRecord::Base
priority ||= SiteSetting.reviewable_default_visibility
id = Reviewable.priorities[priority.to_sym]
return 0.0 if id.nil?
- return PluginStore.get('reviewables', "priority_#{id}").to_f
+ PluginStore.get('reviewables', "priority_#{id}").to_f
end
def history
@@ -406,7 +418,10 @@ class Reviewable < ActiveRecord::Base
offset: nil,
priority: nil,
username: nil,
- sort_order: nil
+ sort_order: nil,
+ from_date: nil,
+ to_date: nil,
+ additional_filters: {}
)
min_score = Reviewable.min_score_for_priority(priority)
@@ -434,6 +449,18 @@ class Reviewable < ActiveRecord::Base
result = result.where(category_id: category_id) if category_id
result = result.where(topic_id: topic_id) if topic_id
result = result.where("score >= ?", min_score) if min_score > 0
+ result = result.where("created_at >= ?", from_date) if from_date
+ result = result.where("created_at <= ?", to_date) if to_date
+
+ if !custom_filters.empty?
+ result = custom_filters.reduce(result) do |memo, filter|
+ key = filter.first
+ filter_query = filter.last
+
+ next(memo) unless additional_filters[key]
+ filter_query.call(result, additional_filters[key])
+ end
+ end
# If a reviewable doesn't have a target, allow us to filter on who created that reviewable.
if user_id
diff --git a/app/models/reviewable_flagged_post.rb b/app/models/reviewable_flagged_post.rb
index 340d63c8b5..5f3a3a6d95 100644
--- a/app/models/reviewable_flagged_post.rb
+++ b/app/models/reviewable_flagged_post.rb
@@ -228,7 +228,7 @@ class ReviewableFlaggedPost < Reviewable
def perform_delete_and_agree_replies(performed_by, args)
result = agree(performed_by, args)
- PostDestroyer.delete_with_replies(performed_by, post, self)
+ PostDestroyer.delete_with_replies(performed_by, post, self, defer_reply_flags: false)
result
end
diff --git a/app/models/search_log.rb b/app/models/search_log.rb
index a98f5fcaf2..003331250b 100644
--- a/app/models/search_log.rb
+++ b/app/models/search_log.rb
@@ -104,7 +104,7 @@ class SearchLog < ActiveRecord::Base
details << { x: Date.parse(record['date'].to_s), y: record['count'] }
end
- return {
+ {
type: "search_log_term",
title: I18n.t("search_logs.graph_title"),
start_date: start_of(period),
diff --git a/app/models/site.rb b/app/models/site.rb
index c888fb22c9..de8cfe0be5 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -55,15 +55,11 @@ class Site
by_id = {}
- category_user = {}
- unless @guardian.anonymous?
- category_user = Hash[*CategoryUser.where(user: @guardian.user).pluck(:category_id, :notification_level).flatten]
- end
-
- regular = CategoryUser.notification_levels[:regular]
+ notification_levels = CategoryUser.notification_levels_for(@guardian)
+ default_notification_level = CategoryUser.default_notification_level
categories.each do |category|
- category.notification_level = category_user[category.id] || regular
+ category.notification_level = notification_levels[category.id] || default_notification_level
category.permission = CategoryGroup.permission_types[:full] if allowed_topic_create&.include?(category.id) || @guardian.is_admin?
category.has_children = with_children.include?(category.id)
by_id[category.id] = category
@@ -78,10 +74,6 @@ class Site
Group.visible_groups(@guardian.user, "name ASC", include_everyone: true)
end
- def suppressed_from_latest_category_ids
- categories.select { |c| c.suppress_from_latest == true }.map(&:id)
- end
-
def archetypes
Archetype.list.reject { |t| t.id == Archetype.private_message }
end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 375832614d..30b86b38cf 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -5,15 +5,17 @@ class Tag < ActiveRecord::Base
include HasDestroyedWebHook
validates :name, presence: true, uniqueness: { case_sensitive: false }
+ validate :target_tag_validator, if: Proc.new { |t| t.new_record? || t.will_save_change_to_target_tag_id? }
scope :where_name, ->(name) do
name = Array(name).map(&:downcase)
- where("lower(name) IN (?)", name)
+ where("lower(tags.name) IN (?)", name)
end
scope :unused, -> { where(topic_count: 0, pm_topic_count: 0) }
+ scope :base_tags, -> { where(target_tag_id: nil) }
- has_many :tag_users # notification settings
+ has_many :tag_users, dependent: :destroy # notification settings
has_many :topic_tags, dependent: :destroy
has_many :topics, through: :topic_tags
@@ -21,10 +23,14 @@ class Tag < ActiveRecord::Base
has_many :category_tags, dependent: :destroy
has_many :categories, through: :category_tags
- has_many :tag_group_memberships
+ has_many :tag_group_memberships, dependent: :destroy
has_many :tag_groups, through: :tag_group_memberships
+ belongs_to :target_tag, class_name: "Tag", optional: true
+ has_many :synonyms, class_name: "Tag", foreign_key: "target_tag_id", dependent: :destroy
+
after_save :index_search
+ after_save :update_synonym_associations
after_commit :trigger_tag_created_event, on: :create
after_commit :trigger_tag_updated_event, on: :update
@@ -137,6 +143,25 @@ class Tag < ActiveRecord::Base
SearchIndexer.index(self)
end
+ def synonym?
+ !self.target_tag_id.nil?
+ end
+
+ def target_tag_validator
+ if synonyms.exists?
+ errors.add(:target_tag_id, I18n.t("tags.synonyms_exist"))
+ elsif target_tag&.synonym?
+ errors.add(:target_tag_id, I18n.t("tags.invalid_target_tag"))
+ end
+ end
+
+ def update_synonym_associations
+ if target_tag_id && saved_change_to_target_tag_id?
+ target_tag.tag_groups.each { |tag_group| tag_group.tags << self unless tag_group.tags.include?(self) }
+ target_tag.categories.each { |category| category.tags << self unless category.tags.include?(self) }
+ end
+ end
+
%i{
tag_created
tag_updated
diff --git a/app/models/tag_user.rb b/app/models/tag_user.rb
index 820d750b66..b4bc5d9f17 100644
--- a/app/models/tag_user.rb
+++ b/app/models/tag_user.rb
@@ -21,6 +21,12 @@ class TagUser < ActiveRecord::Base
tag_ids = tags.empty? ? [] : Tag.where_name(tags).pluck(:id)
+ Tag.where_name(tags).joins(:target_tag).each do |tag|
+ tag_ids[tag_ids.index(tag.id)] = tag.target_tag_id
+ end
+
+ tag_ids.uniq!
+
remove = (old_ids - tag_ids)
if remove.present?
records.where('tag_id in (?)', remove).destroy_all
@@ -41,7 +47,17 @@ class TagUser < ActiveRecord::Base
end
def self.change(user_id, tag_id, level)
- tag_id = tag_id.id if tag_id.is_a?(::Tag)
+ if tag_id.is_a?(::Tag)
+ tag = tag_id
+ tag_id = tag.id
+ else
+ tag = Tag.find_by_id(tag_id)
+ end
+
+ if tag.synonym?
+ tag_id = tag.target_tag_id
+ end
+
user_id = user_id.id if user_id.is_a?(::User)
tag_id = tag_id.to_i
diff --git a/app/models/theme.rb b/app/models/theme.rb
index 0597cda86f..f0476e67a9 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -376,10 +376,15 @@ class Theme < ActiveRecord::Base
fields.values
end
- def add_child_theme!(theme)
- new_relation = child_theme_relation.new(child_theme_id: theme.id)
+ def add_relative_theme!(kind, theme)
+ new_relation = if kind == :child
+ child_theme_relation.new(child_theme_id: theme.id)
+ else
+ parent_theme_relation.new(parent_theme_id: theme.id)
+ end
if new_relation.save
child_themes.reload
+ parent_themes.reload
save!
Theme.clear_cache!
else
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index 38c19da7bb..fe4e0bf644 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -71,6 +71,8 @@ class ThemeField < ActiveRecord::Base
errors = []
javascript_cache || build_javascript_cache
+ errors << I18n.t("themes.errors.optimized_link") if contains_optimized_link?(html)
+
js_compiler = ThemeJavascriptCompiler.new(theme_id, self.theme.name)
doc = Nokogiri::HTML.fragment(html)
@@ -355,7 +357,11 @@ class ThemeField < ActiveRecord::Base
result = ["failed"]
begin
result = compile_scss
- self.error = nil unless error.nil?
+ if contains_optimized_link?(self.value)
+ self.error = I18n.t("themes.errors.optimized_link")
+ else
+ self.error = nil unless error.nil?
+ end
rescue SassC::SyntaxError => e
self.error = e.message unless self.destroyed?
end
@@ -367,6 +373,10 @@ class ThemeField < ActiveRecord::Base
Theme.targets[target_id].to_s
end
+ def contains_optimized_link?(text)
+ OptimizedImage::URL_REGEX.match?(text)
+ end
+
class ThemeFileMatcher
OPTIONS = %i{name type target}
# regex: used to match file names to fields (import).
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 1af8598d2d..6e10a13c2f 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -135,6 +135,7 @@ class Topic < ActiveRecord::Base
# When we want to temporarily attach some data to a forum topic (usually before serialization)
attr_accessor :user_data
+ attr_accessor :category_user_data
attr_accessor :posters # TODO: can replace with posters_summary once we remove old list code
attr_accessor :participants
@@ -157,6 +158,8 @@ class Topic < ActiveRecord::Base
scope :created_since, lambda { |time_ago| where('topics.created_at > ?', time_ago) }
+ scope :exclude_scheduled_bump_topics, -> { where.not(id: TopicTimer.scheduled_bump_topics) }
+
scope :secured, lambda { |guardian = nil|
ids = guardian.secure_category_ids if guardian
@@ -1371,7 +1374,8 @@ class Topic < ActiveRecord::Base
post_type: Post.types[:regular]
).last || first_post
- update!(bumped_at: post.created_at)
+ self.bumped_at = post.created_at
+ self.save(validate: false)
end
def auto_close_threshold_reached?
diff --git a/app/models/topic_converter.rb b/app/models/topic_converter.rb
index 650333749d..120920b412 100644
--- a/app/models/topic_converter.rb
+++ b/app/models/topic_converter.rb
@@ -30,9 +30,9 @@ class TopicConverter
)
update_user_stats
+ update_post_uploads_secure_status
Jobs.enqueue(:topic_action_converter, topic_id: @topic.id)
Jobs.enqueue(:delete_inaccessible_notifications, topic_id: @topic.id)
-
watch_topic(topic)
end
@topic
@@ -49,6 +49,7 @@ class TopicConverter
)
add_allowed_users
+ update_post_uploads_secure_status
Jobs.enqueue(:topic_action_converter, topic_id: @topic.id)
Jobs.enqueue(:delete_inaccessible_notifications, topic_id: @topic.id)
@@ -60,31 +61,30 @@ class TopicConverter
private
+ def posters
+ @posters ||= @topic.posts.distinct.pluck(:user_id).to_a
+ end
+
def update_user_stats
- @topic.posts.where(deleted_at: nil).each do |p|
- user = User.find(p.user_id)
- # update posts count. NOTE that DirectoryItem.refresh will overwrite this by counting UserAction records.
- user.user_stat.post_count += 1
- user.user_stat.save!
- end
+ # update posts count. NOTE that DirectoryItem.refresh will overwrite this by counting UserAction records.
# update topics count
- @topic.user.user_stat.topic_count += 1
- @topic.user.user_stat.save!
+ UserStat.where(user_id: posters).update_all('post_count = post_count + 1')
+ UserStat.where(user_id: @topic.user_id).update_all('topic_count = topic_count + 1')
end
def add_allowed_users
- @topic.posts.where(deleted_at: nil).each do |p|
- user = User.find(p.user_id)
- @topic.topic_allowed_users.build(user_id: user.id) unless @topic.topic_allowed_users.where(user_id: user.id).exists?
- # update posts count. NOTE that DirectoryItem.refresh will overwrite this by counting UserAction records.
- user.user_stat.post_count -= 1
- user.user_stat.save!
- end
- @topic.topic_allowed_users.build(user_id: @user.id) unless @topic.topic_allowed_users.where(user_id: @user.id).exists?
- @topic.topic_allowed_users = @topic.topic_allowed_users.uniq(&:user_id)
+ # update posts count. NOTE that DirectoryItem.refresh will overwrite this by counting UserAction records.
# update topics count
- @topic.user.user_stat.topic_count -= 1
- @topic.user.user_stat.save!
+ UserStat.where(user_id: posters).update_all('post_count = post_count - 1')
+ UserStat.where(user_id: @topic.user_id).update_all('topic_count = topic_count - 1')
+
+ existing_allowed_users = @topic.topic_allowed_users.pluck(:user_id)
+ users_to_allow = posters << @user.id
+
+ (users_to_allow - existing_allowed_users).uniq.each do |user_id|
+ @topic.topic_allowed_users.build(user_id: user_id)
+ end
+
@topic.save!
end
@@ -97,4 +97,11 @@ class TopicConverter
end
end
+ def update_post_uploads_secure_status
+ @topic.posts.each do |post|
+ next if post.uploads.empty?
+ post.update_uploads_secure_status
+ post.rebake!
+ end
+ end
end
diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb
index 5222d438dc..ed0633ecd7 100644
--- a/app/models/topic_link.rb
+++ b/app/models/topic_link.rb
@@ -172,11 +172,12 @@ class TopicLink < ActiveRecord::Base
internal = false
topic_id = nil
post_number = nil
+ topic = nil
if upload = Upload.get_from_url(url)
internal = Discourse.store.internal?
# Store the same URL that will be used in the cooked version of the post
- url = UrlHelper.cook_url(upload.url)
+ url = UrlHelper.cook_url(upload.url, secure: upload.secure?)
elsif route = Discourse.route_for(parsed)
internal = true
@@ -185,9 +186,11 @@ class TopicLink < ActiveRecord::Base
topic_id = route[:topic_id].to_i
post_number = route[:post_number] || 1
+ topic_slug = route[:id]
# Store the canonical URL
topic = Topic.find_by(id: topic_id)
+ topic ||= Topic.find_by(slug: topic_slug) if topic_slug
topic_id = nil unless topic
if topic.present?
@@ -197,11 +200,11 @@ class TopicLink < ActiveRecord::Base
end
# Skip linking to ourselves
- return nil if topic_id == post.topic_id
+ return nil if topic&.id == post.topic_id
reflected_post = nil
- if post_number && topic_id
- reflected_post = Post.find_by(topic_id: topic_id, post_number: post_number.to_i)
+ if post_number && topic
+ reflected_post = Post.find_by(topic_id: topic.id, post_number: post_number.to_i)
end
url = url[0...TopicLink.max_url_length]
@@ -216,7 +219,7 @@ class TopicLink < ActiveRecord::Base
url: url,
domain: parsed.host || Discourse.current_hostname,
internal: internal,
- link_topic_id: topic_id,
+ link_topic_id: topic&.id,
link_post_id: reflected_post.try(:id),
quote: link.is_quote,
extension: file_extension)
@@ -228,31 +231,27 @@ class TopicLink < ActiveRecord::Base
reflected_id = nil
# Create the reflection if we can
- if topic_id.present?
- topic = Topic.find_by(id: topic_id)
+ if topic && post.topic && topic.archetype != 'private_message' && post.topic.archetype != 'private_message' && post.topic.visible?
+ prefix = Discourse.base_url_no_prefix
+ reflected_url = "#{prefix}#{post.topic.relative_url(post.post_number)}"
+ tl = TopicLink.find_by(topic_id: topic&.id,
+ post_id: reflected_post&.id,
+ url: reflected_url)
- if topic && post.topic && topic.archetype != 'private_message' && post.topic.archetype != 'private_message' && post.topic.visible?
- prefix = Discourse.base_url_no_prefix
- reflected_url = "#{prefix}#{post.topic.relative_url(post.post_number)}"
- tl = TopicLink.find_by(topic_id: topic_id,
- post_id: reflected_post.try(:id),
- url: reflected_url)
+ unless tl
+ tl = TopicLink.create(user_id: post.user_id,
+ topic_id: topic&.id,
+ post_id: reflected_post&.id,
+ url: reflected_url,
+ domain: Discourse.current_hostname,
+ reflection: true,
+ internal: true,
+ link_topic_id: post.topic_id,
+ link_post_id: post.id)
- unless tl
- tl = TopicLink.create(user_id: post.user_id,
- topic_id: topic_id,
- post_id: reflected_post.try(:id),
- url: reflected_url,
- domain: Discourse.current_hostname,
- reflection: true,
- internal: true,
- link_topic_id: post.topic_id,
- link_post_id: post.id)
-
- end
-
- reflected_id = tl.id if tl.persisted?
end
+
+ reflected_id = tl.id if tl.persisted?
end
[url, reflected_id]
diff --git a/app/models/topic_list.rb b/app/models/topic_list.rb
index 27730561d7..52b0ee0070 100644
--- a/app/models/topic_list.rb
+++ b/app/models/topic_list.rb
@@ -83,6 +83,7 @@ class TopicList
# Attach some data for serialization to each topic
@topic_lookup = TopicUser.lookup_for(@current_user, @topics) if @current_user
+ @category_user_lookup = CategoryUser.lookup_for(@current_user, @topics.map(&:category_id).uniq) if @current_user
post_action_type =
if @current_user
@@ -114,6 +115,7 @@ class TopicList
@topics.each do |ft|
ft.user_data = @topic_lookup[ft.id] if @topic_lookup.present?
+ ft.category_user_data = @category_user_lookup[ft.category_id] if @category_user_lookup.present?
if ft.user_data && post_action_lookup && actions = post_action_lookup[ft.id]
ft.user_data.post_action_data = { post_action_type => actions }
diff --git a/app/models/topic_participants_summary.rb b/app/models/topic_participants_summary.rb
index 51ecfa15cc..df3f385670 100644
--- a/app/models/topic_participants_summary.rb
+++ b/app/models/topic_participants_summary.rb
@@ -3,6 +3,7 @@
# This is used on a topic page
class TopicParticipantsSummary
attr_reader :topic, :options
+ PARTICIPANT_COUNT = 5 # should match maxUserCount in topic list
def initialize(topic, options = {})
@topic = topic
@@ -26,7 +27,7 @@ class TopicParticipantsSummary
end
def top_participants
- user_ids.map { |id| avatar_lookup[id] }.compact.uniq.take(4)
+ user_ids.map { |id| avatar_lookup[id] }.compact.uniq.take(PARTICIPANT_COUNT)
end
def user_ids
diff --git a/app/models/topic_timer.rb b/app/models/topic_timer.rb
index c6213a164e..1599f77ce5 100644
--- a/app/models/topic_timer.rb
+++ b/app/models/topic_timer.rb
@@ -17,6 +17,8 @@ class TopicTimer < ActiveRecord::Base
validate :ensure_update_will_happen
+ scope :scheduled_bump_topics, -> { where(status_type: TopicTimer.types[:bump], deleted_at: nil).pluck(:topic_id) }
+
before_save do
self.created_at ||= Time.zone.now if execute_at
self.public_type = self.public_type?
diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index 1b99db2095..3118214f8c 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -144,6 +144,15 @@ class TopicTrackingState
MessageBus.publish(self.unread_channel_key(user_id), message.as_json, user_ids: [user_id])
end
+ def self.publish_dismiss_new(user_id, category_id = nil)
+ payload = category_id ? { category_id: category_id } : {}
+ message = {
+ message_type: "dismiss_new",
+ payload: payload
+ }
+ MessageBus.publish(self.unread_channel_key(user_id), message.as_json, user_ids: [user_id])
+ end
+
def self.treat_as_new_topic_clause
User.where("GREATEST(CASE
WHEN COALESCE(uo.new_topic_duration_minutes, :default_duration) = :always THEN u.created_at
@@ -159,7 +168,6 @@ class TopicTrackingState
end
def self.report(user, topic_id = nil)
-
# Sam: this is a hairy report, in particular I need custom joins and fancy conditions
# Dropping to sql_builder so I can make sense of it.
#
@@ -173,7 +181,8 @@ class TopicTrackingState
skip_unread: true,
skip_order: true,
staff: user.staff?,
- admin: user.admin?
+ admin: user.admin?,
+ user: user
)
sql << "\nUNION ALL\n\n"
@@ -184,7 +193,8 @@ class TopicTrackingState
skip_order: true,
staff: user.staff?,
filter_old_unread: true,
- admin: user.admin?
+ admin: user.admin?,
+ user: user
)
DB.query(
@@ -221,7 +231,8 @@ class TopicTrackingState
"1=0"
else
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"
+ " AND topics.created_at > :min_new_topic_date" +
+ " AND (category_users.last_seen_at IS NULL OR topics.created_at > category_users.last_seen_at)"
end
select = (opts[:select]) || "
@@ -240,7 +251,7 @@ class TopicTrackingState
append = "OR u.admin" if !opts.key?(:admin)
<<~SQL
(
- NOT c.read_restricted #{append} OR category_id IN (
+ NOT c.read_restricted #{append} OR c.id IN (
SELECT c2.id FROM categories c2
JOIN category_groups cg ON cg.category_id = c2.id
JOIN group_users gu ON gu.user_id = :user_id AND cg.group_id = gu.group_id
@@ -265,6 +276,7 @@ class TopicTrackingState
JOIN user_options AS uo ON uo.user_id = u.id
JOIN categories c ON c.id = topics.category_id
LEFT JOIN topic_users tu ON tu.topic_id = topics.id AND tu.user_id = u.id
+ LEFT JOIN category_users ON category_users.category_id = topics.category_id AND category_users.user_id = #{opts[:user].id}
WHERE u.id = :user_id AND
#{filter_old_unread}
topics.archetype <> 'private_message' AND
@@ -272,12 +284,9 @@ class TopicTrackingState
#{visibility_filter}
topics.deleted_at IS NULL AND
#{category_filter}
- NOT EXISTS( SELECT 1 FROM category_users cu
- WHERE last_read_post_number IS NULL AND
- cu.user_id = :user_id AND
- cu.category_id = topics.category_id AND
- cu.notification_level = #{CategoryUser.notification_levels[:muted]})
-
+ (category_users.id IS NULL OR
+ last_read_post_number IS NOT NULL OR
+ category_users.notification_level <> #{CategoryUser.notification_levels[:muted]})
SQL
if opts[:topic_id]
diff --git a/app/models/trust_level3_requirements.rb b/app/models/trust_level3_requirements.rb
index 6b7746b223..3092259aaf 100644
--- a/app/models/trust_level3_requirements.rb
+++ b/app/models/trust_level3_requirements.rb
@@ -7,9 +7,14 @@ class TrustLevel3Requirements
class PenaltyCounts
attr_reader :silenced, :suspended
- def initialize(row)
+ def initialize(user, row)
@silenced = row['silence_count'] || 0
@suspended = row['suspend_count'] || 0
+
+ # If penalty started more than 6 months ago and still continues, it will
+ # not be selected by the query from 'penalty_counts'.
+ @silenced += 1 if @silenced == 0 && user.silenced?
+ @suspended += 1 if @suspended == 0 && user.suspended?
end
def total
@@ -114,7 +119,7 @@ class TrustLevel3Requirements
AND uh.created_at > :since
SQL
- PenaltyCounts.new(DB.query_hash(sql, args).first)
+ PenaltyCounts.new(@user, DB.query_hash(sql, args).first)
end
def min_days_visited
diff --git a/app/models/upload.rb b/app/models/upload.rb
index 5821afea84..a6842ce9a9 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -140,11 +140,6 @@ class Upload < ActiveRecord::Base
!(url =~ /^(https?:)?\/\//)
end
- def private?
- return false if self.for_theme || self.for_site_setting
- SiteSetting.prevent_anons_from_downloading_files && !FileHelper.is_supported_image?(self.original_filename)
- end
-
def fix_dimensions!
return if !FileHelper.is_supported_image?("image.#{extension}")
@@ -235,6 +230,34 @@ class Upload < ActiveRecord::Base
self.posts.where("cooked LIKE '%/_optimized/%'").find_each(&:rebake!)
end
+ def update_secure_status(secure_override_value: nil)
+ return false if self.for_theme || self.for_site_setting
+ mark_secure = secure_override_value.nil? ? should_be_secure? : secure_override_value
+
+ self.update_column("secure", mark_secure)
+ Discourse.store.update_upload_ACL(self) if Discourse.store.external?
+ end
+
+ def should_be_secure?
+ mark_secure = false
+ if FileHelper.is_supported_media?(self.original_filename)
+ if SiteSetting.secure_media?
+ mark_secure = true if SiteSetting.login_required?
+ unless SiteSetting.login_required?
+ # first post associated with upload determines secure status
+ # i.e. an already public upload will stay public even if added to a new PM
+ first_post_with_upload = self.posts.order(sort_order: :asc).first
+ mark_secure = first_post_with_upload ? first_post_with_upload.with_secure_media? : false
+ end
+ else
+ mark_secure = false
+ end
+ else
+ mark_secure = SiteSetting.prevent_anons_from_downloading_files?
+ end
+ mark_secure
+ end
+
def self.migrate_to_new_scheme(limit: nil)
problems = []
@@ -385,6 +408,7 @@ end
# thumbnail_width :integer
# thumbnail_height :integer
# etag :string
+# secure :boolean default(FALSE), not null
#
# Indexes
#
diff --git a/app/models/user.rb b/app/models/user.rb
index 6f5ec24ff1..44dbfa7b1f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -56,7 +56,6 @@ class User < ActiveRecord::Base
has_many :user_associated_accounts, dependent: :destroy
has_one :github_user_info, dependent: :destroy
has_many :oauth2_user_infos, dependent: :destroy
- has_one :instagram_user_info, dependent: :destroy
has_many :user_second_factors, dependent: :destroy
has_many :totps, -> {
@@ -418,6 +417,7 @@ class User < ActiveRecord::Base
def enqueue_staff_welcome_message(role)
return unless staff?
+ return if role == :admin && User.real.where(admin: true).count == 1
Jobs.enqueue(
:send_system_message,
@@ -670,6 +670,15 @@ class User < ActiveRecord::Base
create_visit_record!(date) unless visit_record_for(date)
end
+ def update_timezone_if_missing(timezone)
+ return if timezone.blank? || !TimezoneValidator.valid?(timezone)
+
+ # we only want to update the user's timezone if they have not set it themselves
+ UserOption
+ .where(user_id: self.id, timezone: nil)
+ .update_all(timezone: timezone)
+ end
+
def update_posts_read!(num_posts, opts = {})
now = opts[:at] || Time.zone.now
_retry = opts[:retry] || false
@@ -908,7 +917,7 @@ class User < ActiveRecord::Base
def email_confirmed?
email_tokens.where(email: email, confirmed: true).present? ||
email_tokens.empty? ||
- single_sign_on_record&.external_email == email
+ single_sign_on_record&.external_email&.downcase == email
end
def activate
@@ -1478,8 +1487,13 @@ class User < ActiveRecord::Base
def check_if_title_is_badged_granted
if title_changed? && !new_record? && user_profile
- badge_granted_title = title.present? && badges.where(allow_title: true, name: title).exists?
- user_profile.update_column(:badge_granted_title, badge_granted_title)
+ badge_matching_title = title && badges.find do |badge|
+ badge.allow_title? && (badge.display_name == title || badge.name == title)
+ end
+ user_profile.update(
+ badge_granted_title: badge_matching_title.present?,
+ granted_title_badge_id: badge_matching_title&.id
+ )
end
end
diff --git a/app/models/user_api_key.rb b/app/models/user_api_key.rb
index dbd6c52862..7d696246ca 100644
--- a/app/models/user_api_key.rb
+++ b/app/models/user_api_key.rb
@@ -67,9 +67,9 @@ class UserApiKey < ActiveRecord::Base
end
def self.invalid_auth_redirect?(auth_redirect)
- return SiteSetting.allowed_user_api_auth_redirects
- .split('|')
- .none? { |u| WildcardUrlChecker.check_url(u, auth_redirect) }
+ SiteSetting.allowed_user_api_auth_redirects
+ .split('|')
+ .none? { |u| WildcardUrlChecker.check_url(u, auth_redirect) }
end
end
diff --git a/app/models/user_auth_token.rb b/app/models/user_auth_token.rb
index 30a38c68bc..48079e351d 100644
--- a/app/models/user_auth_token.rb
+++ b/app/models/user_auth_token.rb
@@ -8,6 +8,8 @@ class UserAuthToken < ActiveRecord::Base
# used when token did not arrive at client
URGENT_ROTATE_TIME = 1.minute
+ MAX_SESSION_COUNT = 60
+
USER_ACTIONS = ['generate']
attr_accessor :unhashed_auth_token
@@ -220,6 +222,14 @@ class UserAuthToken < ActiveRecord::Base
end
end
+
+ def self.enforce_session_count_limit!(user_id)
+ tokens_to_destroy = where(user_id: user_id).
+ where('rotated_at > ?', SiteSetting.maximum_session_age.hours.ago).
+ order("rotated_at DESC").offset(MAX_SESSION_COUNT)
+
+ tokens_to_destroy.delete_all # Returns the number of deleted rows
+ end
end
# == Schema Information
diff --git a/app/models/user_history.rb b/app/models/user_history.rb
index ec6fec4f11..3adbb62eb1 100644
--- a/app/models/user_history.rb
+++ b/app/models/user_history.rb
@@ -101,6 +101,9 @@ class UserHistory < ActiveRecord::Base
api_key_create: 80,
api_key_update: 81,
api_key_destroy: 82,
+ revoke_title: 83,
+ change_title: 84,
+ override_upload_secure_status: 85
)
end
@@ -175,9 +178,12 @@ class UserHistory < ActiveRecord::Base
:change_theme_setting,
:disable_theme_component,
:enable_theme_component,
+ :revoke_title,
+ :change_title,
:api_key_create,
:api_key_update,
:api_key_destroy,
+ :override_upload_secure_status
]
end
diff --git a/app/models/user_option.rb b/app/models/user_option.rb
index 7f606671c7..10fd562c6c 100644
--- a/app/models/user_option.rb
+++ b/app/models/user_option.rb
@@ -42,6 +42,7 @@ class UserOption < ActiveRecord::Base
validates :text_size_key, inclusion: { in: UserOption.text_sizes.values }
validates :email_level, inclusion: { in: UserOption.email_level_types.values }
validates :email_messages_level, inclusion: { in: UserOption.email_level_types.values }
+ validates :timezone, timezone: true
def set_defaults
self.mailing_list_mode = SiteSetting.default_email_mailing_list_mode
@@ -224,6 +225,7 @@ end
# email_messages_level :integer default(0), not null
# title_count_mode_key :integer default(0), not null
# enable_defer :boolean default(FALSE), not null
+# timezone :string
#
# Indexes
#
diff --git a/app/models/user_profile.rb b/app/models/user_profile.rb
index 7f16cfe90e..abd5ba06c2 100644
--- a/app/models/user_profile.rb
+++ b/app/models/user_profile.rb
@@ -9,6 +9,7 @@ class UserProfile < ActiveRecord::Base
belongs_to :user, inverse_of: :user_profile
belongs_to :card_background_upload, class_name: "Upload"
belongs_to :profile_background_upload, class_name: "Upload"
+ belongs_to :granted_title_badge, class_name: "Badge"
validates :bio_raw, length: { maximum: 3000 }
validates :website, url: true, allow_blank: true, if: Proc.new { |c| c.new_record? || c.website_changed? }
@@ -161,15 +162,18 @@ end
# views :integer default(0), not null
# profile_background_upload_id :integer
# card_background_upload_id :integer
+# granted_title_badge_id :bigint
#
# Indexes
#
-# index_user_profiles_on_bio_cooked_version (bio_cooked_version)
-# index_user_profiles_on_card_background (card_background)
-# index_user_profiles_on_profile_background (profile_background)
+# index_user_profiles_on_bio_cooked_version (bio_cooked_version)
+# index_user_profiles_on_card_background (card_background)
+# index_user_profiles_on_granted_title_badge_id (granted_title_badge_id)
+# index_user_profiles_on_profile_background (profile_background)
#
# Foreign Keys
#
# fk_rails_... (card_background_upload_id => uploads.id)
+# fk_rails_... (granted_title_badge_id => badges.id)
# fk_rails_... (profile_background_upload_id => uploads.id)
#
diff --git a/app/serializers/admin_detailed_user_serializer.rb b/app/serializers/admin_detailed_user_serializer.rb
index 3555522497..4a83a594b1 100644
--- a/app/serializers/admin_detailed_user_serializer.rb
+++ b/app/serializers/admin_detailed_user_serializer.rb
@@ -39,7 +39,7 @@ class AdminDetailedUserSerializer < AdminUserSerializer
has_many :groups, embed: :object, serializer: BasicGroupSerializer
def second_factor_enabled
- object.totp_enabled?
+ object.totp_enabled? || object.security_keys_enabled?
end
def can_disable_second_factor
diff --git a/app/serializers/admin_user_list_serializer.rb b/app/serializers/admin_user_list_serializer.rb
index e670cd767f..5e1363f108 100644
--- a/app/serializers/admin_user_list_serializer.rb
+++ b/app/serializers/admin_user_list_serializer.rb
@@ -23,7 +23,6 @@ class AdminUserListSerializer < BasicUserSerializer
:approved,
:suspended_at,
:suspended_till,
- :suspended,
:silenced,
:silenced_till,
:time_read,
@@ -62,10 +61,6 @@ class AdminUserListSerializer < BasicUserSerializer
object.silenced_till?
end
- def suspended
- object.suspended?
- end
-
def include_suspended_at?
object.suspended?
end
diff --git a/app/serializers/basic_group_serializer.rb b/app/serializers/basic_group_serializer.rb
index d3c012194a..df250920d8 100644
--- a/app/serializers/basic_group_serializer.rb
+++ b/app/serializers/basic_group_serializer.rb
@@ -45,7 +45,7 @@ class BasicGroupSerializer < ApplicationSerializer
end
def bio_excerpt
- PrettyText.excerpt(object.bio_cooked, 110) if object.bio_cooked.present?
+ PrettyText.excerpt(object.bio_cooked, 110, keep_emoji_images: true) if object.bio_cooked.present?
end
def include_incoming_email?
diff --git a/app/serializers/basic_user_badge_serializer.rb b/app/serializers/basic_user_badge_serializer.rb
index 510f23b5e6..dd3880e423 100644
--- a/app/serializers/basic_user_badge_serializer.rb
+++ b/app/serializers/basic_user_badge_serializer.rb
@@ -10,6 +10,6 @@ class BasicUserBadgeSerializer < ApplicationSerializer
end
def grouping_position
- object.badge.badge_grouping.position
+ object.badge&.badge_grouping&.position
end
end
diff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rb
index b5bae438a7..cb5b2ff056 100644
--- a/app/serializers/category_serializer.rb
+++ b/app/serializers/category_serializer.rb
@@ -11,7 +11,6 @@ class CategorySerializer < SiteCategorySerializer
:email_in,
:email_in_allow_strangers,
:mailinglist_mirror,
- :suppress_from_latest,
:all_topics_wiki,
:can_delete,
:cannot_delete_reason,
@@ -82,10 +81,6 @@ class CategorySerializer < SiteCategorySerializer
scope && scope.can_edit?(object)
end
- def include_suppress_from_latest?
- scope && scope.can_edit?(object)
- end
-
def notification_level
user = scope && scope.user
object.notification_level ||
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index 4ba1a982f8..a119bb324a 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -44,7 +44,8 @@ class CurrentUserSerializer < BasicUserSerializer
:groups,
:second_factor_enabled,
:ignored_users,
- :title_count_mode
+ :title_count_mode,
+ :timezone
def groups
object.visible_groups.pluck(:id, :name).map { |id, name| { id: id, name: name.downcase } }
@@ -106,6 +107,10 @@ class CurrentUserSerializer < BasicUserSerializer
object.user_option.redirected_to_top
end
+ def timezone
+ object.user_option.timezone
+ end
+
def can_send_private_email_messages
scope.can_send_private_messages_to_email?
end
@@ -210,6 +215,6 @@ class CurrentUserSerializer < BasicUserSerializer
end
def second_factor_enabled
- object.totp_enabled?
+ object.totp_enabled? || object.security_keys_enabled?
end
end
diff --git a/app/serializers/detailed_tag_serializer.rb b/app/serializers/detailed_tag_serializer.rb
new file mode 100644
index 0000000000..25b0c555c9
--- /dev/null
+++ b/app/serializers/detailed_tag_serializer.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class DetailedTagSerializer < TagSerializer
+ attributes :synonyms, :tag_group_names
+
+ has_many :categories, serializer: BasicCategorySerializer
+
+ def synonyms
+ TagsController.tag_counts_json(object.synonyms)
+ end
+
+ def categories
+ Category.secured(scope).where(
+ id: object.categories.pluck(:id) +
+ object.tag_groups.includes(:categories).map do |tg|
+ tg.categories.map(&:id)
+ end.flatten
+ )
+ end
+
+ def include_tag_group_names?
+ scope.is_admin? || SiteSetting.tags_listed_by_group == true
+ end
+
+ def tag_group_names
+ object.tag_groups.map(&:name)
+ end
+end
diff --git a/app/serializers/group_user_serializer.rb b/app/serializers/group_user_serializer.rb
index 4b79988877..aa191cf18d 100644
--- a/app/serializers/group_user_serializer.rb
+++ b/app/serializers/group_user_serializer.rb
@@ -7,7 +7,8 @@ class GroupUserSerializer < BasicUserSerializer
:title,
:last_posted_at,
:last_seen_at,
- :added_at
+ :added_at,
+ :timezone
def include_added_at
object.respond_to? :added_at
diff --git a/app/serializers/invite_serializer.rb b/app/serializers/invite_serializer.rb
index 26b5c1794f..befa52fc21 100644
--- a/app/serializers/invite_serializer.rb
+++ b/app/serializers/invite_serializer.rb
@@ -2,7 +2,7 @@
class InviteSerializer < ApplicationSerializer
- attributes :email, :created_at, :redeemed_at, :expired, :user
+ attributes :email, :updated_at, :redeemed_at, :expired, :user
def include_email?
!object.redeemed?
diff --git a/app/serializers/listable_topic_serializer.rb b/app/serializers/listable_topic_serializer.rb
index 1336a92c14..4e5829df02 100644
--- a/app/serializers/listable_topic_serializer.rb
+++ b/app/serializers/listable_topic_serializer.rb
@@ -59,6 +59,7 @@ class ListableTopicSerializer < BasicTopicSerializer
def seen
return true if !scope || !scope.user
return true if object.user_data && !object.user_data.last_read_post_number.nil?
+ return true if object.category_user_data&.last_seen_at && object.created_at < object.category_user_data.last_seen_at
return true if object.created_at < scope.user.user_option.treat_as_new_topic_start_date
false
end
diff --git a/app/serializers/new_post_result_serializer.rb b/app/serializers/new_post_result_serializer.rb
index ca6eee7f9c..9232062711 100644
--- a/app/serializers/new_post_result_serializer.rb
+++ b/app/serializers/new_post_result_serializer.rb
@@ -6,7 +6,9 @@ class NewPostResultSerializer < ApplicationSerializer
:errors,
:success,
:pending_count,
- :reason
+ :reason,
+ :message,
+ :route_to
has_one :pending_post, serializer: TopicPendingPostSerializer, root: false, embed: :objects
@@ -64,4 +66,20 @@ class NewPostResultSerializer < ApplicationSerializer
pending_count.present?
end
+ def route_to
+ object.route_to
+ end
+
+ def include_route_to?
+ object.route_to.present?
+ end
+
+ def message
+ object.message
+ end
+
+ def include_message?
+ object.message.present?
+ end
+
end
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index 0e2a7b3072..8651252e84 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -368,7 +368,7 @@ class PostSerializer < BasicPostSerializer
end
def notice_type
- post_custom_fields["notice_type"]
+ post_custom_fields[Post::NOTICE_TYPE]
end
def include_notice_type?
@@ -389,7 +389,7 @@ class PostSerializer < BasicPostSerializer
end
def notice_args
- post_custom_fields["notice_args"]
+ post_custom_fields[Post::NOTICE_ARGS]
end
def include_notice_args?
diff --git a/app/serializers/reviewable_serializer.rb b/app/serializers/reviewable_serializer.rb
index b2cbdab459..af03419d2a 100644
--- a/app/serializers/reviewable_serializer.rb
+++ b/app/serializers/reviewable_serializer.rb
@@ -106,7 +106,7 @@ class ReviewableSerializer < ApplicationSerializer
end
def target_url
- return object.target.url if object.target.is_a?(Post) && object.target.present?
+ return Discourse.base_url + object.target.url if object.target.is_a?(Post) && object.target.present?
topic_url
end
@@ -115,7 +115,7 @@ class ReviewableSerializer < ApplicationSerializer
end
def topic_url
- return object.topic&.url
+ object.topic&.url
end
def include_topic_url?
diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb
index 3f8a653d96..d7c2ef58fe 100644
--- a/app/serializers/site_serializer.rb
+++ b/app/serializers/site_serializer.rb
@@ -15,7 +15,6 @@ class SiteSerializer < ApplicationSerializer
:is_readonly,
:disabled_plugins,
:user_field_max_length,
- :suppressed_from_latest_category_ids,
:post_action_types,
:topic_flag_types,
:can_create_tag,
diff --git a/app/serializers/tag_group_serializer.rb b/app/serializers/tag_group_serializer.rb
index 3fa051bfa9..db61936fce 100644
--- a/app/serializers/tag_group_serializer.rb
+++ b/app/serializers/tag_group_serializer.rb
@@ -4,7 +4,7 @@ class TagGroupSerializer < ApplicationSerializer
attributes :id, :name, :tag_names, :parent_tag_name, :one_per_topic, :permissions
def tag_names
- object.tags.map(&:name).sort
+ object.tags.base_tags.map(&:name).sort
end
def parent_tag_name
diff --git a/app/serializers/topic_list_item_serializer.rb b/app/serializers/topic_list_item_serializer.rb
index 658df93614..7962c400c0 100644
--- a/app/serializers/topic_list_item_serializer.rb
+++ b/app/serializers/topic_list_item_serializer.rb
@@ -14,7 +14,8 @@ class TopicListItemSerializer < ListableTopicSerializer
:bookmarked_post_numbers,
:liked_post_numbers,
:featured_link,
- :featured_link_root_domain
+ :featured_link_root_domain,
+ :allowed_user_count
has_many :posters, serializer: TopicPosterSerializer, embed: :objects
has_many :participants, serializer: TopicPosterSerializer, embed: :objects
@@ -86,4 +87,12 @@ class TopicListItemSerializer < ListableTopicSerializer
SiteSetting.topic_featured_link_enabled && object.featured_link.present?
end
+ def allowed_user_count
+ object.allowed_users.count
+ end
+
+ def include_allowed_user_count?
+ object.private_message?
+ end
+
end
diff --git a/app/serializers/user_auth_token_log_serializer.rb b/app/serializers/user_auth_token_log_serializer.rb
deleted file mode 100644
index 0a676f8c7c..0000000000
--- a/app/serializers/user_auth_token_log_serializer.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-class UserAuthTokenLogSerializer < ApplicationSerializer
- include UserAuthTokensMixin
-
- attributes :action
-
- def action
- case object.action
- when 'generate'
- I18n.t('log_in')
- when 'destroy'
- I18n.t('unsubscribe.log_out')
- else
- I18n.t('staff_action_logs.unknown')
- end
- end
-end
diff --git a/app/serializers/user_option_serializer.rb b/app/serializers/user_option_serializer.rb
index 4a8a5a1d0c..4c78c7b5bd 100644
--- a/app/serializers/user_option_serializer.rb
+++ b/app/serializers/user_option_serializer.rb
@@ -27,7 +27,8 @@ class UserOptionSerializer < ApplicationSerializer
:hide_profile_and_presence,
:text_size,
:text_size_seq,
- :title_count_mode
+ :title_count_mode,
+ :timezone
def auto_track_topics_after_msecs
object.auto_track_topics_after_msecs || SiteSetting.default_other_auto_track_topics_after_msecs
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index 52d1214cfd..79111200ef 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -164,7 +164,7 @@ class UserSerializer < BasicUserSerializer
end
def second_factor_enabled
- object.totp_enabled?
+ object.totp_enabled? || object.security_keys_enabled?
end
def include_second_factor_backup_enabled?
diff --git a/app/serializers/web_hook_post_serializer.rb b/app/serializers/web_hook_post_serializer.rb
index 030b55203b..2099a17c4c 100644
--- a/app/serializers/web_hook_post_serializer.rb
+++ b/app/serializers/web_hook_post_serializer.rb
@@ -3,6 +3,7 @@
class WebHookPostSerializer < PostSerializer
attributes :topic_posts_count,
+ :topic_filtered_posts_count,
:topic_archetype,
:category_slug
@@ -34,6 +35,10 @@ class WebHookPostSerializer < PostSerializer
object.topic ? object.topic.posts_count : 0
end
+ def topic_filtered_posts_count
+ object.topic ? object.topic.posts.where(post_type: Post.types[:regular]).count : 0
+ end
+
def topic_archetype
object.topic ? object.topic.archetype : ''
end
diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index 737837fa67..25462cf467 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -72,8 +72,19 @@ class BadgeGranter
StaffActionLogger.new(options[:revoked_by]).log_badge_revoke(user_badge)
end
- # If the user's title is the same as the badge name, remove their title.
- if user_badge.user.title == user_badge.badge.name
+ # If the user's title is the same as the badge name OR the custom badge name, remove their title.
+ custom_badge_name = TranslationOverride.find_by(translation_key: user_badge.badge.translation_key)&.value
+ user_title_is_badge_name = user_badge.user.title == user_badge.badge.name
+ user_title_is_custom_badge_name = custom_badge_name.present? && user_badge.user.title == custom_badge_name
+
+ if user_title_is_badge_name || user_title_is_custom_badge_name
+ if options[:revoked_by]
+ StaffActionLogger.new(options[:revoked_by]).log_title_revoke(
+ user_badge.user,
+ revoke_reason: 'user title was same as revoked badge name or custom badge name',
+ previous_value: user_badge.user.title
+ )
+ end
user_badge.user.title = nil
user_badge.user.save!
end
diff --git a/app/services/notification_consolidator.rb b/app/services/notification_consolidator.rb
new file mode 100644
index 0000000000..9ba3dc0ba4
--- /dev/null
+++ b/app/services/notification_consolidator.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+class NotificationConsolidator
+ attr_reader :notification, :notification_type, :consolidation_type, :data
+
+ def initialize(notification)
+ @notification = notification
+ @notification_type = notification.notification_type
+ @data = notification.data_hash
+
+ if notification_type == Notification.types[:liked]
+ @consolidation_type = Notification.types[:liked_consolidated]
+ @data[:username] = @data[:display_username]
+ elsif notification_type == Notification.types[:private_message]
+ post_id = @data[:original_post_id]
+ return if post_id.blank?
+
+ custom_field = PostCustomField.select(:value).find_by(post_id: post_id, name: "requested_group_id")
+ return if custom_field.blank?
+
+ group_id = custom_field.value.to_i
+ group_name = Group.select(:name).find_by(id: group_id)&.name
+ return if group_name.blank?
+
+ @consolidation_type = Notification.types[:membership_request_consolidated]
+ @data[:group_name] = group_name
+ end
+ end
+
+ def consolidate!
+ return if SiteSetting.notification_consolidation_threshold.zero? || consolidation_type.blank?
+
+ update_consolidated_notification! || create_consolidated_notification!
+ end
+
+ def update_consolidated_notification!
+ consolidated_notification = user_notifications.filter_by_consolidation_data(consolidation_type, data).first
+ return if consolidated_notification.blank?
+
+ data_hash = consolidated_notification.data_hash
+ data_hash["count"] += 1
+
+ Notification.transaction do
+ consolidated_notification.update!(
+ data: data_hash.to_json,
+ read: false,
+ updated_at: timestamp
+ )
+ notification.destroy!
+ end
+
+ consolidated_notification
+ end
+
+ def create_consolidated_notification!
+ notifications = user_notifications.unread.filter_by_consolidation_data(notification_type, data)
+ return if notifications.count <= SiteSetting.notification_consolidation_threshold
+
+ consolidated_notification = nil
+
+ Notification.transaction do
+ timestamp = notifications.last.created_at
+ data[:count] = notifications.count
+
+ consolidated_notification = Notification.create!(
+ notification_type: consolidation_type,
+ user_id: notification.user_id,
+ data: data.to_json,
+ updated_at: timestamp,
+ created_at: timestamp
+ )
+
+ notifications.destroy_all
+ end
+
+ consolidated_notification
+ end
+
+ private
+
+ def user_notifications
+ notification.user.notifications
+ end
+
+ def timestamp
+ @timestamp ||= Time.zone.now
+ end
+end
diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index d71e4b4914..f769649e53 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -249,7 +249,7 @@ class PostAlerter
end
def should_notify_edit?(notification, opts)
- return notification.data_hash["display_username"] != opts[:display_username]
+ notification.data_hash["display_username"] != opts[:display_username]
end
def should_notify_like?(user, notification)
@@ -331,28 +331,19 @@ class PostAlerter
notification_data = {}
- if is_liked
- if existing_notification_of_same_type &&
- existing_notification_of_same_type.created_at > 1.day.ago &&
- (
- user.user_option.like_notification_frequency ==
- UserOption.like_notification_frequency_type[:always]
- )
+ if is_liked &&
+ existing_notification_of_same_type &&
+ existing_notification_of_same_type.created_at > 1.day.ago &&
+ (
+ user.user_option.like_notification_frequency ==
+ UserOption.like_notification_frequency_type[:always]
+ )
- data = existing_notification_of_same_type.data_hash
- notification_data["username2"] = data["display_username"]
- notification_data["count"] = (data["count"] || 1).to_i + 1
- # don't use destroy so we don't trigger a notification count refresh
- Notification.where(id: existing_notification_of_same_type.id).destroy_all
- elsif !SiteSetting.likes_notification_consolidation_threshold.zero?
- notification = consolidate_liked_notifications(
- user,
- post,
- opts[:display_username]
- )
-
- return notification if notification
- end
+ data = existing_notification_of_same_type.data_hash
+ notification_data["username2"] = data["display_username"]
+ notification_data["count"] = (data["count"] || 1).to_i + 1
+ # don't use destroy so we don't trigger a notification count refresh
+ Notification.where(id: existing_notification_of_same_type.id).destroy_all
end
collapsed = false
@@ -559,7 +550,7 @@ class PostAlerter
end
end
- def notify_post_users(post, notified)
+ def notify_post_users(post, notified, include_category_watchers: true, include_tag_watchers: true)
return unless post.topic
warn_if_not_sidekiq
@@ -570,8 +561,14 @@ class PostAlerter
FROM topic_users
WHERE notification_level = :watching
AND topic_id = :topic_id
+ /*category*/
+ /*tags*/
+ )
+ SQL
- UNION
+ if include_category_watchers
+ condition.sub! "/*category*/", <<~SQL
+ UNION
SELECT cu.user_id
FROM category_users cu
@@ -580,14 +577,12 @@ class PostAlerter
WHERE cu.notification_level = :watching
AND cu.category_id = :category_id
AND tu.user_id IS NULL
-
- /*tags*/
- )
- SQL
+ SQL
+ end
tag_ids = post.topic.topic_tags.pluck('topic_tags.tag_id')
- if tag_ids.present?
+ if include_tag_watchers && tag_ids.present?
condition.sub! "/*tags*/", <<~SQL
UNION
@@ -621,82 +616,4 @@ class PostAlerter
def warn_if_not_sidekiq
Rails.logger.warn("PostAlerter.#{caller_locations(1, 1)[0].label} was called outside of sidekiq") unless Sidekiq.server?
end
-
- private
-
- def consolidate_liked_notifications(user, post, username)
- user_notifications = user.notifications
-
- consolidation_window =
- SiteSetting.likes_notification_consolidation_window_mins.minutes.ago
-
- liked_by_user_notifications =
- user_notifications
- .filter_by_display_username_and_type(
- username, Notification.types[:liked]
- )
- .where(
- "created_at > ? AND data::json ->> 'username2' IS NULL",
- consolidation_window
- )
-
- user_liked_consolidated_notification =
- user_notifications
- .filter_by_display_username_and_type(
- username, Notification.types[:liked_consolidated]
- )
- .where("created_at > ?", consolidation_window)
- .first
-
- if user_liked_consolidated_notification
- return update_consolidated_liked_notification_count!(
- user_liked_consolidated_notification
- )
- elsif (
- liked_by_user_notifications.count >=
- SiteSetting.likes_notification_consolidation_threshold
- )
- return create_consolidated_liked_notification!(
- liked_by_user_notifications,
- post,
- username
- )
- end
- end
-
- def update_consolidated_liked_notification_count!(notification)
- data = notification.data_hash
- data["count"] += 1
-
- notification.update!(
- data: data.to_json,
- read: false
- )
-
- notification
- end
-
- def create_consolidated_liked_notification!(notifications, post, username)
- notification = nil
-
- Notification.transaction do
- timestamp = notifications.last.created_at
-
- notification = Notification.create!(
- notification_type: Notification.types[:liked_consolidated],
- user_id: post.user_id,
- data: {
- username: username,
- display_username: username,
- count: notifications.count + 1
- }.to_json,
- updated_at: timestamp,
- created_at: timestamp
- )
-
- notifications.each(&:destroy!)
- end
-
- notification
- end
end
diff --git a/app/services/search_indexer.rb b/app/services/search_indexer.rb
index 8b3c84944b..17817c4c09 100644
--- a/app/services/search_indexer.rb
+++ b/app/services/search_indexer.rb
@@ -137,7 +137,12 @@ class SearchIndexer
end
category_name = topic.category&.name if topic
- tag_names = topic.tags.pluck(:name).join(' ') if topic
+ if topic
+ tags = topic.tags.select(:id, :name)
+ unless tags.empty?
+ tag_names = (tags.map(&:name) + Tag.where(target_tag_id: tags.map(&:id)).pluck(:name)).join(' ')
+ end
+ end
if Post === obj && obj.raw.present? &&
(
diff --git a/app/services/site_settings_task.rb b/app/services/site_settings_task.rb
index 4cddf6d4dc..f9d185cdf2 100644
--- a/app/services/site_settings_task.rb
+++ b/app/services/site_settings_task.rb
@@ -36,6 +36,6 @@ class SiteSettingsTask
counts[:not_found] += 1
end
end
- return log, counts
+ [log, counts]
end
end
diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb
index f6264da3eb..9130f34692 100644
--- a/app/services/staff_action_logger.rb
+++ b/app/services/staff_action_logger.rb
@@ -352,6 +352,38 @@ class StaffActionLogger
))
end
+ def log_title_revoke(user, opts = {})
+ raise Discourse::InvalidParameters.new(:user) unless user
+ UserHistory.create!(params(opts).merge(
+ action: UserHistory.actions[:revoke_title],
+ target_user_id: user.id,
+ details: opts[:revoke_reason],
+ previous_value: opts[:previous_value]
+ ))
+ end
+
+ def log_title_change(user, opts = {})
+ raise Discourse::InvalidParameters.new(:user) unless user
+ UserHistory.create!(params(opts).merge(
+ action: UserHistory.actions[:change_title],
+ target_user_id: user.id,
+ details: opts[:details],
+ new_value: opts[:new_value],
+ previous_value: opts[:previous_value]
+ ))
+ end
+
+ def log_change_upload_secure_status(opts = {})
+ UserHistory.create!(params(opts).merge(
+ action: UserHistory.actions[:override_upload_secure_status],
+ details: [
+ "upload_id: #{opts[:upload_id]}",
+ "reason: #{I18n.t("uploads.marked_insecure_from_theme_component_reason")}"
+ ].join("\n"),
+ new_value: opts[:new_value]
+ ))
+ end
+
def log_check_email(user, opts = {})
raise Discourse::InvalidParameters.new(:user) unless user
UserHistory.create!(params(opts).merge(
diff --git a/app/services/themes_install_task.rb b/app/services/themes_install_task.rb
index 1a3ac1bbcf..8466e7b8cb 100644
--- a/app/services/themes_install_task.rb
+++ b/app/services/themes_install_task.rb
@@ -25,7 +25,7 @@ class ThemesInstallTask
end
end
- return log, counts
+ [log, counts]
end
attr_reader :url, :options
diff --git a/app/services/user_anonymizer.rb b/app/services/user_anonymizer.rb
index 99c7dc6dd4..bb5bd3f705 100644
--- a/app/services/user_anonymizer.rb
+++ b/app/services/user_anonymizer.rb
@@ -64,7 +64,6 @@ class UserAnonymizer
@user.single_sign_on_record.try(:destroy)
@user.oauth2_user_infos.try(:destroy_all)
@user.user_associated_accounts.try(:destroy_all)
- @user.instagram_user_info.try(:destroy)
@user.user_open_ids.find_each { |x| x.destroy }
@user.api_keys.find_each { |x| x.try(:destroy) }
@user.user_emails.secondary.destroy_all
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index c5d539e1db..44c262d8f2 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -40,7 +40,8 @@ class UserUpdater
:homepage_id,
:hide_profile_and_presence,
:text_size,
- :title_count_mode
+ :title_count_mode,
+ :timezone
]
def initialize(actor, user)
diff --git a/app/views/users_email/confirm.html.erb b/app/views/users_email/confirm.html.erb
deleted file mode 100644
index 0f236a1992..0000000000
--- a/app/views/users_email/confirm.html.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-
- <% if @update_result == :authorizing_new %>
- <%= t 'change_email.authorizing_old.title' %>
-
- <%= t 'change_email.authorizing_old.description' %>
- <% elsif @update_result == :complete %>
- <%= t 'change_email.confirmed' %>
-
- <%= t('change_email.please_continue', site_name: SiteSetting.title) %>
- <% elsif @update_result == :invalid_second_factor%>
-
-
- <%if @backup_codes_enabled %>
-
- <%=t "login.second_factor_backup" %>
- <%= render 'common/second_factor_form_script' %>
- <%end%>
- <% else %>
-
- <%=t 'change_email.already_done' %>
-
- <% end %>
-
+ <% if @done %>
+
+ <%= t 'change_email.confirmed' %>
+
+
+ "><%= t('change_email.please_continue', site_name: SiteSetting.title) %>
+
+ <% elsif @error %>
+
+ <%= @error %>
+
+ <% else %>
+ <%= t 'change_email.authorizing_new.title' %>
+
+ <%= t 'change_email.authorizing_new.description' %>
+
+
+ <%= @to_email %>
+
+
+ <%=form_tag(u_confirm_new_email_path, method: :put) do %>
+ <%= hidden_field_tag 'token', @token.token %>
+
+ <% if @show_backup_codes %>
+
+ <%= link_to t("login.second_factor_toggle.totp"), show_backup: "false" %>
+ <% elsif @show_second_factor %>
+
+ <% if @backup_codes_enabled %>
+ <%= link_to t("login.second_factor_toggle.backup_code"), show_backup: "true" %>
+ <% end %>
+ <% else %>
+ <%= submit_tag t('change_email.confirm'), class: "btn btn-primary" %>
+ <% end %>
+ <%end%>
+ <% end%>
+
+ <% if @almost_done %>
+ <%= t 'change_email.authorizing_old.almost_done_title' %>
+
+ <%= t 'change_email.authorizing_old.almost_done_description' %>
+
+ <% elsif @error %>
+
+ <%= @error %>
+
+ <% else %>
+ <%= t 'change_email.authorizing_old.title' %>
+
+ <%= t 'change_email.authorizing_old.description' %>
+
+
+ <%= t 'change_email.authorizing_old.old_email', email: @from_email %>
+
+ <%= t 'change_email.authorizing_old.new_email', email: @to_email %>
+
+
+ <%=form_tag(u_confirm_old_email_path, method: :put) do %>
+ <%= hidden_field_tag 'token', @token.token %>
+ <%= submit_tag t('change_email.confirm'), class: "btn btn-primary" %>
+ <% end %>
+ <% end %>
+ |