commit: 3dcb5fa28f13f597d49b5b442f61d12bc2be6152
parent: 1d5dcfcd46b973791c4f19f1dd66f33f3498800a
Author: beatrix <beatrix.bitrot@gmail.com>
Date: Fri, 12 May 2017 22:03:43 -0400
Revert HTML CW changes (#3020)
* selectively Revert "Fix regressions from #2683 (#2970)"
This reverts commit 72698bc3b49925a2b2955f32e5a562c1eecd729b.
* Revert "Handle hashtags in spoiler_texts (partial fix for #699) (#2683)"
This reverts commit e2491680e696d2c285a798ec4c66b26d2748df66.
Diffstat:
8 files changed, 11 insertions(+), 18 deletions(-)
diff --git 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
@@ -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 (
- <div
- ref={this.setRef}
- className='status__content'
- onMouseDown={this.handleMouseDown}
- onMouseUp={this.handleMouseUp}
- >
+ <div className='status__content' ref={this.setRef} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
<p style={{ marginBottom: hidden && status.get('mentions').size === 0 ? '0px' : '' }} >
<span dangerouslySetInnerHTML={spoilerContent} /> <button tabIndex='0' className='status__content__spoiler-link' onClick={this.handleSpoilerClick}>{toggleText}</button>
+
</p>
{mentionsPlaceholder}
<div style={{ display: hidden ? 'none' : 'block', ...directionStyle }} dangerouslySetInnerHTML={content} />
+
</div>
);
} else if (this.props.onClick) {
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)