diff --git a/app/javascript/mastodon/actions/importer/index.js b/app/javascript/mastodon/actions/importer/index.js index b07f25699f4cc6..09820827e6f0ce 100644 --- a/app/javascript/mastodon/actions/importer/index.js +++ b/app/javascript/mastodon/actions/importer/index.js @@ -50,7 +50,7 @@ export function importFetchedStatus(status, options = {}) { return importFetchedStatuses([status], options); } -export function importFetchedStatuses(statuses) { +export function importFetchedStatuses(statuses, outsideOptions = {}) { return (dispatch, getState) => { const accounts = []; const normalStatuses = []; @@ -58,6 +58,8 @@ export function importFetchedStatuses(statuses) { const filters = []; function processStatus(status, options = undefined) { + options ??= outsideOptions; + pushUnique(normalStatuses, normalizeStatus(status, getState().getIn(['statuses', status.id]), options)); pushUnique(accounts, status.account); @@ -70,7 +72,7 @@ export function importFetchedStatuses(statuses) { } if (status.quote?.quoted_status) { - processStatus(status.quote.quoted_status, { withoutEmojiReaction: true }); + processStatus(status.quote.quoted_status, { ...options, withoutEmojiReaction: true }); } if (status.poll?.id) { diff --git a/docker-compose.yml b/docker-compose.yml index 25ab54d031b50c..f93dfd9a30d119 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -59,7 +59,7 @@ services: web: # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes build: . - image: kmyblue:21.1-lts + image: kmyblue:21.2-lts restart: always env_file: .env.production command: bundle exec puma -C config/puma.rb @@ -83,7 +83,7 @@ services: build: dockerfile: ./streaming/Dockerfile context: . - image: kmyblue-streaming:21.1-lts + image: kmyblue-streaming:21.2-lts restart: always env_file: .env.production command: node ./streaming/index.js @@ -101,7 +101,7 @@ services: sidekiq: build: . - image: kmyblue:21.1-lts + image: kmyblue:21.2-lts restart: always env_file: .env.production command: bundle exec sidekiq diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 75432abf5acafd..e27aa32427bfc5 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ def kmyblue_major end def kmyblue_minor - 1 + 2 end def kmyblue_flag