From 70b1e98609599446a91bdfaf59ed63ca381abe35 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Mon, 4 May 2020 18:23:45 +0200 Subject: [PATCH 001/442] FIX: reverts to use an observer to support loading more notifications (#9628) Apparently, didReceiveAttrs is not called when loading more notifications, this would require a more heavy refactoring. --- .../discourse/app/components/user-notifications-large.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/app/components/user-notifications-large.js b/app/assets/javascripts/discourse/app/components/user-notifications-large.js index 193a5b8b12..5f50878099 100644 --- a/app/assets/javascripts/discourse/app/components/user-notifications-large.js +++ b/app/assets/javascripts/discourse/app/components/user-notifications-large.js @@ -1,4 +1,5 @@ import MountWidget from "discourse/components/mount-widget"; +import { observes } from "discourse-common/utils/decorators"; export default MountWidget.extend({ widget: "user-notifications-large", @@ -6,9 +7,14 @@ export default MountWidget.extend({ filter: null, args: null, - didReceiveAttrs() { + init() { this._super(...arguments); + this.args = { notifications: this.notifications, filter: this.filter }; + }, + + @observes("notifications.length", "notifications.@each.read", "filter") + _triggerRefresh() { this.set("args", { notifications: this.notifications, filter: this.filter From a2c85f08451056e11d6ae286b4e8214a1a66d8c4 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Mon, 4 May 2020 18:35:04 +0200 Subject: [PATCH 002/442] DEV: use the existing parsePostData function (#9629) --- test/javascripts/acceptance/bookmarks-test.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/test/javascripts/acceptance/bookmarks-test.js b/test/javascripts/acceptance/bookmarks-test.js index 6361d43261..7bde21a515 100644 --- a/test/javascripts/acceptance/bookmarks-test.js +++ b/test/javascripts/acceptance/bookmarks-test.js @@ -1,15 +1,12 @@ import { acceptance, loggedInUser } from "helpers/qunit-helpers"; import pretender from "helpers/create-pretender"; +import { parsePostData } from "helpers/create-pretender"; acceptance("Bookmarking", { loggedIn: true }); function handleRequest(assert, request) { - const body = request.requestBody; - const reminderType = body - .substr(0, body.indexOf("&")) - .replace("reminder_type=", ""); - - assert.step(reminderType || "none"); + const data = parsePostData(request.requestBody); + assert.step(data.reminder_type || "none"); return [ 200, From 5706cab89781fc627924604bfdc628f44585f8a7 Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Mon, 4 May 2020 14:07:03 -0400 Subject: [PATCH 003/442] FIX: Improve digest email styling on Outlook 2016 (#9626) --- app/views/user_notifications/digest.html.erb | 36 +++++++++++--------- lib/email/styles.rb | 1 + 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb index 7ce440ff46..3ff453bb1a 100644 --- a/app/views/user_notifications/digest.html.erb +++ b/app/views/user_notifications/digest.html.erb @@ -34,7 +34,7 @@
- +
@@ -50,7 +50,7 @@
 
-
<%=t 'user_notifications.digest.since_last_visit' %>
+
<%=t 'user_notifications.digest.since_last_visit' %>
@@ -73,7 +73,7 @@
-
<%=t 'user_notifications.digest.popular_topics' %>
+
<%=t 'user_notifications.digest.popular_topics' %>
@@ -124,7 +124,7 @@ - <%- if show_image_with_url(t.image_url) && t.featured_link.nil? && !(@excerpts[t.first_post&.id]||"").include?(t.image_url) -%> - <%- end -%> @@ -145,10 +145,10 @@
+ <%= t.user.username -%> @@ -136,7 +136,7 @@ <% end %> + topic image
<%- if t.first_post.present? && !t.first_post.user_deleted %> - +
- @@ -161,29 +161,31 @@
+ <%= @excerpts[t.first_post.id] %>
likes -

<%= t.like_count -%>

+  <%= t.like_count -%> 		replies -

<%= t.posts_count - 1 -%>

+  <%= t.posts_count - 1 -%> 		<% t.posters_summary.each do |ps| %> <% if ps.user %> - <%= ps.user.username -%> + <%= ps.user.username -%> <% end %> <% end %> - - <%=t 'user_notifications.digest.join_the_discussion' %> - + + + <%=t 'user_notifications.digest.join_the_discussion' %> + +
- +
 
@@ -203,7 +205,7 @@
- +
@@ -276,7 +278,7 @@
 
- +
 
@@ -295,7 +297,7 @@ <%= digest_custom_html("above_popular_topics") %> <% if @other_new_for_you.present? %> -
<%=t 'user_notifications.digest.more_new' %>
+
<%=t 'user_notifications.digest.more_new' %>
diff --git a/lib/email/styles.rb b/lib/email/styles.rb index 34845f9df6..955398aad8 100644 --- a/lib/email/styles.rb +++ b/lib/email/styles.rb @@ -217,6 +217,7 @@ module Email style('.whisper div.body', 'font-style: italic; color: #9c9c9c;') style('.lightbox-wrapper .meta', 'display: none') style('div.undecorated-link-footer a', "font-weight: normal;") + style('.mso-accent-link', "mso-border-alt: 6px solid #{SiteSetting.email_accent_bg_color}; background-color: #{SiteSetting.email_accent_bg_color};") onebox_styles plugin_styles From a610a762d1594cebf6e8e44d481477272cc41c4b Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Mon, 4 May 2020 15:58:35 -0400 Subject: [PATCH 004/442] DEV: Deprecated icon name fix --- .../discourse/app/components/bookmark-actions-dropdown.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js b/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js index 84737c4973..65707fa08d 100644 --- a/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js +++ b/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js @@ -23,7 +23,7 @@ export default DropdownSelectBoxComponent.extend({ }, { id: "edit", - icon: "pencil", + icon: "pencil-alt", name: I18n.t("post.bookmarks.actions.edit_bookmark.name"), description: I18n.t("post.bookmarks.actions.edit_bookmark.description") } From 0ee796f66dcb3acfb55df5f3e1c820ddbfe2bcd8 Mon Sep 17 00:00:00 2001 From: Kris Date: Mon, 4 May 2020 19:40:51 -0400 Subject: [PATCH 005/442] revert 4afbcb9 --- app/assets/stylesheets/common/base/header.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss index 6142120652..5460036ba0 100644 --- a/app/assets/stylesheets/common/base/header.scss +++ b/app/assets/stylesheets/common/base/header.scss @@ -255,7 +255,8 @@ } } .header-title { - margin: 0 0 0.1em 0; + // bottom margin here is very fragile, causes tag misalignment + margin: 0 0 0.15em 0; .archetype-private_message & { // PMs might have participant avatars in the header margin: 0; From d59d1704527de226a9927b11b32e97b8832a686b Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Mon, 4 May 2020 21:34:25 -0300 Subject: [PATCH 006/442] FIX: PostgreSQL fallback was broken due to Rails masking exception (#9633) The PR https://github.com/rails/rails/pull/36612 changes the raised exception if the error message includes the target database name. Since the error message contains the hostname, this could be triggered when the hostname contains the database name. --- .../connection_adapters/postgresql_fallback_adapter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb index b8bfb62909..7cc4dce92b 100644 --- a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb +++ b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb @@ -154,7 +154,7 @@ module ActiveRecord begin connection = postgresql_connection(config) fallback_handler.initialized ||= true - rescue PG::ConnectionBad => e + rescue ::ActiveRecord::NoDatabaseError, PG::ConnectionBad => e fallback_handler.master_down fallback_handler.verify_master From b8b1cbbfb920fcd065bff5cddbb8b69f766b9264 Mon Sep 17 00:00:00 2001 From: tshenry Date: Mon, 4 May 2020 18:05:25 -0700 Subject: [PATCH 007/442] UX: Improve second factor UI (#9526) This will make a few minor improvements to the second factor user interface. Highlights include: - Using the site's title to prefix the backup code filename. If non-ascii characters are detected, then prefix "discourse" instead. - Add icons and change the text on some of the buttons for better clarity and consistency - Add an education link to the security key modal --- .../discourse/app/components/backup-codes.js | 9 + .../controllers/second-factor-backup-edit.js | 8 - .../discourse/app/lib/utilities.js | 22 +++ .../app/templates/components/backup-codes.hbs | 8 +- .../modal/second-factor-backup-edit.hbs | 21 ++- .../modal/second-factor-edit-security-key.hbs | 6 +- .../templates/modal/second-factor-edit.hbs | 6 +- .../templates/preferences-second-factor.hbs | 10 +- app/assets/stylesheets/common/base/user.scss | 9 +- config/locales/client.en.yml | 17 +- .../components/composer-presence-display.hbs | 12 +- plugins/lazy-yt/assets/javascripts/lazyYT.js | 175 ++++++++++-------- test/javascripts/lib/utilities-test.js | 45 +++++ 13 files changed, 239 insertions(+), 109 deletions(-) diff --git a/app/assets/javascripts/discourse/app/components/backup-codes.js b/app/assets/javascripts/discourse/app/components/backup-codes.js index 1109c4cde6..279a659a52 100644 --- a/app/assets/javascripts/discourse/app/components/backup-codes.js +++ b/app/assets/javascripts/discourse/app/components/backup-codes.js @@ -1,5 +1,6 @@ import discourseComputed from "discourse-common/utils/decorators"; import Component from "@ember/component"; +import { toAsciiPrintable, slugify } from "discourse/lib/utilities"; // https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding function b64EncodeUnicode(str) { @@ -42,6 +43,14 @@ export default Component.extend({ return backupCodes.join("\n").trim(); }, + @discourseComputed() + siteTitleSlug() { + const title = this.siteSettings.title; + const convertedTitle = toAsciiPrintable(title, "discourse"); + + return slugify(convertedTitle); + }, + actions: { copyToClipboard() { this._selectAllBackupCodes(); diff --git a/app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js b/app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js index aa3e0c1143..3ef9658cc4 100644 --- a/app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js +++ b/app/assets/javascripts/discourse/app/controllers/second-factor-backup-edit.js @@ -1,7 +1,6 @@ import { alias } from "@ember/object/computed"; import { later } from "@ember/runloop"; import Controller from "@ember/controller"; -import discourseComputed from "discourse-common/utils/decorators"; import { SECOND_FACTOR_METHODS } from "discourse/models/user"; import ModalFunctionality from "discourse/mixins/modal-functionality"; @@ -14,13 +13,6 @@ export default Controller.extend(ModalFunctionality, { backupCodes: null, secondFactorMethod: SECOND_FACTOR_METHODS.TOTP, - @discourseComputed("backupEnabled") - generateBackupCodeBtnLabel(backupEnabled) { - return backupEnabled - ? "user.second_factor_backup.regenerate" - : "user.second_factor_backup.enable"; - }, - onShow() { this.setProperties({ loading: false, diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js index b848ca7f86..f104c30002 100644 --- a/app/assets/javascripts/discourse/app/lib/utilities.js +++ b/app/assets/javascripts/discourse/app/lib/utilities.js @@ -328,6 +328,28 @@ export function clipboardData(e, canUpload) { return { clipboard, types, canUpload, canPasteHtml }; } +// Replace any accented characters with their ASCII equivalent +// Return the string if it only contains ASCII printable characters, +// otherwise use the fallback +export function toAsciiPrintable(string, fallback) { + if (typeof string.normalize === "function") { + string = string.normalize("NFD").replace(/[\u0300-\u036f]/g, ""); + } + + return /^[/\040-\176/]*$/.test(string) ? string : fallback; +} + +export function slugify(string) { + return string + .trim() + .toLowerCase() + .replace(/\s|_+/g, "-") // Replace spaces and underscores with dashes + .replace(/[^\w\-]+/g, "") // Remove non-word characters except for dashes + .replace(/\-\-+/g, "-") // Replace multiple dashes with a single dash + .replace(/^-+/, "") // Remove leading dashes + .replace(/-+$/, ""); // Remove trailing dashes +} + export function toNumber(input) { return typeof input === "number" ? input : parseFloat(input); } diff --git a/app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs b/app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs index 73b7ad43aa..95ae666471 100644 --- a/app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs @@ -4,10 +4,14 @@ {{d-button action=(action "copyToClipboard") class="backup-codes-copy-btn" - icon="copy"}} + icon="copy" + aria-label="user.second_factor_backup.copy_to_clipboard" + title="user.second_factor_backup.copy_to_clipboard"}} - diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs index 8a9e433672..1d3e96142b 100644 --- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs +++ b/app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs @@ -18,18 +18,27 @@ {{/if}}
- {{d-button - class="btn-primary" - action=(action "generateSecondFactorCodes") - type="submit" - disabled=loading - label=generateBackupCodeBtnLabel}} {{#if backupEnabled}} + {{d-button + class="btn-primary" + icon="redo" + action=(action "generateSecondFactorCodes") + type="submit" + isLoading=loading + label="user.second_factor_backup.regenerate"}} {{d-button class="btn-danger" + icon="ban" action=(action "disableSecondFactorBackup") disabled=loading label="user.second_factor_backup.disable"}} + {{else}} + {{d-button + class="btn-primary" + action=(action "generateSecondFactorCodes") + type="submit" + disabled=loading + label="user.second_factor_backup.enable"}} {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs index bd0d5a2636..d0d1207d75 100644 --- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs +++ b/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs @@ -8,11 +8,13 @@ {{d-button action=(action "editSecurityKey") class="btn-primary" - label="user.second_factor.security_key.edit" + label="user.second_factor.security_key.save" }} {{d-button action=(action "disableSecurityKey") class="btn-danger" - label="user.second_factor.security_key.delete" + icon="trash-alt" + aria-label="user.second_factor.disable" + title="user.second_factor.disable" }} {{/d-modal-body}} diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs index 2a77fceab6..a7a4f60a29 100644 --- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs +++ b/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs @@ -8,11 +8,13 @@ {{d-button action=(action "editSecondFactor") class="btn-primary" - label="user.second_factor.edit" + label="user.second_factor.save" }} {{d-button action=(action "disableSecondFactor") class="btn-danger" - label="user.second_factor.disable" + icon="trash-alt" + aria-label="user.second_factor.disable" + title="user.second_factor.disable" }} {{/d-modal-body}} diff --git a/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs index d8b8d95ac0..62cadd2595 100644 --- a/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs +++ b/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs @@ -31,6 +31,7 @@

{{i18n "user.second_factor.totp.title"}}

{{d-button action=(action "createTotp") class="btn-primary new-totp" + icon="plus" disabled=loading label="user.second_factor.totp.add"}} {{#each totps as |totp|}} @@ -46,6 +47,8 @@ class="btn-default btn-small btn-icon pad-left no-text edit" disabled=loading icon="pencil-alt" + aria-label="user.second_factor.edit" + title="user.second_factor.edit" }} {{/if}} @@ -58,6 +61,7 @@

{{i18n "user.second_factor.security_key.title"}}

{{d-button action=(action "createSecurityKey") class="btn-primary new-security-key" + icon="plus" disabled=loading label="user.second_factor.security_key.add"}} {{#each security_keys as |security_key|}} @@ -73,6 +77,8 @@ class="btn-default btn-small btn-icon pad-left no-text edit" disabled=loading icon="pencil-alt" + aria-label="user.second_factor.edit" + title="user.second_factor.edit" }} {{/if}} @@ -95,6 +101,8 @@ class="btn-default btn-small btn-icon pad-left no-text edit edit-2fa-backup" disabled=loading icon="pencil-alt" + aria-label="user.second_factor.edit" + title="user.second_factor.edit" }} {{/if}} {{else}} @@ -107,9 +115,9 @@ {{#unless showEnforcedNotice}}
-

{{i18n "user.second_factor.disable_title"}}

{{d-button class="btn-danger" + icon="ban" action=(action "disableAllSecondFactors") disabled=loading label="disable"}} diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss index 869635a250..587af3c353 100644 --- a/app/assets/stylesheets/common/base/user.scss +++ b/app/assets/stylesheets/common/base/user.scss @@ -590,8 +590,13 @@ margin-right: 10px; } - .form-horizontal .instructions { - margin-left: 0; + .form-horizontal { + .instructions { + margin-left: 0; + } + .actions { + margin-top: 5px; + } } .backup-codes { diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 336a4cf6c1..7dacfab23b 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1010,8 +1010,10 @@ en: enable: "Enable" enable_long: "Enable backup codes" manage: "Manage backup codes. You have {{count}} backup codes remaining." - copied_to_clipboard: "Copied to Clipboard" + copy_to_clipboard: "Copy to Clipboard" copy_to_clipboard_error: "Error copying data to Clipboard" + copied_to_clipboard: "Copied to Clipboard" + download_backup_codes: "Download backup codes" remaining_codes: "You have {{count}} backup codes remaining." use: "Use a backup code" enable_prerequisites: "You must enable a primary second factor before generating backup codes." @@ -1038,28 +1040,29 @@ en: oauth_enabled_warning: "Please note that social logins will be disabled once two factor authentication has been enabled on your account." use: "Use Authenticator app" enforced_notice: "You are required to enable two factor authentication before accessing this site." - disable: "disable" - disable_title: "Disable Second Factor" + disable: "Disable" disable_confirm: "Are you sure you want to disable all second factors?" + save: "Save" edit: "Edit" edit_title: "Edit Second Factor" edit_description: "Second Factor Name" - enable_security_key_description: "When you have your physical security key prepared press the Register button below." + enable_security_key_description: | + When you have your hardware security key prepared, press the Register button below. totp: title: "Token-Based Authenticators" - add: "New Authenticator" + add: "Add Authenticator" default_name: "My Authenticator" name_and_code_required_error: "You must provide a name and the code from your authenticator app." security_key: register: "Register" title: "Security Keys" - add: "Register Security Key" + add: "Add Security Key" default_name: "Main Security Key" not_allowed_error: "The security key registration process either timed out or was cancelled." already_added_error: "You have already registered this security key. You don’t have to register it again." edit: "Edit Security Key" + save: "Save" edit_description: "Security Key Name" - delete: "Delete" name_required_error: "You must provide a name for your security key." change_about: diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs index 453b13d07a..1f4b4ec727 100644 --- a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs +++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs @@ -8,12 +8,14 @@ {{#if isReply ~}} - {{i18n 'presence.replying'}} + {{i18n "presence.replying"}} {{~else~}} - {{i18n 'presence.editing'}} - {{~/if}}{{!-- (using comment to stop whitespace) - --}}{{!-- - --}}... + {{i18n "presence.editing"}} + {{~/if}} + {{!-- (using comment to stop whitespace) +--}}{{!-- +--}} + ...
{{/if}} diff --git a/plugins/lazy-yt/assets/javascripts/lazyYT.js b/plugins/lazy-yt/assets/javascripts/lazyYT.js index 897c15497d..651ea9df48 100644 --- a/plugins/lazy-yt/assets/javascripts/lazyYT.js +++ b/plugins/lazy-yt/assets/javascripts/lazyYT.js @@ -1,40 +1,40 @@ /*! -* lazyYT (lazy load YouTube videos) -* v1.0.1 - 2014-12-30 -* (CC) This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License. -* http://creativecommons.org/licenses/by-sa/4.0/ -* Contributors: https://github.com/tylerpearson/lazyYT/graphs/contributors || https://github.com/daugilas/lazyYT/graphs/contributors -* -* Usage:
loading...
-* -* Note: Discourse has forked this from the original, beware when updating the file. -* -*/ + * lazyYT (lazy load YouTube videos) + * v1.0.1 - 2014-12-30 + * (CC) This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License. + * http://creativecommons.org/licenses/by-sa/4.0/ + * Contributors: https://github.com/tylerpearson/lazyYT/graphs/contributors || https://github.com/daugilas/lazyYT/graphs/contributors + * + * Usage:
loading...
+ * + * Note: Discourse has forked this from the original, beware when updating the file. + * + */ -(function ($) { - 'use strict'; +(function($) { + "use strict"; function setUp($el, settings) { - var width = $el.data('width'), - height = $el.data('height'), - ratio = ($el.data('ratio')) ? $el.data('ratio') : settings.default_ratio, - id = $el.data('youtube-id'), - title = $el.data('youtube-title'), - padding_bottom, - innerHtml = [], - $thumb, - thumb_img, - youtube_parameters = $el.data('parameters') || ''; + var width = $el.data("width"), + height = $el.data("height"), + ratio = $el.data("ratio") ? $el.data("ratio") : settings.default_ratio, + id = $el.data("youtube-id"), + title = $el.data("youtube-title"), + padding_bottom, + innerHtml = [], + $thumb, + thumb_img, + youtube_parameters = $el.data("parameters") || ""; ratio = ratio.split(":"); // width and height might override default_ratio value - if (typeof width === 'number' && typeof height === 'number') { + if (typeof width === "number" && typeof height === "number") { $el.width(width); - padding_bottom = height + 'px'; - } else if (typeof width === 'number') { + padding_bottom = height + "px"; + } else if (typeof width === "number") { $el.width(width); - padding_bottom = (width * ratio[1] / ratio[0]) + 'px'; + padding_bottom = (width * ratio[1]) / ratio[0] + "px"; } else { width = $el.width(); @@ -43,7 +43,7 @@ width = $el.parent().width(); } - padding_bottom = (ratio[1] / ratio[0] * 100) + '%'; + padding_bottom = (ratio[1] / ratio[0]) * 100 + "%"; } // @@ -53,81 +53,108 @@ // Play button from YouTube (exactly as it is in YouTube) innerHtml.push('
'); - innerHtml.push(''); - innerHtml.push(''); - innerHtml.push(''); - innerHtml.push(''); - innerHtml.push('
'); // end of .ytp-large-play-button + if (width <= 640) + innerHtml.push(' style="transform: scale(0.563888888888889);"'); + innerHtml.push(">"); + innerHtml.push(""); + innerHtml.push( + '' + ); + innerHtml.push( + '' + ); + innerHtml.push(""); + innerHtml.push("
"); // end of .ytp-large-play-button - innerHtml.push(''); // end of .ytp-thumbnail + innerHtml.push(""); // end of .ytp-thumbnail // Video title (info bar) innerHtml.push('
'); innerHtml.push('
'); innerHtml.push('
'); - innerHtml.push(''); - if (title === undefined || title === null || title === '') { - innerHtml.push('youtube.com/watch?v=' + id); + innerHtml.push( + '' + ); + if (title === undefined || title === null || title === "") { + innerHtml.push("youtube.com/watch?v=" + id); } else { innerHtml.push(title); } - innerHtml.push(''); - innerHtml.push('
'); // .html5-title - innerHtml.push('
'); // .html5-title-text-wrapper - innerHtml.push('
'); // end of Video title .html5-info-bar + innerHtml.push(""); + innerHtml.push(""); // .html5-title + innerHtml.push(""); // .html5-title-text-wrapper + innerHtml.push(""); // end of Video title .html5-info-bar - $el.css({ - 'padding-bottom': padding_bottom - }) - .html(innerHtml.join('')); + $el + .css({ + "padding-bottom": padding_bottom + }) + .html(innerHtml.join("")); if (width > 640) { - thumb_img = 'maxresdefault.jpg'; + thumb_img = "maxresdefault.jpg"; } else if (width > 480) { - thumb_img = 'sddefault.jpg'; + thumb_img = "sddefault.jpg"; } else if (width > 320) { - thumb_img = 'hqdefault.jpg'; + thumb_img = "hqdefault.jpg"; } else if (width > 120) { - thumb_img = 'mqdefault.jpg'; - } else if (width === 0) { // sometimes it fails on fluid layout - thumb_img = 'hqdefault.jpg'; + thumb_img = "mqdefault.jpg"; + } else if (width === 0) { + // sometimes it fails on fluid layout + thumb_img = "hqdefault.jpg"; } else { - thumb_img = 'default.jpg'; + thumb_img = "default.jpg"; } - $thumb = $el.find('.ytp-thumbnail').css({ - 'background-image': ['url(https://img.youtube.com/vi/', id, '/', thumb_img, ')'].join('') - }) - .addClass('lazyYT-image-loaded') - .on('click', function (e) { - e.preventDefault(); + $thumb = $el + .find(".ytp-thumbnail") + .css({ + "background-image": [ + "url(https://img.youtube.com/vi/", + id, + "/", + thumb_img, + ")" + ].join("") + }) + .addClass("lazyYT-image-loaded") + .on("click", function(e) { + e.preventDefault(); - if (!$el.hasClass('lazyYT-video-loaded') && $thumb.hasClass('lazyYT-image-loaded')) { - $el.html('') - .addClass('lazyYT-video-loaded'); - } - - if (settings.onPlay) { - settings.onPlay(e, $el); - } - }); + if ( + !$el.hasClass("lazyYT-video-loaded") && + $thumb.hasClass("lazyYT-image-loaded") + ) { + $el + .html( + '' + ) + .addClass("lazyYT-video-loaded"); + } + if (settings.onPlay) { + settings.onPlay(e, $el); + } + }); } - $.fn.lazyYT = function (newSettings) { + $.fn.lazyYT = function(newSettings) { var defaultSettings = { - default_ratio: '16:9', + default_ratio: "16:9", callback: null, // ToDO execute callback if given - container_class: 'lazyYT-container' + container_class: "lazyYT-container" }; var settings = $.extend(defaultSettings, newSettings); - return this.each(function () { + return this.each(function() { var $el = $(this).addClass(settings.container_class); setUp($el, settings); }); }; - })(jQuery); diff --git a/test/javascripts/lib/utilities-test.js b/test/javascripts/lib/utilities-test.js index 46609895a2..f3d14a2657 100644 --- a/test/javascripts/lib/utilities-test.js +++ b/test/javascripts/lib/utilities-test.js @@ -9,6 +9,8 @@ import { setDefaultHomepage, caretRowCol, setCaretPosition, + toAsciiPrintable, + slugify, fillMissingDates, inCodeBlock } from "discourse/lib/utilities"; @@ -175,6 +177,49 @@ QUnit.test("caretRowCol", assert => { document.body.removeChild(textarea); }); +QUnit.test("toAsciiPrintable", assert => { + const accentedString = "Créme_Brûlée!"; + const unicodeString = "談話"; + + assert.equal( + toAsciiPrintable(accentedString, "discourse"), + "Creme_Brulee!", + "it replaces accented characters with the appropriate ASCII equivalent" + ); + + assert.equal( + toAsciiPrintable(unicodeString, "discourse"), + "discourse", + "it uses the fallback string when unable to convert" + ); + + assert.strictEqual( + typeof toAsciiPrintable(unicodeString), + "undefined", + "it returns undefined when unable to convert and no fallback is provided" + ); +}); + +QUnit.test("slugify", assert => { + const asciiString = "--- 0__( Some-cool Discourse Site! )__0 --- "; + const accentedString = "Créme_Brûlée!"; + const unicodeString = "談話"; + + assert.equal( + slugify(asciiString), + "0-some-cool-discourse-site-0", + "it properly slugifies an ASCII string" + ); + + assert.equal( + slugify(accentedString), + "crme-brle", + "it removes accented characters" + ); + + assert.equal(slugify(unicodeString), "", "it removes unicode characters"); +}); + QUnit.test("fillMissingDates", assert => { const startDate = "2017-11-12"; // YYYY-MM-DD const endDate = "2017-12-12"; // YYYY-MM-DD From 9bff0882c3df594850de68ade2697407c84dcd7b Mon Sep 17 00:00:00 2001 From: Krzysztof Kotlarek Date: Tue, 5 May 2020 13:46:57 +1000 Subject: [PATCH 008/442] FEATURE: Nokogumbo (#9577) * FEATURE: Nokogumbo Use Nokogumbo HTML parser. --- app/helpers/user_notifications_helper.rb | 4 +- app/jobs/onceoff/grant_emoji.rb | 2 +- app/jobs/onceoff/grant_onebox.rb | 2 +- app/jobs/regular/pull_hotlinked_images.rb | 2 +- app/jobs/regular/update_username.rb | 4 +- app/models/category.rb | 2 +- app/models/post.rb | 2 +- app/models/post_analyzer.rb | 2 +- app/models/quoted_post.rb | 2 +- app/models/theme_field.rb | 2 +- app/models/topic_embed.rb | 8 +- app/services/inline_uploads.rb | 6 +- app/services/search_indexer.rb | 2 +- ...3951_backfill_post_upload_reverse_index.rb | 2 +- db/migrate/20140715055242_add_quoted_posts.rb | 2 +- lib/content_security_policy/extension.rb | 3 +- lib/cooked_post_processor.rb | 4 +- lib/discourse_diff.rb | 2 +- lib/email/receiver.rb | 2 +- lib/email/styles.rb | 10 +- .../engine/whitelisted_generic_onebox.rb | 2 +- lib/oneboxer.rb | 6 +- lib/post_revisor.rb | 2 +- lib/pretty_text.rb | 26 +++-- lib/quote_comparer.rb | 2 +- lib/retrieve_title.rb | 2 +- lib/reviewable/conversation.rb | 2 +- lib/tasks/emoji.rake | 2 +- .../spec/components/pretty_text_spec.rb | 4 +- .../lib/discourse_narrative_bot/actions.rb | 2 +- .../advanced_user_narrative.rb | 6 +- .../new_user_narrative.rb | 8 +- plugins/poll/plugin.rb | 2 +- plugins/poll/spec/lib/pretty_text_spec.rb | 2 +- script/import_scripts/ipboard3.rb | 2 +- script/import_scripts/jive.rb | 2 +- script/import_scripts/jive_api.rb | 2 +- script/import_scripts/lithium.rb | 2 +- spec/components/cooked_post_processor_spec.rb | 107 ++++++++---------- spec/components/email/styles_spec.rb | 4 +- spec/components/excerpt_parser_spec.rb | 2 +- spec/components/pretty_text_spec.rb | 32 +++--- spec/lib/content_security_policy_spec.rb | 6 +- spec/models/topic_embed_spec.rb | 4 +- spec/requests/categories_controller_spec.rb | 2 +- spec/requests/email_controller_spec.rb | 6 +- spec/requests/embed_controller_spec.rb | 2 +- .../requests/user_api_keys_controller_spec.rb | 2 +- spec/services/username_changer_spec.rb | 34 +++--- spec/support/match_html_matcher.rb | 2 +- 50 files changed, 165 insertions(+), 179 deletions(-) diff --git a/app/helpers/user_notifications_helper.rb b/app/helpers/user_notifications_helper.rb index eb0293183b..ffbf7352c2 100644 --- a/app/helpers/user_notifications_helper.rb +++ b/app/helpers/user_notifications_helper.rb @@ -13,7 +13,7 @@ module UserNotificationsHelper end def correct_top_margin(html, desired) - fragment = Nokogiri::HTML.fragment(html) + fragment = Nokogiri::HTML5.fragment(html) if para = fragment.css("p:first").first para["style"] = "margin-top: #{desired};" end @@ -32,7 +32,7 @@ module UserNotificationsHelper end def first_paragraphs_from(html) - doc = Nokogiri::HTML(html) + doc = Nokogiri::HTML5(html) result = +"" length = 0 diff --git a/app/jobs/onceoff/grant_emoji.rb b/app/jobs/onceoff/grant_emoji.rb index 5f85b431b8..5abdb34d5d 100644 --- a/app/jobs/onceoff/grant_emoji.rb +++ b/app/jobs/onceoff/grant_emoji.rb @@ -14,7 +14,7 @@ module Jobs .where("cooked LIKE '%emoji%'") .find_in_batches do |group| group.each do |p| - doc = Nokogiri::HTML::fragment(p.cooked) + doc = Nokogiri::HTML5::fragment(p.cooked) if (doc.css("img.emoji") - doc.css(".quote img")).size > 0 to_award[p.user_id] ||= { post_id: p.id, created_at: p.created_at } end diff --git a/app/jobs/onceoff/grant_onebox.rb b/app/jobs/onceoff/grant_onebox.rb index 59cf443f4e..66d2cf2670 100644 --- a/app/jobs/onceoff/grant_onebox.rb +++ b/app/jobs/onceoff/grant_onebox.rb @@ -19,7 +19,7 @@ module Jobs begin # Note we can't use `p.cooked` here because oneboxes have been cooked out cooked = PrettyText.cook(p.raw) - doc = Nokogiri::HTML::fragment(cooked) + doc = Nokogiri::HTML5::fragment(cooked) if doc.search('a.onebox').size > 0 to_award[p.user_id] ||= { post_id: p.id, created_at: p.created_at } end diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb index 2570365946..e7644e8ca8 100644 --- a/app/jobs/regular/pull_hotlinked_images.rb +++ b/app/jobs/regular/pull_hotlinked_images.rb @@ -157,7 +157,7 @@ module Jobs end def extract_images_from(html) - doc = Nokogiri::HTML::fragment(html) + doc = Nokogiri::HTML5::fragment(html) doc.css("img[src], a.lightbox[href]") - doc.css("img.avatar") - diff --git a/app/jobs/regular/update_username.rb b/app/jobs/regular/update_username.rb index d43c119060..7c9fcedb5a 100644 --- a/app/jobs/regular/update_username.rb +++ b/app/jobs/regular/update_username.rb @@ -154,11 +154,11 @@ module Jobs # and there is no reason to invalidate oneboxes, run the post analyzer etc. # when only the username changes. def update_cooked(cooked) - doc = Nokogiri::HTML.fragment(cooked) + doc = Nokogiri::HTML5.fragment(cooked) doc.css("a.mention").each do |a| a.content = a.content.gsub(@cooked_mention_username_regex, "@#{@new_username}") - a["href"] = a["href"].gsub(@cooked_mention_user_path_regex, "/u/#{@new_username}") if a["href"] + a["href"] = a["href"].gsub(@cooked_mention_user_path_regex, "/u/#{URI.escape(@new_username)}") if a["href"] end doc.css("aside.quote").each do |aside| diff --git a/app/models/category.rb b/app/models/category.rb index bbf1e9b98c..ddab403c5d 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -306,7 +306,7 @@ class Category < ActiveRecord::Base @@cache_text ||= LruRedux::ThreadSafeCache.new(1000) @@cache_text.getset(self.description) do - text = Nokogiri::HTML.fragment(self.description).text.strip + text = Nokogiri::HTML5.fragment(self.description).text.strip Rack::Utils.escape_html(text).html_safe end end diff --git a/app/models/post.rb b/app/models/post.rb index 5da5d16320..f2ee10543f 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -953,7 +953,7 @@ class Post < ActiveRecord::Base /\/uploads\/short-url\/[a-zA-Z0-9]+(\.[a-z0-9]+)?/ ] - fragments ||= Nokogiri::HTML::fragment(self.cooked) + fragments ||= Nokogiri::HTML5::fragment(self.cooked) selectors = fragments.css("a/@href", "img/@src", "source/@src", "track/@src", "video/@poster") links = selectors.map do |media| diff --git a/app/models/post_analyzer.rb b/app/models/post_analyzer.rb index 63fe9724b4..bae36c39f8 100644 --- a/app/models/post_analyzer.rb +++ b/app/models/post_analyzer.rb @@ -131,7 +131,7 @@ class PostAnalyzer def cooked_stripped @cooked_stripped ||= begin - doc = Nokogiri::HTML.fragment(cook(@raw, topic_id: @topic_id)) + doc = Nokogiri::HTML5.fragment(cook(@raw, topic_id: @topic_id)) doc.css("pre .mention, aside.quote > .title, aside.quote .mention, aside.quote .mention-group, .onebox, .elided").remove doc end diff --git a/app/models/quoted_post.rb b/app/models/quoted_post.rb index 03b981e1fb..9a6a96e9eb 100644 --- a/app/models/quoted_post.rb +++ b/app/models/quoted_post.rb @@ -9,7 +9,7 @@ class QuotedPost < ActiveRecord::Base # we are double parsing this fragment, this may be worth optimising later def self.extract_from(post) - doc = Nokogiri::HTML.fragment(post.cooked) + doc = Nokogiri::HTML5.fragment(post.cooked) uniq = {} diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb index 351c7b90f1..a9f98ce407 100644 --- a/app/models/theme_field.rb +++ b/app/models/theme_field.rb @@ -78,7 +78,7 @@ class ThemeField < ActiveRecord::Base js_compiler = ThemeJavascriptCompiler.new(theme_id, self.theme.name) - doc = Nokogiri::HTML.fragment(html) + doc = Nokogiri::HTML5.fragment(html) doc.css('script[type="text/x-handlebars"]').each do |node| name = node["name"] || node["data-template-name"] || "broken" diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb index 43de234a15..a18e5b85de 100644 --- a/app/models/topic_embed.rb +++ b/app/models/topic_embed.rb @@ -126,7 +126,7 @@ class TopicEmbed < ActiveRecord::Base return end - raw_doc = Nokogiri::HTML(html) + raw_doc = Nokogiri::HTML5(html) auth_element = raw_doc.at('meta[@name="author"]') if auth_element.present? response.author = User.where(username_lower: auth_element[:content].strip).first @@ -142,7 +142,7 @@ class TopicEmbed < ActiveRecord::Base title.strip! end response.title = title - doc = Nokogiri::HTML(read_doc.content) + doc = Nokogiri::HTML5(read_doc.content) tags = { 'img' => 'src', 'script' => 'src', 'a' => 'href' } doc.search(tags.keys.join(',')).each do |node| @@ -198,7 +198,7 @@ class TopicEmbed < ActiveRecord::Base prefix = "#{uri.scheme}://#{uri.host}" prefix += ":#{uri.port}" if uri.port != 80 && uri.port != 443 - fragment = Nokogiri::HTML.fragment("
#{contents}
") + fragment = Nokogiri::HTML5.fragment("
#{contents}
") fragment.css('a').each do |a| href = a['href'] if href.present? && href.start_with?('/') @@ -220,7 +220,7 @@ class TopicEmbed < ActiveRecord::Base end def self.first_paragraph_from(html) - doc = Nokogiri::HTML(html) + doc = Nokogiri::HTML5(html) result = +"" doc.css('p').each do |p| diff --git a/app/services/inline_uploads.rb b/app/services/inline_uploads.rb index e75348bcce..0facc329fb 100644 --- a/app/services/inline_uploads.rb +++ b/app/services/inline_uploads.rb @@ -16,7 +16,7 @@ class InlineUploads end end - cooked_fragment = Nokogiri::HTML::fragment(PrettyText.cook(markdown, disable_emojis: true)) + cooked_fragment = Nokogiri::HTML5::fragment(PrettyText.cook(markdown, disable_emojis: true)) link_occurences = [] cooked_fragment.traverse do |node| @@ -183,7 +183,7 @@ class InlineUploads def self.match_anchor(markdown, external_href: false) markdown.scan(/(()([^<\a>]*?)<\/a>)/i) do |match| - node = Nokogiri::HTML::fragment(match[0]).children[0] + node = Nokogiri::HTML5::fragment(match[0]).children[0] href = node.attributes["href"]&.value if href && (matched_uploads(href).present? || external_href) @@ -199,7 +199,7 @@ class InlineUploads def self.match_img(markdown, external_src: false) markdown.scan(/(<(?!img)[^<>]+\/?>)?(\s*)(\n]+>)/i) do |match| - node = Nokogiri::HTML::fragment(match[2].strip).children[0] + node = Nokogiri::HTML5::fragment(match[2].strip).children[0] src = node.attributes["src"]&.value if src && (matched_uploads(src).present? || external_src) diff --git a/app/services/search_indexer.rb b/app/services/search_indexer.rb index 17817c4c09..ceeaaf27f2 100644 --- a/app/services/search_indexer.rb +++ b/app/services/search_indexer.rb @@ -191,7 +191,7 @@ class SearchIndexer def self.scrub(html, strip_diacritics: false) return +"" if html.blank? - document = Nokogiri::HTML("
#{html}
", nil, Encoding::UTF_8.to_s) + document = Nokogiri::HTML5("
#{html}
", nil, Encoding::UTF_8.to_s) nodes = document.css( "div.#{CookedPostProcessor::LIGHTBOX_WRAPPER_CSS_CLASS}" diff --git a/db/migrate/20131014203951_backfill_post_upload_reverse_index.rb b/db/migrate/20131014203951_backfill_post_upload_reverse_index.rb index 793da0ce64..0c5f4bb3e6 100644 --- a/db/migrate/20131014203951_backfill_post_upload_reverse_index.rb +++ b/db/migrate/20131014203951_backfill_post_upload_reverse_index.rb @@ -8,7 +8,7 @@ class BackfillPostUploadReverseIndex < ActiveRecord::Migration[4.2] # fill the reverse index up Post.select([:id, :cooked]).find_each do |post| - doc = Nokogiri::HTML::fragment(post.cooked) + doc = Nokogiri::HTML5::fragment(post.cooked) # images doc.search("img").each { |img| add_to_reverse_index(img['src'], post.id) } # thumbnails and/or attachments diff --git a/db/migrate/20140715055242_add_quoted_posts.rb b/db/migrate/20140715055242_add_quoted_posts.rb index 47550f9251..d3052b8a07 100644 --- a/db/migrate/20140715055242_add_quoted_posts.rb +++ b/db/migrate/20140715055242_add_quoted_posts.rb @@ -30,7 +30,7 @@ SQL results.each do |row| post_id, max_id = row["id"].to_i - doc = Nokogiri::HTML.fragment(row["cooked"]) + doc = Nokogiri::HTML5.fragment(row["cooked"]) uniq = {} diff --git a/lib/content_security_policy/extension.rb b/lib/content_security_policy/extension.rb index 4c8231b60a..93eab088e4 100644 --- a/lib/content_security_policy/extension.rb +++ b/lib/content_security_policy/extension.rb @@ -61,7 +61,8 @@ class ContentSecurityPolicy auto_script_src_extension = { script_src: [] } html_fields.each(&:ensure_baked!) doc = html_fields.map(&:value_baked).join("\n") - Nokogiri::HTML.fragment(doc).css('script[src]').each do |node| + + Nokogiri::HTML5.fragment(doc).css('script[src]').each do |node| src = node['src'] uri = URI(src) diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb index a2d75bfdf9..725258cc10 100644 --- a/lib/cooked_post_processor.rb +++ b/lib/cooked_post_processor.rb @@ -24,7 +24,7 @@ class CookedPostProcessor @cooking_options = @cooking_options.symbolize_keys cooked = post.cook(post.raw, @cooking_options) - @doc = Nokogiri::HTML::fragment(cooked) + @doc = Nokogiri::HTML5::fragment(cooked) @has_oneboxes = post.post_analyzer.found_oneboxes? @size_cache = {} @@ -95,7 +95,7 @@ class CookedPostProcessor return if previous.blank? - previous_text = Nokogiri::HTML::fragment(previous).text.strip + previous_text = Nokogiri::HTML5::fragment(previous).text.strip quoted_text = @doc.css("aside.quote:first-child blockquote").first&.text&.strip || "" return if previous_text.gsub(/(\s){2,}/, '\1') != quoted_text.gsub(/(\s){2,}/, '\1') diff --git a/lib/discourse_diff.rb b/lib/discourse_diff.rb index c2b3171623..cdf3787020 100644 --- a/lib/discourse_diff.rb +++ b/lib/discourse_diff.rb @@ -168,7 +168,7 @@ class DiscourseDiff end def tokenize_html_blocks(html) - Nokogiri::HTML.fragment(html).search("./*").map(&:to_html) + Nokogiri::HTML5.fragment(html).search("./*").map(&:to_html) end def tokenize_html(html) diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb index 69f7ccf270..3cb73a8976 100644 --- a/lib/email/receiver.rb +++ b/lib/email/receiver.rb @@ -338,7 +338,7 @@ module Email markdown, elided_markdown = if html.present? # use the first html extracter that matches if html_extracter = HTML_EXTRACTERS.select { |_, r| html[r] }.min_by { |_, r| html =~ r } - doc = Nokogiri::HTML.fragment(html) + doc = Nokogiri::HTML5.fragment(html) self.public_send(:"extract_from_#{html_extracter[0]}", doc) else markdown = HtmlToMarkdown.new(html, keep_img_tags: true, keep_cid_imgs: true).to_markdown diff --git a/lib/email/styles.rb b/lib/email/styles.rb index 955398aad8..69bfc7ec23 100644 --- a/lib/email/styles.rb +++ b/lib/email/styles.rb @@ -15,7 +15,7 @@ module Email def initialize(html, opts = nil) @html = html @opts = opts || {} - @fragment = Nokogiri::HTML.fragment(@html) + @fragment = Nokogiri::HTML5.parse(@html) @custom_styles = nil end @@ -161,7 +161,7 @@ module Email src_uri = i["data-original-href"].present? ? URI(i["data-original-href"]) : URI(i['src']) # If an iframe is protocol relative, use SSL when displaying it display_src = "#{src_uri.scheme || 'https'}://#{src_uri.host}#{src_uri.path}#{src_uri.query.nil? ? '' : '?' + src_uri.query}#{src_uri.fragment.nil? ? '' : '#' + src_uri.fragment}" - i.replace "

#{CGI.escapeHTML(display_src)}

" + i.replace(Nokogiri::HTML5.fragment("

#{CGI.escapeHTML(display_src)}

")) rescue URI::Error # If the URL is weird, remove the iframe i.remove @@ -242,7 +242,11 @@ module Email strip_classes_and_ids replace_relative_urls replace_secure_media_urls - @fragment.to_html + include_body? ? @fragment.at("body").to_html : @fragment.at("body").children.to_html + end + + def include_body? + @html =~ //i end def strip_avatars_and_emojis diff --git a/lib/onebox/engine/whitelisted_generic_onebox.rb b/lib/onebox/engine/whitelisted_generic_onebox.rb index a10f22e83b..7a46a0d1e5 100644 --- a/lib/onebox/engine/whitelisted_generic_onebox.rb +++ b/lib/onebox/engine/whitelisted_generic_onebox.rb @@ -24,7 +24,7 @@ module Onebox return true if WhitelistedGenericOnebox.html_providers.include?(data[:provider_name]) if data[:html]["iframe"] - fragment = Nokogiri::HTML::fragment(data[:html]) + fragment = Nokogiri::HTML5::fragment(data[:html]) if iframe = fragment.at_css("iframe") src = iframe["src"] return src.present? && SiteSetting.allowed_iframes.split("|").any? { |url| src.start_with?(url) } diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb index 4e3ab68cf8..d3625f19d8 100644 --- a/lib/oneboxer.rb +++ b/lib/oneboxer.rb @@ -78,7 +78,7 @@ module Oneboxer # Parse URLs out of HTML, returning the document when finished. def self.each_onebox_link(string_or_doc, extra_paths: []) doc = string_or_doc - doc = Nokogiri::HTML::fragment(doc) if doc.is_a?(String) + doc = Nokogiri::HTML5::fragment(doc) if doc.is_a?(String) onebox_links = doc.css("a.#{ONEBOX_CSS_CLASS}", *extra_paths) if onebox_links.present? @@ -94,14 +94,14 @@ module Oneboxer def self.apply(string_or_doc, extra_paths: nil) doc = string_or_doc - doc = Nokogiri::HTML::fragment(doc) if doc.is_a?(String) + doc = Nokogiri::HTML5::fragment(doc) if doc.is_a?(String) changed = false each_onebox_link(doc, extra_paths: extra_paths) do |url, element| onebox, _ = yield(url, element) if onebox - parsed_onebox = Nokogiri::HTML::fragment(onebox) + parsed_onebox = Nokogiri::HTML5::fragment(onebox) next unless parsed_onebox.children.count > 0 if element&.parent&.node_name&.downcase == "p" && diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb index 9da306db09..fd85696cf0 100644 --- a/lib/post_revisor.rb +++ b/lib/post_revisor.rb @@ -579,7 +579,7 @@ class PostRevisor def update_category_description return unless category = Category.find_by(topic_id: @topic.id) - doc = Nokogiri::HTML.fragment(@post.cooked) + doc = Nokogiri::HTML5.fragment(@post.cooked) doc.css("img").remove if html = doc.css("p").first&.inner_html&.strip diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index 73c18d0099..9f3f65e350 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -259,7 +259,7 @@ module PrettyText sanitized = markdown(working_text, options) - doc = Nokogiri::HTML.fragment(sanitized) + doc = Nokogiri::HTML5.fragment(sanitized) if !options[:omit_nofollow] && SiteSetting.add_rel_nofollow_to_user_content add_rel_nofollow_to_user_content(doc) @@ -269,7 +269,11 @@ module PrettyText add_mentions(doc, user_id: opts[:user_id]) end - doc.to_html + scrubber = Loofah::Scrubber.new do |node| + node.remove if node.name == 'script' + end + loofah_fragment = Loofah.fragment(doc.to_html) + loofah_fragment.scrub!(scrubber).to_html end def self.add_rel_nofollow_to_user_content(doc) @@ -282,7 +286,7 @@ module PrettyText doc.css("a").each do |l| href = l["href"].to_s begin - uri = URI(href) + uri = URI(URI.escape(href)) site_uri ||= URI(Discourse.base_url) if !uri.host.present? || @@ -305,7 +309,7 @@ module PrettyText def self.extract_links(html) links = [] - doc = Nokogiri::HTML.fragment(html) + doc = Nokogiri::HTML5.fragment(html) # remove href inside quotes & elided part doc.css("aside.quote a, .elided a").each { |a| a["href"] = "" } @@ -338,7 +342,7 @@ module PrettyText def self.excerpt(html, max_length, options = {}) # TODO: properly fix this HACK in ExcerptParser without introducing XSS - doc = Nokogiri::HTML.fragment(html) + doc = Nokogiri::HTML5.fragment(html) DiscourseEvent.trigger(:reduce_excerpt, doc, options) strip_image_wrapping(doc) strip_oneboxed_media(doc) @@ -350,7 +354,7 @@ module PrettyText return string if string.blank? # If the user is not basic, strip links from their bio - fragment = Nokogiri::HTML.fragment(string) + fragment = Nokogiri::HTML5.fragment(string) fragment.css('a').each { |a| a.replace(a.inner_html) } fragment.to_html end @@ -395,14 +399,14 @@ module PrettyText def self.strip_secure_media(doc) doc.css("a[href]").each do |a| if Upload.secure_media_url?(a["href"]) - target = %w(video audio).include?(a&.parent&.parent&.name) ? a.parent.parent : a + target = %w(video audio).include?(a&.parent&.name) ? a.parent : a target.replace "

#{I18n.t("emails.secure_media_placeholder")}

" end end end def self.format_for_email(html, post = nil) - doc = Nokogiri::HTML.fragment(html) + doc = Nokogiri::HTML5.fragment(html) DiscourseEvent.trigger(:reduce_cooked, doc, post) strip_secure_media(doc) if post&.with_secure_media? strip_image_wrapping(doc) @@ -462,13 +466,13 @@ module PrettyText case type when USER_TYPE - element['href'] = "#{Discourse::base_uri}/u/#{name}" + element['href'] = "#{Discourse::base_uri}/u/#{URI.escape(name)}" when GROUP_MENTIONABLE_TYPE element['class'] = 'mention-group notify' - element['href'] = "#{Discourse::base_uri}/groups/#{name}" + element['href'] = "#{Discourse::base_uri}/groups/#{URI.escape(name)}" when GROUP_TYPE element['class'] = 'mention-group' - element['href'] = "#{Discourse::base_uri}/groups/#{name}" + element['href'] = "#{Discourse::base_uri}/groups/#{URI.escape(name)}" end end end diff --git a/lib/quote_comparer.rb b/lib/quote_comparer.rb index 5da2891a7e..74f39f84a7 100644 --- a/lib/quote_comparer.rb +++ b/lib/quote_comparer.rb @@ -18,7 +18,7 @@ class QuoteComparer def modified? return true if @text.blank? || @parent_post.blank? - parent_text = Nokogiri::HTML::fragment(@parent_post.cooked).text.delete(QuoteComparer.whitespace) + parent_text = Nokogiri::HTML5::fragment(@parent_post.cooked).text.delete(QuoteComparer.whitespace) text = @text.delete(QuoteComparer.whitespace) !parent_text.include?(text) diff --git a/lib/retrieve_title.rb b/lib/retrieve_title.rb index 3c55ec7aec..227da9f0cb 100644 --- a/lib/retrieve_title.rb +++ b/lib/retrieve_title.rb @@ -11,7 +11,7 @@ module RetrieveTitle def self.extract_title(html) title = nil - if doc = Nokogiri::HTML(html) + if doc = Nokogiri::HTML5(html) title = doc.at('title')&.inner_text diff --git a/lib/reviewable/conversation.rb b/lib/reviewable/conversation.rb index 53eba48ef1..696959dd92 100644 --- a/lib/reviewable/conversation.rb +++ b/lib/reviewable/conversation.rb @@ -17,7 +17,7 @@ class Reviewable < ActiveRecord::Base def self.excerpt(cooked) excerpt = ::Post.excerpt(cooked, 250, keep_emoji_images: true) # remove the first link if it's the first node - fragment = Nokogiri::HTML.fragment(excerpt) + fragment = Nokogiri::HTML5.fragment(excerpt) if fragment.children.first == fragment.css("a:first").first && fragment.children.first fragment.children.first.remove end diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake index ad05c0d1b2..ace173d55c 100644 --- a/lib/tasks/emoji.rake +++ b/lib/tasks/emoji.rake @@ -353,7 +353,7 @@ def generate_emoji_groups(keywords, sections) puts "Generating groups..." list = open(EMOJI_ORDERING_URL).read - doc = Nokogiri::HTML(list) + doc = Nokogiri::HTML5(list) table = doc.css("table")[0] EMOJI_GROUPS.map do |group| diff --git a/plugins/discourse-details/spec/components/pretty_text_spec.rb b/plugins/discourse-details/spec/components/pretty_text_spec.rb index aa768305ec..dd0cf14a72 100644 --- a/plugins/discourse-details/spec/components/pretty_text_spec.rb +++ b/plugins/discourse-details/spec/components/pretty_text_spec.rb @@ -8,7 +8,7 @@ describe PrettyText do let(:post) { Fabricate(:post) } it "supports details tag" do - cooked_html = <<~HTML + cooked_html = <<~HTML.gsub("\n", "")
foo @@ -17,7 +17,7 @@ describe PrettyText do HTML expect(cooked_html).to match_html(cooked_html) - expect(PrettyText.cook("[details=foo]\nbar\n[/details]")).to match_html(cooked_html) + expect(PrettyText.cook("[details=foo]\nbar\n[/details]").gsub("\n", "")).to match_html(cooked_html) end it "deletes elided content" do diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb index 342e149128..56afacf2af 100644 --- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb +++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb @@ -68,7 +68,7 @@ module DiscourseNarrativeBot end def bot_mentioned?(post) - doc = Nokogiri::HTML.fragment(post.cooked) + doc = Nokogiri::HTML5.fragment(post.cooked) valid = false diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb index aa66cb1802..52f1cdab65 100644 --- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb +++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb @@ -280,7 +280,7 @@ module DiscourseNarrativeBot topic_id = @post.topic_id return unless valid_topic?(topic_id) - if Nokogiri::HTML.fragment(@post.cooked).css('.hashtag').size > 0 + if Nokogiri::HTML5.fragment(@post.cooked).css('.hashtag').size > 0 raw = <<~RAW #{I18n.t("#{I18N_KEY}.category_hashtag.reply", i18n_post_args)} @@ -331,7 +331,7 @@ module DiscourseNarrativeBot topic_id = @post.topic_id return unless valid_topic?(topic_id) - if Nokogiri::HTML.fragment(@post.cooked).css(".poll").size > 0 + if Nokogiri::HTML5.fragment(@post.cooked).css(".poll").size > 0 raw = <<~RAW #{I18n.t("#{I18N_KEY}.poll.reply", i18n_post_args)} @@ -354,7 +354,7 @@ module DiscourseNarrativeBot fake_delay - if Nokogiri::HTML.fragment(@post.cooked).css("details").size > 0 + if Nokogiri::HTML5.fragment(@post.cooked).css("details").size > 0 reply_to(@post, I18n.t("#{I18N_KEY}.details.reply", i18n_post_args)) else reply_to(@post, I18n.t("#{I18N_KEY}.details.not_found", i18n_post_args)) unless @data[:attempted] diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb index 5e9a1f38a5..9898ba085e 100644 --- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb +++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb @@ -326,7 +326,7 @@ module DiscourseNarrativeBot cooked = @post.post_analyzer.cook(@post.raw, {}) - if Nokogiri::HTML.fragment(cooked).css("img").size > 0 + if Nokogiri::HTML5.fragment(cooked).css("img").size > 0 set_state_data(:post_id, @post.id) if get_state_data(:liked) @@ -366,7 +366,7 @@ module DiscourseNarrativeBot post_topic_id = @post.topic_id return unless valid_topic?(post_topic_id) - if Nokogiri::HTML.fragment(@post.cooked).css("b", "strong", "em", "i", ".bbcode-i", ".bbcode-b").size > 0 + if Nokogiri::HTML5.fragment(@post.cooked).css("b", "strong", "em", "i", ".bbcode-i", ".bbcode-b").size > 0 raw = <<~RAW #{I18n.t("#{I18N_KEY}.formatting.reply", i18n_post_args)} @@ -390,7 +390,7 @@ module DiscourseNarrativeBot post_topic_id = @post.topic_id return unless valid_topic?(post_topic_id) - doc = Nokogiri::HTML.fragment(@post.cooked) + doc = Nokogiri::HTML5.fragment(@post.cooked) if doc.css(".quote").size > 0 raw = <<~RAW @@ -416,7 +416,7 @@ module DiscourseNarrativeBot post_topic_id = @post.topic_id return unless valid_topic?(post_topic_id) - doc = Nokogiri::HTML.fragment(@post.cooked) + doc = Nokogiri::HTML5.fragment(@post.cooked) if doc.css(".emoji").size > 0 raw = <<~RAW diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb index e0c1057e36..78fa0ba548 100644 --- a/plugins/poll/plugin.rb +++ b/plugins/poll/plugin.rb @@ -350,7 +350,7 @@ after_initialize do # in the validators instead of cooking twice cooked = PrettyText.cook(raw, topic_id: topic_id, user_id: user_id) - Nokogiri::HTML(cooked).css("div.poll").map do |p| + Nokogiri::HTML5(cooked).css("div.poll").map do |p| poll = { "options" => [], "name" => DiscoursePoll::DEFAULT_POLL_NAME } # attributes diff --git a/plugins/poll/spec/lib/pretty_text_spec.rb b/plugins/poll/spec/lib/pretty_text_spec.rb index db8af253a8..c4d09d2aac 100644 --- a/plugins/poll/spec/lib/pretty_text_spec.rb +++ b/plugins/poll/spec/lib/pretty_text_spec.rb @@ -131,7 +131,7 @@ describe PrettyText do MD onebox = Oneboxer.onebox_raw(post.full_url, user_id: Fabricate(:user).id) - doc = Nokogiri::HTML(onebox[:preview]) + doc = Nokogiri::HTML5(onebox[:preview]) expect(onebox[:preview]).to include("A post with a poll") expect(onebox[:preview]).to include("poll") diff --git a/script/import_scripts/ipboard3.rb b/script/import_scripts/ipboard3.rb index 0791e2b3a0..4e7638633d 100644 --- a/script/import_scripts/ipboard3.rb +++ b/script/import_scripts/ipboard3.rb @@ -376,7 +376,7 @@ class ImportScripts::IPBoard3 < ImportScripts::Base raw.gsub!(/<(.+)> <\/\1>/, "\n\n") - doc = Nokogiri::HTML.fragment(raw) + doc = Nokogiri::HTML5.fragment(raw) doc.css("blockquote.ipsBlockquote").each do |bq| post_id = post_id_from_imported_post_id(bq["data-cid"]) diff --git a/script/import_scripts/jive.rb b/script/import_scripts/jive.rb index 8d386a52c5..f380b2bfee 100644 --- a/script/import_scripts/jive.rb +++ b/script/import_scripts/jive.rb @@ -218,7 +218,7 @@ class ImportScripts::Jive < ImportScripts::Base raw = raw.dup raw = raw[5..-6] - doc = Nokogiri::HTML.fragment(raw) + doc = Nokogiri::HTML5.fragment(raw) doc.css('img').each do |img| img.remove if img['class'] == "jive-image" end diff --git a/script/import_scripts/jive_api.rb b/script/import_scripts/jive_api.rb index cf6df4d5be..cee4928227 100644 --- a/script/import_scripts/jive_api.rb +++ b/script/import_scripts/jive_api.rb @@ -297,7 +297,7 @@ class ImportScripts::JiveApi < ImportScripts::Base end def process_raw(raw) - doc = Nokogiri::HTML.fragment(raw) + doc = Nokogiri::HTML5.fragment(raw) # convert emoticon doc.css("span.emoticon-inline").each do |span| diff --git a/script/import_scripts/lithium.rb b/script/import_scripts/lithium.rb index ac18a3fa36..161618a7c1 100644 --- a/script/import_scripts/lithium.rb +++ b/script/import_scripts/lithium.rb @@ -913,7 +913,7 @@ SQL raw.sub!(match, content) end - doc = Nokogiri::HTML.fragment(raw) + doc = Nokogiri::HTML5.fragment(raw) doc.css("a,img,li-image").each do |l| upload_name, image, linked_upload = [nil] * 3 diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb index 47262f1342..51e9eadf69 100644 --- a/spec/components/cooked_post_processor_spec.rb +++ b/spec/components/cooked_post_processor_spec.rb @@ -453,10 +453,8 @@ describe CookedPostProcessor do it "generates overlay information" do cpp.post_process - expect(cpp.html).to match_html <<~HTML -

- logo.png1750×2000 1.21 KB -

+ expect(cpp.html).to match_html <<~HTML.rstrip +

logo.png1750×2000 1.21 KB

HTML expect(cpp).to be_dirty @@ -475,7 +473,7 @@ describe CookedPostProcessor do cpp.post_process - expect(cpp.html).to match_html <<~HTML + expect(cpp.html).to match_html <<~HTML.rstrip

HTML end @@ -491,7 +489,7 @@ describe CookedPostProcessor do cpp.post_process - expect(cpp.html).to match_html <<~HTML + expect(cpp.html).to match_html <<~HTML.rstrip

HTML end @@ -619,10 +617,8 @@ describe CookedPostProcessor do it "crops the image" do cpp.post_process - expect(cpp.html).to match_html <<~HTML -

- logo.png1125×2436 1.21 KB -

+ expect(cpp.html).to match_html <<~HTML.rstrip +

logo.png1125×2436 1.21 KB

HTML expect(cpp).to be_dirty @@ -652,10 +648,8 @@ describe CookedPostProcessor do it "generates overlay information" do cpp.post_process - expect(cpp.html). to match_html <<~HTML -

- logo.png1750×2000 1.21 KB -

+ expect(cpp.html). to match_html <<~HTML.rstrip +

logo.png1750×2000 1.21 KB

HTML expect(cpp).to be_dirty @@ -665,10 +659,8 @@ describe CookedPostProcessor do upload.update!(original_filename: ">.png") cpp.post_process - expect(cpp.html).to match_html <<~HTML -

- &gt;&lt;img src=x onerror=alert(&#39;haha&#39;)&gt;.png1750×2000 1.21 KB -

+ expect(cpp.html).to match_html <<~HTML.rstrip +

&gt;&lt;img src=x onerror=alert(&#39;haha&#39;)&gt;.png1750×2000 1.21 KB

HTML end @@ -693,10 +685,8 @@ describe CookedPostProcessor do it "generates overlay information using image title and ignores alt" do cpp.post_process - expect(cpp.html).to match_html <<~HTML -

RED
- WAT1750×2000 1.21 KB -

+ expect(cpp.html).to match_html <<~HTML.rstrip +

RED
WAT1750×2000 1.21 KB

HTML expect(cpp).to be_dirty @@ -723,10 +713,8 @@ describe CookedPostProcessor do it "generates overlay information using image title" do cpp.post_process - expect(cpp.html).to match_html <<~HTML -

- WAT1750×2000 1.21 KB -

+ expect(cpp.html).to match_html <<~HTML.rstrip +

WAT1750×2000 1.21 KB

HTML expect(cpp).to be_dirty @@ -753,10 +741,8 @@ describe CookedPostProcessor do it "generates overlay information using image alt" do cpp.post_process - expect(cpp.html).to match_html <<~HTML -

RED
- RED1750×2000 1.21 KB -

+ expect(cpp.html).to match_html <<~HTML.rstrip +

RED
RED1750×2000 1.21 KB

HTML expect(cpp).to be_dirty @@ -993,7 +979,7 @@ describe CookedPostProcessor do cpp = CookedPostProcessor.new(post, disable_loading_image: true) cpp.post_process - doc = Nokogiri::HTML::fragment(cpp.html) + doc = Nokogiri::HTML5::fragment(cpp.html) expect(doc.css('.lightbox-wrapper').size).to eq(1) expect(doc.css('img').first['srcset']).to_not eq(nil) end @@ -1008,7 +994,7 @@ describe CookedPostProcessor do cpp = CookedPostProcessor.new(post, disable_loading_image: true) cpp.post_process - doc = Nokogiri::HTML::fragment(cpp.html) + doc = Nokogiri::HTML5::fragment(cpp.html) expect(doc.css('.lightbox-wrapper').size).to eq(0) expect(doc.css('img').first['srcset']).to_not eq(nil) end @@ -1023,7 +1009,7 @@ describe CookedPostProcessor do cpp = CookedPostProcessor.new(post, disable_loading_image: true) cpp.post_process - doc = Nokogiri::HTML::fragment(cpp.html) + doc = Nokogiri::HTML5::fragment(cpp.html) expect(doc.css('.lightbox-wrapper').size).to eq(0) expect(doc.css('img').first['srcset']).to_not eq(nil) end @@ -1227,7 +1213,7 @@ describe CookedPostProcessor do it "uses schemaless url for uploads" do cpp.optimize_urls - expect(cpp.html).to match_html <<~HTML + expect(cpp.html).to match_html <<~HTML.rstrip

Link

Google
@@ -1242,7 +1228,7 @@ describe CookedPostProcessor do it "uses schemaless CDN url for http uploads" do Rails.configuration.action_controller.stubs(:asset_host).returns("http://my.cdn.com") cpp.optimize_urls - expect(cpp.html).to match_html <<~HTML + expect(cpp.html).to match_html <<~HTML.rstrip

Link

Google
@@ -1255,7 +1241,7 @@ describe CookedPostProcessor do it "doesn't use schemaless CDN url for https uploads" do Rails.configuration.action_controller.stubs(:asset_host).returns("https://my.cdn.com") cpp.optimize_urls - expect(cpp.html).to match_html <<~HTML + expect(cpp.html).to match_html <<~HTML.rstrip

Link

Google
@@ -1269,7 +1255,7 @@ describe CookedPostProcessor do SiteSetting.login_required = true Rails.configuration.action_controller.stubs(:asset_host).returns("http://my.cdn.com") cpp.optimize_urls - expect(cpp.html).to match_html <<~HTML + expect(cpp.html).to match_html <<~HTML.rstrip

Link

Google
@@ -1283,7 +1269,7 @@ describe CookedPostProcessor do SiteSetting.prevent_anons_from_downloading_files = true Rails.configuration.action_controller.stubs(:asset_host).returns("http://my.cdn.com") cpp.optimize_urls - expect(cpp.html).to match_html <<~HTML + expect(cpp.html).to match_html <<~HTML.rstrip

Link

Google
@@ -1318,7 +1304,7 @@ describe CookedPostProcessor do cpp = CookedPostProcessor.new(the_post) cpp.optimize_urls - expect(cpp.html).to match_html <<~HTML + expect(cpp.html).to match_html <<~HTML.rstrip

This post has a local emoji :+1: and an external upload

smallest.png

HTML @@ -1336,7 +1322,7 @@ describe CookedPostProcessor do cpp = CookedPostProcessor.new(the_post) cpp.optimize_urls - expect(cpp.html).to match_html <<~HTML + expect(cpp.html).to match_html <<~HTML.rstrip

This post has a local emoji :+1: and an external upload

smallest.png

HTML @@ -1357,18 +1343,20 @@ describe CookedPostProcessor do the_post = Fabricate(:post, raw: "This post has an S3 video onebox:\n#{video_upload.url}") - cpp = CookedPostProcessor.new(the_post) + cpp = CookedPostProcessor.new(the_post.reload) + cpp.post_process_oneboxes + + cpp = CookedPostProcessor.new(the_post.reload) cpp.post_process_oneboxes expect(cpp.html).to match_html <<~HTML -

This post has an S3 video onebox:

-
- -
+

This post has an S3 video onebox:
+

+ +
HTML end @@ -1384,13 +1372,12 @@ describe CookedPostProcessor do secure_url = video_upload.url.sub(SiteSetting.s3_cdn_url, "#{Discourse.base_url}/secure-media-uploads") - expect(cpp.html).to match_html <<~HTML + expect(cpp.html).to match_html <<~HTML.rstrip

This post has an S3 video onebox:

@@ -1416,7 +1403,7 @@ describe CookedPostProcessor do stub_request(:head, audio_upload.url) stub_request(:get, image_upload.url) - raw = <<~RAW + raw = <<~RAW.rstrip This post has a video upload. #{video_upload.url} @@ -1435,19 +1422,17 @@ describe CookedPostProcessor do secure_video_url = video_upload.url.sub(SiteSetting.s3_cdn_url, "#{Discourse.base_url}/secure-media-uploads") secure_audio_url = audio_upload.url.sub(SiteSetting.s3_cdn_url, "#{Discourse.base_url}/secure-media-uploads") - expect(cpp.html).to match_html <<~HTML -

This post has a video upload.

+ expect(cpp.html).to match_html <<~HTML.rstrip +

This post has a video upload.

- -

This post has an audio upload.
-

+

This post has an audio upload.
+

And an image upload.
#{image_upload.original_filename}

@@ -1616,7 +1601,7 @@ describe CookedPostProcessor do let(:post) { build(:post) } let(:cpp) { CookedPostProcessor.new(post) } - let(:doc) { Nokogiri::HTML::fragment('

') } + let(:doc) { Nokogiri::HTML5::fragment('

') } it "is true when the image is inside a link" do img = doc.css("img#linked_image").first diff --git a/spec/components/email/styles_spec.rb b/spec/components/email/styles_spec.rb index bdcd27aa06..74addfe29d 100644 --- a/spec/components/email/styles_spec.rb +++ b/spec/components/email/styles_spec.rb @@ -8,14 +8,14 @@ describe Email::Styles do def basic_fragment(html) styler = Email::Styles.new(html) styler.format_basic - Nokogiri::HTML.fragment(styler.to_html) + Nokogiri::HTML5.fragment(styler.to_html) end def html_fragment(html) styler = Email::Styles.new(html) styler.format_basic styler.format_html - Nokogiri::HTML.fragment(styler.to_html) + Nokogiri::HTML5.fragment(styler.to_html) end context "basic formatter" do diff --git a/spec/components/excerpt_parser_spec.rb b/spec/components/excerpt_parser_spec.rb index 8f0654bab5..363dd049e0 100644 --- a/spec/components/excerpt_parser_spec.rb +++ b/spec/components/excerpt_parser_spec.rb @@ -18,7 +18,7 @@ describe ExcerptParser do
HTML - expect(ExcerptParser.get_excerpt(html, 50, {})).to match_html(<<~HTML) + expect(ExcerptParser.get_excerpt(html, 50, {})).to match_html(<<~HTML.rstrip)
FOOBAR Lorem ipsum dolor sit amet, consectetur adi…
HTML diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index 784b607972..8969a526bd 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -184,7 +184,7 @@ describe PrettyText do
@@ -12,6 +14,7 @@ at the end of the link, preventing it from line wrapping onto its own line. --}} + {{~raw-plugin-outlet name="topic-list-before-link"}} {{~raw-plugin-outlet name="topic-list-before-status"}} {{~raw "topic-status" topic=topic}} diff --git a/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr b/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr index c126de0924..6c4663b83d 100644 --- a/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr +++ b/app/assets/javascripts/discourse/app/templates/mobile/list/topic-list-item.hbr @@ -1,4 +1,5 @@ + {{~raw-plugin-outlet name="topic-list-before-columns"}} {{~#unless expandPinned}}
{{avatar topic.lastPosterUser imageSize="large"}} @@ -14,6 +15,7 @@ This causes the topic-post-badge to be considered the same word as "text" at the end of the link, preventing it from line wrapping onto its own line. --}} + {{~raw-plugin-outlet name="topic-list-before-link"}}
{{~raw-plugin-outlet name="topic-list-before-status"}} {{~raw "topic-status" topic=topic~}} diff --git a/app/jobs/regular/generate_topic_thumbnails.rb b/app/jobs/regular/generate_topic_thumbnails.rb new file mode 100644 index 0000000000..a01452670c --- /dev/null +++ b/app/jobs/regular/generate_topic_thumbnails.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +module Jobs + class GenerateTopicThumbnails < ::Jobs::Base + sidekiq_options queue: 'ultra_low' + + def execute(args) + topic_id = args[:topic_id] + extra_sizes = args[:extra_sizes] + + raise Discourse::InvalidParameters.new(:topic_id) if topic_id.blank? + + topic = Topic.find(topic_id) + topic.generate_thumbnails!(extra_sizes: extra_sizes) + end + + end +end diff --git a/app/jobs/scheduled/ensure_db_consistency.rb b/app/jobs/scheduled/ensure_db_consistency.rb index 6d7f3fbbb8..6c21814fa0 100644 --- a/app/jobs/scheduled/ensure_db_consistency.rb +++ b/app/jobs/scheduled/ensure_db_consistency.rb @@ -22,7 +22,8 @@ module Jobs CategoryTagStat, User, UserAvatar, - Category + Category, + TopicThumbnail ].each do |klass| klass.ensure_consistency! measure(klass) diff --git a/app/models/post.rb b/app/models/post.rb index f2ee10543f..c2f80c8c6f 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -51,6 +51,8 @@ class Post < ActiveRecord::Base has_many :user_actions, foreign_key: :target_post_id + belongs_to :image_upload, class_name: "Upload" + validates_with PostValidator, unless: :skip_validation after_save :index_search @@ -1062,6 +1064,10 @@ class Post < ActiveRecord::Base Upload.where(access_control_post_id: self.id) end + def image_url + image_upload&.url + end + private def parse_quote_into_arguments(quote) @@ -1144,6 +1150,7 @@ end # action_code :string # image_url :string # locked_by_id :integer +# image_upload_id :bigint # # Indexes # @@ -1152,6 +1159,7 @@ end # idx_posts_user_id_deleted_at (user_id) WHERE (deleted_at IS NULL) # index_for_rebake_old (id) WHERE (((baked_version IS NULL) OR (baked_version < 2)) AND (deleted_at IS NULL)) # index_posts_on_id_and_baked_version (id DESC,baked_version) WHERE (deleted_at IS NULL) +# index_posts_on_image_upload_id (image_upload_id) # index_posts_on_reply_to_post_number (reply_to_post_number) # index_posts_on_topic_id_and_percent_rank (topic_id,percent_rank) # index_posts_on_topic_id_and_post_number (topic_id,post_number) UNIQUE diff --git a/app/models/theme_modifier_set.rb b/app/models/theme_modifier_set.rb index 99a8818f58..9fae7faf54 100644 --- a/app/models/theme_modifier_set.rb +++ b/app/models/theme_modifier_set.rb @@ -12,7 +12,7 @@ class ThemeModifierSet < ActiveRecord::Base def type_validator ThemeModifierSet.modifiers.each do |k, config| - value = public_send(k) + value = read_attribute(k) next if value.nil? case config[:type] @@ -39,7 +39,7 @@ class ThemeModifierSet < ActiveRecord::Base def self.resolve_modifier_for_themes(theme_ids, modifier_name) return nil if !(config = self.modifiers[modifier_name]) - all_values = self.where(theme_id: theme_ids).where.not(modifier_name => nil).pluck(modifier_name) + all_values = self.where(theme_id: theme_ids).where.not(modifier_name => nil).map { |s| s.public_send(modifier_name) } case config[:type] when :boolean all_values.any? @@ -50,6 +50,26 @@ class ThemeModifierSet < ActiveRecord::Base end end + def topic_thumbnail_sizes + array = read_attribute(:topic_thumbnail_sizes) + + return if array.nil? + + array.map do |dimension| + parts = dimension.split("x") + next if parts.length != 2 + [parts[0].to_i, parts[1].to_i] + end.filter(&:present?) + end + + def topic_thumbnail_sizes=(val) + return write_attribute(:topic_thumbnail_sizes, val) if val.nil? + return write_attribute(:topic_thumbnail_sizes, val) if !val.is_a?(Array) + return write_attribute(:topic_thumbnail_sizes, val) if !val.all? { |v| v.is_a?(Array) && v.length == 2 } + + super(val.map { |dim| "#{dim[0]}x#{dim[1]}" }) + end + private # Build the list of modifiers from the DB schema. @@ -78,11 +98,12 @@ end # # Table name: theme_modifier_sets # -# id :bigint not null, primary key -# theme_id :bigint not null -# serialize_topic_excerpts :boolean -# csp_extensions :string is an Array -# svg_icons :string is an Array +# id :bigint not null, primary key +# theme_id :bigint not null +# serialize_topic_excerpts :boolean +# csp_extensions :string is an Array +# svg_icons :string is an Array +# topic_thumbnail_sizes :string is an Array # # Indexes # diff --git a/app/models/topic.rb b/app/models/topic.rb index aaeca3f145..371f32d570 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -28,6 +28,83 @@ class Topic < ActiveRecord::Base 400 end + def self.share_thumbnail_size + [1024, 1024] + end + + def self.thumbnail_sizes + [ self.share_thumbnail_size ] + end + + def thumbnail_job_redis_key(extra_sizes) + "generate_topic_thumbnail_enqueue_#{id}_#{extra_sizes.inspect}" + end + + def filtered_topic_thumbnails(extra_sizes: []) + return nil unless original = image_upload + return nil unless original.width && original.height + + thumbnail_sizes = Topic.thumbnail_sizes + extra_sizes + topic_thumbnails.filter { |record| thumbnail_sizes.include?([record.max_width, record.max_height]) } + end + + def thumbnail_info(enqueue_if_missing: false, extra_sizes: []) + return nil unless original = image_upload + return nil unless original.width && original.height + + infos = [] + infos << { # Always add original + max_width: nil, + max_height: nil, + width: original.width, + height: original.height, + url: original.url + } + + records = filtered_topic_thumbnails(extra_sizes: extra_sizes) + + records.each do |record| + next unless record.optimized_image # Only serialize successful thumbnails + + infos << { + max_width: record.max_width, + max_height: record.max_height, + width: record.optimized_image&.width, + height: record.optimized_image&.height, + url: record.optimized_image&.url + } + end + + thumbnail_sizes = Topic.thumbnail_sizes + extra_sizes + if SiteSetting.create_thumbnails && + enqueue_if_missing && + records.length < thumbnail_sizes.length && + Discourse.redis.set(thumbnail_job_redis_key(extra_sizes), 1, nx: true, ex: 1.minute) + + Jobs.enqueue(:generate_topic_thumbnails, { topic_id: id, extra_sizes: extra_sizes }) + end + + infos.sort_by! { |i| -i[:width] * i[:height] } + end + + def generate_thumbnails!(extra_sizes: []) + return nil unless SiteSetting.create_thumbnails + return nil unless original = image_upload + return nil unless original.width && original.height + + (Topic.thumbnail_sizes + extra_sizes).each do |dim| + TopicThumbnail.find_or_create_for!(original, max_width: dim[0], max_height: dim[1]) + end + end + + def image_url + thumbnail = topic_thumbnails.detect do |record| + record.max_width == Topic.share_thumbnail_size[0] && + record.max_height == Topic.share_thumbnail_size[1] + end + thumbnail&.optimized_image&.url || image_upload&.url + end + def featured_users @featured_users ||= TopicFeaturedUsers.new(self) end @@ -139,6 +216,9 @@ class Topic < ActiveRecord::Base has_one :topic_search_data has_one :topic_embed, dependent: :destroy + belongs_to :image_upload, class_name: 'Upload' + has_many :topic_thumbnails, through: :image_upload + # When we want to temporarily attach some data to a forum topic (usually before serialization) attr_accessor :user_data attr_accessor :category_user_data @@ -1601,6 +1681,7 @@ end # highest_staff_post_number :integer default(0), not null # featured_link :string # reviewable_score :float default(0.0), not null +# image_upload_id :bigint # # Indexes # @@ -1611,6 +1692,7 @@ end # index_topics_on_created_at_and_visible (created_at,visible) WHERE ((deleted_at IS NULL) AND ((archetype)::text <> 'private_message'::text)) # index_topics_on_id_and_deleted_at (id,deleted_at) # index_topics_on_id_filtered_banner (id) UNIQUE WHERE (((archetype)::text = 'banner'::text) AND (deleted_at IS NULL)) +# index_topics_on_image_upload_id (image_upload_id) # index_topics_on_lower_title (lower((title)::text)) # index_topics_on_pinned_at (pinned_at) WHERE (pinned_at IS NOT NULL) # index_topics_on_pinned_globally (pinned_globally) WHERE pinned_globally diff --git a/app/models/topic_thumbnail.rb b/app/models/topic_thumbnail.rb new file mode 100644 index 0000000000..139ddde232 --- /dev/null +++ b/app/models/topic_thumbnail.rb @@ -0,0 +1,60 @@ +# frozen_string_literal: true + +# This model indicates an 'attempt' to create a topic thumbnail +# for an upload. This means we don't keep trying to create optimized +# images for small/invalid original images. +# +# Foreign keys with ON DELETE CASCADE are used to ensure unneeded data +# is deleted automatically +class TopicThumbnail < ActiveRecord::Base + belongs_to :upload + belongs_to :optimized_image + + def self.find_or_create_for!(original, max_width: , max_height:) + existing = TopicThumbnail.find_by(upload: original, max_width: max_width, max_height: max_height) + return existing if existing + return nil if !SiteSetting.create_thumbnails? + + target_width, target_height = ImageSizer.resize(original.width, original.height, { max_width: max_width, max_height: max_height }) + + if target_width < original.width && target_height < original.height + optimized = OptimizedImage.create_for(original, target_width, target_height) + end + + create!(upload: original, max_width: max_width, max_height: max_height, optimized_image: optimized) + end + + def self.ensure_consistency! + # Clean up records for broken upload links or broken optimized image links + TopicThumbnail + .joins("LEFT JOIN uploads on upload_id = uploads.id") + .joins("LEFT JOIN optimized_images on optimized_image_id = optimized_images.id") + .where(<<~SQL) + (optimized_image_id IS NOT NULL AND optimized_images IS NULL) + OR uploads IS NULL + SQL + .delete_all + + # Delete records for sizes which are no longer needed + sizes = Topic.thumbnail_sizes + ThemeModifierHelper.new(theme_ids: Theme.pluck(:id)).topic_thumbnail_sizes + sizes_sql = sizes.map { |s| "(max_width = #{s[0].to_i} AND max_height = #{s[1].to_i})" }.join(" OR ") + TopicThumbnail.where.not(sizes_sql).delete_all + end +end + +# == Schema Information +# +# Table name: topic_thumbnails +# +# id :bigint not null, primary key +# upload_id :bigint not null +# optimized_image_id :bigint +# max_width :integer not null +# max_height :integer not null +# +# Indexes +# +# index_topic_thumbnails_on_optimized_image_id (optimized_image_id) +# index_topic_thumbnails_on_upload_id (upload_id) +# unique_topic_thumbnails (upload_id,max_width,max_height) UNIQUE +# diff --git a/app/models/upload.rb b/app/models/upload.rb index cb4cf458af..bb4e7976f5 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -25,6 +25,7 @@ class Upload < ActiveRecord::Base has_many :optimized_images, dependent: :destroy has_many :user_uploads, dependent: :destroy + has_many :topic_thumbnails attr_accessor :for_group_message attr_accessor :for_theme diff --git a/app/serializers/listable_topic_serializer.rb b/app/serializers/listable_topic_serializer.rb index a00cd2f619..52d7fb2715 100644 --- a/app/serializers/listable_topic_serializer.rb +++ b/app/serializers/listable_topic_serializer.rb @@ -25,10 +25,20 @@ class ListableTopicSerializer < BasicTopicSerializer :bookmarked, :liked, :unicode_title, - :unread_by_group_member + :unread_by_group_member, + :thumbnails has_one :last_poster, serializer: BasicUserSerializer, embed: :objects + def image_url + object.image_url + end + + def thumbnails + extra_sizes = ThemeModifierHelper.new(request: scope.request).topic_thumbnail_sizes + object.thumbnail_info(enqueue_if_missing: true, extra_sizes: extra_sizes) + end + def include_unicode_title? object.title.match?(/:[\w\-+]+:/) end diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb index e40dca1d9f..27cc97523e 100644 --- a/app/serializers/topic_view_serializer.rb +++ b/app/serializers/topic_view_serializer.rb @@ -73,6 +73,7 @@ class TopicViewSerializer < ApplicationSerializer :queued_posts_count, :show_read_indicator, :requested_group_name, + :thumbnails ) has_one :details, serializer: TopicViewDetailsSerializer, root: false, embed: :objects @@ -284,4 +285,9 @@ class TopicViewSerializer < ApplicationSerializer def include_published_page? SiteSetting.enable_page_publishing? && scope.is_staff? && object.published_page.present? end + + def thumbnails + extra_sizes = ThemeModifierHelper.new(request: scope.request).topic_thumbnail_sizes + object.topic.thumbnail_info(enqueue_if_missing: true, extra_sizes: extra_sizes) + end end diff --git a/db/migrate/20200429095034_add_topic_thumbnail_information.rb b/db/migrate/20200429095034_add_topic_thumbnail_information.rb new file mode 100644 index 0000000000..be34f93c32 --- /dev/null +++ b/db/migrate/20200429095034_add_topic_thumbnail_information.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class AddTopicThumbnailInformation < ActiveRecord::Migration[6.0] + def change + add_reference :posts, :image_upload + add_reference :topics, :image_upload + + add_column :theme_modifier_sets, :topic_thumbnail_sizes, :string, array: true + + create_table :topic_thumbnails do |t| + t.references :upload, null: false + t.references :optimized_image, null: true + t.integer :max_width, null: false + t.integer :max_height, null: false + end + + add_index :topic_thumbnails, [:upload_id, :max_width, :max_height], name: :unique_topic_thumbnails, unique: true + end +end diff --git a/db/migrate/20200429095035_migrate_image_url_to_image_upload_id.rb b/db/migrate/20200429095035_migrate_image_url_to_image_upload_id.rb new file mode 100644 index 0000000000..5f4747b2c3 --- /dev/null +++ b/db/migrate/20200429095035_migrate_image_url_to_image_upload_id.rb @@ -0,0 +1,95 @@ +# frozen_string_literal: true + +class MigrateImageUrlToImageUploadId < ActiveRecord::Migration[6.0] + disable_ddl_transaction! # Avoid holding update locks on posts for the whole migration + + BATCH_SIZE = 1000 + + def up + # Defining regex here to avoid needing to double-escape the \ characters + regex = '\/(original|optimized)\/\dX[\/\.\w]*\/([a-zA-Z0-9]+)[\.\w]*' + + execute <<~SQL + CREATE TEMPORARY TABLE tmp_post_image_uploads( + post_id int primary key, + upload_id int + ) + SQL + + # Look for an SHA1 in the existing image_url, and match to the uploads table + execute <<~SQL + INSERT INTO tmp_post_image_uploads(post_id, upload_id) + SELECT + posts.id as post_id, + uploads.id as upload_id + FROM posts + LEFT JOIN LATERAL regexp_matches(posts.image_url, '#{regex}') matched_sha1 ON TRUE + LEFT JOIN uploads on uploads.sha1 = matched_sha1[2] + WHERE posts.image_url IS NOT NULL + AND uploads.id IS NOT NULL + ORDER BY posts.id ASC + SQL + + # Update the posts table to match the temp table data + last_update_id = -1 + begin + result = DB.query <<~SQL + WITH to_update AS ( + SELECT post_id, upload_id + FROM tmp_post_image_uploads + JOIN posts ON posts.id = post_id + WHERE posts.id > #{last_update_id} + ORDER BY post_id ASC + LIMIT #{BATCH_SIZE} + ) + UPDATE posts SET image_upload_id = to_update.upload_id + FROM to_update + WHERE to_update.post_id = posts.id + RETURNING posts.id + SQL + last_update_id = result.last&.id + end while last_update_id + + # Update the topic image based on the first post image + last_update_id = -1 + begin + result = DB.query <<~SQL + WITH to_update AS ( + SELECT topic_id, posts.image_upload_id as upload_id + FROM topics + JOIN posts ON post_number = 1 AND posts.topic_id = topics.id + WHERE posts.image_upload_id IS NOT NULL + AND topics.id > #{last_update_id} + ORDER BY topics.id ASC + LIMIT #{BATCH_SIZE} + ) + UPDATE topics SET image_upload_id = to_update.upload_id + FROM to_update + WHERE topics.id = to_update.topic_id + RETURNING topics.id + SQL + last_update_id = result.last&.id + end while last_update_id + + # For posts we couldn't figure out, mark them for background rebake + last_update_id = -1 + begin + updated_count = DB.query <<~SQL + WITH to_update AS ( + SELECT id as post_id + FROM posts + WHERE posts.image_url IS NOT NULL + AND posts.image_upload_id IS NULL + AND posts.id > #{last_update_id} + ORDER BY posts.id ASC + LIMIT #{BATCH_SIZE} + ) + UPDATE posts SET baked_version = NULL + FROM to_update + WHERE posts.id = to_update.post_id + RETURNING posts.id + SQL + last_update_id = result.last&.id + end while last_update_id + end +end diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb index 725258cc10..d2e8f4d2d5 100644 --- a/lib/cooked_post_processor.rb +++ b/lib/cooked_post_processor.rb @@ -490,16 +490,26 @@ class CookedPostProcessor end def update_post_image - img = extract_images_for_post.first - if img.blank? - @post.update_column(:image_url, nil) if @post.image_url - @post.topic.update_column(:image_url, nil) if @post.topic.image_url && @post.is_first_post? - return + upload = nil + eligible_image_fragments = extract_images_for_post + + # Loop through those fragments until we find one with an upload record + @post.each_upload_url(fragments: eligible_image_fragments) do |src, path, sha1| + upload = Upload.find_by(sha1: sha1) + break if upload end - if img["src"].present? - @post.update_column(:image_url, img["src"][0...255]) # post - @post.topic.update_column(:image_url, img["src"][0...255]) if @post.is_first_post? # topic + if upload.present? + @post.update_column(:image_upload_id, upload.id) # post + if @post.is_first_post? # topic + @post.topic.update_column(:image_upload_id, upload.id) + extra_sizes = ThemeModifierHelper.new(theme_ids: Theme.user_selectable.pluck(:id)).topic_thumbnail_sizes + @post.topic.generate_thumbnails!(extra_sizes: extra_sizes) + end + else + @post.update_column(:image_upload_id, nil) if @post.image_upload_id + @post.topic.update_column(:image_upload_id, nil) if @post.topic.image_upload_id && @post.is_first_post? + nil end end diff --git a/lib/search.rb b/lib/search.rb index e1c6509c42..ffe08884ea 100644 --- a/lib/search.rb +++ b/lib/search.rb @@ -434,7 +434,7 @@ class Search end advanced_filter(/^with:images$/) do |posts| - posts.where("posts.image_url IS NOT NULL") + posts.where("posts.image_upload_id IS NOT NULL") end advanced_filter(/^category:(.+)$/) do |posts, match| diff --git a/lib/topic_query.rb b/lib/topic_query.rb index 35bc7347fe..772ea5af28 100644 --- a/lib/topic_query.rb +++ b/lib/topic_query.rb @@ -828,6 +828,8 @@ class TopicQuery result = result.where('topics.posts_count <= ?', options[:max_posts]) if options[:max_posts].present? result = result.where('topics.posts_count >= ?', options[:min_posts]) if options[:min_posts].present? + result = preload_thumbnails(result) + result = TopicQuery.apply_custom_filters(result, self) @guardian.filter_allowed_categories(result) @@ -1050,6 +1052,10 @@ class TopicQuery result.order('topics.bumped_at DESC') end + def preload_thumbnails(result) + result.preload(:image_upload, topic_thumbnails: :optimized_image) + end + private def sanitize_sql_array(input) diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb index 51e9eadf69..a429d64bee 100644 --- a/spec/components/cooked_post_processor_spec.rb +++ b/spec/components/cooked_post_processor_spec.rb @@ -751,16 +751,16 @@ describe CookedPostProcessor do end context "topic image" do - let(:post) { Fabricate(:post_with_uploaded_image) } + fab!(:post) { Fabricate(:post_with_uploaded_image) } let(:cpp) { CookedPostProcessor.new(post) } it "adds a topic image if there's one in the first post" do FastImage.stubs(:size) - expect(post.topic.image_url).to eq(nil) + expect(post.topic.image_upload_id).to eq(nil) cpp.post_process post.topic.reload - expect(post.topic.image_url).to be_present + expect(post.topic.image_upload_id).to be_present end it "removes image if post is edited and no longer has an image" do @@ -768,14 +768,14 @@ describe CookedPostProcessor do cpp.post_process post.topic.reload - expect(post.topic.image_url).to be_present - expect(post.image_url).to be_present + expect(post.topic.image_upload_id).to be_present + expect(post.image_upload_id).to be_present post.update!(raw: "This post no longer has an image.") CookedPostProcessor.new(post).post_process post.topic.reload - expect(post.topic.image_url).not_to be_present - expect(post.image_url).not_to be_present + expect(post.topic.image_upload_id).not_to be_present + expect(post.image_upload_id).not_to be_present end it "won't remove the original image if another post doesn't have an image" do @@ -784,15 +784,32 @@ describe CookedPostProcessor do cpp.post_process topic.reload - expect(topic.image_url).to be_present - expect(post.image_url).to be_present + expect(topic.image_upload_id).to be_present + expect(post.image_upload_id).to be_present post = Fabricate(:post, topic: topic, raw: "this post doesn't have an image") CookedPostProcessor.new(post).post_process topic.reload - expect(post.topic.image_url).to be_present - expect(post.image_url).to be_blank + expect(post.topic.image_upload_id).to be_present + expect(post.image_upload_id).to be_blank + end + + it "generates thumbnails correctly" do + FastImage.expects(:size).returns([1750, 2000]) + + topic = post.topic + cpp.post_process + topic.reload + expect(topic.image_upload_id).to be_present + expect(post.image_upload_id).to be_present + + post = Fabricate(:post, topic: topic, raw: "this post doesn't have an image") + CookedPostProcessor.new(post).post_process + topic.reload + + expect(post.topic.image_upload_id).to be_present + expect(post.image_upload_id).to be_blank end end @@ -802,10 +819,10 @@ describe CookedPostProcessor do it "adds a post image if there's one in the post" do FastImage.stubs(:size) - expect(reply.image_url).to eq(nil) + expect(reply.image_upload_id).to eq(nil) cpp.post_process reply.reload - expect(reply.image_url).to be_present + expect(reply.image_upload_id).to be_present end end end diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb index 64e0efb726..a455d81ec1 100644 --- a/spec/components/search_spec.rb +++ b/spec/components/search_spec.rb @@ -1134,13 +1134,11 @@ describe Search do it 'can find posts with images' do post_uploaded = Fabricate(:post_with_uploaded_image) - post_with_image_urls = Fabricate(:post_with_image_urls) Fabricate(:post) CookedPostProcessor.new(post_uploaded).update_post_image - CookedPostProcessor.new(post_with_image_urls).update_post_image - expect(Search.execute('with:images').posts.map(&:id)).to contain_exactly(post_uploaded.id, post_with_image_urls.id) + expect(Search.execute('with:images').posts.map(&:id)).to contain_exactly(post_uploaded.id) end it 'can find by latest' do diff --git a/spec/components/topic_view_spec.rb b/spec/components/topic_view_spec.rb index 16ee55dab0..73bb74ac25 100644 --- a/spec/components/topic_view_spec.rb +++ b/spec/components/topic_view_spec.rb @@ -708,9 +708,12 @@ describe TopicView do end describe '#image_url' do - let!(:post1) { Fabricate(:post, topic: topic) } - let!(:post2) { Fabricate(:post, topic: topic) } - let!(:post3) { Fabricate(:post, topic: topic).tap { |p| p.update_column(:image_url, "post3_image.png") }.reload } + fab!(:op_upload) { Fabricate(:image_upload) } + fab!(:post3_upload) { Fabricate(:image_upload) } + + fab!(:post1) { Fabricate(:post, topic: topic) } + fab!(:post2) { Fabricate(:post, topic: topic) } + fab!(:post3) { Fabricate(:post, topic: topic).tap { |p| p.update_column(:image_upload_id, post3_upload.id) }.reload } def topic_view_for_post(post_number) TopicView.new(topic.id, evil_trout, post_number: post_number) @@ -718,14 +721,14 @@ describe TopicView do context "when op has an image" do before do - topic.update_column(:image_url, "op_image.png") - post1.update_column(:image_url, "op_image.png") + topic.update_column(:image_upload_id, op_upload.id) + post1.update_column(:image_upload_id, op_upload.id) end it "uses the topic image as a fallback when posts have no image" do - expect(topic_view_for_post(1).image_url).to eq("op_image.png") - expect(topic_view_for_post(2).image_url).to eq("op_image.png") - expect(topic_view_for_post(3).image_url).to eq("post3_image.png") + expect(topic_view_for_post(1).image_url).to eq(op_upload.url) + expect(topic_view_for_post(2).image_url).to eq(op_upload.url) + expect(topic_view_for_post(3).image_url).to eq(post3_upload.url) end end @@ -733,7 +736,7 @@ describe TopicView do it "returns nil when posts have no image" do expect(topic_view_for_post(1).image_url).to eq(nil) expect(topic_view_for_post(2).image_url).to eq(nil) - expect(topic_view_for_post(3).image_url).to eq("post3_image.png") + expect(topic_view_for_post(3).image_url).to eq(post3_upload.url) end end end diff --git a/spec/fabricators/post_fabricator.rb b/spec/fabricators/post_fabricator.rb index 412504c7c4..42235cb94f 100644 --- a/spec/fabricators/post_fabricator.rb +++ b/spec/fabricators/post_fabricator.rb @@ -56,7 +56,7 @@ HTML end Fabricator(:post_with_uploaded_image, from: :post) do - raw "" + raw { "" } end Fabricator(:post_with_an_attachment, from: :post) do diff --git a/spec/integration/topic_thumbnail_spec.rb b/spec/integration/topic_thumbnail_spec.rb new file mode 100644 index 0000000000..b288fb6c48 --- /dev/null +++ b/spec/integration/topic_thumbnail_spec.rb @@ -0,0 +1,88 @@ +# frozen_string_literal: true +require 'rails_helper' + +describe "Topic Thumbnails" do + before { SiteSetting.create_thumbnails = true } + + fab!(:image) { Fabricate(:image_upload, width: 5000, height: 5000) } + fab!(:topic) { Fabricate(:topic, image_upload_id: image.id) } + fab!(:user) { Fabricate(:user) } + + context 'latest' do + def get_topic + Discourse.redis.del(topic.thumbnail_job_redis_key([])) + get '/latest.json' + response.parsed_body["topic_list"]["topics"][0] + end + + it "includes thumbnails" do + topic_json = nil + expect do + topic_json = get_topic + end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(1) + + thumbnails = topic_json["thumbnails"] + + # Original only. Optimized not yet generated + expect(thumbnails.length).to eq(1) + + # Original + expect(thumbnails[0]["max_width"]).to eq(nil) + expect(thumbnails[0]["max_height"]).to eq(nil) + expect(thumbnails[0]["width"]).to eq(image.width) + expect(thumbnails[0]["height"]).to eq(image.height) + expect(thumbnails[0]["url"]).to eq(image.url) + + # Run the job + args = Jobs::GenerateTopicThumbnails.jobs.last["args"].first + Jobs::GenerateTopicThumbnails.new.execute(args.with_indifferent_access) + + # Re-request + expect do + topic_json = get_topic + end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(0) + thumbnails = topic_json["thumbnails"] + + expect(thumbnails[1]["max_width"]).to eq(Topic.share_thumbnail_size[0]) + expect(thumbnails[1]["max_height"]).to eq(Topic.share_thumbnail_size[1]) + expect(thumbnails[1]["width"]).to eq(1024) + expect(thumbnails[1]["height"]).to eq(1024) + expect(thumbnails[1]["url"]).to include("/optimized/") + end + + context "with a theme" do + before do + theme = Fabricate(:theme) + theme.theme_modifier_set.topic_thumbnail_sizes = [ + [100, 100], + [200, 200], + [300, 300] + ] + theme.theme_modifier_set.save! + theme.set_default! + end + + it "includes the theme specified resolutions" do + topic_json = nil + + expect do + topic_json = get_topic + end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(1) + + # Run the job + args = Jobs::GenerateTopicThumbnails.jobs.last["args"].first + Jobs::GenerateTopicThumbnails.new.execute(args.with_indifferent_access) + + # Request again + expect do + topic_json = get_topic + end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(0) + + thumbnails = topic_json["thumbnails"] + + # Original + Optimized + 3 theme requests + expect(thumbnails.length).to eq(5) + end + end + end +end diff --git a/spec/lib/db_helper_spec.rb b/spec/lib/db_helper_spec.rb index b178cd1e19..c2074a0f80 100644 --- a/spec/lib/db_helper_spec.rb +++ b/spec/lib/db_helper_spec.rb @@ -7,8 +7,6 @@ RSpec.describe DbHelper do it 'should remap columns properly' do post = Fabricate(:post, cooked: "this is a specialcode that I included") post_attributes = post.reload.attributes - post2 = Fabricate(:post, image_url: "/testing/specialcode") - post2_attributes = post2.reload.attributes badge = Fabricate(:badge, query: "specialcode") badge_attributes = badge.reload.attributes @@ -19,13 +17,6 @@ RSpec.describe DbHelper do expect(post.cooked).to include("codespecial") - post2.reload - - expect(post2.image_url).to eq("/testing/codespecial") - - expect(post2_attributes.except("image_url")) - .to eq(post2.attributes.except("image_url")) - badge.reload expect(badge.query).to eq("codespecial") diff --git a/spec/models/topic_thumbnail_spec.rb b/spec/models/topic_thumbnail_spec.rb new file mode 100644 index 0000000000..b9e1df75fd --- /dev/null +++ b/spec/models/topic_thumbnail_spec.rb @@ -0,0 +1,46 @@ +# frozen_string_literal: true +require 'rails_helper' + +describe "TopicThumbnail" do + let(:upload1) { Fabricate(:image_upload, width: 5000, height: 5000) } + let(:topic) { Fabricate(:topic, image_upload: upload1) } + + before do + SiteSetting.create_thumbnails = true + topic.generate_thumbnails! + + TopicThumbnail.ensure_consistency! + topic.reload + + expect(topic.topic_thumbnails.length).to eq(1) + end + + it "cleans up deleted uploads" do + upload1.delete + + TopicThumbnail.ensure_consistency! + topic.reload + + expect(topic.topic_thumbnails.length).to eq(0) + end + + it "cleans up deleted optimized images" do + upload1.optimized_images.reload.delete_all + + TopicThumbnail.ensure_consistency! + topic.reload + + expect(topic.topic_thumbnails.length).to eq(0) + end + + it "cleans up unneeded sizes" do + expect(topic.topic_thumbnails.length).to eq(1) + topic.topic_thumbnails[0].update_column(:max_width, 999999) + + TopicThumbnail.ensure_consistency! + topic.reload + + expect(topic.topic_thumbnails.length).to eq(0) + end + +end diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb index a80f884812..0adfbfe08a 100644 --- a/spec/serializers/topic_view_serializer_spec.rb +++ b/spec/serializers/topic_view_serializer_spec.rb @@ -46,15 +46,35 @@ describe TopicViewSerializer do end describe '#image_url' do - let(:image_url) { 'http://meta.discourse.org/images/welcome/discourse-edit-post-animated.gif' } + let(:image_upload) { Fabricate(:image_upload, width: 5000, height: 5000) } describe 'when a topic has an image' do - it 'should return the image url' do - topic.update!(image_url: image_url) + before { topic.update!(image_upload_id: image_upload.id) } + it 'should return the image url' do json = serialize_topic(topic, user) - expect(json[:image_url]).to eq(image_url) + expect(json[:image_url]).to eq(image_upload.url) + end + + it 'should have thumbnails' do + SiteSetting.create_thumbnails = true + + Discourse.redis.del(topic.thumbnail_job_redis_key([])) + json = nil + + expect do + json = serialize_topic(topic, user) + end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(1) + + topic.generate_thumbnails! + + expect do + json = serialize_topic(topic, user) + end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(0) + + # Original + Optimized + expect(json[:thumbnails].length).to eq(2) end end diff --git a/spec/serializers/web_hook_topic_view_serializer_spec.rb b/spec/serializers/web_hook_topic_view_serializer_spec.rb index f0499f985e..df878fb7cb 100644 --- a/spec/serializers/web_hook_topic_view_serializer_spec.rb +++ b/spec/serializers/web_hook_topic_view_serializer_spec.rb @@ -50,6 +50,7 @@ RSpec.describe WebHookTopicViewSerializer do created_by last_poster tags + thumbnails } keys = serializer.as_json.keys From 04e493230745872493c8e98bf7e6c5819c0b619d Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 5 May 2020 09:50:50 +0100 Subject: [PATCH 012/442] DEV: Skip time-dependent bookmark test --- test/javascripts/acceptance/bookmarks-test.js | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/test/javascripts/acceptance/bookmarks-test.js b/test/javascripts/acceptance/bookmarks-test.js index 51d1706a4d..d30ff498c0 100644 --- a/test/javascripts/acceptance/bookmarks-test.js +++ b/test/javascripts/acceptance/bookmarks-test.js @@ -196,20 +196,25 @@ test("Editing a bookmark", async assert => { assert.verifySteps(["tomorrow"]); }); -test("Editing a bookmark that has a Later Today reminder, and it is before 6pm today", async assert => { - mockSuccessfulBookmarkPost(assert); - await visit("/t/internationalization-localization/280"); - await openBookmarkModal(); - await fillIn("input#bookmark-name", "Test name"); - await click("#tap_tile_later_today"); - await openEditBookmarkModal(); - assert.not( - exists("#bookmark-custon-date > input"), - "it does not show the custom date input" - ); - assert.ok( - exists("#tap_tile_later_today.active"), - "it preselects Later Today" - ); - assert.verifySteps(["later_today"]); -}); +QUnit.skip( + "Editing a bookmark that has a Later Today reminder, and it is before 6pm today", + async assert => { + // This test needs to mock the current time. sandbox.useFakeTimers() seems to break the `visit` step + + mockSuccessfulBookmarkPost(assert); + await visit("/t/internationalization-localization/280"); + await openBookmarkModal(); + await fillIn("input#bookmark-name", "Test name"); + await click("#tap_tile_later_today"); + await openEditBookmarkModal(); + assert.not( + exists("#bookmark-custon-date > input"), + "it does not show the custom date input" + ); + assert.ok( + exists("#tap_tile_later_today.active"), + "it preselects Later Today" + ); + assert.verifySteps(["later_today"]); + } +); From bd0abddf6f474011b760972cb8afc0cde11db123 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 5 May 2020 12:59:47 +0200 Subject: [PATCH 013/442] UX: attempts to have a better use of available space with sk (#9639) --- .../select-kit/components/select-kit.js | 31 ++++++++++++++++++- .../common/select-kit/category-drop.scss | 4 --- .../common/select-kit/category-row.scss | 2 +- .../select-kit/dropdown-select-box.scss | 3 +- .../common/select-kit/multi-select.scss | 4 --- .../select-kit/notifications-button.scss | 5 --- .../common/select-kit/pinned-button.scss | 6 ---- .../common/select-kit/select-kit.scss | 6 ---- .../topic-footer-mobile-dropdown.scss | 24 +++++++++----- app/assets/stylesheets/mobile/compose.scss | 7 ----- 10 files changed, 48 insertions(+), 44 deletions(-) diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js index e5c9394908..12a258357b 100644 --- a/app/assets/javascripts/select-kit/components/select-kit.js +++ b/app/assets/javascripts/select-kit/components/select-kit.js @@ -808,7 +808,7 @@ export default Component.extend( placementStrategy = inModal ? "fixed" : "absolute"; } - const verticalOffset = this.multiSelect ? 0 : 2; + const verticalOffset = this.multiSelect ? 0 : 3; /* global Popper:true */ this.popper = Popper.createPopper(anchor, popper, { @@ -822,6 +822,35 @@ export default Component.extend( offset: [0, verticalOffset] } }, + { + name: "applySmallScreenOffset", + enabled: window.innerWidth <= 450, + phase: "main", + fn({ state }) { + let { x } = state.elements.reference.getBoundingClientRect(); + state.modifiersData.popperOffsets.x = -x + 10; + } + }, + { + name: "applySmallScreenMaxWidth", + enabled: window.innerWidth <= 450, + phase: "beforeWrite", + fn({ state }) { + state.styles.popper.width = `${window.innerWidth - 20}px`; + } + }, + { + name: "sameWidth", + enabled: window.innerWidth > 400, + phase: "beforeWrite", + requires: ["computeStyles"], + fn: ({ state }) => { + state.styles.popper.minWidth = `${state.rects.reference.width}px`; + }, + effect: ({ state }) => { + state.elements.popper.style.minWidth = `${state.elements.reference.offsetWidth}px`; + } + }, { name: "positionWrapper", phase: "afterWrite", diff --git a/app/assets/stylesheets/common/select-kit/category-drop.scss b/app/assets/stylesheets/common/select-kit/category-drop.scss index 2f84f85a3c..8529cfd2a2 100644 --- a/app/assets/stylesheets/common/select-kit/category-drop.scss +++ b/app/assets/stylesheets/common/select-kit/category-drop.scss @@ -39,10 +39,6 @@ } } - .select-kit-body { - min-width: 300px; - } - .select-kit-row { flex-direction: column; align-items: flex-start; diff --git a/app/assets/stylesheets/common/select-kit/category-row.scss b/app/assets/stylesheets/common/select-kit/category-row.scss index 0d90a61814..2bbe33c96e 100644 --- a/app/assets/stylesheets/common/select-kit/category-row.scss +++ b/app/assets/stylesheets/common/select-kit/category-row.scss @@ -1,6 +1,6 @@ .select-kit { .category-row { - max-width: 320px; + max-width: 345px; .category-status { display: flex; align-items: center; 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 13ac7f46e3..5221072afa 100644 --- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss +++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss @@ -17,8 +17,6 @@ border: 1px solid $primary-low; background-clip: padding-box; box-shadow: shadow("dropdown"); - max-width: 300px; - width: 300px; } .select-kit-row { @@ -89,6 +87,7 @@ font-weight: normal; color: $primary-medium; white-space: normal; + min-width: 350px; } } } diff --git a/app/assets/stylesheets/common/select-kit/multi-select.scss b/app/assets/stylesheets/common/select-kit/multi-select.scss index 65d9d290d5..83648c0eb5 100644 --- a/app/assets/stylesheets/common/select-kit/multi-select.scss +++ b/app/assets/stylesheets/common/select-kit/multi-select.scss @@ -4,10 +4,6 @@ background: $secondary; border-radius: 0; - .select-kit-body { - width: 100%; - } - .select-kit-row { margin: 5px; min-height: 1px; diff --git a/app/assets/stylesheets/common/select-kit/notifications-button.scss b/app/assets/stylesheets/common/select-kit/notifications-button.scss index 03d7e8c209..40ed042d53 100644 --- a/app/assets/stylesheets/common/select-kit/notifications-button.scss +++ b/app/assets/stylesheets/common/select-kit/notifications-button.scss @@ -3,11 +3,6 @@ &.notifications-button { .select-kit-body { max-width: 400px; - width: 400px; - - @media screen and (max-width: 767px) { - width: auto; - } } .select-kit-row { diff --git a/app/assets/stylesheets/common/select-kit/pinned-button.scss b/app/assets/stylesheets/common/select-kit/pinned-button.scss index e1b31d2d82..f080b8a016 100644 --- a/app/assets/stylesheets/common/select-kit/pinned-button.scss +++ b/app/assets/stylesheets/common/select-kit/pinned-button.scss @@ -24,11 +24,5 @@ .pinned-options { display: inline; - - .select-kit-body { - min-width: unset; - max-width: unset; - width: 550px; - } } } diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss index 59a3d42a1b..2f2c31bb9b 100644 --- a/app/assets/stylesheets/common/select-kit/select-kit.scss +++ b/app/assets/stylesheets/common/select-kit/select-kit.scss @@ -1,6 +1,5 @@ .select-kit { border: none; - min-width: 220px; box-sizing: border-box; display: inline-block; flex-direction: column; @@ -22,12 +21,8 @@ .select-kit-body { display: flex; flex-direction: column; - left: 0; - position: absolute; - top: 0; align-items: center; justify-content: center; - max-width: 450px; } .select-kit-collection { @@ -133,7 +128,6 @@ display: none; background: $secondary; box-sizing: border-box; - width: auto; } .select-kit-row { diff --git a/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss b/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss index 42a90c7c6a..932ddf346f 100644 --- a/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss +++ b/app/assets/stylesheets/mobile/components/topic-footer-mobile-dropdown.scss @@ -1,11 +1,19 @@ -.topic-footer-mobile-dropdown { - .select-kit-row { - .svg-icon-title { - margin-right: 0.5em; - } - &.bookmarked { - .d-icon { - color: $tertiary; +.select-kit { + &.combo-box { + &.topic-footer-mobile-dropdown { + .select-kit-row { + .svg-icon-title { + margin-right: 0.5em; + } + &.bookmarked { + .d-icon { + color: $tertiary; + } + } + } + + .select-kit-collection { + max-height: 100%; } } } diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss index 636fa06ada..902f42102c 100644 --- a/app/assets/stylesheets/mobile/compose.scss +++ b/app/assets/stylesheets/mobile/compose.scss @@ -81,9 +81,6 @@ .category-input { margin-bottom: 5px; - .category-chooser { - width: 100% !important; - } } .submit-panel { @@ -206,10 +203,6 @@ } } } - - .title-and-category .select-kit { - min-width: unset; - } } .title-input, From 6b14a0f3528096d43d94a59961b37b6f585aff5e Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 5 May 2020 13:01:02 +0200 Subject: [PATCH 014/442] FIX: apply sameWidth from 450px screen width --- app/assets/javascripts/select-kit/components/select-kit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/select-kit/components/select-kit.js b/app/assets/javascripts/select-kit/components/select-kit.js index 12a258357b..61e21beeec 100644 --- a/app/assets/javascripts/select-kit/components/select-kit.js +++ b/app/assets/javascripts/select-kit/components/select-kit.js @@ -841,7 +841,7 @@ export default Component.extend( }, { name: "sameWidth", - enabled: window.innerWidth > 400, + enabled: window.innerWidth > 450, phase: "beforeWrite", requires: ["computeStyles"], fn: ({ state }) => { From 8010e1ab2edb4601ba34fe58c6b1507f064bea3d Mon Sep 17 00:00:00 2001 From: Zdravko Curic Date: Tue, 5 May 2020 15:18:02 +0200 Subject: [PATCH 015/442] DEV: Add remove button function to PluginAPI (#9627) --- .../discourse/app/lib/plugin-api.js | 16 ++++++- .../discourse/app/widgets/post-menu.js | 5 +++ test/javascripts/widgets/post-menu-test.js | 44 +++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 test/javascripts/widgets/post-menu-test.js diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js index 3d9dcd4a49..ab04e0e711 100644 --- a/app/assets/javascripts/discourse/app/lib/plugin-api.js +++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js @@ -5,7 +5,7 @@ import { addPluginOutletDecorator } from "discourse/components/plugin-connector" import { addTopicTitleDecorator } from "discourse/components/topic-title"; import ComposerEditor from "discourse/components/composer-editor"; import DiscourseBanner from "discourse/components/discourse-banner"; -import { addButton } from "discourse/widgets/post-menu"; +import { addButton, removeButton } from "discourse/widgets/post-menu"; import { includeAttributes } from "discourse/lib/transform-post"; import { registerHighlightJSLanguage } from "discourse/lib/highlight-syntax"; import { addToolbarCallback } from "discourse/components/d-editor"; @@ -399,11 +399,25 @@ class PluginApi { * position: 'first' // can be `first`, `last` or `second-last-hidden` * }; * }); + * ``` **/ addPostMenuButton(name, callback) { addButton(name, callback); } + /** + * Remove existing button below a post with your plugin. + * + * Example: + * + * ``` + * api.removePostMenuButton('like'); + * ``` + **/ + removePostMenuButton(name) { + removeButton(name); + } + /** * A hook that is called when the editor toolbar is created. You can * use this to add custom editor buttons. diff --git a/app/assets/javascripts/discourse/app/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js index 62489dc94d..b02253a8e1 100644 --- a/app/assets/javascripts/discourse/app/widgets/post-menu.js +++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js @@ -41,6 +41,11 @@ export function addButton(name, builder) { _extraButtons[name] = builder; } +export function removeButton(name) { + if (_extraButtons[name]) delete _extraButtons[name]; + if (_builders[name]) delete _builders[name]; +} + function registerButton(name, builder) { _builders[name] = builder; } diff --git a/test/javascripts/widgets/post-menu-test.js b/test/javascripts/widgets/post-menu-test.js new file mode 100644 index 0000000000..971fdfa348 --- /dev/null +++ b/test/javascripts/widgets/post-menu-test.js @@ -0,0 +1,44 @@ +import { moduleForWidget, widgetTest } from "helpers/widget-test"; +import { withPluginApi } from "discourse/lib/plugin-api"; + +moduleForWidget("post-menu"); + +widgetTest("add extra button", { + template: '{{mount-widget widget="post-menu" args=args}}', + beforeEach() { + this.set("args", {}); + withPluginApi("0.8", api => { + api.addPostMenuButton("coffee", () => { + return { + action: "drinkCoffee", + icon: "coffee", + className: "hot-coffee", + title: "coffee.title", + position: "first" + }; + }); + }); + }, + async test(assert) { + assert.ok( + find(".actions .extra-buttons .hot-coffee").length === 1, + "It renders extra button" + ); + } +}); + +widgetTest("remove extra button", { + template: '{{mount-widget widget="post-menu" args=args}}', + beforeEach() { + this.set("args", {}); + withPluginApi("0.8", api => { + api.removePostMenuButton("coffee"); + }); + }, + async test(assert) { + assert.ok( + find(".actions .extra-buttons .hot-coffee").length === 0, + "It doesn't removes coffee button" + ); + } +}); From 1019789d1a3b7cdadc89482aeead374b81f2164b Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Tue, 5 May 2020 16:56:04 +0300 Subject: [PATCH 016/442] FIX: Resolve Schema.org validation issues --- app/views/categories/index.html.erb | 2 +- app/views/layouts/crawler.html.erb | 30 ++++++++++++++++++++++++----- app/views/list/list.erb | 3 ++- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb index 3e476eabcc..93d3e17033 100644 --- a/app/views/categories/index.html.erb +++ b/app/views/categories/index.html.erb @@ -1,4 +1,5 @@
+ @@ -7,7 +8,6 @@ - <% @category_list.categories.each_with_index do |c, index| %>
diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb index b5a8345550..8848af5cf4 100644 --- a/app/views/layouts/crawler.html.erb +++ b/app/views/layouts/crawler.html.erb @@ -36,11 +36,31 @@