diff --git a/app/javascript/mastodon/features/account_timeline/components/limited_account_hint.js b/app/javascript/mastodon/features/account_timeline/components/limited_account_hint.js
new file mode 100644
index 0000000000..6b025596ca
--- /dev/null
+++ b/app/javascript/mastodon/features/account_timeline/components/limited_account_hint.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import { revealAccount } from 'mastodon/actions/accounts';
+import { FormattedMessage } from 'react-intl';
+import Button from 'mastodon/components/button';
+
+const mapDispatchToProps = (dispatch, { accountId }) => ({
+
+ reveal () {
+ dispatch(revealAccount(accountId));
+ },
+
+});
+
+export default @connect(() => {}, mapDispatchToProps)
+class LimitedAccountHint extends React.PureComponent {
+
+ static propTypes = {
+ accountId: PropTypes.string.isRequired,
+ reveal: PropTypes.func,
+ }
+
+ render () {
+ const { reveal } = this.props;
+
+ return (
+
+ );
+ }
+
+}
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.js b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
index b3f8521cb9..371794dd75 100644
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.js
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
@@ -1,6 +1,6 @@
import React from 'react';
import { connect } from 'react-redux';
-import { makeGetAccount } from '../../../selectors';
+import { makeGetAccount, getAccountHidden } from '../../../selectors';
import Header from '../components/header';
import {
followAccount,
@@ -33,6 +33,7 @@ const makeMapStateToProps = () => {
const mapStateToProps = (state, { accountId }) => ({
account: getAccount(state, accountId),
domain: state.getIn(['meta', 'domain']),
+ hidden: getAccountHidden(state, accountId),
});
return mapStateToProps;
diff --git a/app/javascript/mastodon/features/account_timeline/index.js b/app/javascript/mastodon/features/account_timeline/index.js
index 5122aec4e9..5b592c5a76 100644
--- a/app/javascript/mastodon/features/account_timeline/index.js
+++ b/app/javascript/mastodon/features/account_timeline/index.js
@@ -16,6 +16,8 @@ import MissingIndicator from 'mastodon/components/missing_indicator';
import TimelineHint from 'mastodon/components/timeline_hint';
import { me } from 'mastodon/initial_state';
import { connectTimeline, disconnectTimeline } from 'mastodon/actions/timelines';
+import LimitedAccountHint from './components/limited_account_hint';
+import { getAccountHidden } from 'mastodon/selectors';
const emptyList = ImmutableList();
@@ -40,6 +42,7 @@ const mapStateToProps = (state, { params: { acct, id }, withReplies = false }) =
isLoading: state.getIn(['timelines', `account:${path}`, 'isLoading']),
hasMore: state.getIn(['timelines', `account:${path}`, 'hasMore']),
suspended: state.getIn(['accounts', accountId, 'suspended'], false),
+ hidden: getAccountHidden(state, accountId),
blockedBy: state.getIn(['relationships', accountId, 'blocked_by'], false),
};
};
@@ -70,6 +73,7 @@ class AccountTimeline extends ImmutablePureComponent {
blockedBy: PropTypes.bool,
isAccount: PropTypes.bool,
suspended: PropTypes.bool,
+ hidden: PropTypes.bool,
remote: PropTypes.bool,
remoteUrl: PropTypes.string,
multiColumn: PropTypes.bool,
@@ -128,7 +132,7 @@ class AccountTimeline extends ImmutablePureComponent {
}
render () {
- const { statusIds, featuredStatusIds, isLoading, hasMore, blockedBy, suspended, isAccount, multiColumn, remote, remoteUrl } = this.props;
+ const { accountId, statusIds, featuredStatusIds, isLoading, hasMore, blockedBy, suspended, isAccount, hidden, multiColumn, remote, remoteUrl } = this.props;
if (!isAccount) {
return (
@@ -149,8 +153,12 @@ class AccountTimeline extends ImmutablePureComponent {
let emptyMessage;
+ const forceEmptyState = suspended || blockedBy || hidden;
+
if (suspended) {
emptyMessage =
;
+ } else if (hidden) {
+ emptyMessage =
;
} else if (blockedBy) {
emptyMessage =
;
} else if (remote && statusIds.isEmpty()) {
@@ -166,14 +174,14 @@ class AccountTimeline extends ImmutablePureComponent {
}
+ prepend={
}
alwaysPrepend
append={remoteMessage}
scrollKey='account_timeline'
- statusIds={(suspended || blockedBy) ? emptyList : statusIds}
+ statusIds={forceEmptyState ? emptyList : statusIds}
featuredStatusIds={featuredStatusIds}
isLoading={isLoading}
- hasMore={hasMore}
+ hasMore={!forceEmptyState && hasMore}
onLoadMore={this.handleLoadMore}
emptyMessage={emptyMessage}
bindToDocument={!multiColumn}
diff --git a/app/javascript/mastodon/features/blocks/index.js b/app/javascript/mastodon/features/blocks/index.js
index 7ec1774344..e00f2b60e0 100644
--- a/app/javascript/mastodon/features/blocks/index.js
+++ b/app/javascript/mastodon/features/blocks/index.js
@@ -69,7 +69,7 @@ class Blocks extends ImmutablePureComponent {
bindToDocument={!multiColumn}
>
{accountIds.map(id =>
-
,
+
,
)}
diff --git a/app/javascript/mastodon/features/followers/index.js b/app/javascript/mastodon/features/followers/index.js
index 224e74b3dd..5b7f402f8d 100644
--- a/app/javascript/mastodon/features/followers/index.js
+++ b/app/javascript/mastodon/features/followers/index.js
@@ -19,6 +19,8 @@ import ColumnBackButton from '../../components/column_back_button';
import ScrollableList from '../../components/scrollable_list';
import MissingIndicator from 'mastodon/components/missing_indicator';
import TimelineHint from 'mastodon/components/timeline_hint';
+import LimitedAccountHint from '../account_timeline/components/limited_account_hint';
+import { getAccountHidden } from 'mastodon/selectors';
const mapStateToProps = (state, { params: { acct, id } }) => {
const accountId = id || state.getIn(['accounts_map', acct]);
@@ -37,6 +39,8 @@ const mapStateToProps = (state, { params: { acct, id } }) => {
accountIds: state.getIn(['user_lists', 'followers', accountId, 'items']),
hasMore: !!state.getIn(['user_lists', 'followers', accountId, 'next']),
isLoading: state.getIn(['user_lists', 'followers', accountId, 'isLoading'], true),
+ suspended: state.getIn(['accounts', accountId, 'suspended'], false),
+ hidden: getAccountHidden(state, accountId),
blockedBy: state.getIn(['relationships', accountId, 'blocked_by'], false),
};
};
@@ -64,6 +68,8 @@ class Followers extends ImmutablePureComponent {
isLoading: PropTypes.bool,
blockedBy: PropTypes.bool,
isAccount: PropTypes.bool,
+ suspended: PropTypes.bool,
+ hidden: PropTypes.bool,
remote: PropTypes.bool,
remoteUrl: PropTypes.string,
multiColumn: PropTypes.bool,
@@ -101,7 +107,7 @@ class Followers extends ImmutablePureComponent {
}, 300, { leading: true });
render () {
- const { accountIds, hasMore, blockedBy, isAccount, multiColumn, isLoading, remote, remoteUrl } = this.props;
+ const { accountId, accountIds, hasMore, blockedBy, isAccount, multiColumn, isLoading, suspended, hidden, remote, remoteUrl } = this.props;
if (!isAccount) {
return (
@@ -121,7 +127,13 @@ class Followers extends ImmutablePureComponent {
let emptyMessage;
- if (blockedBy) {
+ const forceEmptyState = blockedBy || suspended || hidden;
+
+ if (suspended) {
+ emptyMessage =
;
+ } else if (hidden) {
+ emptyMessage =
;
+ } else if (blockedBy) {
emptyMessage =
;
} else if (remote && accountIds.isEmpty()) {
emptyMessage =
;
@@ -137,7 +149,7 @@ class Followers extends ImmutablePureComponent {
}
@@ -146,7 +158,7 @@ class Followers extends ImmutablePureComponent {
emptyMessage={emptyMessage}
bindToDocument={!multiColumn}
>
- {blockedBy ? [] : accountIds.map(id =>
+ {forceEmptyState ? [] : accountIds.map(id =>
,
)}
diff --git a/app/javascript/mastodon/features/following/index.js b/app/javascript/mastodon/features/following/index.js
index aadce1644f..143082d760 100644
--- a/app/javascript/mastodon/features/following/index.js
+++ b/app/javascript/mastodon/features/following/index.js
@@ -19,6 +19,8 @@ import ColumnBackButton from '../../components/column_back_button';
import ScrollableList from '../../components/scrollable_list';
import MissingIndicator from 'mastodon/components/missing_indicator';
import TimelineHint from 'mastodon/components/timeline_hint';
+import LimitedAccountHint from '../account_timeline/components/limited_account_hint';
+import { getAccountHidden } from 'mastodon/selectors';
const mapStateToProps = (state, { params: { acct, id } }) => {
const accountId = id || state.getIn(['accounts_map', acct]);
@@ -37,6 +39,8 @@ const mapStateToProps = (state, { params: { acct, id } }) => {
accountIds: state.getIn(['user_lists', 'following', accountId, 'items']),
hasMore: !!state.getIn(['user_lists', 'following', accountId, 'next']),
isLoading: state.getIn(['user_lists', 'following', accountId, 'isLoading'], true),
+ suspended: state.getIn(['accounts', accountId, 'suspended'], false),
+ hidden: getAccountHidden(state, accountId),
blockedBy: state.getIn(['relationships', accountId, 'blocked_by'], false),
};
};
@@ -64,6 +68,8 @@ class Following extends ImmutablePureComponent {
isLoading: PropTypes.bool,
blockedBy: PropTypes.bool,
isAccount: PropTypes.bool,
+ suspended: PropTypes.bool,
+ hidden: PropTypes.bool,
remote: PropTypes.bool,
remoteUrl: PropTypes.string,
multiColumn: PropTypes.bool,
@@ -101,7 +107,7 @@ class Following extends ImmutablePureComponent {
}, 300, { leading: true });
render () {
- const { accountIds, hasMore, blockedBy, isAccount, multiColumn, isLoading, remote, remoteUrl } = this.props;
+ const { accountId, accountIds, hasMore, blockedBy, isAccount, multiColumn, isLoading, suspended, hidden, remote, remoteUrl } = this.props;
if (!isAccount) {
return (
@@ -121,7 +127,13 @@ class Following extends ImmutablePureComponent {
let emptyMessage;
- if (blockedBy) {
+ const forceEmptyState = blockedBy || suspended || hidden;
+
+ if (suspended) {
+ emptyMessage =
;
+ } else if (hidden) {
+ emptyMessage =
;
+ } else if (blockedBy) {
emptyMessage =
;
} else if (remote && accountIds.isEmpty()) {
emptyMessage =
;
@@ -137,7 +149,7 @@ class Following extends ImmutablePureComponent {
}
@@ -146,7 +158,7 @@ class Following extends ImmutablePureComponent {
emptyMessage={emptyMessage}
bindToDocument={!multiColumn}
>
- {blockedBy ? [] : accountIds.map(id =>
+ {forceEmptyState ? [] : accountIds.map(id =>
,
)}
diff --git a/app/javascript/mastodon/features/mutes/index.js b/app/javascript/mastodon/features/mutes/index.js
index c1d50d1940..c21433cc41 100644
--- a/app/javascript/mastodon/features/mutes/index.js
+++ b/app/javascript/mastodon/features/mutes/index.js
@@ -69,7 +69,7 @@ class Mutes extends ImmutablePureComponent {
bindToDocument={!multiColumn}
>
{accountIds.map(id =>
-
,
+
,
)}
diff --git a/app/javascript/mastodon/reducers/accounts.js b/app/javascript/mastodon/reducers/accounts.js
index 530ed8e607..b5589668c1 100644
--- a/app/javascript/mastodon/reducers/accounts.js
+++ b/app/javascript/mastodon/reducers/accounts.js
@@ -1,4 +1,5 @@
-import { ACCOUNT_IMPORT, ACCOUNTS_IMPORT } from '../actions/importer';
+import { ACCOUNT_IMPORT, ACCOUNTS_IMPORT } from 'mastodon/actions/importer';
+import { ACCOUNT_REVEAL } from 'mastodon/actions/accounts';
import { Map as ImmutableMap, fromJS } from 'immutable';
const initialState = ImmutableMap();
@@ -10,6 +11,8 @@ const normalizeAccount = (state, account) => {
delete account.following_count;
delete account.statuses_count;
+ account.hidden = state.getIn([account.id, 'hidden']) === false ? false : account.limited;
+
return state.set(account.id, fromJS(account));
};
@@ -27,6 +30,8 @@ export default function accounts(state = initialState, action) {
return normalizeAccount(state, action.account);
case ACCOUNTS_IMPORT:
return normalizeAccounts(state, action.accounts);
+ case ACCOUNT_REVEAL:
+ return state.setIn([action.id, 'hidden'], false);
default:
return state;
}
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 1e19db65d0..3121774b3d 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -175,3 +175,11 @@ export const getAccountGallery = createSelector([
return medias;
});
+
+export const getAccountHidden = createSelector([
+ (state, id) => state.getIn(['accounts', id, 'hidden']),
+ (state, id) => state.getIn(['relationships', id, 'following']) || state.getIn(['relationships', id, 'requested']),
+ (state, id) => id === me,
+], (hidden, followingOrRequested, isSelf) => {
+ return hidden && !(isSelf || followingOrRequested);
+});
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 4a805992e6..e6133ee328 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4037,6 +4037,15 @@ a.status-card.compact:hover {
vertical-align: middle;
}
+.limited-account-hint {
+ p {
+ color: $secondary-text-color;
+ font-size: 15px;
+ font-weight: 500;
+ margin-bottom: 20px;
+ }
+}
+
.empty-column-indicator,
.error-column,
.follow_requests-unlocked_explanation {
diff --git a/app/lib/emoji_formatter.rb b/app/lib/emoji_formatter.rb
index f808f3a226..194849c23d 100644
--- a/app/lib/emoji_formatter.rb
+++ b/app/lib/emoji_formatter.rb
@@ -11,6 +11,7 @@ class EmojiFormatter
# @param [Array
] custom_emojis
# @param [Hash] options
# @option options [Boolean] :animate
+ # @option options [String] :style
def initialize(html, custom_emojis, options = {})
raise ArgumentError unless html.html_safe?
@@ -85,14 +86,29 @@ class EmojiFormatter
def image_for_emoji(shortcode, emoji)
original_url, static_url = emoji
- if animate?
- image_tag(original_url, draggable: false, class: 'emojione', alt: ":#{shortcode}:", title: ":#{shortcode}:")
- else
- image_tag(original_url, draggable: false, class: 'emojione custom-emoji', alt: ":#{shortcode}:", title: ":#{shortcode}:", data: { original: original_url, static: static_url })
- end
+ image_tag(
+ animate? ? original_url : static_url,
+ image_attributes.merge(alt: ":#{shortcode}:", title: ":#{shortcode}:", data: image_data_attributes(original_url, static_url))
+ )
+ end
+
+ def image_attributes
+ { rel: 'emoji', draggable: false, width: 16, height: 16, class: image_class_names, style: image_style }
+ end
+
+ def image_data_attributes(original_url, static_url)
+ { original: original_url, static: static_url } unless animate?
+ end
+
+ def image_class_names
+ animate? ? 'emojione' : 'emojione custom-emoji'
+ end
+
+ def image_style
+ @options[:style]
end
def animate?
- @options[:animate]
+ @options[:animate] || @options.key?(:style)
end
end
diff --git a/app/lib/rss/builder.rb b/app/lib/rss/builder.rb
new file mode 100644
index 0000000000..a9b3f08c5a
--- /dev/null
+++ b/app/lib/rss/builder.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class RSS::Builder
+ attr_reader :dsl
+
+ def self.build
+ new.tap do |builder|
+ yield builder.dsl
+ end.to_xml
+ end
+
+ def initialize
+ @dsl = RSS::Channel.new
+ end
+
+ def to_xml
+ (''.dup << Ox.dump(wrap_in_document, effort: :tolerant)).force_encoding('UTF-8')
+ end
+
+ private
+
+ def wrap_in_document
+ Ox::Document.new(version: '1.0').tap do |document|
+ document << Ox::Element.new('rss').tap do |rss|
+ rss['version'] = '2.0'
+ rss['xmlns:webfeeds'] = 'http://webfeeds.org/rss/1.0'
+ rss['xmlns:media'] = 'http://search.yahoo.com/mrss/'
+
+ rss << @dsl.to_element
+ end
+ end
+ end
+end
diff --git a/app/lib/rss/channel.rb b/app/lib/rss/channel.rb
new file mode 100644
index 0000000000..1dba94e47e
--- /dev/null
+++ b/app/lib/rss/channel.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class RSS::Channel < RSS::Element
+ def initialize
+ super()
+
+ @root = create_element('channel')
+ end
+
+ def title(str)
+ append_element('title', str)
+ end
+
+ def link(str)
+ append_element('link', str)
+ end
+
+ def last_build_date(date)
+ append_element('lastBuildDate', date.to_formatted_s(:rfc822))
+ end
+
+ def image(url, title, link)
+ append_element('image') do |image|
+ image << create_element('url', url)
+ image << create_element('title', title)
+ image << create_element('link', link)
+ end
+ end
+
+ def description(str)
+ append_element('description', str)
+ end
+
+ def generator(str)
+ append_element('generator', str)
+ end
+
+ def icon(str)
+ append_element('webfeeds:icon', str)
+ end
+
+ def logo(str)
+ append_element('webfeeds:logo', str)
+ end
+
+ def item(&block)
+ @root << RSS::Item.with(&block)
+ end
+end
diff --git a/app/lib/rss/element.rb b/app/lib/rss/element.rb
new file mode 100644
index 0000000000..7142fa0396
--- /dev/null
+++ b/app/lib/rss/element.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class RSS::Element
+ def self.with(*args, &block)
+ new(*args).tap(&block).to_element
+ end
+
+ def create_element(name, content = nil)
+ Ox::Element.new(name).tap do |element|
+ yield element if block_given?
+ element << content if content.present?
+ end
+ end
+
+ def append_element(name, content = nil)
+ @root << create_element(name, content).tap do |element|
+ yield element if block_given?
+ end
+ end
+
+ def to_element
+ @root
+ end
+end
diff --git a/app/lib/rss/item.rb b/app/lib/rss/item.rb
new file mode 100644
index 0000000000..c02991ace2
--- /dev/null
+++ b/app/lib/rss/item.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+class RSS::Item < RSS::Element
+ def initialize
+ super()
+
+ @root = create_element('item')
+ end
+
+ def title(str)
+ append_element('title', str)
+ end
+
+ def link(str)
+ append_element('guid', str) do |guid|
+ guid['isPermaLink'] = 'true'
+ end
+
+ append_element('link', str)
+ end
+
+ def pub_date(date)
+ append_element('pubDate', date.to_formatted_s(:rfc822))
+ end
+
+ def description(str)
+ append_element('description', str)
+ end
+
+ def category(str)
+ append_element('category', str)
+ end
+
+ def enclosure(url, type, size)
+ append_element('enclosure') do |enclosure|
+ enclosure['url'] = url
+ enclosure['length'] = size
+ enclosure['type'] = type
+ end
+ end
+
+ def media_content(url, type, size, &block)
+ @root << RSS::MediaContent.with(url, type, size, &block)
+ end
+end
diff --git a/app/lib/rss/media_content.rb b/app/lib/rss/media_content.rb
new file mode 100644
index 0000000000..7aefd8b40b
--- /dev/null
+++ b/app/lib/rss/media_content.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class RSS::MediaContent < RSS::Element
+ def initialize(url, type, size)
+ super()
+
+ @root = create_element('media:content') do |content|
+ content['url'] = url
+ content['type'] = type
+ content['fileSize'] = size
+ end
+ end
+
+ def medium(str)
+ @root['medium'] = str
+ end
+
+ def rating(str)
+ append_element('media:rating', str) do |rating|
+ rating['scheme'] = 'urn:simple'
+ end
+ end
+
+ def description(str)
+ append_element('media:description', str) do |description|
+ description['type'] = 'plain'
+ end
+ end
+end
diff --git a/app/lib/rss/serializer.rb b/app/lib/rss/serializer.rb
deleted file mode 100644
index d44e94221b..0000000000
--- a/app/lib/rss/serializer.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-class RSS::Serializer
- include FormattingHelper
-
- private
-
- def render_statuses(builder, statuses)
- statuses.each do |status|
- builder.item do |item|
- item.title(status_title(status))
- .link(ActivityPub::TagManager.instance.url_for(status))
- .pub_date(status.created_at)
- .description(status_description(status))
-
- status.ordered_media_attachments.each do |media|
- item.enclosure(full_asset_url(media.file.url(:original, false)), media.file.content_type, media.file.size)
- end
- end
- end
- end
-
- def status_title(status)
- preview = status.proper.spoiler_text.presence || status.proper.text
-
- if preview.length > 30 || preview[0, 30].include?("\n")
- preview = preview[0, 30]
- preview = preview[0, preview.index("\n").presence || 30] + '…'
- end
-
- preview = "#{status.proper.spoiler_text.present? ? 'CW ' : ''}“#{preview}”#{status.proper.sensitive? ? ' (sensitive)' : ''}"
-
- if status.reblog?
- "#{status.account.acct} boosted #{status.reblog.account.acct}: #{preview}"
- else
- "#{status.account.acct}: #{preview}"
- end
- end
-
- def status_description(status)
- if status.proper.spoiler_text?
- status.proper.spoiler_text
- else
- html = status_content_format(status.proper).to_str
- after_html = ''
-
- if status.proper.preloadable_poll
- poll_options_html = status.proper.preloadable_poll.options.map { |o| "[ ] #{o}" }.join('
')
- after_html = "#{poll_options_html}
"
- end
-
- "#{html}#{after_html}"
- end
- end
-end
diff --git a/app/lib/rss_builder.rb b/app/lib/rss_builder.rb
deleted file mode 100644
index 63ddba2e8e..0000000000
--- a/app/lib/rss_builder.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-# frozen_string_literal: true
-
-class RSSBuilder
- class ItemBuilder
- def initialize
- @item = Ox::Element.new('item')
- end
-
- def title(str)
- @item << (Ox::Element.new('title') << str)
-
- self
- end
-
- def link(str)
- @item << Ox::Element.new('guid').tap do |guid|
- guid['isPermalink'] = 'true'
- guid << str
- end
-
- @item << (Ox::Element.new('link') << str)
-
- self
- end
-
- def pub_date(date)
- @item << (Ox::Element.new('pubDate') << date.to_formatted_s(:rfc822))
-
- self
- end
-
- def description(str)
- @item << (Ox::Element.new('description') << str)
-
- self
- end
-
- def enclosure(url, type, size)
- @item << Ox::Element.new('enclosure').tap do |enclosure|
- enclosure['url'] = url
- enclosure['length'] = size
- enclosure['type'] = type
- end
-
- self
- end
-
- def to_element
- @item
- end
- end
-
- def initialize
- @document = Ox::Document.new(version: '1.0')
- @channel = Ox::Element.new('channel')
-
- @document << (rss << @channel)
- end
-
- def title(str)
- @channel << (Ox::Element.new('title') << str)
-
- self
- end
-
- def link(str)
- @channel << (Ox::Element.new('link') << str)
-
- self
- end
-
- def image(str)
- @channel << Ox::Element.new('image').tap do |image|
- image << (Ox::Element.new('url') << str)
- image << (Ox::Element.new('title') << '')
- image << (Ox::Element.new('link') << '')
- end
-
- @channel << (Ox::Element.new('webfeeds:icon') << str)
-
- self
- end
-
- def cover(str)
- @channel << Ox::Element.new('webfeeds:cover').tap do |cover|
- cover['image'] = str
- end
-
- self
- end
-
- def logo(str)
- @channel << (Ox::Element.new('webfeeds:logo') << str)
-
- self
- end
-
- def accent_color(str)
- @channel << (Ox::Element.new('webfeeds:accentColor') << str)
-
- self
- end
-
- def description(str)
- @channel << (Ox::Element.new('description') << str)
-
- self
- end
-
- def item
- @channel << ItemBuilder.new.tap do |item|
- yield item
- end.to_element
-
- self
- end
-
- def to_xml
- ('' + Ox.dump(@document, effort: :tolerant)).force_encoding('UTF-8')
- end
-
- private
-
- def rss
- Ox::Element.new('rss').tap do |rss|
- rss['version'] = '2.0'
- rss['xmlns:webfeeds'] = 'http://webfeeds.org/rss/1.0'
- end
- end
-end
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb
index 113e0cca70..e644a3f917 100644
--- a/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@@ -13,6 +13,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
has_many :emojis, serializer: REST::CustomEmojiSerializer
attribute :suspended, if: :suspended?
+ attribute :silenced, key: :limited, if: :silenced?
class FieldSerializer < ActiveModel::Serializer
include FormattingHelper
@@ -102,7 +103,11 @@ class REST::AccountSerializer < ActiveModel::Serializer
object.suspended?
end
- delegate :suspended?, to: :object
+ def silenced
+ object.silenced?
+ end
+
+ delegate :suspended?, :silenced?, to: :object
def moved_and_not_nested?
object.moved? && object.moved_to_account.moved_to_account_id.nil?
diff --git a/app/serializers/rss/account_serializer.rb b/app/serializers/rss/account_serializer.rb
deleted file mode 100644
index 81e24af0d0..0000000000
--- a/app/serializers/rss/account_serializer.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-class RSS::AccountSerializer < RSS::Serializer
- include ActionView::Helpers::NumberHelper
- include AccountsHelper
- include RoutingHelper
-
- def render(account, statuses, tag)
- builder = RSSBuilder.new
-
- builder.title("#{display_name(account)} (@#{account.local_username_and_domain})")
- .description(account_description(account))
- .link(tag.present? ? short_account_tag_url(account, tag) : short_account_url(account))
- .logo(full_pack_url('media/images/logo.svg'))
- .accent_color('2b90d9')
-
- builder.image(full_asset_url(account.avatar.url(:original))) if account.avatar?
- builder.cover(full_asset_url(account.header.url(:original))) if account.header?
-
- render_statuses(builder, statuses)
-
- builder.to_xml
- end
-
- def self.render(account, statuses, tag)
- new.render(account, statuses, tag)
- end
-end
diff --git a/app/serializers/rss/tag_serializer.rb b/app/serializers/rss/tag_serializer.rb
deleted file mode 100644
index e549ac3675..0000000000
--- a/app/serializers/rss/tag_serializer.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-class RSS::TagSerializer < RSS::Serializer
- include ActionView::Helpers::NumberHelper
- include ActionView::Helpers::SanitizeHelper
- include RoutingHelper
-
- def render(tag, statuses)
- builder = RSSBuilder.new
-
- builder.title("##{tag.name}")
- .description(strip_tags(I18n.t('about.about_hashtag_html', hashtag: tag.name)))
- .link(tag_url(tag))
- .logo(full_pack_url('media/images/logo.svg'))
- .accent_color('2b90d9')
-
- render_statuses(builder, statuses)
-
- builder.to_xml
- end
-
- def self.render(tag, statuses)
- new.render(tag, statuses)
- end
-end
diff --git a/app/views/accounts/show.rss.ruby b/app/views/accounts/show.rss.ruby
new file mode 100644
index 0000000000..73c1c51e07
--- /dev/null
+++ b/app/views/accounts/show.rss.ruby
@@ -0,0 +1,37 @@
+RSS::Builder.build do |doc|
+ doc.title(display_name(@account))
+ doc.description(I18n.t('rss.descriptions.account', acct: @account.local_username_and_domain))
+ doc.link(params[:tag].present? ? short_account_tag_url(@account, params[:tag]) : short_account_url(@account))
+ doc.image(full_asset_url(@account.avatar.url(:original)), display_name(@account), params[:tag].present? ? short_account_tag_url(@account, params[:tag]) : short_account_url(@account))
+ doc.last_build_date(@statuses.first.created_at) if @statuses.any?
+ doc.icon(full_asset_url(@account.avatar.url(:original)))
+ doc.logo(full_pack_url('media/images/logo_transparent_white.svg'))
+ doc.generator("Mastodon v#{Mastodon::Version.to_s}")
+
+ @statuses.each do |status|
+ doc.item do |item|
+ item.title(l(status.created_at))
+ item.link(ActivityPub::TagManager.instance.url_for(status))
+ item.pub_date(status.created_at)
+ item.description(rss_status_content_format(status))
+
+ if status.ordered_media_attachments.first&.audio?
+ media = status.ordered_media_attachments.first
+ item.enclosure(full_asset_url(media.file.url(:original, false)), media.file.content_type, media.file.size)
+ end
+
+ status.ordered_media_attachments.each do |media|
+ item.media_content(full_asset_url(media.file.url(:original, false)), media.file.content_type, media.file.size) do |media_content|
+ media_content.medium(media.gifv? ? 'image' : media.type.to_s)
+ media_content.rating(status.sensitive? ? 'adult' : 'nonadult')
+ media_content.description(media.description) if media.description.present?
+ media_content.thumbnail(media.thumbnail.url(:original, false)) if media.thumbnail?
+ end
+ end
+
+ status.tags.each do |tag|
+ item.category(tag.name)
+ end
+ end
+ end
+end
diff --git a/app/views/tags/show.rss.ruby b/app/views/tags/show.rss.ruby
new file mode 100644
index 0000000000..4152ecd24b
--- /dev/null
+++ b/app/views/tags/show.rss.ruby
@@ -0,0 +1,36 @@
+RSS::Builder.build do |doc|
+ doc.title("##{@tag.name}")
+ doc.description(I18n.t('rss.descriptions.tag', hashtag: @tag.name))
+ doc.link(tag_url(@tag))
+ doc.last_build_date(@statuses.first.created_at) if @statuses.any?
+ doc.icon(full_asset_url(@account.avatar.url(:original)))
+ doc.logo(full_pack_url('media/images/logo_transparent_white.svg'))
+ doc.generator("Mastodon v#{Mastodon::Version.to_s}")
+
+ @statuses.each do |status|
+ doc.item do |item|
+ item.title(l(status.created_at))
+ item.link(ActivityPub::TagManager.instance.url_for(status))
+ item.pub_date(status.created_at)
+ item.description(rss_status_content_format(status))
+
+ if status.ordered_media_attachments.first&.audio?
+ media = status.ordered_media_attachments.first
+ item.enclosure(full_asset_url(media.file.url(:original, false)), media.file.content_type, media.file.size)
+ end
+
+ status.ordered_media_attachments.each do |media|
+ item.media_content(full_asset_url(media.file.url(:original, false)), media.file.content_type, media.file.size) do |media_content|
+ media_content.medium(media.gifv? ? 'image' : media.type.to_s)
+ media_content.rating(status.sensitive? ? 'adult' : 'nonadult')
+ media_content.description(media.description) if media.description.present?
+ media_content.thumbnail(media.thumbnail.url(:original, false)) if media.thumbnail?
+ end
+ end
+
+ status.tags.each do |tag|
+ item.category(tag.name)
+ end
+ end
+ end
+end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2c8455d0ae..50e762db72 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1357,6 +1357,11 @@ en:
reports:
errors:
invalid_rules: does not reference valid rules
+ rss:
+ content_warning: 'Content warning:'
+ descriptions:
+ account: Public posts from @%{acct}
+ tag: 'Public posts tagged #%{hashtag}'
scheduled_statuses:
over_daily_limit: You have exceeded the limit of %{limit} scheduled posts for today
over_total_limit: You have exceeded the limit of %{limit} scheduled posts
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index a89af67780..d652468b37 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -8,6 +8,14 @@ namespace :mastodon do
prompt = TTY::Prompt.new
env = {}
+ # When the application code gets loaded, it runs `lib/mastodon/redis_configuration.rb`.
+ # This happens before application environment configuration and sets REDIS_URL etc.
+ # These variables are then used even when REDIS_HOST etc. are changed, so clear them
+ # out so they don't interfer with our new configuration.
+ ENV.delete('REDIS_URL')
+ ENV.delete('CACHE_REDIS_URL')
+ ENV.delete('SIDEKIQ_REDIS_URL')
+
begin
prompt.say('Your instance is identified by its domain name. Changing it afterward will break things.')
env['LOCAL_DOMAIN'] = prompt.ask('Domain name:') do |q|
diff --git a/package.json b/package.json
index 69283b6984..68b7f12f0a 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
"@gamestdio/websocket": "^0.3.2",
"@github/webauthn-json": "^0.5.7",
"@rails/ujs": "^6.1.5",
- "array-includes": "^3.1.4",
+ "array-includes": "^3.1.5",
"atrament": "0.2.4",
"arrow-key-navigation": "^1.2.0",
"autoprefixer": "^9.8.8",
@@ -110,7 +110,7 @@
"react-redux-loading-bar": "^4.0.8",
"react-router-dom": "^4.1.1",
"react-router-scroll-4": "^1.0.0-beta.1",
- "react-select": "^5.3.1",
+ "react-select": "^5.3.2",
"react-sparklines": "^1.7.0",
"react-swipeable-views": "^0.14.0",
"react-textarea-autosize": "^8.3.3",
@@ -147,14 +147,14 @@
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^12.1.5",
"babel-eslint": "^10.1.0",
- "babel-jest": "^28.0.3",
+ "babel-jest": "^28.1.0",
"eslint": "^7.32.0",
"eslint-plugin-import": "~2.26.0",
"eslint-plugin-jsx-a11y": "~6.5.1",
"eslint-plugin-promise": "~6.0.0",
"eslint-plugin-react": "~7.29.4",
- "jest": "^28.0.3",
- "jest-environment-jsdom": "^28.0.2",
+ "jest": "^28.1.0",
+ "jest-environment-jsdom": "^28.1.0",
"prettier": "^2.6.2",
"raf": "^3.4.1",
"react-intl-translations-manager": "^5.0.3",
diff --git a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
index 7b86513bef..569c8322bd 100644
--- a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
@@ -22,7 +22,7 @@ describe Settings::TwoFactorAuthentication::ConfirmationsController do
let(:user) { Fabricate(:user, email: 'local-part@domain', otp_secret: with_otp_secret ? 'oldotpsecret' : nil) }
describe 'GET #new' do
- context 'when signed in and a new otp secret has been setted in the session' do
+ context 'when signed in and a new otp secret has been set in the session' do
subject do
sign_in user, scope: :user
get :new, session: { challenge_passed_at: Time.now.utc, new_otp_secret: 'thisisasecretforthespecofnewview' }
@@ -36,7 +36,7 @@ describe Settings::TwoFactorAuthentication::ConfirmationsController do
expect(response).to redirect_to('/auth/sign_in')
end
- it 'redirects if a new otp_secret has not been setted in the session' do
+ it 'redirects if a new otp_secret has not been set in the session' do
sign_in user, scope: :user
get :new, session: { challenge_passed_at: Time.now.utc }
expect(response).to redirect_to('/settings/otp_authentication')
diff --git a/spec/lib/emoji_formatter_spec.rb b/spec/lib/emoji_formatter_spec.rb
index 129445aa59..e1747bdd9d 100644
--- a/spec/lib/emoji_formatter_spec.rb
+++ b/spec/lib/emoji_formatter_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe EmojiFormatter do
let(:text) { preformat_text(':coolcat: Beep boop') }
it 'converts the shortcode to an image tag' do
- is_expected.to match(/