+
{{outlet "modalBody"}}
{{#each errors as |error|}}
diff --git a/app/assets/javascripts/discourse/templates/modal/activation-edit.hbs b/app/assets/javascripts/discourse/templates/modal/activation-edit.hbs
new file mode 100644
index 0000000000..735f4912a7
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/modal/activation-edit.hbs
@@ -0,0 +1,12 @@
+{{#d-modal-body}}
+
{{i18n "login.provide_new_email"}}
+ {{input value=newEmail class="activate-new-email"}} +{{/d-modal-body}} + + diff --git a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs new file mode 100644 index 0000000000..e694c838bf --- /dev/null +++ b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs @@ -0,0 +1,5 @@ +{{#d-modal-body}} + {{{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}} +{{/d-modal-body}} + +{{modal-footer-close closeModal=(action "closeModal")}} diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs deleted file mode 100644 index d5dcb92fa6..0000000000 --- a/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs +++ /dev/null @@ -1,20 +0,0 @@ - diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-status-update.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-status-update.hbs new file mode 100644 index 0000000000..8fca98f413 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/modal/edit-topic-status-update.hbs @@ -0,0 +1,103 @@ + diff --git a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs index f8e4aeee29..4ed586628b 100644 --- a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs +++ b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs @@ -1,12 +1,14 @@ {{#d-modal-body}} - {{#if emailSent}} - {{{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}} - {{else}} - {{{i18n 'login.not_activated' sentTo=sentTo}}} - {{i18n 'login.resend_activation_email'}} - {{/if}} + {{{i18n 'login.not_activated' sentTo=sentTo}}} {{/d-modal-body}} diff --git a/app/assets/javascripts/discourse/templates/preferences.hbs b/app/assets/javascripts/discourse/templates/preferences.hbs index 4be554bdf6..6fea4f7f6f 100644 --- a/app/assets/javascripts/discourse/templates/preferences.hbs +++ b/app/assets/javascripts/discourse/templates/preferences.hbs @@ -263,12 +263,14 @@ -
{{category-selector categories=model.trackedCategories blacklist=selectedCategories}}
{{i18n 'user.tracked_categories_instructions'}}
+
{{category-selector categories=model.watchedFirstPostCategories}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index ff77c3ae0e..c22ed994bb 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -81,7 +81,7 @@
toggleClosed=(action "toggleClosed")
toggleArchived=(action "toggleArchived")
toggleVisibility=(action "toggleVisibility")
- showAutoClose=(action "topicRouteAction" "showAutoClose")
+ showTopicStatusUpdate=(action "topicRouteAction" "showTopicStatusUpdate")
showFeatureTopic=(action "topicRouteAction" "showFeatureTopic")
showChangeTimestamp=(action "topicRouteAction" "showChangeTimestamp")
convertToPublicTopic=(action "convertToPublicTopic")
@@ -107,7 +107,7 @@
toggleClosed=(action "toggleClosed")
toggleArchived=(action "toggleArchived")
toggleVisibility=(action "toggleVisibility")
- showAutoClose=(action "topicRouteAction" "showAutoClose")
+ showTopicStatusUpdate=(action "topicRouteAction" "showTopicStatusUpdate")
showFeatureTopic=(action "topicRouteAction" "showFeatureTopic")
showChangeTimestamp=(action "topicRouteAction" "showChangeTimestamp")
convertToPublicTopic=(action "convertToPublicTopic")
@@ -174,7 +174,7 @@
{{#conditional-loading-spinner condition=model.postStream.loadingFilter}}
{{#if loadedAllPosts}}
- {{topic-closing topic=model}}
+ {{topic-status-info topic=model}}
{{#if session.showSignupCta}}
{{! replace "Log In to Reply" with the infobox }}
{{signup-cta}}
@@ -188,7 +188,7 @@
toggleClosed=(action "toggleClosed")
toggleArchived=(action "toggleArchived")
toggleVisibility=(action "toggleVisibility")
- showAutoClose=(action "topicRouteAction" "showAutoClose")
+ showTopicStatusUpdate=(action "topicRouteAction" "showTopicStatusUpdate")
showFeatureTopic=(action "topicRouteAction" "showFeatureTopic")
showChangeTimestamp=(action "topicRouteAction" "showChangeTimestamp")
convertToPublicTopic=(action "convertToPublicTopic")
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index fc8657b0d4..0a78d6e64f 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -17,6 +17,7 @@
{{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}}
{{#if canBulkInvite}}
{{csv-uploader uploading=uploading}}
+ {{fa-icon "question-circle"}}
{{/if}}
{{#if showReinviteAllButton}}
{{#if reinvitedAll}}
diff --git a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 b/app/assets/javascripts/discourse/widgets/actions-summary.js.es6
index bf09613c73..df852621b9 100644
--- a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6
+++ b/app/assets/javascripts/discourse/widgets/actions-summary.js.es6
@@ -3,12 +3,13 @@ import { avatarFor } from 'discourse/widgets/post';
import { iconNode } from 'discourse/helpers/fa-icon-node';
import { h } from 'virtual-dom';
import { dateNode } from 'discourse/helpers/node';
+import { userPath } from 'discourse/lib/url';
export function avatarAtts(user) {
return { template: user.avatar_template,
username: user.username,
post_url: user.post_url,
- url: Discourse.getURL('/users/') + user.username_lower };
+ url: userPath(user.username_lower) };
}
createWidget('small-user-list', {
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
index 7b95c36328..3e9979cad1 100644
--- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
@@ -2,6 +2,7 @@ import { createWidget, applyDecorators } from 'discourse/widgets/widget';
import { h } from 'virtual-dom';
import DiscourseURL from 'discourse/lib/url';
import { ajax } from 'discourse/lib/ajax';
+import { userPath } from 'discourse/lib/url';
const flatten = array => [].concat.apply([], array);
@@ -19,7 +20,7 @@ createWidget('priority-faq-link', {
click(e) {
e.preventDefault();
if (this.siteSettings.faq_url === this.attrs.href) {
- ajax("/users/read-faq", { method: "POST" }).then(() => {
+ ajax(userPath("read-faq"), { method: "POST" }).then(() => {
this.currentUser.set('read_faq', true);
DiscourseURL.routeToTag($(e.target).closest('a')[0]);
});
diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6
index 1f66b5eec6..5b67b1bda3 100644
--- a/app/assets/javascripts/discourse/widgets/header.js.es6
+++ b/app/assets/javascripts/discourse/widgets/header.js.es6
@@ -166,6 +166,11 @@ createWidget('header-buttons', {
const forceContextEnabled = ['category', 'user', 'private_messages'];
+let additionalPanels = [];
+export function attachAdditionalPanel(name, toggle, transformAttrs) {
+ additionalPanels.push({ name, toggle, transformAttrs });
+}
+
export default createWidget('header', {
tagName: 'header.d-header.clearfix',
buildKey: () => `header`,
@@ -214,6 +219,12 @@ export default createWidget('header', {
panels.push(this.attach('user-menu'));
}
+ additionalPanels.map((panel) => {
+ if (this.state[panel.toggle]) {
+ panels.push(this.attach(panel.name, panel.transformAttrs.call(this, attrs, state)));
+ }
+ });
+
const contents = [ this.attach('home-logo', { minimized: !!attrs.topic }),
h('div.panel.clearfix', panels) ];
diff --git a/app/assets/javascripts/discourse/widgets/notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/notification-item.js.es6
index 7cb5ce028a..187a090ce0 100644
--- a/app/assets/javascripts/discourse/widgets/notification-item.js.es6
+++ b/app/assets/javascripts/discourse/widgets/notification-item.js.es6
@@ -6,6 +6,7 @@ import { h } from 'virtual-dom';
import { emojiUnescape } from 'discourse/lib/text';
import { postUrl, escapeExpression } from 'discourse/lib/utilities';
import { setTransientHeader } from 'discourse/lib/ajax';
+import { userPath } from 'discourse/lib/url';
const LIKED_TYPE = 5;
const INVITED_TYPE = 8;
@@ -45,11 +46,11 @@ createWidget('notification-item', {
}
if (attrs.notification_type === INVITED_TYPE) {
- return Discourse.getURL('/users/' + data.display_username);
+ return userPath(data.display_username);
}
if (data.group_id) {
- return Discourse.getURL('/users/' + data.username + '/messages/group/' + data.group_name);
+ return userPath(data.username + '/messages/group/' + data.group_name);
}
},
diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
index 699dd78142..ce00e979de 100644
--- a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
@@ -122,12 +122,13 @@ export default createWidget('topic-admin-menu', {
action: 'toggleClosed',
icon: 'lock',
label: 'actions.close' });
- buttons.push({ className: 'topic-admin-autoclose',
- action: 'showAutoClose',
- icon: 'clock-o',
- label: 'actions.auto_close' });
}
+ buttons.push({ className: 'topic-admin-status-update',
+ action: 'showTopicStatusUpdate',
+ icon: 'clock-o',
+ label: 'actions.timed_update' });
+
const isPrivateMessage = topic.get('isPrivateMessage');
if (!isPrivateMessage && topic.get('visible')) {
diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js.es6 b/app/assets/javascripts/discourse/widgets/topic-map.js.es6
index 7d4c89c0b3..aca0c8aae2 100644
--- a/app/assets/javascripts/discourse/widgets/topic-map.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-map.js.es6
@@ -159,8 +159,7 @@ createWidget('topic-map-expanded', {
if (l.title && l.title.length) {
const domain = l.domain;
if (domain && domain.length) {
- const s = domain.split('.');
- host = h('span.domain', s[s.length-2] + "." + s[s.length-1]);
+ host = h('span.domain', domain);
}
}
diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
index ca925d343d..a77012282b 100644
--- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
@@ -154,8 +154,7 @@ createWidget('timeline-scrollarea', {
if (this.state.position !== result.current) {
this.state.position = result.current;
- const timeline = this._findAncestorWithProperty('updatePosition');
- timeline.updatePosition.call(timeline, result.current);
+ this.sendWidgetAction('updatePosition', result.current);
}
return result;
@@ -287,8 +286,6 @@ export default createWidget('topic-timeline', {
this.state.position = pos;
this.state.excerpt = "";
- this.scheduleRerender();
-
const stream = this.attrs.topic.get('postStream');
// a little debounce to avoid flashing
@@ -300,7 +297,6 @@ export default createWidget('topic-timeline', {
// we have an off by one, stream is zero based,
// pos is 1 based
stream.excerpt(pos-1).then(info => {
-
if (info && this.state.position === pos) {
let excerpt = "";
@@ -308,9 +304,7 @@ export default createWidget('topic-timeline', {
excerpt = "" + info.username + ": ";
}
- excerpt += info.excerpt;
-
- this.state.excerpt = excerpt;
+ this.state.excerpt = excerpt + info.excerpt;
this.scheduleRerender();
}
});
@@ -332,22 +326,20 @@ export default createWidget('topic-timeline', {
}
let elems = [h('h2', this.attach('link', {
- contents: ()=>titleHTML,
- className: 'fancy-title',
- action: 'jumpTop'}))];
-
+ contents: () => titleHTML,
+ className: 'fancy-title',
+ action: 'jumpTop'
+ }))];
if (this.state.excerpt) {
- elems.push(
- new RawHtml({
- html: "
<%- if show_username_on_post(post) %>
- <%= post.user.username %>
+ <%= post.user.username %>
<% end %>
<%- if show_name_on_post(post) %>
- <%= post.user.name %>
+ <%= post.user.name %>
<% end %>
<%- if post.user.title.present? %>
<%= post.user.title %>
diff --git a/app/views/embed/comments.html.erb b/app/views/embed/comments.html.erb
index 29ab277232..23f69584fe 100644
--- a/app/views/embed/comments.html.erb
+++ b/app/views/embed/comments.html.erb
@@ -16,11 +16,11 @@
<%- end %>
- <%= post.user.username %>
+ <%= post.user.username %>
<%- if post.user.title.present? %>
<%= post.user.title %>
<%- end %>
diff --git a/app/views/list/list.rss.erb b/app/views/list/list.rss.erb
index d0f6c14957..69799bc593 100644
--- a/app/views/list/list.rss.erb
+++ b/app/views/list/list.rss.erb
@@ -20,7 +20,7 @@
" + this.state.excerpt + "
"
- }));
+ elems.push(new RawHtml({
+ html: "" + this.state.excerpt + "
"
+ }));
}
result.push(h('div.title', elems));
}
-
if (!attrs.fullScreen && currentUser && currentUser.get('canManageTopic')) {
result.push(h('div.timeline-controls', this.attach('topic-admin-menu-button', { topic })));
}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode.js.es6
index bc15c40fb2..52e0ecba1e 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode.js.es6
@@ -9,6 +9,8 @@ export function register(helper, codeName, args, emitter) {
start: new RegExp("\\[" + codeName + "(=[^\\[\\]]+)?\\]([\\s\\S]*)", "igm"),
stop: new RegExp("\\[\\/" + codeName + "\\]", "igm"),
emitter(blockContents, matches) {
+
+
const options = helper.getOptions();
while (blockContents.length && (typeof blockContents[0] === "string" || blockContents[0] instanceof String)) {
blockContents[0] = String(blockContents[0]).replace(/^\s+/, '');
@@ -22,7 +24,11 @@ export function register(helper, codeName, args, emitter) {
let contents = [];
if (blockContents.length) {
const nextContents = blockContents.slice(1);
- blockContents = this.processBlock(blockContents[0], nextContents).concat(nextContents);
+ blockContents = this.processBlock(blockContents[0], nextContents);
+
+ nextContents.forEach(nc => {
+ blockContents = blockContents.concat(this.processBlock(nc, []));
+ });
blockContents.forEach(bc => {
if (typeof bc === "string" || bc instanceof String) {
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6
index 177c322cca..115f58997d 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6
@@ -38,7 +38,7 @@ export function setup(helper) {
const type = mentionLookup && mentionLookup(name);
if (type === "user") {
- return ['a', {'class': 'mention', href: opts.getURL("/users/") + name.toLowerCase()}, mention];
+ return ['a', {'class': 'mention', href: opts.getURL("/u/") + name.toLowerCase()}, mention];
} else if (type === "group") {
return ['a', {'class': 'mention-group', href: opts.getURL("/groups/") + name}, mention];
} else {
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quote.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quote.js.es6
index 96b798a326..87bc948d69 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quote.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quote.js.es6
@@ -10,6 +10,7 @@ registerOption((siteSettings, opts) => {
export function setup(helper) {
register(helper, 'quote', {noWrap: true, singlePara: true}, (contents, bbParams, options) => {
+
const params = {'class': 'quote'};
let username = null;
const opts = helper.getOptions();
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index bf1c8ea5c5..9f86c23d94 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -133,16 +133,7 @@ div.ac-wrap {
}
}
-.auto-close-fields {
- div:not(:first-child) {
- margin-top: 10px;
- }
- label {
- font-size: 1em;
- }
- input {
- width: 150px;
- }
+.auto-update-input {
.examples {
color: lighten($primary, 40%);
}
@@ -187,5 +178,3 @@ div.ac-wrap {
.cooked > *:first-child {
margin-top: 0;
}
-
-
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 3eb8868bfa..c69d4a4058 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -295,34 +295,13 @@
}
}
-.edit-auto-close-modal {
- .btn.pull-right {
- margin-right: 10px;
- }
- form {
- margin: 0;
- }
- .auto-close-fields {
- i.fa-clock-o {
- font-size: 1.143em;
- }
- input {
- margin: 0;
- }
- }
-}
-
.edit-category-modal {
- .auto-close-fields, .num-featured-topics-fields, .position-fields {
+ .auto-update-input, .num-featured-topics-fields, .position-fields {
input[type=text] {
width: 50px;
}
}
- .auto-close-fields label {
- font-size: .929em;
- }
-
.subcategory-list-style-field {
margin-left: 16px;
}
@@ -398,3 +377,10 @@
}
}
+.modal-button-bar {
+ margin-top: 1em;
+
+ button {
+ margin-right: 0.5em;
+ }
+}
diff --git a/app/assets/stylesheets/common/base/notification-options.scss b/app/assets/stylesheets/common/base/notification-options.scss
index 745f0aa650..1e560fadf8 100644
--- a/app/assets/stylesheets/common/base/notification-options.scss
+++ b/app/assets/stylesheets/common/base/notification-options.scss
@@ -1,4 +1,4 @@
-.fa.muted {
+.fa.muted, .fa.watching-first-post {
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
}
.fa.tracking, .fa.watching {
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index aa13934ae5..7fb5f4813e 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -93,6 +93,12 @@ $tag-color: scale-color($primary, $lightness: 40%);
}
}
+.d-header .topic-header-extra {
+ display: inline-block;
+ .discourse-tags { display: inline-block; }
+ .topic-featured-link { margin-left: 8px; }
+}
+
.select2-container-multi .select2-choices .select2-search-choice.discourse-tag-select2 {
padding-top: 5px;
-webkit-box-shadow: none;
diff --git a/app/assets/stylesheets/common/base/topic-close-modal.scss b/app/assets/stylesheets/common/base/topic-close-modal.scss
new file mode 100644
index 0000000000..0a638b6f81
--- /dev/null
+++ b/app/assets/stylesheets/common/base/topic-close-modal.scss
@@ -0,0 +1,29 @@
+.topic-close-modal {
+ label {
+ display: inline-block;
+ }
+
+ .radios {
+ padding-bottom: 20px;
+ display: inline-block;
+
+ input[type='radio'] {
+ vertical-align: middle;
+ margin: 0px;
+ }
+
+ label {
+ padding: 0 10px 0px 5px;
+ }
+ }
+
+ .btn.pull-right {
+ margin-right: 10px;
+ }
+
+ .auto-update-input {
+ input {
+ margin: 0;
+ }
+ }
+}
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 7ff8c83869..6c7fbfbb51 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -297,7 +297,3 @@ and (max-width : 600px) {
border: none;
}
}
-
-.user-preferences .watching-first-post.fa-dot-circle-o {
- color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-}
diff --git a/app/assets/stylesheets/common/printer-friendly.scss b/app/assets/stylesheets/common/printer-friendly.scss
index 5f2b7f81ab..6d62eb40d8 100644
--- a/app/assets/stylesheets/common/printer-friendly.scss
+++ b/app/assets/stylesheets/common/printer-friendly.scss
@@ -16,7 +16,7 @@
.show-topic-admin,
#topic-progress,
.quote-controls,
- #topic-closing-info,
+ #topic-status-info,
div.lazyYT,
.post-info.edits,
.post-action,
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index 0f9bfb589b..c8aa5306ea 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -342,7 +342,7 @@
display: block;
bottom: 8px;
}
- .auto-close-fields .examples {
+ .auto-update-input .examples {
margin-top: 0;
padding-bottom: 8px;
}
diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss
index fd82268119..cf751ad717 100644
--- a/app/assets/stylesheets/desktop/modal.scss
+++ b/app/assets/stylesheets/desktop/modal.scss
@@ -46,15 +46,20 @@
margin-left: -1px;
}
+.modal-close {
+ display: inline-block;
+ float: right;
+ margin: 7px;
+}
+
.modal-header {
h3 {
+ display: inline-block;;
font-size: 1.429em;
padding: 10px 15px 7px;
}
- .close {margin: 10px;}
}
.close {
- float: right;
font-size: 1.429em;
text-decoration: none;
color: dark-light-choose(scale-color($primary, $lightness: 35%), scale-color($secondary, $lightness: 65%));
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index ff8f81747a..59d297ac47 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -79,7 +79,7 @@
}
}
-#topic-closing-info {
+#topic-status-info {
border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
padding-top: 10px;
height: 20px;
@@ -242,4 +242,3 @@ and (max-width : 485px) {
max-width: 100%;
}
}
-
diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss
index f94a9facd5..8b2498f1bc 100644
--- a/app/assets/stylesheets/mobile/modal.scss
+++ b/app/assets/stylesheets/mobile/modal.scss
@@ -49,23 +49,24 @@
margin-bottom: 5px;
}
+.modal-close {
+ display: inline-block;
+ float: right;
+}
+
.modal-header {
- // we need tighter spacing on mobile for header
- // this clearfix under the modal title h3 pushes it way down
- .clearfix {
- display:none;
- }
+ padding: 10px 0px;
+
h3 {
+ display: inline-block;
font-size: 1.286em;
padding-left: 15px;
- margin-bottom: 5px;
+ margin: 0px;
}
}
.close {
- float: right;
font-size: 1.714em;
padding: 10px 15px 5px 5px;
- margin: -15px 0 0 0;
color: $primary;
}
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index c13be8a7c4..1c06d3d379 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -475,7 +475,9 @@ button.select-post {
.deleted {
- background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%);
+ .topic-body {
+ background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%);
+ }
}
.deleted-user-avatar {
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 00210c6be5..4365009a6a 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -43,7 +43,7 @@
clear: both;
}
-#topic-closing-info {
+#topic-status-info {
margin-left: 10px;
}
@@ -190,7 +190,7 @@ sup sup, sub sup, sup sub, sub sub { top: 0; }
}
// make mobile timeline top and bottom dates easier to select
-.topic-timeline {
+.topic-timeline {
.start-date { font-size: 110%; padding: 5px; }
.now-date { font-size: 110%; padding: 5px; }
}
diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb
index 62628d6af2..74ce0901ec 100644
--- a/app/controllers/admin/email_controller.rb
+++ b/app/controllers/admin/email_controller.rb
@@ -69,6 +69,19 @@ class Admin::EmailController < Admin::AdminController
end
end
+ def smtp_should_reject
+ params.require(:from)
+ params.require(:to)
+ # These strings aren't localized; they are sent to an anonymous SMTP user.
+ if !User.exists?(email: Email.downcase(params[:from])) && !SiteSetting.enable_staged_users
+ render json: { reject: true, reason: "Mail from your address is not accepted. Do you have an account here?" }
+ elsif Email::Receiver.check_address(Email.downcase(params[:to])).nil?
+ render json: { reject: true, reason: "Mail to this address is not accepted. Check the address and try to send again?" }
+ else
+ render json: { reject: false }
+ end
+ end
+
def handle_mail
params.require(:email)
Email::Processor.process!(params[:email])
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index f24ee3f528..8a47b8a9d1 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -7,12 +7,9 @@ class Admin::ReportsController < Admin::AdminController
raise Discourse::NotFound unless report_type =~ /^[a-z0-9\_]+$/
- start_date = 1.month.ago
- start_date = Time.parse(params[:start_date]) if params[:start_date].present?
-
- end_date = start_date + 1.month
- end_date = Time.parse(params[:end_date]) if params[:end_date].present?
-
+ start_date = params[:start_date].present? ? Time.parse(params[:start_date]) : 30.days.ago
+ end_date = params[:end_date].present? ? Time.parse(params[:end_date]) : start_date + 30.days
+
if params.has_key?(:category_id) && params[:category_id].to_i > 0
category_id = params[:category_id].to_i
else
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 8fdd4b9536..3f007d48c5 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -1,5 +1,6 @@
require_dependency 'user_destroyer'
require_dependency 'admin_user_index_query'
+require_dependency 'admin_confirmation'
class Admin::UsersController < Admin::AdminController
@@ -103,10 +104,8 @@ class Admin::UsersController < Admin::AdminController
end
def grant_admin
- guardian.ensure_can_grant_admin!(@user)
- @user.grant_admin!
- StaffActionLogger.new(current_user).log_grant_admin(@user)
- render_serialized(@user, AdminUserSerializer)
+ AdminConfirmation.new(@user, current_user).create_confirmation
+ render json: success_json
end
def revoke_moderation
@@ -321,6 +320,7 @@ class Admin::UsersController < Admin::AdminController
end
def invite_admin
+ raise Discourse::InvalidAccess.new unless is_api?
email = params[:email]
unless user = User.find_by_email(email)
@@ -348,7 +348,9 @@ class Admin::UsersController < Admin::AdminController
email_token: email_token.token)
end
- render json: success_json.merge!(password_url: "#{Discourse.base_url}/users/password-reset/#{email_token.token}")
+ render json: success_json.merge!(
+ password_url: "#{Discourse.base_url}#{password_reset_token_path(token: email_token.token)}"
+ )
end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 22c81fbdb3..d7a37a3a45 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -147,7 +147,11 @@ class ApplicationController < ActionController::Base
def rescue_discourse_actions(type, status_code, include_ember=false)
- if (request.format && request.format.json?) || (request.xhr?)
+ show_json_errors = (request.format && request.format.json?) ||
+ (request.xhr?) ||
+ ((params[:external_id] || '').ends_with? '.json')
+
+ if show_json_errors
# HACK: do not use render_json_error for topics#show
if request.params[:controller] == 'topics' && request.params[:action] == 'show'
return render status: status_code, layout: false, text: (status_code == 404 || status_code == 410) ? build_not_found_page(status_code) : I18n.t(type)
diff --git a/app/controllers/badges_controller.rb b/app/controllers/badges_controller.rb
index e7991c9de9..432489a3d4 100644
--- a/app/controllers/badges_controller.rb
+++ b/app/controllers/badges_controller.rb
@@ -38,20 +38,20 @@ class BadgesController < ApplicationController
raise Discourse::NotFound unless SiteSetting.enable_badges
params.require(:id)
- badge = Badge.enabled.find(params[:id])
+ @badge = Badge.enabled.find(params[:id])
if current_user
- user_badge = UserBadge.find_by(user_id: current_user.id, badge_id: badge.id)
+ user_badge = UserBadge.find_by(user_id: current_user.id, badge_id: @badge.id)
if user_badge && user_badge.notification
user_badge.notification.update_attributes read: true
end
end
- serialized = MultiJson.dump(serialize_data(badge, BadgeSerializer, root: "badge", include_long_description: true))
+ serialized = MultiJson.dump(serialize_data(@badge, BadgeSerializer, root: "badge", include_long_description: true))
respond_to do |format|
format.html do
store_preloaded "badge", serialized
- render "default/empty"
+ render :show
end
format.json { render json: serialized }
end
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 69391459d8..ec901ddb63 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -79,8 +79,8 @@ class ListController < ApplicationController
# Note the first is the default and we don't add a title
if (filter.to_s != current_homepage) && use_crawler_layout?
filter_title = I18n.t("js.filters.#{filter.to_s}.title", count: 0)
- if list_opts[:category]
- @title = I18n.t('js.filters.with_category', filter: filter_title, category: Category.find(list_opts[:category]).name)
+ if list_opts[:category] && @category
+ @title = I18n.t('js.filters.with_category', filter: filter_title, category: @category.name)
else
@title = I18n.t('js.filters.with_topics', filter: filter_title)
end
@@ -192,8 +192,8 @@ class ListController < ApplicationController
target_user = fetch_user_from_params
@title = "#{SiteSetting.title} - #{I18n.t("rss_description.user_topics", username: target_user.username)}"
- @link = "#{Discourse.base_url}/users/#{target_user.username}/activity/topics"
- @atom_link = "#{Discourse.base_url}/users/#{target_user.username}/activity/topics.rss"
+ @link = "#{Discourse.base_url}/u/#{target_user.username}/activity/topics"
+ @atom_link = "#{Discourse.base_url}/u/#{target_user.username}/activity/topics.rss"
@description = I18n.t("rss_description.user_topics", username: target_user.username)
@topic_list = TopicQuery.new(nil, order: 'created').send("list_topics_by", target_user)
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 7d2f0da89b..e6c82e01ec 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -5,8 +5,14 @@ class NotificationsController < ApplicationController
before_filter :ensure_logged_in
def index
- user = current_user
- user = User.find_by_username(params[:username].to_s) if params[:username]
+ user =
+ if params[:username] && !params[:recent]
+ user_record = User.find_by(username: params[:username].to_s)
+ raise Discourse::InvalidParameters.new(:username) if !user_record
+ user_record
+ else
+ current_user
+ end
guardian.ensure_can_see_notifications!(user)
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index db9494f657..9feab0fe82 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -103,7 +103,7 @@ class PostsController < ApplicationController
@posts = posts
@title = "#{SiteSetting.title} - #{I18n.t("rss_description.user_posts", username: user.username)}"
- @link = "#{Discourse.base_url}/users/#{user.username}/activity"
+ @link = "#{Discourse.base_url}/u/#{user.username}/activity"
@description = I18n.t("rss_description.user_posts", username: user.username)
render 'posts/latest', formats: [:rss]
end
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index 186a166a92..49e7639974 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -243,7 +243,7 @@ class SessionController < ApplicationController
RateLimiter.new(nil, "forgot-password-login-min-#{params[:login].to_s[0..100]}", 3, 1.minute).performed!
user = User.find_by_username_or_email(params[:login])
- user_presence = user.present? && user.id != Discourse::SYSTEM_USER_ID && !user.staged
+ user_presence = user.present? && user.id > 0 && !user.staged
if user_presence
email_token = user.email_tokens.create(email: user.email)
Jobs.enqueue(:critical_user_email, type: :forgot_password, user_id: user.id, email_token: email_token.token)
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index e3f70dc40b..33b88966a7 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -21,7 +21,7 @@ class TopicsController < ApplicationController
:merge_topic,
:clear_pin,
:re_pin,
- :autoclose,
+ :status_update,
:bulk,
:reset_new,
:change_post_owners,
@@ -273,7 +273,12 @@ class TopicsController < ApplicationController
@topic = Topic.find_by(id: topic_id)
guardian.ensure_can_moderate!(@topic)
@topic.update_status(status, enabled, current_user, until: params[:until])
- render nothing: true
+
+ render json: success_json.merge!(
+ topic_status_update: TopicStatusUpdateSerializer.new(
+ TopicStatusUpdate.find_by(topic: @topic), root: false
+ )
+ )
end
def mute
@@ -284,20 +289,41 @@ class TopicsController < ApplicationController
toggle_mute
end
- def autoclose
- params.permit(:auto_close_time, :timezone_offset)
- params.require(:auto_close_based_on_last_post)
+ def status_update
+ params.permit(:time, :timezone_offset, :based_on_last_post, :category_id)
+ params.require(:status_type)
- topic = Topic.find_by(id: params[:topic_id].to_i)
+ status_type =
+ begin
+ TopicStatusUpdate.types.fetch(params[:status_type].to_sym)
+ rescue
+ invalid_param(:status_type)
+ end
+
+ topic = Topic.find_by(id: params[:topic_id])
guardian.ensure_can_moderate!(topic)
- topic.auto_close_based_on_last_post = params[:auto_close_based_on_last_post]
- topic.set_auto_close(params[:auto_close_time], {by_user: current_user, timezone_offset: params[:timezone_offset] ? params[:timezone_offset].to_i : nil})
+ options = {
+ by_user: current_user,
+ timezone_offset: params[:timezone_offset]&.to_i,
+ based_on_last_post: params[:based_on_last_post]
+ }
+
+ options.merge!(category_id: params[:category_id]) if !params[:category_id].blank?
+
+ topic_status_update = topic.set_or_create_status_update(
+ status_type,
+ params[:time],
+ options
+ )
if topic.save
render json: success_json.merge!({
- auto_close_at: topic.auto_close_at,
- auto_close_hours: topic.auto_close_hours
+ execute_at: topic_status_update&.execute_at,
+ duration: topic_status_update&.duration,
+ based_on_last_post: topic_status_update&.based_on_last_post,
+ closed: topic.closed,
+ category_id: topic_status_update&.category_id
})
else
render_json_error(topic)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6874fff56d..eb69ce7d3c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -3,11 +3,12 @@ require_dependency 'user_name_suggester'
require_dependency 'rate_limiter'
require_dependency 'wizard'
require_dependency 'wizard/builder'
+require_dependency 'admin_confirmation'
class UsersController < ApplicationController
skip_before_filter :authorize_mini_profiler, only: [:avatar]
- skip_before_filter :check_xhr, only: [:show, :password_reset, :update, :account_created, :activate_account, :perform_account_activation, :user_preferences_redirect, :avatar, :my_redirect, :toggle_anon, :admin_login]
+ skip_before_filter :check_xhr, only: [:show, :password_reset, :update, :account_created, :activate_account, :perform_account_activation, :user_preferences_redirect, :avatar, :my_redirect, :toggle_anon, :admin_login, :confirm_admin]
before_filter :ensure_logged_in, only: [:username, :update, :user_preferences_redirect, :upload_user_image,
:pick_avatar, :destroy_user_image, :destroy, :check_emails, :topic_tracking_state]
@@ -25,9 +26,11 @@ class UsersController < ApplicationController
:activate_account,
:perform_account_activation,
:send_activation_email,
+ :update_activation_email,
:password_reset,
:confirm_email_token,
- :admin_login]
+ :admin_login,
+ :confirm_admin]
def index
end
@@ -189,7 +192,7 @@ class UsersController < ApplicationController
cookies[:destination_url] = "/my/#{params[:path]}"
redirect_to "/login-preferences"
else
- redirect_to(path("/users/#{current_user.username}/#{params[:path]}"))
+ redirect_to(path("/u/#{current_user.username}/#{params[:path]}"))
end
end
@@ -392,12 +395,12 @@ class UsersController < ApplicationController
token = params[:token]
if EmailToken.valid_token_format?(token)
- if request.put?
- @user = EmailToken.confirm(token)
- else
- email_token = EmailToken.confirmable(token)
- @user = email_token.try(:user)
- end
+ @user =
+ if request.put?
+ EmailToken.confirm(token)
+ else
+ EmailToken.confirmable(token)&.user
+ end
if @user
secure_session["password-#{token}"] = @user.id
@@ -438,11 +441,11 @@ class UsersController < ApplicationController
format.json do
if request.put?
- if @error || @user.errors&.any?
+ if @error || @user&.errors&.any?
render json: {
success: false,
message: @error,
- errors: @user.errors.to_hash,
+ errors: @user&.errors.to_hash,
is_developer: UsernameCheckerService.is_developer?(@user.email)
}
else
@@ -488,7 +491,7 @@ class UsersController < ApplicationController
RateLimiter.new(nil, "admin-login-hr-#{request.remote_ip}", 6, 1.hour).performed!
RateLimiter.new(nil, "admin-login-min-#{request.remote_ip}", 3, 1.minute).performed!
- user = User.where(email: params[:email], admin: true).where.not(id: Discourse::SYSTEM_USER_ID).first
+ user = User.where(email: params[:email], admin: true).human_users.first
if user
email_token = user.email_tokens.create(email: user.email)
Jobs.enqueue(:critical_user_email, type: :admin_login, user_id: user.id, email_token: email_token.token)
@@ -567,6 +570,28 @@ class UsersController < ApplicationController
render layout: 'no_ember'
end
+ def update_activation_email
+ RateLimiter.new(nil, "activate-edit-email-hr-#{request.remote_ip}", 5, 1.hour).performed!
+
+ @user = User.find_by_username_or_email(params[:username])
+ raise Discourse::InvalidAccess.new unless @user.present?
+ raise Discourse::InvalidAccess.new if @user.active?
+ raise Discourse::InvalidAccess.new if current_user.present?
+
+ raise Discourse::InvalidAccess.new unless @user.confirm_password?(params[:password])
+
+ User.transaction do
+ @user.email = params[:email]
+ if @user.save
+ @user.email_tokens.create(email: @user.email)
+ enqueue_activation_email
+ render json: success_json
+ else
+ render_json_error(@user)
+ end
+ end
+ end
+
def send_activation_email
if current_user.blank? || !current_user.staff?
RateLimiter.new(nil, "activate-hr-#{request.remote_ip}", 30, 1.hour).performed!
@@ -726,6 +751,21 @@ class UsersController < ApplicationController
render json: result
end
+ def confirm_admin
+ @confirmation = AdminConfirmation.find_by_code(params[:token])
+
+ raise Discourse::NotFound unless @confirmation
+ raise Discourse::InvalidAccess.new unless
+ @confirmation.performed_by.id == (current_user&.id || @confirmation.performed_by.id)
+
+ if request.post?
+ @confirmation.email_confirmed!
+ @confirmed = true
+ end
+
+ render layout: 'no_ember'
+ end
+
private
def honeypot_value
diff --git a/app/helpers/topics_helper.rb b/app/helpers/topics_helper.rb
index 677e72ae2b..ad96e94177 100644
--- a/app/helpers/topics_helper.rb
+++ b/app/helpers/topics_helper.rb
@@ -1,7 +1,8 @@
module TopicsHelper
+ include ApplicationHelper
def render_topic_title(topic)
- link_to(topic.title,topic.relative_url)
+ link_to(gsub_emoji_to_unicode(topic.title),topic.relative_url)
end
def categories_breadcrumb(topic)
diff --git a/app/jobs/onceoff/remove_old_auto_close_jobs.rb b/app/jobs/onceoff/remove_old_auto_close_jobs.rb
new file mode 100644
index 0000000000..756cb26d04
--- /dev/null
+++ b/app/jobs/onceoff/remove_old_auto_close_jobs.rb
@@ -0,0 +1,10 @@
+module Jobs
+ class RemoveOldAutoCloseJobs < Jobs::Onceoff
+ def execute_onceoff(args)
+ Jobs.cancel_scheduled_job(:close_topic)
+
+ # No need to enqueue new jobs since we have a scheduled job that will
+ # automatically enqueue the new jobs.
+ end
+ end
+end
diff --git a/app/jobs/regular/admin_confirmation_email.rb b/app/jobs/regular/admin_confirmation_email.rb
new file mode 100644
index 0000000000..dbebf60962
--- /dev/null
+++ b/app/jobs/regular/admin_confirmation_email.rb
@@ -0,0 +1,21 @@
+require_dependency 'email/sender'
+
+module Jobs
+ class AdminConfirmationEmail < Jobs::Base
+ sidekiq_options queue: 'critical'
+
+ def execute(args)
+ to_address = args[:to_address]
+ token = args[:token]
+ target_username = args[:target_username]
+
+ raise Discourse::InvalidParameters.new(:to_address) if to_address.blank?
+ raise Discourse::InvalidParameters.new(:token) if token.blank?
+ raise Discourse::InvalidParameters.new(:target_username) if target_username.blank?
+
+ message = AdminConfirmationMailer.send_email(to_address, target_username, token)
+ Email::Sender.new(message, :admin_confirmation_message).send
+ end
+
+ end
+end
diff --git a/app/jobs/regular/close_topic.rb b/app/jobs/regular/close_topic.rb
deleted file mode 100644
index 0703c971f5..0000000000
--- a/app/jobs/regular/close_topic.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-module Jobs
- class CloseTopic < Jobs::Base
-
- def execute(args)
- if topic = Topic.find_by(id: args[:topic_id])
- closer = User.find_by(id: args[:user_id])
- guardian = Guardian.new(closer)
- unless guardian.can_close?(topic)
- closer = Discourse.system_user
- end
- topic.auto_close(closer)
- end
- end
-
- end
-end
diff --git a/app/jobs/regular/publish_topic_to_category.rb b/app/jobs/regular/publish_topic_to_category.rb
new file mode 100644
index 0000000000..11424dd32f
--- /dev/null
+++ b/app/jobs/regular/publish_topic_to_category.rb
@@ -0,0 +1,18 @@
+module Jobs
+ class PublishTopicToCategory < Jobs::Base
+ def execute(args)
+ topic_status_update = TopicStatusUpdate.find_by(id: args[:topic_status_update_id])
+ raise Discourse::InvalidParameters.new(:topic_status_update_id) if topic_status_update.blank?
+
+ topic = topic_status_update.topic
+ return if topic.blank?
+
+ PostTimestampChanger.new(timestamp: Time.zone.now, topic: topic).change! do
+ topic.change_category_to_id(topic_status_update.category_id)
+ topic.update_columns(visible: true)
+ end
+
+ MessageBus.publish("/topic/#{topic.id}", reload_topic: true, refresh_stream: true)
+ end
+ end
+end
diff --git a/app/jobs/regular/toggle_topic_closed.rb b/app/jobs/regular/toggle_topic_closed.rb
new file mode 100644
index 0000000000..150df7625c
--- /dev/null
+++ b/app/jobs/regular/toggle_topic_closed.rb
@@ -0,0 +1,22 @@
+module Jobs
+ class ToggleTopicClosed < Jobs::Base
+ def execute(args)
+ topic_status_update = TopicStatusUpdate.find_by(id: args[:topic_status_update_id])
+ state = !!args[:state]
+
+ if topic_status_update.blank? ||
+ topic_status_update.execute_at > Time.zone.now ||
+ (topic = topic_status_update.topic).blank? ||
+ topic.closed == state
+
+ return
+ end
+
+ user = topic_status_update.user
+
+ if Guardian.new(user).can_close?(topic)
+ topic.update_status('autoclosed', state, user)
+ end
+ end
+ end
+end
diff --git a/app/jobs/scheduled/calculate_avg_time.rb b/app/jobs/scheduled/calculate_avg_time.rb
index e842285ab4..c0bc9387e4 100644
--- a/app/jobs/scheduled/calculate_avg_time.rb
+++ b/app/jobs/scheduled/calculate_avg_time.rb
@@ -1,5 +1,4 @@
module Jobs
-
class CalculateAvgTime < Jobs::Scheduled
every 1.day
diff --git a/app/jobs/scheduled/disable_bootstrap_mode.rb b/app/jobs/scheduled/disable_bootstrap_mode.rb
index 16028bac87..108a293062 100644
--- a/app/jobs/scheduled/disable_bootstrap_mode.rb
+++ b/app/jobs/scheduled/disable_bootstrap_mode.rb
@@ -4,7 +4,7 @@ module Jobs
def execute(args)
return unless SiteSetting.bootstrap_mode_enabled
- total_users = User.where.not(id: Discourse::SYSTEM_USER_ID).count
+ total_users = User.human_users.count
if SiteSetting.bootstrap_mode_min_users == 0 || total_users > SiteSetting.bootstrap_mode_min_users
SiteSetting.set_and_log('default_trust_level', TrustLevel[0]) if SiteSetting.send('default_trust_level') == TrustLevel[1]
diff --git a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
new file mode 100644
index 0000000000..7842175fa3
--- /dev/null
+++ b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
@@ -0,0 +1,82 @@
+require 'badge_granter'
+
+module Jobs
+ class GrantNewUserOfTheMonthBadges < Jobs::Scheduled
+ every 1.month
+
+ MAX_AWARDED = 2
+
+ def execute(args)
+ badge = Badge.find(Badge::NewUserOfTheMonth)
+
+ # Don't award it if a month hasn't gone by
+ return if UserBadge.where("badge_id = ? AND granted_at >= ?",
+ badge.id,
+ (1.month.ago + 1.day) # give it a day slack just in case
+ ).exists?
+
+ scores.each do |user_id, score|
+ # Don't bother awarding to users who haven't received any likes
+ if score > 0.0
+ user = User.find(user_id)
+ if user.badges.where(id: Badge::NewUserOfTheMonth).blank?
+ BadgeGranter.grant(badge, user)
+ SystemMessage.new(user).create('new_user_of_the_month', {
+ month_year: Time.now.strftime("%B %Y")
+ })
+ end
+ end
+ end
+ end
+
+ def scores
+ scores = {}
+
+ # Find recent accounts and come up with a score based on how many likes they
+ # received, based on how much they posted and how old the accounts of the people
+ # who voted on them are.
+ sql = <<~SQL
+ SELECT u.id,
+ SUM(CASE
+ WHEN pa.id IS NOT NULL THEN
+ CASE
+ WHEN liked_by.admin OR liked_by.moderator THEN 2.0
+ WHEN liked_by.trust_level = 0 THEN 0.1
+ WHEN liked_by.trust_level = 1 THEN 0.25
+ WHEN liked_by.trust_level = 2 THEN 1.0
+ WHEN liked_by.trust_level = 3 THEN 1.5
+ WHEN liked_by.trust_level = 4 THEN 2.0
+ ELSE 1.0
+ END
+ ELSE 0
+ END) / COUNT(DISTINCT p.id) AS score
+ FROM users AS u
+ INNER JOIN user_stats AS us ON u.id = us.user_id
+ LEFT OUTER JOIN posts AS p ON p.user_id = u.id
+ LEFT OUTER JOIN post_actions AS pa ON
+ pa.post_id = p.id AND pa.post_action_type_id = :like
+ LEFT OUTER JOIN users AS liked_by ON liked_by.id = pa.user_id
+ WHERE u.active AND
+ u.id > 0 AND
+ NOT(u.admin) AND
+ NOT(u.moderator) AND
+ u.created_at >= CURRENT_TIMESTAMP - '1 month'::INTERVAL
+ GROUP BY u.id
+ HAVING COUNT(DISTINCT p.id) > 1
+ AND COUNT(DISTINCT p.topic_id) > 1
+ AND COUNT(pa.id) > 1
+ ORDER BY score DESC
+ LIMIT :max_awarded
+ SQL
+
+ User.exec_sql(sql, {
+ like: PostActionType.types[:like],
+ max_awarded: MAX_AWARDED
+ }).each do |row|
+ scores[row['id'].to_i] = row['score'].to_f
+ end
+ scores
+ end
+
+ end
+end
diff --git a/app/jobs/scheduled/periodical_updates.rb b/app/jobs/scheduled/periodical_updates.rb
index 70c634e738..fbf6f80f06 100644
--- a/app/jobs/scheduled/periodical_updates.rb
+++ b/app/jobs/scheduled/periodical_updates.rb
@@ -24,8 +24,8 @@ module Jobs
args[:max_topic_length] = 500 unless self.class.should_update_long_topics?
ScoreCalculator.new.calculate(args)
- # Automatically close stuff that we missed
- Topic.auto_close
+ # Re-run stuff that we missed
+ TopicStatusUpdate.ensure_consistency!
# Forces rebake of old posts where needed, as long as no system avatars need updating
unless UserAvatar.where("last_gravatar_download_attempt IS NULL").limit(1).first
diff --git a/app/mailers/admin_confirmation_mailer.rb b/app/mailers/admin_confirmation_mailer.rb
new file mode 100644
index 0000000000..ea4d444ad8
--- /dev/null
+++ b/app/mailers/admin_confirmation_mailer.rb
@@ -0,0 +1,15 @@
+require_dependency 'email/message_builder'
+
+class AdminConfirmationMailer < ActionMailer::Base
+ include Email::BuildEmailHelper
+
+ def send_email(to_address, target_username, token)
+ build_email(
+ to_address,
+ template: 'admin_confirmation_mailer',
+ target_username: target_username,
+ admin_confirm_url: confirm_admin_url(token: token, host: Discourse.base_url_no_prefix)
+ )
+ end
+end
+
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index 56593fe8aa..acf82ae2dc 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -4,6 +4,7 @@ require_dependency 'age_words'
class UserNotifications < ActionMailer::Base
include UserNotificationsHelper
+ include ApplicationHelper
helper :application
default charset: 'UTF-8'
@@ -117,7 +118,7 @@ class UserNotifications < ActionMailer::Base
.for_mailing_list(user, min_date)
.where('posts.post_type = ?', Post.types[:regular])
.where('posts.deleted_at IS NULL AND posts.hidden = false AND posts.user_deleted = false')
- .where("posts.post_number > ? AND posts.score > ?", 1, ScoreCalculator.default_score_weights[:like_score] * 5.0)
+ .where("posts.post_number > ? AND posts.score > ?", 1, ScoreCalculator.default_score_weights[:like_score] * 1.0)
.limit(SiteSetting.digest_posts)
else
[]
@@ -399,7 +400,7 @@ class UserNotifications < ActionMailer::Base
invite_template = "user_notifications.invited_to_topic_body"
end
topic_excerpt = post.excerpt.tr("\n", " ") if post.is_first_post? && post.excerpt
- message = I18n.t(invite_template, username: username, topic_title: title, topic_excerpt: topic_excerpt, site_title: SiteSetting.title, site_description: SiteSetting.site_description)
+ message = I18n.t(invite_template, username: username, topic_title: gsub_emoji_to_unicode(title), topic_excerpt: topic_excerpt, site_title: SiteSetting.title, site_description: SiteSetting.site_description)
unless translation_override_exists
html = UserNotificationRenderer.new(Rails.configuration.paths["app/views"]).render(
@@ -434,7 +435,7 @@ class UserNotifications < ActionMailer::Base
end
email_opts = {
- topic_title: title,
+ topic_title: gsub_emoji_to_unicode(title),
topic_title_url_encoded: title ? URI.encode(title) : title,
message: message,
url: post.url,
diff --git a/app/models/badge.rb b/app/models/badge.rb
index ae554c4d40..5ffde4726b 100644
--- a/app/models/badge.rb
+++ b/app/models/badge.rb
@@ -56,6 +56,8 @@ class Badge < ActiveRecord::Base
GivesBack = 32
Empathetic = 39
+ NewUserOfTheMonth = 44
+
# other consts
AutobiographerMinBioLength = 10
diff --git a/app/models/category.rb b/app/models/category.rb
index fb5c330921..2a48c6a53a 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -203,7 +203,7 @@ SQL
t = Topic.new(title: I18n.t("category.topic_prefix", category: name), user: user, pinned_at: Time.now, category_id: id)
t.skip_callbacks = true
t.ignore_category_auto_close = true
- t.set_auto_close(nil)
+ t.set_or_create_status_update(TopicStatusUpdate.types[:close], nil)
t.save!(validate: false)
update_column(:topic_id, t.id)
t.posts.create(raw: post_template, user: user)
diff --git a/app/models/draft_sequence.rb b/app/models/draft_sequence.rb
index 9a2e16cbe0..0e1c44359e 100644
--- a/app/models/draft_sequence.rb
+++ b/app/models/draft_sequence.rb
@@ -3,7 +3,7 @@ class DraftSequence < ActiveRecord::Base
user_id = user
user_id = user.id unless user.class == Fixnum
- return 0 if user_id == Discourse::SYSTEM_USER_ID
+ return 0 if user_id < 0
h = { user_id: user_id, draft_key: key }
c = DraftSequence.find_by(h)
diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index e098719b0a..54cac0c4b2 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -92,7 +92,7 @@ class Emoji
def self.load_custom
result = []
- CustomEmoji.all.each do |emoji|
+ CustomEmoji.order(:name).all.each do |emoji|
result << Emoji.new.tap do |e|
e.name = emoji.name
e.url = emoji.upload.url
diff --git a/app/models/post_action.rb b/app/models/post_action.rb
index e90767a087..92310d30cd 100644
--- a/app/models/post_action.rb
+++ b/app/models/post_action.rb
@@ -160,9 +160,12 @@ SQL
def self.clear_flags!(post, moderator)
# -1 is the automatic system cleary
- action_type_ids = moderator.id == -1 ?
- PostActionType.auto_action_flag_types.values :
+ action_type_ids =
+ if moderator.id == Discourse::SYSTEM_USER_ID
+ PostActionType.auto_action_flag_types.values
+ else
PostActionType.flag_types.values
+ end
actions = PostAction.where(post_id: post.id)
.where(post_action_type_id: action_type_ids)
@@ -305,6 +308,19 @@ SQL
PostAction.where(where_attrs).first
end
+ def self.copy(original_post, target_post)
+ cols_to_copy = (column_names - %w{id post_id}).join(', ')
+
+ exec_sql <<~SQL
+ INSERT INTO post_actions(post_id, #{cols_to_copy})
+ SELECT #{target_post.id}, #{cols_to_copy}
+ FROM post_actions
+ WHERE post_id = #{original_post.id}
+ SQL
+
+ target_post.post_actions.each { |post_action| post_action.update_counters }
+ end
+
def self.remove_act(user, post, post_action_type_id)
limit_action!(user,post,post_action_type_id)
@@ -487,7 +503,7 @@ SQL
.flags
.joins(:post)
.where("posts.topic_id = ?", topic.id)
- .where.not(user_id: Discourse::SYSTEM_USER_ID)
+ .where("post_actions.user_id > 0")
.group("post_actions.user_id")
.pluck("post_actions.user_id, COUNT(post_id)")
@@ -497,8 +513,18 @@ SQL
return if flags.sum { |f| f[1] } < SiteSetting.num_flags_to_close_topic
# the threshold has been reached, we will close the topic waiting for intervention
- message = I18n.t("temporarily_closed_due_to_flags")
- topic.update_status("closed", true, Discourse.system_user, message: message)
+ topic.update_status("closed", true, Discourse.system_user,
+ message: I18n.t(
+ "temporarily_closed_due_to_flags",
+ count: SiteSetting.num_hours_to_close_topic
+ )
+ )
+
+ topic.set_or_create_status_update(
+ TopicStatusUpdate.types[:open],
+ SiteSetting.num_hours_to_close_topic,
+ by_user: Discourse.system_user
+ )
end
def self.auto_hide_if_needed(acting_user, post, post_action_type)
diff --git a/app/models/post_analyzer.rb b/app/models/post_analyzer.rb
index 09f7cd9932..53296c8e59 100644
--- a/app/models/post_analyzer.rb
+++ b/app/models/post_analyzer.rb
@@ -124,7 +124,8 @@ class PostAnalyzer
def link_is_a_mention?(l)
html_class = l['class']
return false if html_class.blank?
- html_class.to_s['mention'] && l['href'].to_s[/^\/users\//]
+ href = l['href'].to_s
+ html_class.to_s['mention'] && href[/^\/u\//] || href[/^\/users\//]
end
end
diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb
index 78a19ba179..793bfcc59a 100644
--- a/app/models/post_mover.rb
+++ b/app/models/post_mover.rb
@@ -85,14 +85,16 @@ class PostMover
end
def create_first_post(post)
- p = PostCreator.create(
+ new_post = PostCreator.create(
post.user,
raw: post.raw,
topic_id: destination_topic.id,
acting_user: user,
skip_validations: true
)
- p.update_column(:reply_count, @reply_count[1] || 0)
+
+ PostAction.copy(post, new_post)
+ new_post.update_column(:reply_count, @reply_count[1] || 0)
end
def move(post)
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 437ddaf534..4f1367fa07 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -110,15 +110,14 @@ class Topic < ActiveRecord::Base
belongs_to :featured_user2, class_name: 'User', foreign_key: :featured_user2_id
belongs_to :featured_user3, class_name: 'User', foreign_key: :featured_user3_id
belongs_to :featured_user4, class_name: 'User', foreign_key: :featured_user4_id
- belongs_to :auto_close_user, class_name: 'User', foreign_key: :auto_close_user_id
has_many :topic_users
has_many :topic_links
has_many :topic_invites
has_many :invites, through: :topic_invites, source: :invite
+ has_many :topic_status_updates, dependent: :destroy
has_one :warning
-
has_one :first_post, -> {where post_number: 1}, class_name: Post
# When we want to temporarily attach some data to a forum topic (usually before serialization)
@@ -175,7 +174,6 @@ class Topic < ActiveRecord::Base
before_save do
unless skip_callbacks
- cancel_auto_close_job
ensure_topic_has_a_category
end
if title_changed?
@@ -184,10 +182,6 @@ class Topic < ActiveRecord::Base
end
after_save do
- unless skip_callbacks
- schedule_auto_close_job
- end
-
banner = "banner".freeze
if archetype_was == banner || archetype == banner
@@ -210,9 +204,16 @@ class Topic < ActiveRecord::Base
end
def inherit_auto_close_from_category
- if !@ignore_category_auto_close && self.category && self.category.auto_close_hours && self.auto_close_at.nil?
- self.auto_close_based_on_last_post = self.category.auto_close_based_on_last_post
- set_auto_close(self.category.auto_close_hours)
+ if !@ignore_category_auto_close &&
+ self.category &&
+ self.category.auto_close_hours &&
+ !topic_status_update&.execute_at
+
+ self.set_or_create_status_update(
+ TopicStatusUpdate.types[:close],
+ self.category.auto_close_hours,
+ based_on_last_post: self.category.auto_close_based_on_last_post
+ )
end
end
@@ -224,20 +225,6 @@ class Topic < ActiveRecord::Base
end
end
- def cancel_auto_close_job
- if (auto_close_at_changed? && !auto_close_at_was.nil?) || (auto_close_user_id_changed? && auto_close_at)
- self.auto_close_started_at ||= Time.zone.now if auto_close_at
- Jobs.cancel_scheduled_job(:close_topic, topic_id: id)
- end
- end
-
- def schedule_auto_close_job
- if auto_close_at && (auto_close_at_changed? || auto_close_user_id_changed?)
- options = { topic_id: id, user_id: auto_close_user_id || user_id }
- Jobs.enqueue_at(auto_close_at, :close_topic, options)
- end
- end
-
def ensure_topic_has_a_category
if category_id.nil? && (archetype.nil? || archetype == Archetype.default)
self.category_id = SiteSetting.uncategorized_category_id
@@ -470,7 +457,7 @@ class Topic < ActiveRecord::Base
end
def update_status(status, enabled, user, opts={})
- TopicStatusUpdate.new(self, user).update!(status, enabled, opts)
+ TopicStatusUpdater.new(self, user).update!(status, enabled, opts)
DiscourseEvent.trigger(:topic_status_updated, self.id, status, enabled)
end
@@ -951,91 +938,87 @@ SQL
Topic.where("pinned_until < now()").update_all(pinned_at: nil, pinned_globally: false, pinned_until: nil)
end
- def self.auto_close
- Topic.where("NOT closed AND auto_close_at < ? AND auto_close_user_id IS NOT NULL", 1.minute.ago).each do |t|
- t.auto_close
- end
+ def topic_status_update
+ @topic_status_update ||= topic_status_updates.where('deleted_at IS NULL').first
end
- def auto_close(closer = nil)
- if auto_close_at && !closed? && !deleted_at && auto_close_at < 5.minutes.from_now
- closer ||= auto_close_user
- if Guardian.new(closer).can_moderate?(self)
- update_status('autoclosed', true, closer)
- end
- end
- end
-
- # Valid arguments for the auto close time:
- # * An integer, which is the number of hours from now to close the topic.
- # * A time, like "12:00", which is the time at which the topic will close in the current day
+ # Valid arguments for the time:
+ # * An integer, which is the number of hours from now to update the topic's status.
+ # * A time, like "12:00", which is the time at which the topic's status will update in the current day
# or the next day if that time has already passed today.
- # * A timestamp, like "2013-11-25 13:00", when the topic should close.
+ # * A timestamp, like "2013-11-25 13:00", when the topic's status should update.
# * A timestamp with timezone in JSON format. (e.g., "2013-11-26T21:00:00.000Z")
- # * nil, to prevent the topic from automatically closing.
+ # * `nil` to delete the topic's status update.
# Options:
- # * by_user: User who is setting the auto close time
- # * timezone_offset: (Integer) offset from UTC in minutes of the given argument. Default 0.
- def set_auto_close(arg, opts={})
- self.auto_close_hours = nil
- by_user = opts[:by_user]
- offset_minutes = opts[:timezone_offset]
+ # * by_user: User who is setting the topic's status update.
+ # * timezone_offset: (Integer) offset from UTC in minutes of the given argument.
+ # * based_on_last_post: True if time should be based on timestamp of the last post.
+ # * category_id: Category that the update will apply to.
+ def set_or_create_status_update(status_type, time, by_user: nil, timezone_offset: 0, based_on_last_post: false, category_id: SiteSetting.uncategorized_category_id)
+ topic_status_update = TopicStatusUpdate.find_or_initialize_by(
+ status_type: status_type,
+ topic: self
+ )
+
+ if time.blank?
+ topic_status_update.trash!(trashed_by: by_user || Discourse.system_user)
+ return
+ end
+
+ time_now = Time.zone.now
+ topic_status_update.based_on_last_post = !based_on_last_post.blank?
+
+ if status_type == TopicStatusUpdate.types[:publish_to_category]
+ topic_status_update.category = Category.find_by(id: category_id)
+ end
+
+ if topic_status_update.based_on_last_post
+ num_hours = time.to_f
- if self.auto_close_based_on_last_post
- num_hours = arg.to_f
if num_hours > 0
- last_post_created_at = self.ordered_posts.last.try(:created_at) || Time.zone.now
- self.auto_close_at = last_post_created_at + num_hours.hours
- self.auto_close_hours = num_hours
- else
- self.auto_close_at = nil
+ last_post_created_at = self.ordered_posts.last.present? ? self.ordered_posts.last.created_at : time_now
+ topic_status_update.execute_at = last_post_created_at + num_hours.hours
+ topic_status_update.created_at = last_post_created_at
end
else
utc = Time.find_zone("UTC")
- if arg.is_a?(String) && m = /^(\d{1,2}):(\d{2})(?:\s*[AP]M)?$/i.match(arg.strip)
+ is_timestamp = time.is_a?(String)
+ now = utc.now
+
+ if is_timestamp && m = /^(\d{1,2}):(\d{2})(?:\s*[AP]M)?$/i.match(time.strip)
# a time of day in client's time zone, like "15:00"
- now = utc.now
- self.auto_close_at = utc.local(now.year, now.month, now.day, m[1].to_i, m[2].to_i)
- self.auto_close_at += offset_minutes * 60 if offset_minutes
- self.auto_close_at += 1.day if self.auto_close_at < now
- self.auto_close_hours = -1
- elsif arg.is_a?(String) && arg.include?("-") && timestamp = utc.parse(arg)
+ topic_status_update.execute_at = utc.local(now.year, now.month, now.day, m[1].to_i, m[2].to_i)
+ topic_status_update.execute_at += timezone_offset * 60 if timezone_offset
+ topic_status_update.execute_at += 1.day if topic_status_update.execute_at < now
+ elsif is_timestamp && time.include?("-") && timestamp = utc.parse(time)
# a timestamp in client's time zone, like "2015-5-27 12:00"
- self.auto_close_at = timestamp
- self.auto_close_at += offset_minutes * 60 if offset_minutes
- self.auto_close_hours = -1
- self.errors.add(:auto_close_at, :invalid) if timestamp < Time.zone.now
+ topic_status_update.execute_at = timestamp
+ topic_status_update.execute_at += timezone_offset * 60 if timezone_offset
+ topic_status_update.errors.add(:execute_at, :invalid) if timestamp < now
else
- num_hours = arg.to_f
+ num_hours = time.to_f
+
if num_hours > 0
- self.auto_close_at = num_hours.hours.from_now
- self.auto_close_hours = num_hours
- else
- self.auto_close_at = nil
+ topic_status_update.execute_at = num_hours.hours.from_now
end
end
end
- if self.auto_close_at.nil?
- self.auto_close_started_at = nil
- else
- if self.auto_close_based_on_last_post
- self.auto_close_started_at = Time.zone.now
+ if topic_status_update.execute_at
+ if by_user&.staff? || by_user&.trust_level == TrustLevel[4]
+ topic_status_update.user = by_user
else
- self.auto_close_started_at ||= Time.zone.now
- end
- if by_user.try(:staff?) || by_user.try(:trust_level) == TrustLevel[4]
- self.auto_close_user = by_user
- else
- self.auto_close_user ||= (self.user.staff? || self.user.trust_level == TrustLevel[4] ? self.user : Discourse.system_user)
+ topic_status_update.user ||= (self.user.staff? || self.user.trust_level == TrustLevel[4] ? self.user : Discourse.system_user)
end
- if self.auto_close_at.try(:<, Time.zone.now)
- auto_close(auto_close_user)
+ if self.persisted?
+ topic_status_update.save!
+ else
+ self.topic_status_updates << topic_status_update
end
+
+ topic_status_update
end
-
- self
end
def read_restricted_category?
diff --git a/app/models/topic_converter.rb b/app/models/topic_converter.rb
index 4e40c28342..ddbda3a690 100644
--- a/app/models/topic_converter.rb
+++ b/app/models/topic_converter.rb
@@ -61,7 +61,7 @@ class TopicConverter
@topic.notifier.watch_topic!(topic.user_id)
@topic.topic_allowed_users(true).each do |tau|
- next if tau.user_id == -1 || tau.user_id == topic.user_id
+ next if tau.user_id < 0 || tau.user_id == topic.user_id
topic.notifier.watch!(tau.user_id)
end
end
diff --git a/app/models/topic_status_update.rb b/app/models/topic_status_update.rb
index bfd438bbae..c8461bd2b7 100644
--- a/app/models/topic_status_update.rb
+++ b/app/models/topic_status_update.rb
@@ -1,116 +1,125 @@
-TopicStatusUpdate = Struct.new(:topic, :user) do
- def update!(status, enabled, opts={})
- status = Status.new(status, enabled)
+class TopicStatusUpdate < ActiveRecord::Base
+ include Trashable
- Topic.transaction do
- change(status, opts)
- highest_post_number = topic.highest_post_number
- create_moderator_post_for(status, opts[:message])
- update_read_state_for(status, highest_post_number)
+ belongs_to :user
+ belongs_to :topic
+ belongs_to :category
+
+ validates :user_id, presence: true
+ validates :topic_id, presence: true
+ validates :execute_at, presence: true
+ validates :status_type, presence: true
+ validates :status_type, uniqueness: { scope: [:topic_id, :deleted_at] }
+ validates :category_id, presence: true, if: :publishing_to_category?
+
+ validate :ensure_update_will_happen
+
+ before_save do
+ self.created_at ||= Time.zone.now if execute_at
+
+ if (execute_at_changed? && !execute_at_was.nil?) || user_id_changed?
+ self.send("cancel_auto_#{self.class.types[status_type]}_job")
+ end
+ end
+
+ after_save do
+ if (execute_at_changed? || user_id_changed?) && topic
+ now = Time.zone.now
+ time = execute_at < now ? now : execute_at
+
+ self.send("schedule_auto_#{self.class.types[status_type]}_job", time)
+ end
+ end
+
+ def self.types
+ @types ||= Enum.new(
+ close: 1,
+ open: 2,
+ publish_to_category: 3
+ )
+ end
+
+ def self.ensure_consistency!
+ TopicStatusUpdate.where("execute_at < ?", Time.zone.now).find_each do |topic_status_update|
+ topic_status_update.send(
+ "schedule_auto_#{self.types[topic_status_update.status_type]}_job",
+ topic_status_update.execute_at
+ )
+ end
+ end
+
+ def duration
+ if (self.execute_at && self.created_at)
+ ((self.execute_at - self.created_at) / 1.hour).round(2)
+ else
+ 0
end
end
private
- def change(status, opts={})
- if status.pinned? || status.pinned_globally?
- topic.update_pinned(status.enabled?, status.pinned_globally?, opts[:until])
- elsif status.autoclosed?
- topic.update_column('closed', status.enabled?)
- else
- topic.update_column(status.name, status.enabled?)
- end
-
- if topic.auto_close_at && (status.reopening_topic? || status.manually_closing_topic?)
- topic.reload.set_auto_close(nil).save
- end
-
- # remove featured topics if we close/archive/make them invisible. Previously we used
- # to run the whole featuring logic but that could be very slow and have concurrency
- # errors on large sites with many autocloses and topics being created.
- if ((status.enabled? && (status.autoclosed? || status.closed? || status.archived?)) ||
- (status.disabled? && status.visible?))
- CategoryFeaturedTopic.where(topic_id: topic.id).delete_all
- end
- end
-
- def create_moderator_post_for(status, message=nil)
- topic.add_moderator_post(user, message || message_for(status), options_for(status))
- topic.reload
- end
-
- def update_read_state_for(status, old_highest_read)
- if status.autoclosed?
- # let's pretend all the people that read up to the autoclose message
- # actually read the topic
- PostTiming.pretend_read(topic.id, old_highest_read, topic.highest_post_number)
- end
- end
-
- def message_for(status)
- if status.autoclosed?
- locale_key = status.locale_key
- locale_key << "_lastpost" if topic.auto_close_based_on_last_post
- message_for_autoclosed(locale_key)
- end
- end
-
- def message_for_autoclosed(locale_key)
- num_minutes = ((
- if topic.auto_close_based_on_last_post
- topic.auto_close_hours.hours
- elsif topic.auto_close_started_at
- Time.zone.now - topic.auto_close_started_at
- else
- Time.zone.now - topic.created_at
- end
- ) / 1.minute).round
-
- if num_minutes.minutes >= 2.days
- I18n.t("#{locale_key}_days", count: (num_minutes.minutes / 1.day).round)
- else
- num_hours = (num_minutes.minutes / 1.hour).round
- if num_hours >= 2
- I18n.t("#{locale_key}_hours", count: num_hours)
- else
- I18n.t("#{locale_key}_minutes", count: num_minutes)
+ def ensure_update_will_happen
+ if created_at && (execute_at < created_at)
+ errors.add(:execute_at, I18n.t(
+ 'activerecord.errors.models.topic_status_update.attributes.execute_at.in_the_past'
+ ))
end
end
- end
- def options_for(status)
- { bump: status.reopening_topic?,
- post_type: Post.types[:small_action],
- action_code: status.action_code }
- end
+ def cancel_auto_close_job
+ Jobs.cancel_scheduled_job(:toggle_topic_closed, topic_status_update_id: id)
+ end
+ alias_method :cancel_auto_open_job, :cancel_auto_close_job
- Status = Struct.new(:name, :enabled) do
- %w(pinned_globally pinned autoclosed closed visible archived).each do |status|
- define_method("#{status}?") { name == status }
+ def cancel_auto_publish_to_category_job
+ Jobs.cancel_scheduled_job(:publish_topic_to_category, topic_status_update_id: id)
end
- def enabled?
- enabled
+ def schedule_auto_open_job(time)
+ topic.update_status('closed', true, user) if !topic.closed
+
+ Jobs.enqueue_at(time, :toggle_topic_closed,
+ topic_status_update_id: id,
+ state: false
+ )
end
- def disabled?
- !enabled?
+ def schedule_auto_close_job(time)
+ topic.update_status('closed', false, user) if topic.closed
+
+ Jobs.enqueue_at(time, :toggle_topic_closed,
+ topic_status_update_id: id,
+ state: true
+ )
end
- def action_code
- "#{name}.#{enabled? ? 'enabled' : 'disabled'}"
+ def schedule_auto_publish_to_category_job(time)
+ Jobs.enqueue_at(time, :publish_topic_to_category, topic_status_update_id: id)
end
- def locale_key
- "topic_statuses.#{action_code.tr('.', '_')}"
+ def publishing_to_category?
+ self.status_type.to_i == TopicStatusUpdate.types[:publish_to_category]
end
-
- def reopening_topic?
- (closed? || autoclosed?) && disabled?
- end
-
- def manually_closing_topic?
- closed? && enabled?
- end
- end
end
+
+# == Schema Information
+#
+# Table name: topic_status_updates
+#
+# id :integer not null, primary key
+# execute_at :datetime not null
+# status_type :integer not null
+# user_id :integer not null
+# topic_id :integer not null
+# based_on_last_post :boolean default(FALSE), not null
+# deleted_at :datetime
+# deleted_by_id :integer
+# created_at :datetime
+# updated_at :datetime
+# category_id :integer
+#
+# Indexes
+#
+# idx_topic_id_status_type_deleted_at (topic_id,status_type) UNIQUE
+# index_topic_status_updates_on_user_id (user_id)
+#
diff --git a/app/models/user.rb b/app/models/user.rb
index 5a0679508d..8c4a0a130a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -521,6 +521,8 @@ class User < ActiveRecord::Base
# using update_column to avoid the AR transaction
update_column(:last_seen_at, now)
update_column(:first_seen_at, now) unless self.first_seen_at
+
+ DiscourseEvent.trigger(:user_seen, self)
end
def self.gravatar_template(email)
@@ -900,7 +902,7 @@ class User < ActiveRecord::Base
end
def is_singular_admin?
- User.where(admin: true).where.not(id: id).where.not(id: Discourse::SYSTEM_USER_ID).blank?
+ User.where(admin: true).where.not(id: id).human_users.blank?
end
def logged_out
@@ -925,7 +927,7 @@ class User < ActiveRecord::Base
end
def clear_global_notice_if_needed
- return if id == Discourse::SYSTEM_USER_ID
+ return if id < 0
if admin && SiteSetting.has_login_hint
SiteSetting.has_login_hint = false
diff --git a/app/models/user_action.rb b/app/models/user_action.rb
index 13e4dea91a..5e3599a381 100644
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@@ -260,7 +260,7 @@ SQL
end
if action.user
- MessageBus.publish("/users/#{action.user.username.downcase}", action.id, user_ids: [user_id], group_ids: group_ids)
+ MessageBus.publish("/u/#{action.user.username.downcase}", action.id, user_ids: [user_id], group_ids: group_ids)
end
action
diff --git a/app/serializers/permalink_serializer.rb b/app/serializers/permalink_serializer.rb
index 98f2062f79..467e07c586 100644
--- a/app/serializers/permalink_serializer.rb
+++ b/app/serializers/permalink_serializer.rb
@@ -1,31 +1,34 @@
class PermalinkSerializer < ApplicationSerializer
- attributes :id, :url, :topic_id, :topic_title, :topic_url, :post_id, :post_url, :post_number, :post_topic_title, :category_id, :category_name, :category_url, :external_url
+ attributes :id, :url, :topic_id, :topic_title, :topic_url,
+ :post_id, :post_url, :post_number, :post_topic_title,
+ :category_id, :category_name, :category_url, :external_url
def topic_title
- object.try(:topic).try(:title)
+ object&.topic&.title
end
def topic_url
- object.try(:topic).try(:url)
+ object&.topic&.url
end
def post_url
- object.try(:post).try(:url)
+ # use `full_url` to support subfolder setups
+ object&.post&.full_url
end
def post_number
- object.try(:post).try(:post_number)
+ object&.post&.post_number
end
def post_topic_title
- object.try(:post).try(:topic).try(:title)
+ object&.post&.topic&.title
end
def category_name
- object.try(:category).try(:name)
+ object&.category&.name
end
def category_url
- object.try(:category).try(:url)
+ object&.category&.url
end
end
diff --git a/app/serializers/topic_status_update_serializer.rb b/app/serializers/topic_status_update_serializer.rb
new file mode 100644
index 0000000000..c2fcd8a586
--- /dev/null
+++ b/app/serializers/topic_status_update_serializer.rb
@@ -0,0 +1,12 @@
+class TopicStatusUpdateSerializer < ApplicationSerializer
+ attributes :id,
+ :execute_at,
+ :duration,
+ :based_on_last_post,
+ :status_type,
+ :category_id
+
+ def status_type
+ TopicStatusUpdate.types[object.status_type]
+ end
+end
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index 586eb35baa..848c3e3f02 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -57,16 +57,16 @@ class TopicViewSerializer < ApplicationSerializer
:bookmarked,
:message_archived,
:tags,
- :featured_link
+ :featured_link,
+ :topic_status_update
# TODO: Split off into proper object / serializer
def details
+ topic = object.topic
+
result = {
- auto_close_at: object.topic.auto_close_at,
- auto_close_hours: object.topic.auto_close_hours,
- auto_close_based_on_last_post: object.topic.auto_close_based_on_last_post,
- created_by: BasicUserSerializer.new(object.topic.user, scope: scope, root: false),
- last_poster: BasicUserSerializer.new(object.topic.last_poster, scope: scope, root: false)
+ created_by: BasicUserSerializer.new(topic.user, scope: scope, root: false),
+ last_poster: BasicUserSerializer.new(topic.last_poster, scope: scope, root: false)
}
if object.topic.private_message?
@@ -246,6 +246,12 @@ class TopicViewSerializer < ApplicationSerializer
SiteSetting.tagging_enabled
end
+ def topic_status_update
+ TopicStatusUpdateSerializer.new(
+ object.topic.topic_status_update, root: false
+ )
+ end
+
def tags
object.topic.tags.map(&:name)
end
diff --git a/app/services/group_mentions_updater.rb b/app/services/group_mentions_updater.rb
index 0bd07a6425..92dd565098 100644
--- a/app/services/group_mentions_updater.rb
+++ b/app/services/group_mentions_updater.rb
@@ -7,7 +7,7 @@ class GroupMentionsUpdater
posts.each do |post|
post.raw.gsub!(/(^|\s)(@#{previous_name})(\s|$)/, "\\1@#{current_name}\\3")
- post.save!
+ post.save!(validate: false)
end
end
end
diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index 014f5d0cfe..6b5eb909d5 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -8,7 +8,7 @@ class PostAlerter
def not_allowed?(user, post)
user.blank? ||
- user.id == Discourse::SYSTEM_USER_ID ||
+ user.id < 0 ||
user.id == post.user_id
end
@@ -269,7 +269,7 @@ class PostAlerter
def create_notification(user, type, post, opts=nil)
return if user.blank?
- return if user.id == Discourse::SYSTEM_USER_ID
+ return if user.id < 0
return if type == Notification.types[:liked] && user.user_option.like_notification_frequency == UserOption.like_notification_frequency_type[:never]
diff --git a/app/services/post_timestamp_changer.rb b/app/services/post_timestamp_changer.rb
index 2364c12472..f2a9b3682a 100644
--- a/app/services/post_timestamp_changer.rb
+++ b/app/services/post_timestamp_changer.rb
@@ -1,6 +1,6 @@
class PostTimestampChanger
def initialize(params)
- @topic = Topic.with_deleted.find(params[:topic_id])
+ @topic = params[:topic] || Topic.with_deleted.find(params[:topic_id])
@posts = @topic.posts
@timestamp = Time.at(params[:timestamp])
@time_difference = calculate_time_difference
@@ -21,6 +21,8 @@ class PostTimestampChanger
end
update_topic(last_posted_at)
+
+ yield(@topic) if block_given?
end
# Burst the cache for stats
diff --git a/app/services/topic_status_updater.rb b/app/services/topic_status_updater.rb
new file mode 100644
index 0000000000..795751a0d7
--- /dev/null
+++ b/app/services/topic_status_updater.rb
@@ -0,0 +1,146 @@
+TopicStatusUpdater = Struct.new(:topic, :user) do
+ def update!(status, enabled, opts={})
+ status = Status.new(status, enabled)
+
+ @topic_status_update = topic.topic_status_update
+
+ updated = nil
+ Topic.transaction do
+ updated = change(status, opts)
+ if updated
+ highest_post_number = topic.highest_post_number
+ create_moderator_post_for(status, opts[:message])
+ update_read_state_for(status, highest_post_number)
+ end
+ end
+
+ updated
+ end
+
+ private
+
+ def change(status, opts={})
+ result = true
+
+ if status.pinned? || status.pinned_globally?
+ topic.update_pinned(status.enabled?, status.pinned_globally?, opts[:until])
+ elsif status.autoclosed?
+ rc = Topic.where(id: topic.id, closed: !status.enabled?).update_all(closed: status.enabled?)
+ topic.closed = status.enabled?
+ result = false if rc == 0
+ else
+ rc = Topic.where(:id => topic.id, status.name => !status.enabled)
+ .update_all(status.name => status.enabled?)
+
+ topic.send("#{status.name}=", status.enabled?)
+ result = false if rc == 0
+ end
+
+ if @topic_status_update
+ if status.manually_closing_topic? || status.closing_topic?
+ topic.set_or_create_status_update(TopicStatusUpdate.types[:close], nil)
+ elsif status.manually_opening_topic? || status.opening_topic?
+ topic.set_or_create_status_update(TopicStatusUpdate.types[:open], nil)
+ end
+ end
+
+ # remove featured topics if we close/archive/make them invisible. Previously we used
+ # to run the whole featuring logic but that could be very slow and have concurrency
+ # errors on large sites with many autocloses and topics being created.
+ if ((status.enabled? && (status.autoclosed? || status.closed? || status.archived?)) ||
+ (status.disabled? && status.visible?))
+ CategoryFeaturedTopic.where(topic_id: topic.id).delete_all
+ end
+
+ result
+ end
+
+ def create_moderator_post_for(status, message=nil)
+ topic.add_moderator_post(user, message || message_for(status), options_for(status))
+ topic.reload
+ end
+
+ def update_read_state_for(status, old_highest_read)
+ if status.autoclosed? && status.enabled?
+ # let's pretend all the people that read up to the autoclose message
+ # actually read the topic
+ PostTiming.pretend_read(topic.id, old_highest_read, topic.highest_post_number)
+ end
+ end
+
+ def message_for(status)
+ if status.autoclosed?
+ locale_key = status.locale_key
+ locale_key << "_lastpost" if @topic_status_update&.based_on_last_post
+ message_for_autoclosed(locale_key)
+ end
+ end
+
+ def message_for_autoclosed(locale_key)
+ num_minutes =
+ if @topic_status_update&.based_on_last_post
+ @topic_status_update.duration.hours
+ elsif @topic_status_update&.created_at
+ Time.zone.now - @topic_status_update.created_at
+ else
+ Time.zone.now - topic.created_at
+ end
+
+ num_minutes = (num_minutes / 1.minute).round
+
+ if num_minutes.minutes >= 2.days
+ I18n.t("#{locale_key}_days", count: (num_minutes.minutes / 1.day).round)
+ else
+ num_hours = (num_minutes.minutes / 1.hour).round
+ if num_hours >= 2
+ I18n.t("#{locale_key}_hours", count: num_hours)
+ else
+ I18n.t("#{locale_key}_minutes", count: num_minutes)
+ end
+ end
+ end
+
+ def options_for(status)
+ { bump: status.opening_topic?,
+ post_type: Post.types[:small_action],
+ action_code: status.action_code }
+ end
+
+ Status = Struct.new(:name, :enabled) do
+ %w(pinned_globally pinned autoclosed closed visible archived).each do |status|
+ define_method("#{status}?") { name == status }
+ end
+
+ def enabled?
+ enabled
+ end
+
+ def disabled?
+ !enabled?
+ end
+
+ def action_code
+ "#{name}.#{enabled? ? 'enabled' : 'disabled'}"
+ end
+
+ def locale_key
+ "topic_statuses.#{action_code.tr('.', '_')}"
+ end
+
+ def opening_topic?
+ (closed? || autoclosed?) && disabled?
+ end
+
+ def closing_topic?
+ (closed? || autoclosed?) && enabled?
+ end
+
+ def manually_closing_topic?
+ closed? && enabled?
+ end
+
+ def manually_opening_topic?
+ closed? && disabled?
+ end
+ end
+end
diff --git a/app/views/badges/show.html.erb b/app/views/badges/show.html.erb
new file mode 100644
index 0000000000..6fc281b9dd
--- /dev/null
+++ b/app/views/badges/show.html.erb
@@ -0,0 +1,3 @@
+<% content_for :head do %>
+ <%= raw crawlable_meta_data(title: I18n.t('badges.badge_title_metadata', display_name: @badge.display_name, site_title: SiteSetting.title), description: @badge.long_description) %>
+<% end %>
diff --git a/app/views/email/_post.html.erb b/app/views/email/_post.html.erb
index 3f0d21580f..569a12e058 100644
--- a/app/views/email/_post.html.erb
+++ b/app/views/email/_post.html.erb
@@ -9,10 +9,10 @@
- 
+
- <%= post.user.username %>
+ <%= post.user.username %>
<%- if post.user.title.present? %>
<%= post.user.title %>
<%- end %>
diff --git a/app/views/list/list.rss.erb b/app/views/list/list.rss.erb
index d0f6c14957..69799bc593 100644
--- a/app/views/list/list.rss.erb
+++ b/app/views/list/list.rss.erb
@@ -20,7 +20,7 @@
<%= topic.category.name %>
- <%= t('author_wrote', author: link_to("@#{username}", "#{Discourse.base_url}/users/#{topic.user.username_lower}")).html_safe %>
+ <%= t('author_wrote', author: link_to("@#{username}", "#{Discourse.base_url}/u/#{topic.user.username_lower}")).html_safe %>
<% end %>
<%= topic.posts.first.cooked.html_safe %>
diff --git a/app/views/robots_txt/index.erb b/app/views/robots_txt/index.erb
index 8ae193da42..e4c6a446bc 100644
--- a/app/views/robots_txt/index.erb
+++ b/app/views/robots_txt/index.erb
@@ -10,6 +10,7 @@ Disallow: /auth/github/callback
Disallow: /auth/cas/callback
Disallow: /assets/browser-update*.js
Disallow: /users/
+Disallow: /u/
Disallow: /badges/
Disallow: /search
Disallow: /search/
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index 73ef1724b6..e24626f203 100644
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -46,7 +46,7 @@
<% if (u = post.user) %>
- <%= u.username %>
+ <%= u.username %>
<%= "(#{u.name})" if (SiteSetting.display_name_on_posts && SiteSetting.enable_names? && !u.name.blank?) %>
<%= t('author_wrote', author: link_to("@#{username}", "#{Discourse.base_url}/users/#{topic.user.username_lower}")).html_safe %>
+<%= t('author_wrote', author: link_to("@#{username}", "#{Discourse.base_url}/u/#{topic.user.username_lower}")).html_safe %>
<% end %><%= topic.posts.first.cooked.html_safe %> diff --git a/app/views/robots_txt/index.erb b/app/views/robots_txt/index.erb index 8ae193da42..e4c6a446bc 100644 --- a/app/views/robots_txt/index.erb +++ b/app/views/robots_txt/index.erb @@ -10,6 +10,7 @@ Disallow: /auth/github/callback Disallow: /auth/cas/callback Disallow: /assets/browser-update*.js Disallow: /users/ +Disallow: /u/ Disallow: /badges/ Disallow: /search Disallow: /search/ diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb index 73ef1724b6..e24626f203 100644 --- a/app/views/topics/show.html.erb +++ b/app/views/topics/show.html.erb @@ -46,7 +46,7 @@ <% if (u = post.user) %>- <%= u.username %> + <%= u.username %> <%= "(#{u.name})" if (SiteSetting.display_name_on_posts && SiteSetting.enable_names? && !u.name.blank?) %>