From b460582b6725a93fa002df2dbde55798a68afec4 Mon Sep 17 00:00:00 2001 From: beatrix Date: Fri, 12 May 2017 22:03:43 -0400 Subject: [PATCH] Revert HTML CW changes (#3020) * selectively Revert "Fix regressions from #2683 (#2970)" This reverts commit 3702e2c9242d312a4d807c43161d534df56352ec. * Revert "Handle hashtags in spoiler_texts (partial fix for #699) (#2683)" This reverts commit 4f54465c3bb794396ded7a97a655237a0cd6624d. --- app/javascript/mastodon/actions/notifications.js | 2 +- app/javascript/mastodon/components/status_content.js | 11 ++++------- app/lib/atom_serializer.rb | 2 +- app/services/process_hashtags_service.rb | 3 +-- app/services/process_mentions_service.rb | 4 +--- app/views/api/v1/statuses/_show.rabl | 3 +-- app/views/stream_entries/_detailed_status.html.haml | 2 +- app/views/stream_entries/_simple_status.html.haml | 2 +- 8 files changed, 11 insertions(+), 18 deletions(-) diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js index 323e2e9b66..da3d562d50 100644 --- a/app/javascript/mastodon/actions/notifications.js +++ b/app/javascript/mastodon/actions/notifications.js @@ -53,7 +53,7 @@ export function updateNotifications(notification, intlMessages, intlLocale) { // Desktop notifications if (typeof window.Notification !== 'undefined' && showAlert) { const title = new IntlMessageFormat(intlMessages[`notification.${notification.type}`], intlLocale).format({ name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username }); - const body = (notification.status && notification.status.spoiler_text.length > 0) ? unescapeHTML(notification.status.spoiler_text) : unescapeHTML(notification.status ? notification.status.content : ''); + const body = (notification.status && notification.status.spoiler_text.length > 0) ? notification.status.spoiler_text : unescapeHTML(notification.status ? notification.status.content : ''); const notify = new Notification(title, { body, icon: notification.account.avatar, tag: notification.id }); notify.addEventListener('click', () => { diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js index f7d6b750f2..c51f85d10c 100644 --- a/app/javascript/mastodon/components/status_content.js +++ b/app/javascript/mastodon/components/status_content.js @@ -93,7 +93,7 @@ class StatusContent extends React.PureComponent { const { hidden } = this.state; const content = { __html: emojify(status.get('content')) }; - const spoilerContent = { __html: emojify(status.get('spoiler_text', '')) }; + const spoilerContent = { __html: emojify(escapeTextContentForBrowser(status.get('spoiler_text', ''))) }; const directionStyle = { direction: 'ltr' }; if (isRtl(status.get('content'))) { @@ -116,19 +116,16 @@ class StatusContent extends React.PureComponent { } return ( -
+
{mentionsPlaceholder} ); } else if (this.props.onClick) { diff --git a/app/lib/atom_serializer.rb b/app/lib/atom_serializer.rb index 3113feac91..561bf7b59b 100644 --- a/app/lib/atom_serializer.rb +++ b/app/lib/atom_serializer.rb @@ -343,7 +343,7 @@ class AtomSerializer end def serialize_status_attributes(entry, status) - append_element(entry, 'summary', Formatter.instance.format(status.proper, :spoiler_text, false).to_str, 'xml:lang': status.language, type: 'html') if status.spoiler_text? + append_element(entry, 'summary', status.spoiler_text, 'xml:lang': status.language) if status.spoiler_text? append_element(entry, 'content', Formatter.instance.format(status).to_str, type: 'html', 'xml:lang': status.language) status.mentions.each do |mentioned| diff --git a/app/services/process_hashtags_service.rb b/app/services/process_hashtags_service.rb index 8904e2cf81..617a381590 100644 --- a/app/services/process_hashtags_service.rb +++ b/app/services/process_hashtags_service.rb @@ -2,8 +2,7 @@ class ProcessHashtagsService < BaseService def call(status, tags = []) - text = [status.text, status.spoiler_text].reject(&:blank?).join(' ') - tags = text.scan(Tag::HASHTAG_RE).map(&:first) if status.local? + tags = status.text.scan(Tag::HASHTAG_RE).map(&:first) if status.local? tags.map { |str| str.mb_chars.downcase }.uniq(&:to_s).each do |tag| status.tags << Tag.where(name: tag).first_or_initialize(name: tag) diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb index fd45810fb9..aa0a4d71bb 100644 --- a/app/services/process_mentions_service.rb +++ b/app/services/process_mentions_service.rb @@ -10,9 +10,7 @@ class ProcessMentionsService < BaseService def call(status) return unless status.local? - text = [status.text, status.spoiler_text].reject(&:blank?).join(' ') - - text.scan(Account::MENTION_RE).each do |match| + status.text.scan(Account::MENTION_RE).each do |match| username, domain = match.first.split('@') mentioned_account = Account.find_remote(username, domain) diff --git a/app/views/api/v1/statuses/_show.rabl b/app/views/api/v1/statuses/_show.rabl index 33bf394588..54e8a86d81 100644 --- a/app/views/api/v1/statuses/_show.rabl +++ b/app/views/api/v1/statuses/_show.rabl @@ -1,8 +1,7 @@ -attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id, :sensitive, :visibility +attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id, :sensitive, :spoiler_text, :visibility node(:uri) { |status| TagManager.instance.uri_for(status) } node(:content) { |status| Formatter.instance.format(status) } -node(:spoiler_text) { |status| Formatter.instance.format(status, :spoiler_text, false) } node(:url) { |status| TagManager.instance.url_for(status) } node(:reblogs_count) { |status| defined?(@reblogs_counts_map) ? (@reblogs_counts_map[status.id] || 0) : status.reblogs_count } node(:favourites_count) { |status| defined?(@favourites_counts_map) ? (@favourites_counts_map[status.id] || 0) : status.favourites_count } diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index 943d768dda..d22afb0822 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -10,7 +10,7 @@ .status__content.p-name.emojify< - if status.spoiler_text? %p{ style: 'margin-bottom: 0' }< - %span.p-summary> #{Formatter.instance.format(status, :spoiler_text, false)}  + %span.p-summary> #{status.spoiler_text}  %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl?(status.content) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status) diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index c076142955..3fa347f74d 100644 --- a/app/views/stream_entries/_simple_status.html.haml +++ b/app/views/stream_entries/_simple_status.html.haml @@ -16,7 +16,7 @@ .status__content.p-name.emojify< - if status.spoiler_text? %p{ style: 'margin-bottom: 0' }< - %span.p-summary> #{Formatter.instance.format(status, :spoiler_text, false)}  + %span.p-summary> #{status.spoiler_text}  %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl?(status.content) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status)