Merge branch 'master' into glitch-soc/merge-upstream
This commit is contained in:
commit
ec3e2b8f72
26
CHANGELOG.md
26
CHANGELOG.md
|
@ -177,6 +177,32 @@ All notable changes to this project will be documented in this file.
|
||||||
- Fix 2FA/sign-in token sessions being valid after password change ([Gargron](https://github.com/tootsuite/mastodon/pull/14802))
|
- Fix 2FA/sign-in token sessions being valid after password change ([Gargron](https://github.com/tootsuite/mastodon/pull/14802))
|
||||||
- Fix resolving accounts sometimes creating duplicate records for a given ActivityPub identifier ([ThibG](https://github.com/tootsuite/mastodon/pull/15364))
|
- Fix resolving accounts sometimes creating duplicate records for a given ActivityPub identifier ([ThibG](https://github.com/tootsuite/mastodon/pull/15364))
|
||||||
|
|
||||||
|
## [3.2.2] - 2020-12-19
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Add `tootctl maintenance fix-duplicates` ([ThibG](https://github.com/tootsuite/mastodon/pull/14860), [Gargron](https://github.com/tootsuite/mastodon/pull/15223))
|
||||||
|
- Index corruption in the database?
|
||||||
|
- This command is for you
|
||||||
|
|
||||||
|
### Removed
|
||||||
|
|
||||||
|
- Remove dependency on unused and unmaintained http_parser.rb gem ([ThibG](https://github.com/tootsuite/mastodon/pull/14574))
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fix Move handler not being triggered when failing to fetch target account ([ThibG](https://github.com/tootsuite/mastodon/pull/15107))
|
||||||
|
- Fix downloading remote media files when server returns empty filename ([ThibG](https://github.com/tootsuite/mastodon/pull/14867))
|
||||||
|
- Fix possible casing inconsistencies in hashtag search ([ThibG](https://github.com/tootsuite/mastodon/pull/14906))
|
||||||
|
- Fix updating account counters when association is not yet created ([Gargron](https://github.com/tootsuite/mastodon/pull/15108))
|
||||||
|
- Fix account processing failing because of large collections ([ThibG](https://github.com/tootsuite/mastodon/pull/15027))
|
||||||
|
- Fix resolving an account through its non-canonical form (i.e. alternate domain) ([ThibG](https://github.com/tootsuite/mastodon/pull/15187))
|
||||||
|
- Fix slow distinct queries where grouped queries are faster ([Gargron](https://github.com/tootsuite/mastodon/pull/15287))
|
||||||
|
|
||||||
|
### Security
|
||||||
|
|
||||||
|
- Fix 2FA/sign-in token sessions being valid after password change ([Gargron](https://github.com/tootsuite/mastodon/pull/14802))
|
||||||
|
- Fix resolving accounts sometimes creating duplicate records for a given ActivityPub identifier ([ThibG](https://github.com/tootsuite/mastodon/pull/15364))
|
||||||
|
|
||||||
## [3.2.1] - 2020-10-19
|
## [3.2.1] - 2020-10-19
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
|
|
|
@ -15,12 +15,12 @@ type: application
|
||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# This is the chart version. This version number should be incremented each time you make changes
|
||||||
# to the chart and its templates, including the app version.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.1.0
|
version: 0.1.2
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# This is the version number of the application being deployed. This version number should be
|
||||||
# incremented each time you make changes to the application. Versions are not expected to
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
# follow Semantic Versioning. They should reflect the version the application is using.
|
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||||
appVersion: 3.1.5
|
appVersion: 3.3.0
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- name: elasticsearch
|
- name: elasticsearch
|
||||||
|
|
|
@ -4,7 +4,7 @@ image:
|
||||||
repository: tootsuite/mastodon
|
repository: tootsuite/mastodon
|
||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
# https://hub.docker.com/r/tootsuite/mastodon/tags
|
# https://hub.docker.com/r/tootsuite/mastodon/tags
|
||||||
tag: v3.2.1
|
tag: v3.3.0
|
||||||
# alternatively, use `latest` for the latest release or `edge` for the image
|
# alternatively, use `latest` for the latest release or `edge` for the image
|
||||||
# built from the most recent commit
|
# built from the most recent commit
|
||||||
#
|
#
|
||||||
|
|
|
@ -245,10 +245,10 @@ module Mastodon
|
||||||
domain configuration.
|
domain configuration.
|
||||||
LONG_DESC
|
LONG_DESC
|
||||||
def fix_duplicates
|
def fix_duplicates
|
||||||
Account.remote.select(:uri, 'count(*)').group(:uri).having('count(*) > 1').pluck_each(:uri) do |uri|
|
Account.remote.select(:uri, 'count(*)').group(:uri).having('count(*) > 1').pluck(:uri).each do |uri|
|
||||||
say("Duplicates found for #{uri}")
|
say("Duplicates found for #{uri}")
|
||||||
begin
|
begin
|
||||||
ActivityPub::FetchRemotAccountService.new.call(uri) unless options[:dry_run]
|
ActivityPub::FetchRemoteAccountService.new.call(uri) unless options[:dry_run]
|
||||||
rescue => e
|
rescue => e
|
||||||
say("Error processing #{uri}: #{e}", :red)
|
say("Error processing #{uri}: #{e}", :red)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue