S3_BUCKET appended to S3_HOSTNAME causes an issue with Digital Ocean Spaces

[Michael-Brooks]

Steps to reproduce the problem

1. Create a Digital Ocean Space
2. Add Digital Ocean Space details to the S3 environment variables
   ...

Expected behaviour

https://mastodonassets.fra1.digitaloceanspaces.com/accounts/avatars/000/000/005/original/639522c276743cd4.jpg

Actual behaviour

https://mastodonassets.fra1.digitaloceanspaces.com/mastodonassets/accounts/avatars/000/000/005/original/639522c276743cd4.jpg

Detailed description

Digital Ocean Spaces is a drop-in replacement for Amazon's S3 storage. It is the same configuration, but they never append their bucket name to the URL's end as Mastodon expects. If I leave the S3_BUCKET blank, it still fails because there are no two forward slashes because it expects the directory to be there.

S3_ENABLED=true
S3_BUCKET=mastodonassets
AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
S3_PROTOCOL=https
S3_HOSTNAME=mastodonassets.fra1.digitaloceanspaces.com
S3_ENDPOINT=https://fra1.digitaloceanspaces.com/

Specifications

Mastodon v3.5.3

[Michael-Brooks]

Fixed using S3_ALIAS_HOST