+// We're choosing to wrap span with div to keep the changes local only to this tool bar.
+const WrapFormattedMessage = ({ children, ...props }) => {children} ;
+WrapFormattedMessage.propTypes = {
+ children: PropTypes.any,
+};
+
+
export default @connect(mapStateToProps)
@injectIntl
class Explore extends React.PureComponent {
@@ -47,7 +57,7 @@ class Explore extends React.PureComponent {
this.column = c;
}
- render () {
+ render() {
const { intl, multiColumn, isSearching } = this.props;
const { signedIn } = this.context.identity;
@@ -70,10 +80,10 @@ class Explore extends React.PureComponent {
) : (
diff --git a/app/javascript/flavours/glitch/features/ui/components/header.js b/app/javascript/flavours/glitch/features/ui/components/header.js
index 6c2fb40ba8..891f7fc078 100644
--- a/app/javascript/flavours/glitch/features/ui/components/header.js
+++ b/app/javascript/flavours/glitch/features/ui/components/header.js
@@ -36,7 +36,7 @@ class Header extends React.PureComponent {
if (signedIn) {
content = (
<>
- {location.pathname !== '/publish' && 
');
});
+
+ it('keeps ordering as expected (issue fixed by PR 20677)', () => {
+ expect(emojify('
`;
+ replacement = document.createElement('img');
+ replacement.setAttribute('draggable', false);
+ replacement.setAttribute('class', 'emojione custom-emoji');
+ replacement.setAttribute('alt', shortname);
+ replacement.setAttribute('title', shortname);
+ replacement.setAttribute('src', filename);
+ replacement.setAttribute('data-original', customEmojis[shortname].url);
+ replacement.setAttribute('data-static', customEmojis[shortname].static_url);
return true;
}
return false;
@@ -59,7 +64,12 @@ const emojifyTextNode = (node, customEmojis) => {
} else { // matched to unicode emoji
const { filename, shortCode } = unicodeMapping[match];
const title = shortCode ? `:${shortCode}:` : '';
- replacement = `}.svg "${title}")
`;
+ replacement = document.createElement('img');
+ replacement.setAttribute('draggable', false);
+ replacement.setAttribute('class', 'emojione');
+ replacement.setAttribute('alt', match);
+ replacement.setAttribute('title', title);
+ replacement.setAttribute('src', `${assetHost}/emoji/${emojiFilename(filename)}.svg`);
rend = i + match.length;
// If the matched character was followed by VS15 (for selecting text presentation), skip it.
if (str.codePointAt(rend) === 65038) {
@@ -69,9 +79,8 @@ const emojifyTextNode = (node, customEmojis) => {
fragment.append(document.createTextNode(str.slice(0, i)));
if (replacement) {
- fragment.append(domParser.parseFromString(replacement, 'text/html').documentElement.getElementsByTagName('img')[0]);
+ fragment.append(replacement);
}
- node.textContent = str.slice(0, i);
str = str.slice(rend);
}
diff --git a/app/javascript/mastodon/features/explore/index.js b/app/javascript/mastodon/features/explore/index.js
index 552def142d..286170c9ff 100644
--- a/app/javascript/mastodon/features/explore/index.js
+++ b/app/javascript/mastodon/features/explore/index.js
@@ -24,6 +24,16 @@ const mapStateToProps = state => ({
isSearching: state.getIn(['search', 'submitted']) || !showTrends,
});
+// Fix strange bug on Safari where (rendered by FormattedMessage) disappears
+// after clicking around Explore top bar (issue #20885).
+// Removing width=100% from also fixes it, as well as replacing with
-
');
});
+
+ it('keeps ordering as expected (issue fixed by PR 20677)', () => {
+ expect(emojify('π #foo test: foo.
')) + .toEqual('
#foo test: foo.
`;
+ replacement = document.createElement('img');
+ replacement.setAttribute('draggable', false);
+ replacement.setAttribute('class', 'emojione');
+ replacement.setAttribute('alt', match);
+ replacement.setAttribute('title', title);
+ replacement.setAttribute('src', `${assetHost}/emoji/${emojiFilename(filename)}.svg`);
rend = i + match.length;
// If the matched character was followed by VS15 (for selecting text presentation), skip it.
if (str.codePointAt(rend) === 65038) {
@@ -69,9 +79,8 @@ const emojifyTextNode = (node, customEmojis) => {
fragment.append(document.createTextNode(str.slice(0, i)));
if (replacement) {
- fragment.append(domParser.parseFromString(replacement, 'text/html').documentElement.getElementsByTagName('img')[0]);
+ fragment.append(replacement);
}
- node.textContent = str.slice(0, i);
str = str.slice(rend);
}
diff --git a/app/javascript/mastodon/features/explore/index.js b/app/javascript/mastodon/features/explore/index.js
index 552def142d..286170c9ff 100644
--- a/app/javascript/mastodon/features/explore/index.js
+++ b/app/javascript/mastodon/features/explore/index.js
@@ -24,6 +24,16 @@ const mapStateToProps = state => ({
isSearching: state.getIn(['search', 'submitted']) || !showTrends,
});
+// Fix strange bug on Safari where (rendered by FormattedMessage) disappears
+// after clicking around Explore top bar (issue #20885).
+// Removing width=100% from also fixes it, as well as replacing with
+// We're choosing to wrap span with div to keep the changes local only to this tool bar.
+const WrapFormattedMessage = ({ children, ...props }) => {children} ;
+WrapFormattedMessage.propTypes = {
+ children: PropTypes.any,
+};
+
+
export default @connect(mapStateToProps)
@injectIntl
class Explore extends React.PureComponent {
@@ -47,7 +57,7 @@ class Explore extends React.PureComponent {
this.column = c;
}
- render () {
+ render() {
const { intl, multiColumn, isSearching } = this.props;
const { signedIn } = this.context.identity;
@@ -70,10 +80,10 @@ class Explore extends React.PureComponent {
) : (
diff --git a/app/javascript/mastodon/features/ui/components/header.js b/app/javascript/mastodon/features/ui/components/header.js
index 4e109080ee..bbb0ca1c62 100644
--- a/app/javascript/mastodon/features/ui/components/header.js
+++ b/app/javascript/mastodon/features/ui/components/header.js
@@ -35,7 +35,7 @@ class Header extends React.PureComponent {
if (signedIn) {
content = (
<>
- {location.pathname !== '/publish' &&
Users that have been invited through a limited-use invite will not need to solve a CAPTCHA diff --git a/config/locales-glitch/ko.yml b/config/locales-glitch/ko.yml index 0e6890db70..bc9c4e86b7 100644 --- a/config/locales-glitch/ko.yml +++ b/config/locales-glitch/ko.yml @@ -4,26 +4,6 @@ ko: custom_emojis: batch_copy_error: 'μ νλ μλͺ¨μ§λ₯Ό 볡μ¬νλ μ€ μ€λ₯κ° λ°μνμ΅λλ€: %{message}' batch_error: 'μλ¬κ° λ°μνμ΅λλ€: %{message}' - domain_allows: - export: λ΄λ³΄λ΄κΈ° - import: λΆλ¬μ€κΈ° - domain_blocks: - export: λ΄λ³΄λ΄κΈ° - import: λΆλ¬μ€κΈ° - export_domain_allows: - new: - title: λλ©μΈ νμ© λΆλ¬μ€κΈ° - no_file: νμΌμ΄ μ νλμ§ μμμ΅λλ€ - export_domain_blocks: - import: - description_html: λλ©μΈ μ°¨λ¨ λͺ©λ‘μ λΆλ¬μ€λ €κ³ ν©λλ€. μ΄ λͺ©λ‘μ μ‘°μ¬μ€λ½κ² κ²ν νμΈμ, νΉν μμ μ΄ μ§μ μμ±ν λͺ©λ‘μ΄ μλλΌλ©΄ λ μ‘°μ¬νμΈμ. - existing_relationships_warning: νλ‘μ° κ΄κ³κ° μ‘΄μ¬ν©λλ€ - private_comment_description_html: 'μ΄λμ λΆλ¬μ¨ κ²μΈμ§ μΆμ μ μννκ² νκΈ° μν΄μ, λΆλ¬μ¨ μ°¨λ¨λ€μ λ€μκ³Ό κ°μ λΉκ³΅κ° μ£Όμκ³Ό ν¨κ» μμ±λ κ²μ λλ€:
νμ λ μ¬μ©λ§ κ°λ₯ν μ΄λμ₯μ ν΅ν κ°μ μλ€μ CAPTCHAλ₯Ό νμ§ μμλ λ©λλ€ diff --git a/config/locales/en.yml b/config/locales/en.yml index 2f766cef38..1cc53dca4b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -373,6 +373,8 @@ en: add_new: Allow federation with domain created_msg: Domain has been successfully allowed for federation destroyed_msg: Domain has been disallowed from federation + export: Export + import: Import undo: Disallow federation with domain domain_blocks: add_new: Add new domain block @@ -382,15 +384,19 @@ en: edit: Edit domain block existing_domain_block: You have already imposed stricter limits on %{name}. existing_domain_block_html: You have already imposed stricter limits on %{name}, you need to unblock it first. + export: Export + import: Import new: create: Create block hint: The domain block will not prevent creation of account entries in the database, but will retroactively and automatically apply specific moderation methods on those accounts. severity: - desc_html: "Silence will make the account's posts invisible to anyone who isn't following them. Suspend will remove all of the account's content, media, and profile data. Use None if you just want to reject media files." + desc_html: "Limit will make posts from accounts at this domain invisible to anyone who isn't following them. Suspend will remove all content, media, and profile data for this domain's accounts from your server. Use None if you just want to reject media files." noop: None - silence: Silence + silence: Limit suspend: Suspend title: New domain block + no_domain_block_selected: No domain blocks were changed as none were selected + not_permitted: You are not permitted to perform this action obfuscate: Obfuscate domain name obfuscate_hint: Partially obfuscate the domain name in the list if advertising the list of domain limitations is enabled private_comment: Private comment @@ -422,6 +428,20 @@ en: resolved_dns_records_hint_html: The domain name resolves to the following MX domains, which are ultimately responsible for accepting e-mail. Blocking an MX domain will block sign-ups from any e-mail address which uses the same MX domain, even if the visible domain name is different. Be careful not to block major e-mail providers. resolved_through_html: Resolved through %{domain} title: Blocked e-mail domains + export_domain_allows: + new: + title: Import domain allows + no_file: No file selected + export_domain_blocks: + import: + description_html: You are about to import a list of domain blocks. Please review this list very carefully, especially if you have not authored this list yourself. + existing_relationships_warning: Existing follow relationships + private_comment_description_html: 'To help you track where imported blocks come from, imported blocks will be created with the following private comment:
-
%{comment}' - private_comment_template: Imported from %{source} on %{date} - title: Import domain blocks - new: - title: Import domain blocks - no_file: No file selected settings: captcha_enabled: desc_html: This relies on external scripts from hCaptcha, which may be a security and privacy concern. In addition, this can make the registration process significantly less accessible to some (especially disabled) people. For these reasons, please consider alternative measures such as approval-based or invite-based registration.
Users that have been invited through a limited-use invite will not need to solve a CAPTCHA diff --git a/config/locales-glitch/ko.yml b/config/locales-glitch/ko.yml index 0e6890db70..bc9c4e86b7 100644 --- a/config/locales-glitch/ko.yml +++ b/config/locales-glitch/ko.yml @@ -4,26 +4,6 @@ ko: custom_emojis: batch_copy_error: 'μ νλ μλͺ¨μ§λ₯Ό 볡μ¬νλ μ€ μ€λ₯κ° λ°μνμ΅λλ€: %{message}' batch_error: 'μλ¬κ° λ°μνμ΅λλ€: %{message}' - domain_allows: - export: λ΄λ³΄λ΄κΈ° - import: λΆλ¬μ€κΈ° - domain_blocks: - export: λ΄λ³΄λ΄κΈ° - import: λΆλ¬μ€κΈ° - export_domain_allows: - new: - title: λλ©μΈ νμ© λΆλ¬μ€κΈ° - no_file: νμΌμ΄ μ νλμ§ μμμ΅λλ€ - export_domain_blocks: - import: - description_html: λλ©μΈ μ°¨λ¨ λͺ©λ‘μ λΆλ¬μ€λ €κ³ ν©λλ€. μ΄ λͺ©λ‘μ μ‘°μ¬μ€λ½κ² κ²ν νμΈμ, νΉν μμ μ΄ μ§μ μμ±ν λͺ©λ‘μ΄ μλλΌλ©΄ λ μ‘°μ¬νμΈμ. - existing_relationships_warning: νλ‘μ° κ΄κ³κ° μ‘΄μ¬ν©λλ€ - private_comment_description_html: 'μ΄λμ λΆλ¬μ¨ κ²μΈμ§ μΆμ μ μννκ² νκΈ° μν΄μ, λΆλ¬μ¨ μ°¨λ¨λ€μ λ€μκ³Ό κ°μ λΉκ³΅κ° μ£Όμκ³Ό ν¨κ» μμ±λ κ²μ λλ€:
%{comment}' - private_comment_template: '%{date}μ %{source}μμ λΆλ¬μ΄' - title: λλ©μΈ μ°¨λ¨ λΆλ¬μ€κΈ° - new: - title: λλ©μΈ μ°¨λ¨ λΆλ¬μ€κΈ° - no_file: νμΌμ΄ μ νλμ§ μμμ΅λλ€ settings: captcha_enabled: desc_html: μ΄κ²μ hCaptchaμ μΈλΆ μ€ν¬λ¦½νΈμ μμ‘΄ν©λλ€, μ΄κ²μ κ°μΈμ 보 보νΈμ μνμ κ°ν μλ μμ΅λλ€. μΆκ°μ μΌλ‘, μ΄κ²μ λͺλͺ μ¬λλ€(νΉνλ μ₯μ μΈλ€)μκ² κ°μ μ μ°¨μ μ κ·Όμ±μ μ¬κ°νκ² λ¨μ΄νΈλ¦΄ μ μμ΅λλ€. μ΄λ¬ν μ΄μ λ‘, λ체μ λ‘ μΉμΈ μ μ©μ΄λ μ΄λμ λ₯Ό ν΅ν κ°μ μ κ³ λ €ν΄λ³΄μΈμ.
νμ λ μ¬μ©λ§ κ°λ₯ν μ΄λμ₯μ ν΅ν κ°μ μλ€μ CAPTCHAλ₯Ό νμ§ μμλ λ©λλ€ diff --git a/config/locales/en.yml b/config/locales/en.yml index 2f766cef38..1cc53dca4b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -373,6 +373,8 @@ en: add_new: Allow federation with domain created_msg: Domain has been successfully allowed for federation destroyed_msg: Domain has been disallowed from federation + export: Export + import: Import undo: Disallow federation with domain domain_blocks: add_new: Add new domain block @@ -382,15 +384,19 @@ en: edit: Edit domain block existing_domain_block: You have already imposed stricter limits on %{name}. existing_domain_block_html: You have already imposed stricter limits on %{name}, you need to unblock it first. + export: Export + import: Import new: create: Create block hint: The domain block will not prevent creation of account entries in the database, but will retroactively and automatically apply specific moderation methods on those accounts. severity: - desc_html: "Silence will make the account's posts invisible to anyone who isn't following them. Suspend will remove all of the account's content, media, and profile data. Use None if you just want to reject media files." + desc_html: "Limit will make posts from accounts at this domain invisible to anyone who isn't following them. Suspend will remove all content, media, and profile data for this domain's accounts from your server. Use None if you just want to reject media files." noop: None - silence: Silence + silence: Limit suspend: Suspend title: New domain block + no_domain_block_selected: No domain blocks were changed as none were selected + not_permitted: You are not permitted to perform this action obfuscate: Obfuscate domain name obfuscate_hint: Partially obfuscate the domain name in the list if advertising the list of domain limitations is enabled private_comment: Private comment @@ -422,6 +428,20 @@ en: resolved_dns_records_hint_html: The domain name resolves to the following MX domains, which are ultimately responsible for accepting e-mail. Blocking an MX domain will block sign-ups from any e-mail address which uses the same MX domain, even if the visible domain name is different. Be careful not to block major e-mail providers. resolved_through_html: Resolved through %{domain} title: Blocked e-mail domains + export_domain_allows: + new: + title: Import domain allows + no_file: No file selected + export_domain_blocks: + import: + description_html: You are about to import a list of domain blocks. Please review this list very carefully, especially if you have not authored this list yourself. + existing_relationships_warning: Existing follow relationships + private_comment_description_html: 'To help you track where imported blocks come from, imported blocks will be created with the following private comment:
%{comment}' + private_comment_template: Imported from %{source} on %{date} + title: Import domain blocks + new: + title: Import domain blocks + no_file: No file selected follow_recommendations: description_html: "Follow recommendations help new users quickly find interesting content. When a user has not interacted with others enough to form personalized follow recommendations, these accounts are recommended instead. They are re-calculated on a daily basis from a mix of accounts with the highest recent engagements and highest local follower counts for a given language." language: For language @@ -914,7 +934,7 @@ en: warning: Be very careful with this data. Never share it with anyone! your_token: Your access token auth: - apply_for_account: Get on waitlist + apply_for_account: Request an account change_password: Password delete_account: Delete account delete_account_html: If you wish to delete your account, you can proceed here. You will be asked for confirmation. diff --git a/config/navigation.rb b/config/navigation.rb index 4d2da7aa47..aab72d27c4 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -23,7 +23,7 @@ SimpleNavigation::Configuration.run do |navigation| n.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_path, if: -> { current_user.functional? } n.item :filters, safe_join([fa_icon('filter fw'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters}, if: -> { current_user.functional? } - n.item :statuses_cleanup, safe_join([fa_icon('history fw'), t('settings.statuses_cleanup')]), statuses_cleanup_path, if: -> { current_user.functional? } + n.item :statuses_cleanup, safe_join([fa_icon('history fw'), t('settings.statuses_cleanup')]), statuses_cleanup_path, if: -> { current_user.functional_or_moved? } n.item :security, safe_join([fa_icon('lock fw'), t('settings.account')]), edit_user_registration_path do |s| s.item :password, safe_join([fa_icon('lock fw'), t('settings.account_settings')]), edit_user_registration_path, highlights_on: %r{/auth/edit|/settings/delete|/settings/migration|/settings/aliases|/settings/login_activities|^/disputes} diff --git a/spec/controllers/admin/statuses_controller_spec.rb b/spec/controllers/admin/statuses_controller_spec.rb index 227688e236..7f912c1c07 100644 --- a/spec/controllers/admin/statuses_controller_spec.rb +++ b/spec/controllers/admin/statuses_controller_spec.rb @@ -41,7 +41,7 @@ describe Admin::StatusesController do describe 'POST #batch' do before do - post :batch, params: { :account_id => account.id, action => '', :admin_status_batch_action => { status_ids: status_ids } } + post :batch, params: { account_id: account.id, action => '', admin_status_batch_action: { status_ids: status_ids } } end let(:status_ids) { [media_attached_status.id] } diff --git a/spec/services/favourite_service_spec.rb b/spec/services/favourite_service_spec.rb index 94a8111dd5..9781f0d78b 100644 --- a/spec/services/favourite_service_spec.rb +++ b/spec/services/favourite_service_spec.rb @@ -23,7 +23,7 @@ RSpec.describe FavouriteService, type: :service do let(:status) { Fabricate(:status, account: bob) } before do - stub_request(:post, "http://example.com/inbox").to_return(:status => 200, :body => "", :headers => {}) + stub_request(:post, "http://example.com/inbox").to_return(status: 200, body: "", headers: {}) subject.call(sender, status) end diff --git a/spec/services/follow_service_spec.rb b/spec/services/follow_service_spec.rb index 88346ec54a..412c04d76b 100644 --- a/spec/services/follow_service_spec.rb +++ b/spec/services/follow_service_spec.rb @@ -140,7 +140,7 @@ RSpec.describe FollowService, type: :service do let(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox') } before do - stub_request(:post, "http://example.com/inbox").to_return(:status => 200, :body => "", :headers => {}) + stub_request(:post, "http://example.com/inbox").to_return(status: 200, body: "", headers: {}) subject.call(sender, bob) end diff --git a/spec/services/verify_link_service_spec.rb b/spec/services/verify_link_service_spec.rb index 3fc88e60e4..52ba454cce 100644 --- a/spec/services/verify_link_service_spec.rb +++ b/spec/services/verify_link_service_spec.rb @@ -76,7 +76,25 @@ RSpec.describe VerifyLinkService, type: :service do context 'when a link does not contain a link back' do let(:html) { '' } - it 'marks the field as verified' do + it 'does not mark the field as verified' do + expect(field.verified?).to be false + end + end + + context 'when link has no `href` attribute' do + let(:html) do + <<-HTML + + + + + + Follow me on Mastodon + + HTML + end + + it 'does not mark the field as verified' do expect(field.verified?).to be false end end diff --git a/spec/views/statuses/show.html.haml_spec.rb b/spec/views/statuses/show.html.haml_spec.rb index eeea2f6985..ca5bb2ae87 100644 --- a/spec/views/statuses/show.html.haml_spec.rb +++ b/spec/views/statuses/show.html.haml_spec.rb @@ -4,7 +4,7 @@ require 'rails_helper' describe 'statuses/show.html.haml', without_verify_partial_doubles: true do before do - double(:api_oembed_url => '') + double(api_oembed_url: '') allow(view).to receive(:show_landing_strip?).and_return(true) allow(view).to receive(:site_title).and_return('example site') allow(view).to receive(:site_hostname).and_return('example.com')