From 18f092d9275c24f26a70c9cb74f5f5ec437de8e9 Mon Sep 17 00:00:00 2001
From: jsgoldstein <jakegoldstein95@gmail.com>
Date: Thu, 8 Jun 2023 11:12:41 -0400
Subject: [PATCH 1/5] Fix translations for changing theme (#25340)
---
app/views/settings/preferences/appearance/show.html.haml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index 5358310e5b..af61df71b8 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -10,7 +10,7 @@
= f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| native_locale_name(locale) }, selected: I18n.locale, hint: false
.fields-group.fields-row__column.fields-row__column-6
= f.simple_fields_for :settings, current_user.settings do |ff|
- = ff.input :theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false, hint: false
+ = ff.input :theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_theme'), include_blank: false, hint: false
- unless I18n.locale == :en
.flash-message.translation-prompt
From 4aff1d2974b47cfb0aedfc7be7c9b8fdd5f1b33a Mon Sep 17 00:00:00 2001
From: Daniel M Brasil <danielmbrasil@protonmail.com>
Date: Fri, 9 Jun 2023 09:00:14 -0300
Subject: [PATCH 2/5] Migrate to request specs in
`/api/v1/admin/email_domain_blocks` (#25337)
---
.../api/v1/admin/email_domain_blocks_spec.rb} | 183 +++++++-----------
1 file changed, 65 insertions(+), 118 deletions(-)
rename spec/{controllers/api/v1/admin/email_domain_blocks_controller_spec.rb => requests/api/v1/admin/email_domain_blocks_spec.rb} (52%)
diff --git a/spec/controllers/api/v1/admin/email_domain_blocks_controller_spec.rb b/spec/requests/api/v1/admin/email_domain_blocks_spec.rb
similarity index 52%
rename from spec/controllers/api/v1/admin/email_domain_blocks_controller_spec.rb
rename to spec/requests/api/v1/admin/email_domain_blocks_spec.rb
index 3643eb0f3d..a24f22be21 100644
--- a/spec/controllers/api/v1/admin/email_domain_blocks_controller_spec.rb
+++ b/spec/requests/api/v1/admin/email_domain_blocks_spec.rb
@@ -2,23 +2,20 @@
require 'rails_helper'
-describe Api::V1::Admin::EmailDomainBlocksController do
- render_views
-
+RSpec.describe 'Email Domain Blocks' do
let(:role) { UserRole.find_by(name: 'Admin') }
let(:user) { Fabricate(:user, role: role) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
let(:account) { Fabricate(:account) }
let(:scopes) { 'admin:read:email_domain_blocks admin:write:email_domain_blocks' }
-
- before do
- allow(controller).to receive(:doorkeeper_token) { token }
- end
+ let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
shared_examples 'forbidden for wrong scope' do |wrong_scope|
let(:scopes) { wrong_scope }
it 'returns http forbidden' do
+ subject
+
expect(response).to have_http_status(403)
end
end
@@ -27,65 +24,54 @@ describe Api::V1::Admin::EmailDomainBlocksController do
let(:role) { UserRole.find_by(name: wrong_role) }
it 'returns http forbidden' do
+ subject
+
expect(response).to have_http_status(403)
end
end
- describe 'GET #index' do
- context 'with wrong scope' do
- before do
- get :index
- end
-
- it_behaves_like 'forbidden for wrong scope', 'read:statuses'
+ describe 'GET /api/v1/admin/email_domain_blocks' do
+ subject do
+ get '/api/v1/admin/email_domain_blocks', headers: headers, params: params
end
- context 'with wrong role' do
- before do
- get :index
- end
+ let(:params) { {} }
- it_behaves_like 'forbidden for wrong role', ''
- it_behaves_like 'forbidden for wrong role', 'Moderator'
- end
+ it_behaves_like 'forbidden for wrong scope', 'read:statuses'
+ it_behaves_like 'forbidden for wrong role', ''
+ it_behaves_like 'forbidden for wrong role', 'Moderator'
it 'returns http success' do
- get :index
+ subject
expect(response).to have_http_status(200)
end
context 'when there is no email domain block' do
it 'returns an empty list' do
- get :index
+ subject
- json = body_as_json
-
- expect(json).to be_empty
+ expect(body_as_json).to be_empty
end
end
context 'when there are email domain blocks' do
- let!(:email_domain_blocks) { Fabricate.times(5, :email_domain_block) }
+ let!(:email_domain_blocks) { Fabricate.times(5, :email_domain_block) }
let(:blocked_email_domains) { email_domain_blocks.pluck(:domain) }
it 'return the correct blocked email domains' do
- get :index
+ subject
- json = body_as_json
-
- expect(json.pluck(:domain)).to match_array(blocked_email_domains)
+ expect(body_as_json.pluck(:domain)).to match_array(blocked_email_domains)
end
context 'with limit param' do
let(:params) { { limit: 2 } }
it 'returns only the requested number of email domain blocks' do
- get :index, params: params
+ subject
- json = body_as_json
-
- expect(json.size).to eq(params[:limit])
+ expect(body_as_json.size).to eq(params[:limit])
end
end
@@ -93,12 +79,11 @@ describe Api::V1::Admin::EmailDomainBlocksController do
let(:params) { { since_id: email_domain_blocks[1].id } }
it 'returns only the email domain blocks after since_id' do
- get :index, params: params
+ subject
email_domain_blocks_ids = email_domain_blocks.pluck(:id).map(&:to_s)
- json = body_as_json
- expect(json.pluck(:id)).to match_array(email_domain_blocks_ids[2..])
+ expect(body_as_json.pluck(:id)).to match_array(email_domain_blocks_ids[2..])
end
end
@@ -106,102 +91,78 @@ describe Api::V1::Admin::EmailDomainBlocksController do
let(:params) { { max_id: email_domain_blocks[3].id } }
it 'returns only the email domain blocks before max_id' do
- get :index, params: params
+ subject
email_domain_blocks_ids = email_domain_blocks.pluck(:id).map(&:to_s)
- json = body_as_json
- expect(json.pluck(:id)).to match_array(email_domain_blocks_ids[..2])
+ expect(body_as_json.pluck(:id)).to match_array(email_domain_blocks_ids[..2])
end
end
end
end
- describe 'GET #show' do
+ describe 'GET /api/v1/admin/email_domain_blocks/:id' do
+ subject do
+ get "/api/v1/admin/email_domain_blocks/#{email_domain_block.id}", headers: headers
+ end
+
let!(:email_domain_block) { Fabricate(:email_domain_block) }
- let(:params) { { id: email_domain_block.id } }
- context 'with wrong scope' do
- before do
- get :show, params: params
- end
-
- it_behaves_like 'forbidden for wrong scope', 'read:statuses'
- end
-
- context 'with wrong role' do
- before do
- get :show, params: params
- end
-
- it_behaves_like 'forbidden for wrong role', ''
- it_behaves_like 'forbidden for wrong role', 'Moderator'
- end
+ it_behaves_like 'forbidden for wrong scope', 'read:statuses'
+ it_behaves_like 'forbidden for wrong role', ''
+ it_behaves_like 'forbidden for wrong role', 'Moderator'
context 'when email domain block exists' do
it 'returns http success' do
- get :show, params: params
+ subject
expect(response).to have_http_status(200)
end
it 'returns the correct blocked domain' do
- get :show, params: params
+ subject
- json = body_as_json
-
- expect(json[:domain]).to eq(email_domain_block.domain)
+ expect(body_as_json[:domain]).to eq(email_domain_block.domain)
end
end
context 'when email domain block does not exist' do
it 'returns http not found' do
- get :show, params: { id: 0 }
+ get '/api/v1/admin/email_domain_blocks/-1', headers: headers
expect(response).to have_http_status(404)
end
end
end
- describe 'POST #create' do
+ describe 'POST /api/v1/admin/email_domain_blocks' do
+ subject do
+ post '/api/v1/admin/email_domain_blocks', headers: headers, params: params
+ end
+
let(:params) { { domain: 'example.com' } }
- context 'with wrong scope' do
- before do
- post :create, params: params
- end
-
- it_behaves_like 'forbidden for wrong scope', 'read:statuses'
- end
-
- context 'with wrong role' do
- before do
- post :create, params: params
- end
-
- it_behaves_like 'forbidden for wrong role', ''
- it_behaves_like 'forbidden for wrong role', 'Moderator'
- end
+ it_behaves_like 'forbidden for wrong scope', 'read:statuses'
+ it_behaves_like 'forbidden for wrong role', ''
+ it_behaves_like 'forbidden for wrong role', 'Moderator'
it 'returns http success' do
- post :create, params: params
+ subject
expect(response).to have_http_status(200)
end
it 'returns the correct blocked email domain' do
- post :create, params: params
+ subject
- json = body_as_json
-
- expect(json[:domain]).to eq(params[:domain])
+ expect(body_as_json[:domain]).to eq(params[:domain])
end
context 'when domain param is not provided' do
let(:params) { { domain: '' } }
it 'returns http unprocessable entity' do
- post :create, params: params
+ subject
expect(response).to have_http_status(422)
end
@@ -211,7 +172,7 @@ describe Api::V1::Admin::EmailDomainBlocksController do
let(:params) { { domain: 'do\uD800.com' } }
it 'returns http unprocessable entity' do
- post :create, params: params
+ subject
expect(response).to have_http_status(422)
end
@@ -223,59 +184,45 @@ describe Api::V1::Admin::EmailDomainBlocksController do
end
it 'returns http unprocessable entity' do
- post :create, params: params
+ subject
expect(response).to have_http_status(422)
end
end
end
- describe 'DELETE #destroy' do
+ describe 'DELETE /api/v1/admin/email_domain_blocks' do
+ subject do
+ delete "/api/v1/admin/email_domain_blocks/#{email_domain_block.id}", headers: headers
+ end
+
let!(:email_domain_block) { Fabricate(:email_domain_block) }
- let(:params) { { id: email_domain_block.id } }
- context 'with wrong scope' do
- before do
- delete :destroy, params: params
- end
-
- it_behaves_like 'forbidden for wrong scope', 'read:statuses'
- end
-
- context 'with wrong role' do
- before do
- delete :destroy, params: params
- end
-
- it_behaves_like 'forbidden for wrong role', ''
- it_behaves_like 'forbidden for wrong role', 'Moderator'
- end
+ it_behaves_like 'forbidden for wrong scope', 'read:statuses'
+ it_behaves_like 'forbidden for wrong role', ''
+ it_behaves_like 'forbidden for wrong role', 'Moderator'
it 'returns http success' do
- delete :destroy, params: params
+ subject
expect(response).to have_http_status(200)
end
it 'returns an empty body' do
- delete :destroy, params: params
+ subject
- json = body_as_json
-
- expect(json).to be_empty
+ expect(body_as_json).to be_empty
end
it 'deletes email domain block' do
- delete :destroy, params: params
+ subject
- email_domain_block = EmailDomainBlock.find_by(id: params[:id])
-
- expect(email_domain_block).to be_nil
+ expect(EmailDomainBlock.find_by(id: email_domain_block.id)).to be_nil
end
context 'when email domain block does not exist' do
it 'returns http not found' do
- delete :destroy, params: { id: 0 }
+ delete '/api/v1/admin/email_domain_blocks/-1', headers: headers
expect(response).to have_http_status(404)
end
From 75e299f44013d8ad9f1e90992e6b07ddb63d37a5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 9 Jun 2023 08:03:35 -0400
Subject: [PATCH 3/5] Remove unused `redis_info` method Admin::Dashboard
(#25345)
---
app/controllers/admin/dashboard_controller.rb | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index 099512248f..3a6df662ea 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -14,15 +14,5 @@ module Admin
@pending_tags_count = Tag.pending_review.count
@pending_appeals_count = Appeal.pending.count
end
-
- private
-
- def redis_info
- @redis_info ||= if redis.is_a?(Redis::Namespace)
- redis.redis.info
- else
- redis.info
- end
- end
end
end
From e34142782f30be3b82768609c77ecf9464ae54e0 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 9 Jun 2023 16:34:36 +0200
Subject: [PATCH 4/5] Add Ruby & Bundler versions to Gemfile.lock (#25317)
---
Gemfile.lock | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Gemfile.lock b/Gemfile.lock
index a9919bd3a2..c4fa1822ea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -882,3 +882,9 @@ DEPENDENCIES
webpacker (~> 5.4)
webpush!
xorcist (~> 1.1)
+
+RUBY VERSION
+ ruby 3.2.2p53
+
+BUNDLED WITH
+ 2.4.13
From 16dd3f08c1e5396d5f9ff3f13417901bc4e4b8b9 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Fri, 9 Jun 2023 19:29:16 +0200
Subject: [PATCH 5/5] Fix performance of streaming by parsing message JSON once
(#25278)
---
streaming/index.js | 60 +++++++++++++++++++++++++++++-----------------
1 file changed, 38 insertions(+), 22 deletions(-)
diff --git a/streaming/index.js b/streaming/index.js
index 279ebbad83..4b2607ed92 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -52,18 +52,31 @@ const redisUrlToClient = async (defaultConfig, redisUrl) => {
};
/**
+ * Attempts to safely parse a string as JSON, used when both receiving a message
+ * from redis and when receiving a message from a client over a websocket
+ * connection, this is why it accepts a `req` argument.
* @param {string} json
- * @param {any} req
+ * @param {any?} req
* @returns {Object.<string, any>|null}
*/
const parseJSON = (json, req) => {
try {
return JSON.parse(json);
} catch (err) {
- if (req.accountId) {
- log.warn(req.requestId, `Error parsing message from user ${req.accountId}: ${err}`);
+ /* FIXME: This logging isn't great, and should probably be done at the
+ * call-site of parseJSON, not in the method, but this would require changing
+ * the signature of parseJSON to return something akin to a Result type:
+ * [Error|null, null|Object<string,any}], and then handling the error
+ * scenarios.
+ */
+ if (req) {
+ if (req.accountId) {
+ log.warn(req.requestId, `Error parsing message from user ${req.accountId}: ${err}`);
+ } else {
+ log.silly(req.requestId, `Error parsing message from ${req.remoteAddress}: ${err}`);
+ }
} else {
- log.silly(req.requestId, `Error parsing message from ${req.remoteAddress}: ${err}`);
+ log.warn(`Error parsing message from redis: ${err}`);
}
return null;
}
@@ -163,7 +176,7 @@ const startServer = async () => {
const { redisParams, redisUrl, redisPrefix } = redisConfigFromEnv(process.env);
/**
- * @type {Object.<string, Array.<function(string): void>>}
+ * @type {Object.<string, Array.<function(Object<string, any>): void>>}
*/
const subs = {};
@@ -203,7 +216,10 @@ const startServer = async () => {
return;
}
- callbacks.forEach(callback => callback(message));
+ const json = parseJSON(message, null);
+ if (!json) return;
+
+ callbacks.forEach(callback => callback(json));
};
/**
@@ -225,7 +241,7 @@ const startServer = async () => {
/**
* @param {string} channel
- * @param {function(string): void} callback
+ * @param {function(Object<string, any>): void} callback
*/
const unsubscribe = (channel, callback) => {
log.silly(`Removing listener for ${channel}`);
@@ -369,7 +385,7 @@ const startServer = async () => {
/**
* @param {any} req
- * @returns {string}
+ * @returns {string|undefined}
*/
const channelNameFromPath = req => {
const { path, query } = req;
@@ -478,15 +494,11 @@ const startServer = async () => {
/**
* @param {any} req
* @param {SystemMessageHandlers} eventHandlers
- * @returns {function(string): void}
+ * @returns {function(object): void}
*/
const createSystemMessageListener = (req, eventHandlers) => {
return message => {
- const json = parseJSON(message, req);
-
- if (!json) return;
-
- const { event } = json;
+ const { event } = message;
log.silly(req.requestId, `System message for ${req.accountId}: ${event}`);
@@ -603,19 +615,16 @@ const startServer = async () => {
* @param {function(string, string): void} output
* @param {function(string[], function(string): void): void} attachCloseHandler
* @param {boolean=} needsFiltering
- * @returns {function(string): void}
+ * @returns {function(object): void}
*/
const streamFrom = (ids, req, output, attachCloseHandler, needsFiltering = false) => {
const accountId = req.accountId || req.remoteAddress;
log.verbose(req.requestId, `Starting stream from ${ids.join(', ')} for ${accountId}`);
+ // Currently message is of type string, soon it'll be Record<string, any>
const listener = message => {
- const json = parseJSON(message, req);
-
- if (!json) return;
-
- const { event, payload, queued_at } = json;
+ const { event, payload, queued_at } = message;
const transmit = () => {
const now = new Date().getTime();
@@ -1198,8 +1207,15 @@ const startServer = async () => {
ws.on('close', onEnd);
ws.on('error', onEnd);
- ws.on('message', data => {
- const json = parseJSON(data, session.request);
+ ws.on('message', (data, isBinary) => {
+ if (isBinary) {
+ log.debug('Received binary data, closing connection');
+ ws.close(1003, 'The mastodon streaming server does not support binary messages');
+ return;
+ }
+ const message = data.toString('utf8');
+
+ const json = parseJSON(message, session.request);
if (!json) return;