@@ -106,6 +109,10 @@ class ColumnSettings extends React.PureComponent {
{this.modeSelect('none')}
)}
+
+
+ } />
+
);
}
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.js b/app/javascript/mastodon/features/hashtag_timeline/index.js
index 28200e6c2..3e06e3652 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/index.js
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.js
@@ -98,21 +98,21 @@ class HashtagTimeline extends React.PureComponent {
componentDidMount () {
const { dispatch } = this.props;
- const { id, tags } = this.props.params;
+ const { id, tags, local } = this.props.params;
this._subscribe(dispatch, id, tags);
- dispatch(expandHashtagTimeline(id, { tags }));
+ dispatch(expandHashtagTimeline(id, { tags, local }));
}
componentWillReceiveProps (nextProps) {
const { dispatch, params } = this.props;
- const { id, tags } = nextProps.params;
+ const { id, tags, local } = nextProps.params;
- if (id !== params.id || !isEqual(tags, params.tags)) {
+ if (id !== params.id || !isEqual(tags, params.tags) || !isEqual(local, params.local)) {
this._unsubscribe();
this._subscribe(dispatch, id, tags);
- this.props.dispatch(clearTimeline(`hashtag:${id}`));
- this.props.dispatch(expandHashtagTimeline(id, { tags }));
+ dispatch(clearTimeline(`hashtag:${id}`));
+ dispatch(expandHashtagTimeline(id, { tags, local }));
}
}
@@ -125,8 +125,8 @@ class HashtagTimeline extends React.PureComponent {
}
handleLoadMore = maxId => {
- const { id, tags } = this.props.params;
- this.props.dispatch(expandHashtagTimeline(id, { maxId, tags }));
+ const { id, tags, local } = this.props.params;
+ this.props.dispatch(expandHashtagTimeline(id, { maxId, tags, local }));
}
render () {
diff --git a/app/javascript/mastodon/features/mutes/index.js b/app/javascript/mastodon/features/mutes/index.js
index 3f58a62d2..17ff5c762 100644
--- a/app/javascript/mastodon/features/mutes/index.js
+++ b/app/javascript/mastodon/features/mutes/index.js
@@ -19,6 +19,7 @@ const messages = defineMessages({
const mapStateToProps = state => ({
accountIds: state.getIn(['user_lists', 'mutes', 'items']),
hasMore: !!state.getIn(['user_lists', 'mutes', 'next']),
+ isLoading: state.getIn(['user_lists', 'mutes', 'isLoading'], true),
});
export default @connect(mapStateToProps)
@@ -30,6 +31,7 @@ class Mutes extends ImmutablePureComponent {
dispatch: PropTypes.func.isRequired,
shouldUpdateScroll: PropTypes.func,
hasMore: PropTypes.bool,
+ isLoading: PropTypes.bool,
accountIds: ImmutablePropTypes.list,
intl: PropTypes.object.isRequired,
multiColumn: PropTypes.bool,
@@ -44,7 +46,7 @@ class Mutes extends ImmutablePureComponent {
}, 300, { leading: true });
render () {
- const { intl, shouldUpdateScroll, hasMore, accountIds, multiColumn } = this.props;
+ const { intl, shouldUpdateScroll, hasMore, accountIds, multiColumn, isLoading } = this.props;
if (!accountIds) {
return (
@@ -63,6 +65,7 @@ class Mutes extends ImmutablePureComponent {
scrollKey='mutes'
onLoadMore={this.handleLoadMore}
hasMore={hasMore}
+ isLoading={isLoading}
shouldUpdateScroll={shouldUpdateScroll}
emptyMessage={emptyMessage}
bindToDocument={!multiColumn}
diff --git a/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js b/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js
index 73919c39d..d3d8a6507 100644
--- a/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js
+++ b/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js
@@ -24,19 +24,25 @@ class HashtagTimeline extends React.PureComponent {
isLoading: PropTypes.bool.isRequired,
hasMore: PropTypes.bool.isRequired,
hashtag: PropTypes.string.isRequired,
+ local: PropTypes.bool.isRequired,
+ };
+
+ static defaultProps = {
+ local: false,
};
componentDidMount () {
- const { dispatch, hashtag } = this.props;
+ const { dispatch, hashtag, local } = this.props;
- dispatch(expandHashtagTimeline(hashtag));
+ dispatch(expandHashtagTimeline(hashtag, { local }));
}
handleLoadMore = () => {
- const maxId = this.props.statusIds.last();
+ const { dispatch, hashtag, local, statusIds } = this.props;
+ const maxId = statusIds.last();
if (maxId) {
- this.props.dispatch(expandHashtagTimeline(this.props.hashtag, { maxId }));
+ dispatch(expandHashtagTimeline(hashtag, { maxId, local }));
}
}
diff --git a/app/javascript/mastodon/reducers/user_lists.js b/app/javascript/mastodon/reducers/user_lists.js
index a7853452f..e7eef2364 100644
--- a/app/javascript/mastodon/reducers/user_lists.js
+++ b/app/javascript/mastodon/reducers/user_lists.js
@@ -2,12 +2,24 @@ import {
NOTIFICATIONS_UPDATE,
} from '../actions/notifications';
import {
+ FOLLOWERS_FETCH_REQUEST,
FOLLOWERS_FETCH_SUCCESS,
+ FOLLOWERS_FETCH_FAIL,
+ FOLLOWERS_EXPAND_REQUEST,
FOLLOWERS_EXPAND_SUCCESS,
+ FOLLOWERS_EXPAND_FAIL,
+ FOLLOWING_FETCH_REQUEST,
FOLLOWING_FETCH_SUCCESS,
+ FOLLOWING_FETCH_FAIL,
+ FOLLOWING_EXPAND_REQUEST,
FOLLOWING_EXPAND_SUCCESS,
+ FOLLOWING_EXPAND_FAIL,
+ FOLLOW_REQUESTS_FETCH_REQUEST,
FOLLOW_REQUESTS_FETCH_SUCCESS,
+ FOLLOW_REQUESTS_FETCH_FAIL,
+ FOLLOW_REQUESTS_EXPAND_REQUEST,
FOLLOW_REQUESTS_EXPAND_SUCCESS,
+ FOLLOW_REQUESTS_EXPAND_FAIL,
FOLLOW_REQUEST_AUTHORIZE_SUCCESS,
FOLLOW_REQUEST_REJECT_SUCCESS,
} from '../actions/accounts';
@@ -16,12 +28,20 @@ import {
FAVOURITES_FETCH_SUCCESS,
} from '../actions/interactions';
import {
+ BLOCKS_FETCH_REQUEST,
BLOCKS_FETCH_SUCCESS,
+ BLOCKS_FETCH_FAIL,
+ BLOCKS_EXPAND_REQUEST,
BLOCKS_EXPAND_SUCCESS,
+ BLOCKS_EXPAND_FAIL,
} from '../actions/blocks';
import {
+ MUTES_FETCH_REQUEST,
MUTES_FETCH_SUCCESS,
+ MUTES_FETCH_FAIL,
+ MUTES_EXPAND_REQUEST,
MUTES_EXPAND_SUCCESS,
+ MUTES_EXPAND_FAIL,
} from '../actions/mutes';
import {
DIRECTORY_FETCH_REQUEST,
@@ -47,12 +67,13 @@ const normalizeList = (state, type, id, accounts, next) => {
return state.setIn([type, id], ImmutableMap({
next,
items: ImmutableList(accounts.map(item => item.id)),
+ isLoading: false,
}));
};
const appendToList = (state, type, id, accounts, next) => {
return state.updateIn([type, id], map => {
- return map.set('next', next).update('items', list => list.concat(accounts.map(item => item.id)));
+ return map.set('next', next).set('isLoading', false).update('items', list => list.concat(accounts.map(item => item.id)));
});
};
@@ -68,10 +89,22 @@ export default function userLists(state = initialState, action) {
return normalizeList(state, 'followers', action.id, action.accounts, action.next);
case FOLLOWERS_EXPAND_SUCCESS:
return appendToList(state, 'followers', action.id, action.accounts, action.next);
+ case FOLLOWERS_FETCH_REQUEST:
+ case FOLLOWERS_EXPAND_REQUEST:
+ return state.setIn(['followers', action.id, 'isLoading'], true);
+ case FOLLOWERS_FETCH_FAIL:
+ case FOLLOWERS_EXPAND_FAIL:
+ return state.setIn(['followers', action.id, 'isLoading'], false);
case FOLLOWING_FETCH_SUCCESS:
return normalizeList(state, 'following', action.id, action.accounts, action.next);
case FOLLOWING_EXPAND_SUCCESS:
return appendToList(state, 'following', action.id, action.accounts, action.next);
+ case FOLLOWING_FETCH_REQUEST:
+ case FOLLOWING_EXPAND_REQUEST:
+ return state.setIn(['following', action.id, 'isLoading'], true);
+ case FOLLOWING_FETCH_FAIL:
+ case FOLLOWING_EXPAND_FAIL:
+ return state.setIn(['following', action.id, 'isLoading'], false);
case REBLOGS_FETCH_SUCCESS:
return state.setIn(['reblogged_by', action.id], ImmutableList(action.accounts.map(item => item.id)));
case FAVOURITES_FETCH_SUCCESS:
@@ -79,9 +112,15 @@ export default function userLists(state = initialState, action) {
case NOTIFICATIONS_UPDATE:
return action.notification.type === 'follow_request' ? normalizeFollowRequest(state, action.notification) : state;
case FOLLOW_REQUESTS_FETCH_SUCCESS:
- return state.setIn(['follow_requests', 'items'], ImmutableList(action.accounts.map(item => item.id))).setIn(['follow_requests', 'next'], action.next);
+ return state.setIn(['follow_requests', 'items'], ImmutableList(action.accounts.map(item => item.id))).setIn(['follow_requests', 'next'], action.next).setIn(['follow_requests', 'isLoading'], false);
case FOLLOW_REQUESTS_EXPAND_SUCCESS:
- return state.updateIn(['follow_requests', 'items'], list => list.concat(action.accounts.map(item => item.id))).setIn(['follow_requests', 'next'], action.next);
+ return state.updateIn(['follow_requests', 'items'], list => list.concat(action.accounts.map(item => item.id))).setIn(['follow_requests', 'next'], action.next).setIn(['follow_requests', 'isLoading'], false);
+ case FOLLOW_REQUESTS_FETCH_REQUEST:
+ case FOLLOW_REQUESTS_EXPAND_REQUEST:
+ return state.setIn(['follow_requests', 'isLoading'], true);
+ case FOLLOW_REQUESTS_FETCH_FAIL:
+ case FOLLOW_REQUESTS_EXPAND_FAIL:
+ return state.setIn(['follow_requests', 'isLoading'], false);
case FOLLOW_REQUEST_AUTHORIZE_SUCCESS:
case FOLLOW_REQUEST_REJECT_SUCCESS:
return state.updateIn(['follow_requests', 'items'], list => list.filterNot(item => item === action.id));
@@ -89,10 +128,22 @@ export default function userLists(state = initialState, action) {
return state.setIn(['blocks', 'items'], ImmutableList(action.accounts.map(item => item.id))).setIn(['blocks', 'next'], action.next);
case BLOCKS_EXPAND_SUCCESS:
return state.updateIn(['blocks', 'items'], list => list.concat(action.accounts.map(item => item.id))).setIn(['blocks', 'next'], action.next);
+ case BLOCKS_FETCH_REQUEST:
+ case BLOCKS_EXPAND_REQUEST:
+ return state.setIn(['blocks', 'isLoading'], true);
+ case BLOCKS_FETCH_FAIL:
+ case BLOCKS_EXPAND_FAIL:
+ return state.setIn(['blocks', 'isLoading'], false);
case MUTES_FETCH_SUCCESS:
return state.setIn(['mutes', 'items'], ImmutableList(action.accounts.map(item => item.id))).setIn(['mutes', 'next'], action.next);
case MUTES_EXPAND_SUCCESS:
return state.updateIn(['mutes', 'items'], list => list.concat(action.accounts.map(item => item.id))).setIn(['mutes', 'next'], action.next);
+ case MUTES_FETCH_REQUEST:
+ case MUTES_EXPAND_REQUEST:
+ return state.setIn(['mutes', 'isLoading'], true);
+ case MUTES_FETCH_FAIL:
+ case MUTES_EXPAND_FAIL:
+ return state.setIn(['mutes', 'isLoading'], false);
case DIRECTORY_FETCH_SUCCESS:
return state.setIn(['directory', 'items'], ImmutableList(action.accounts.map(item => item.id))).setIn(['directory', 'isLoading'], false);
case DIRECTORY_EXPAND_SUCCESS:
diff --git a/app/javascript/mastodon/utils/resize_image.js b/app/javascript/mastodon/utils/resize_image.js
index 7196dc96b..710a08f7c 100644
--- a/app/javascript/mastodon/utils/resize_image.js
+++ b/app/javascript/mastodon/utils/resize_image.js
@@ -2,6 +2,45 @@ import EXIF from 'exif-js';
const MAX_IMAGE_PIXELS = 1638400; // 1280x1280px
+const _browser_quirks = {};
+
+// Some browsers will automatically draw images respecting their EXIF orientation
+// while others won't, and the safest way to detect that is to examine how it
+// is done on a known image.
+// See https://github.com/w3c/csswg-drafts/issues/4666
+// and https://github.com/blueimp/JavaScript-Load-Image/commit/1e4df707821a0afcc11ea0720ee403b8759f3881
+const dropOrientationIfNeeded = (orientation) => new Promise(resolve => {
+ switch (_browser_quirks['image-orientation-automatic']) {
+ case true:
+ resolve(1);
+ break;
+ case false:
+ resolve(orientation);
+ break;
+ default:
+ // black 2x1 JPEG, with the following meta information set:
+ // - EXIF Orientation: 6 (Rotated 90ยฐ CCW)
+ const testImageURL =
+ 'data:image/jpeg;base64,/9j/4QAiRXhpZgAATU0AKgAAAAgAAQESAAMAAAABAAYAAAA' +
+ 'AAAD/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBA' +
+ 'QEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQE' +
+ 'BAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/AABEIAAEAAgMBEQACEQEDEQH/x' +
+ 'ABKAAEAAAAAAAAAAAAAAAAAAAALEAEAAAAAAAAAAAAAAAAAAAAAAQEAAAAAAAAAAAAAAAA' +
+ 'AAAAAEQEAAAAAAAAAAAAAAAAAAAAA/9oADAMBAAIRAxEAPwA/8H//2Q==';
+ const img = new Image();
+ img.onload = () => {
+ const automatic = (img.width === 1 && img.height === 2);
+ _browser_quirks['image-orientation-automatic'] = automatic;
+ resolve(automatic ? 1 : orientation);
+ };
+ img.onerror = () => {
+ _browser_quirks['image-orientation-automatic'] = false;
+ resolve(orientation);
+ };
+ img.src = testImageURL;
+ }
+});
+
const getImageUrl = inputFile => new Promise((resolve, reject) => {
if (window.URL && URL.createObjectURL) {
try {
@@ -38,7 +77,11 @@ const getOrientation = (img, type = 'image/png') => new Promise(resolve => {
EXIF.getData(img, () => {
const orientation = EXIF.getTag(img, 'Orientation');
- resolve(orientation);
+ if (orientation !== 1) {
+ dropOrientationIfNeeded(orientation).then(resolve).catch(() => resolve(orientation));
+ } else {
+ resolve(orientation);
+ }
});
});
diff --git a/app/lib/delivery_failure_tracker.rb b/app/lib/delivery_failure_tracker.rb
index 8d3be35de..25fa694d2 100644
--- a/app/lib/delivery_failure_tracker.rb
+++ b/app/lib/delivery_failure_tracker.rb
@@ -3,47 +3,53 @@
class DeliveryFailureTracker
FAILURE_DAYS_THRESHOLD = 7
- def initialize(inbox_url)
- @inbox_url = inbox_url
+ def initialize(url_or_host)
+ @host = url_or_host.start_with?('https://') || url_or_host.start_with?('http://') ? Addressable::URI.parse(url_or_host).normalized_host : url_or_host
end
def track_failure!
Redis.current.sadd(exhausted_deliveries_key, today)
- Redis.current.sadd('unavailable_inboxes', @inbox_url) if reached_failure_threshold?
+ UnavailableDomain.create(domain: @host) if reached_failure_threshold?
end
def track_success!
Redis.current.del(exhausted_deliveries_key)
- Redis.current.srem('unavailable_inboxes', @inbox_url)
+ UnavailableDomain.find_by(domain: @host)&.destroy
end
def days
Redis.current.scard(exhausted_deliveries_key) || 0
end
- class << self
- def filter(arr)
- arr.reject(&method(:unavailable?))
- end
+ def available?
+ !UnavailableDomain.where(domain: @host).exists?
+ end
- def unavailable?(url)
- Redis.current.sismember('unavailable_inboxes', url)
+ alias reset! track_success!
+
+ class << self
+ def without_unavailable(urls)
+ unavailable_domains_map = Rails.cache.fetch('unavailable_domains') { UnavailableDomain.pluck(:domain).each_with_object({}) { |domain, hash| hash[domain] = true } }
+
+ urls.reject do |url|
+ host = Addressable::URI.parse(url).normalized_host
+ unavailable_domains_map[host]
+ end
end
def available?(url)
- !unavailable?(url)
+ new(url).available?
end
- def track_inverse_success!(from_account)
- new(from_account.inbox_url).track_success! if from_account.inbox_url.present?
- new(from_account.shared_inbox_url).track_success! if from_account.shared_inbox_url.present?
+ def reset!(url)
+ new(url).reset!
end
end
private
def exhausted_deliveries_key
- "exhausted_deliveries:#{@inbox_url}"
+ "exhausted_deliveries:#{@host}"
end
def today
diff --git a/app/models/account.rb b/app/models/account.rb
index 6aceb809c..dc14e8538 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -413,7 +413,7 @@ class Account < ApplicationRecord
def inboxes
urls = reorder(nil).where(protocol: :activitypub).pluck(Arel.sql("distinct coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url)"))
- DeliveryFailureTracker.filter(urls)
+ DeliveryFailureTracker.without_unavailable(urls)
end
def search_for(terms, limit = 10, offset = 0)
diff --git a/app/models/account_alias.rb b/app/models/account_alias.rb
index 66f8ce409..792e9e8d4 100644
--- a/app/models/account_alias.rb
+++ b/app/models/account_alias.rb
@@ -16,8 +16,8 @@ class AccountAlias < ApplicationRecord
belongs_to :account
validates :acct, presence: true, domain: { acct: true }
- validates :uri, presence: true
validates :uri, uniqueness: { scope: :account_id }
+ validate :validate_target_account
before_validation :set_uri
after_create :add_to_account
@@ -44,4 +44,12 @@ class AccountAlias < ApplicationRecord
def remove_from_account
account.update(also_known_as: account.also_known_as.reject { |x| x == uri })
end
+
+ def validate_target_account
+ if uri.blank?
+ errors.add(:acct, I18n.t('migrations.errors.not_found'))
+ elsif ActivityPub::TagManager.instance.uri_for(account) == uri
+ errors.add(:acct, I18n.t('migrations.errors.move_to_self'))
+ end
+ end
end
diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index a4e427b49..c493604c2 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -14,7 +14,7 @@
# created_at :datetime not null
# updated_at :datetime not null
# published_at :datetime
-# status_ids :bigint is an Array
+# status_ids :bigint(8) is an Array
#
class Announcement < ApplicationRecord
diff --git a/app/models/relay.rb b/app/models/relay.rb
index 8c8a97db3..870f31979 100644
--- a/app/models/relay.rb
+++ b/app/models/relay.rb
@@ -27,7 +27,7 @@ class Relay < ApplicationRecord
payload = Oj.dump(follow_activity(activity_id))
update!(state: :pending, follow_activity_id: activity_id)
- DeliveryFailureTracker.new(inbox_url).track_success!
+ DeliveryFailureTracker.track_success!(inbox_url)
ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, inbox_url)
end
@@ -36,7 +36,7 @@ class Relay < ApplicationRecord
payload = Oj.dump(unfollow_activity(activity_id))
update!(state: :idle, follow_activity_id: nil)
- DeliveryFailureTracker.new(inbox_url).track_success!
+ DeliveryFailureTracker.track_success!(inbox_url)
ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, inbox_url)
end
diff --git a/app/models/unavailable_domain.rb b/app/models/unavailable_domain.rb
new file mode 100644
index 000000000..e2918b586
--- /dev/null
+++ b/app/models/unavailable_domain.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: unavailable_domains
+#
+# id :bigint(8) not null, primary key
+# domain :string default(""), not null
+# created_at :datetime not null
+# updated_at :datetime not null
+#
+
+class UnavailableDomain < ApplicationRecord
+ include DomainNormalizable
+
+ after_commit :reset_cache!
+
+ private
+
+ def reset_cache!
+ Rails.cache.delete('unavailable_domains')
+ end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 85ee5cd06..ae0cdf29d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -98,6 +98,7 @@ class User < ApplicationRecord
before_validation :sanitize_languages
before_create :set_approved
+ after_commit :send_pending_devise_notifications
# This avoids a deprecation warning from Rails 5.1
# It seems possible that a future release of devise-two-factor will
@@ -306,11 +307,38 @@ class User < ApplicationRecord
protected
def send_devise_notification(notification, *args)
- devise_mailer.send(notification, self, *args).deliver_later
+ # This method can be called in `after_update` and `after_commit` hooks,
+ # but we must make sure the mailer is actually called *after* commit,
+ # otherwise it may work on stale data. To do this, figure out if we are
+ # within a transaction.
+ if ActiveRecord::Base.connection.current_transaction.try(:records)&.include?(self)
+ pending_devise_notifications << [notification, args]
+ else
+ render_and_send_devise_message(notification, *args)
+ end
end
private
+ def send_pending_devise_notifications
+ pending_devise_notifications.each do |notification, args|
+ render_and_send_devise_message(notification, *args)
+ end
+
+ # Empty the pending notifications array because the
+ # after_commit hook can be called multiple times which
+ # could cause multiple emails to be sent.
+ pending_devise_notifications.clear
+ end
+
+ def pending_devise_notifications
+ @pending_devise_notifications ||= []
+ end
+
+ def render_and_send_devise_message(notification, *args)
+ devise_mailer.send(notification, self, *args).deliver_later
+ end
+
def set_approved
self.approved = open_registrations? || valid_invitation? || external?
end
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index 965fd6fb6..408f94eed 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -171,12 +171,12 @@
%th= t('admin.accounts.inbox_url')
%td
= @account.inbox_url
- = fa_icon DeliveryFailureTracker.unavailable?(@account.inbox_url) ? 'times' : 'check'
+ = fa_icon DeliveryFailureTracker.available?(@account.inbox_url) ? 'check' : 'times'
%tr
%th= t('admin.accounts.shared_inbox_url')
%td
= @account.shared_inbox_url
- = fa_icon DeliveryFailureTracker.unavailable?(@account.shared_inbox_url) ? 'times' : 'check'
+ = fa_icon DeliveryFailureTracker.available?(@account.shared_inbox_url) ? 'check': 'times'
%div{ style: 'overflow: hidden' }
%div{ style: 'float: right' }
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index b9179e23d..a2c4e5deb 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -39,7 +39,7 @@
%h4= t 'footer.developers'
%ul
%li= link_to t('about.documentation'), 'https://docs.joinmastodon.org/'
- %li= link_to t('about.api'), 'https://docs.joinmastodon.org/api/guidelines/'
+ %li= link_to t('about.api'), 'https://docs.joinmastodon.org/client/intro/'
.column-2
%h4= link_to t('about.what_is_mastodon'), 'https://joinmastodon.org/'
= link_to svg_logo, root_url, class: 'brand'
diff --git a/app/views/settings/aliases/index.html.haml b/app/views/settings/aliases/index.html.haml
index 5b6986368..5df0c9669 100644
--- a/app/views/settings/aliases/index.html.haml
+++ b/app/views/settings/aliases/index.html.haml
@@ -23,7 +23,11 @@
%th= t('simple_form.labels.account_alias.acct')
%th
%tbody
- - @aliases.each do |account_alias|
+ - if @aliases.empty?
%tr
- %td= account_alias.acct
- %td= table_link_to 'trash', t('aliases.remove'), settings_alias_path(account_alias), data: { method: :delete }
+ %td.muted-hint{ colspan: 2 }= t('aliases.empty')
+ - else
+ - @aliases.each do |account_alias|
+ %tr
+ %td= account_alias.acct
+ %td= table_link_to 'trash', t('aliases.remove'), settings_alias_path(account_alias), data: { method: :delete }
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index c55ab7b90..6497824c6 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -17,9 +17,9 @@
= render 'application/card', account: @account
.fields-row__column.fields-group.fields-row__column-6
- = f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header', dimensions: '1500x500', size: number_to_human_size(AccountHeader::LIMIT))
+ = f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: picture_hint(t('simple_form.hints.defaults.header', dimensions: '1500x500', size: number_to_human_size(AccountHeader::LIMIT)), @account.header)
- = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar', dimensions: '400x400', size: number_to_human_size(AccountAvatar::LIMIT))
+ = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: picture_hint(t('simple_form.hints.defaults.avatar', dimensions: '400x400', size: number_to_human_size(AccountAvatar::LIMIT)), @account.avatar)
%hr.spacer/
diff --git a/app/views/statuses/_poll.html.haml b/app/views/statuses/_poll.html.haml
index c17476657..de5357e6d 100644
--- a/app/views/statuses/_poll.html.haml
+++ b/app/views/statuses/_poll.html.haml
@@ -12,14 +12,16 @@
%span.poll__number><
- if own_votes.include?(index)
%i.poll__voted__mark.fa.fa-check
- = percent.round
- = Formatter.instance.format_poll_option(status, option, autoplay: autoplay)
+ = "#{percent.round}%"
+ %span.poll__option__text
+ = Formatter.instance.format_poll_option(status, option, autoplay: autoplay)
- %span.poll__chart{ style: "width: #{percent}%" }
+ %span.poll__chart{ style: "width: #{percent}%" }
- else
%label.poll__option><
%span.poll__input{ class: poll.multiple? ? 'checkbox' : nil}><
- = Formatter.instance.format_poll_option(status, option, autoplay: autoplay)
+ %span.poll__option__text
+ = Formatter.instance.format_poll_option(status, option, autoplay: autoplay)
.poll__footer
- unless show_results
%button.button.button-secondary{ disabled: true }
diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.html.haml
index 630702277..19dadd36a 100644
--- a/app/views/tags/show.html.haml
+++ b/app/views/tags/show.html.haml
@@ -12,5 +12,5 @@
%h1= "##{@tag.name}"
%p= t('about.about_hashtag_html', hashtag: @tag.name)
-#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name)) }}
+#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name, local: @local)) }}
#modal-container
diff --git a/app/views/user_mailer/email_changed.html.haml b/app/views/user_mailer/email_changed.html.haml
index 7e91e87ad..96be8624d 100644
--- a/app/views/user_mailer/email_changed.html.haml
+++ b/app/views/user_mailer/email_changed.html.haml
@@ -38,7 +38,7 @@
%table.input{ align: 'center', cellspacing: 0, cellpadding: 0 }
%tbody
%tr
- %td= @resource.try(:unconfirmed_email) ? @resource.unconfirmed_email : @resource.email
+ %td= @resource.unconfirmed_email
%table.email-table{ cellspacing: 0, cellpadding: 0 }
%tbody
diff --git a/app/views/user_mailer/email_changed.text.erb b/app/views/user_mailer/email_changed.text.erb
index 345b16a2c..2b58415f5 100644
--- a/app/views/user_mailer/email_changed.text.erb
+++ b/app/views/user_mailer/email_changed.text.erb
@@ -4,6 +4,6 @@
<%= t 'devise.mailer.email_changed.explanation' %>
-<%= @resource.try(:unconfirmed_email) ? @resource.unconfirmed_email : @resource.email %>
+<%= @resource.unconfirmed_email %>
<%= t 'devise.mailer.email_changed.extra' %>
diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb
index 196af4af1..14e37dc34 100644
--- a/app/workers/activitypub/delivery_worker.rb
+++ b/app/workers/activitypub/delivery_worker.rb
@@ -12,7 +12,7 @@ class ActivityPub::DeliveryWorker
HEADERS = { 'Content-Type' => 'application/activity+json' }.freeze
def perform(json, source_account_id, inbox_url, options = {})
- return if DeliveryFailureTracker.unavailable?(inbox_url)
+ return unless DeliveryFailureTracker.available?(inbox_url)
@options = options.with_indifferent_access
@json = json
@@ -23,10 +23,12 @@ class ActivityPub::DeliveryWorker
perform_request
ensure
- if @performed
- failure_tracker.track_success!
- else
- failure_tracker.track_failure!
+ if @inbox_url.present?
+ if @performed
+ failure_tracker.track_success!
+ else
+ failure_tracker.track_failure!
+ end
end
end
diff --git a/app/workers/post_process_media_worker.rb b/app/workers/post_process_media_worker.rb
index d3ebda194..148ae5e2b 100644
--- a/app/workers/post_process_media_worker.rb
+++ b/app/workers/post_process_media_worker.rb
@@ -25,7 +25,7 @@ class PostProcessMediaWorker
media_attachment = MediaAttachment.find(media_attachment_id)
media_attachment.processing = :in_progress
media_attachment.save
- media_attachment.file.reprocess_original!
+ media_attachment.file.reprocess!(:original)
media_attachment.processing = :complete
media_attachment.save
rescue ActiveRecord::RecordNotFound
diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb
index 9ff0dccc1..18d2f18c1 100644
--- a/config/initializers/chewy.rb
+++ b/config/initializers/chewy.rb
@@ -23,3 +23,9 @@ module Chewy
end
end
end
+
+# ElasticSearch uses Faraday internally. Faraday interprets the
+# http_proxy env variable by default which leads to issues when
+# Mastodon is run with hidden services enabled, because
+# ElasticSearch is *not* supposed to be accessed through a proxy
+Faraday.ignore_env_proxy = true
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a11ecf185..c5cb6a7ed 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -635,6 +635,7 @@ en:
add_new: Create alias
created_msg: Successfully created a new alias. You can now initiate the move from the old account.
deleted_msg: Successfully remove the alias. Moving from that account to this one will no longer be possible.
+ empty: You have no aliases.
hint_html: If you want to move from another account to this one, here you can create an alias, which is required before you can proceed with moving followers from the old account to this one. This action by itself is