diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-07 19:51:47 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-01-07 19:51:47 +0100 |
| commit | fca50e4b50d8b2007fa733c7b732aeab6b2092d7 (patch) | |
| tree | 446de962f769185e739b9e4b09e2530e2e311437 /app | |
| parent | e2933854ac598c5ee7428a654a72cf4f4bd9afea (diff) | |
| parent | bc066d8936e2cfaa2dc275d9a5d4aefc0cbc1d86 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/mastodon/actions/importer/normalizer.js | 2 | ||||
| -rw-r--r-- | app/services/purge_domain_service.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js index 5002292b9..6b79e1f16 100644 --- a/app/javascript/mastodon/actions/importer/normalizer.js +++ b/app/javascript/mastodon/actions/importer/normalizer.js @@ -71,7 +71,7 @@ export function normalizeStatus(status, normalOldStatus) { } const spoilerText = normalStatus.spoiler_text || ''; - const searchContent = ([spoilerText, status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n'); + const searchContent = ([spoilerText, status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n'); const emojiMap = makeEmojiMap(normalStatus); normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent; diff --git a/app/services/purge_domain_service.rb b/app/services/purge_domain_service.rb index e10a8f0c8..9df81f13e 100644 --- a/app/services/purge_domain_service.rb +++ b/app/services/purge_domain_service.rb @@ -5,6 +5,7 @@ class PurgeDomainService < BaseService Account.remote.where(domain: domain).reorder(nil).find_each do |account| DeleteAccountService.new.call(account, reserve_username: false, skip_side_effects: true) end + CustomEmoji.remote.where(domain: domain).reorder(nil).find_each(&:destroy) Instance.refresh end end |