Merge branch 'stable' into develop

.codespellignore

@@ -11,3 +11,4 @@ upto
 # Names
 nin
 noe
+manuel

.pre-commit-config.yaml

@@ -58,13 +58,13 @@ repos:
       - id: flake8
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.2
+    rev: v3.0.3
     hooks:
       - id: prettier
         files: \.(md|yml|yaml|json)$
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.5
+    rev: v2.2.6
     hooks:
       - id: codespell
         additional_dependencies: [tomli]

CHANGELOG.md

@@ -9,6 +9,28 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 <!-- towncrier -->
 
+## 1.3.4 (2023-11-16)
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/administrator/upgrade/index.html
+
+Bugfixes:
+
+- Remove dangling dependency howler
+
+Documentation:
+
+- Fix a redirect loop on documentation for moderators
+
+Contributors to our Merge Requests:
+
+- Georg Krause
+- Thomas
+
+Committers:
+
+- Georg Krause
+
 ## 1.3.3 (2023-09-07)
 
 Upgrade instructions are available at
@@ -2638,7 +2660,7 @@ Bugfixes:
 
 - Downgraded channels dependency to 2.1.6 to fix denied uploads (#697)
 - Fixed cards display issues on medium/small screens (#707)
-- Fixed Embed component name that could lead to issue when developping on OSX (#696)
+- Fixed Embed component name that could lead to issue when developing on OSX (#696)
 - Fixed resizing issues for album cards on artist pages (#694)
 
 ## 0.18.1 (2019-01-29)
@@ -4160,7 +4182,7 @@ deployed in various projects and supported by numerous clients.
 
 By offering this API in Funkwhale, we make it possible to access the instance
 library and listen to the music without from existing Subsonic clients, and
-without developping our own alternative clients for each and every platform.
+without developing our own alternative clients for each and every platform.
 
 Most advanced Subsonic clients support offline caching of music files,
 playlist management and search, which makes them well-suited for nomadic use.

api/funkwhale_api/tags/filters.py

@@ -24,7 +24,7 @@ class TagFilter(filters.FilterSet):
 
 def get_by_similar_tags(qs, tags):
     """
-    Return a queryset of obects with at least one matching tag.
+    Return a queryset of objects with at least one matching tag.
     Annotate the queryset so you can order later by number of matches.
     """
     qs = qs.filter(tagged_items__tag__name__in=tags).annotate(

api/pyproject.toml

@@ -29,7 +29,7 @@ python = "^3.8,<3.12"
 
 # Django
 dj-rest-auth = { extras = ["with_social"], version = "2.2.8" }
-django = "==3.2.20"
+django = "==3.2.23"
 django-allauth = "==0.42.0"
 django-cache-memoize = "0.1.10"
 django-cacheops = "==6.1"
@@ -46,7 +46,7 @@ djangorestframework = "==3.14.0"
 drf-spectacular = "==0.26.1"
 markdown = "==3.4.4"
 persisting-theory = "==1.0"
-psycopg2 = "==2.9.7"
+psycopg2 = "==2.9.9"
 redis = "==4.5.5"
 
 # Django LDAP
@@ -66,7 +66,7 @@ gunicorn = "==20.1.0"
 uvicorn = { version = "==0.20.0", extras = ["standard"] }
 
 # Libs
-aiohttp = "==3.8.5"
+aiohttp = "==3.8.6"
 arrow = "==1.2.3"
 backports-zoneinfo = { version = "==0.2.1", python = "<3.9" }
 bleach = "==5.0.1"
@@ -109,9 +109,9 @@ factory-boy = "==3.2.1"
 faker = "==15.3.4"
 flake8 = "==3.9.2"
 ipdb = "==0.13.13"
-prompt-toolkit = "==3.0.39"
 pytest = "==7.2.2"
 pytest-asyncio = "==0.21.0"
+prompt-toolkit = "==3.0.41"
 pytest-cov = "==4.0.0"
 pytest-django = "==4.5.2"
 pytest-env = "==0.8.1"

api/tests/music/test_utils.py

@@ -131,3 +131,13 @@ def test_transcode_file(name, expected):
             result = {k: round(v) for k, v in utils.get_audio_file_data(f).items()}
 
             assert result == expected
+
+
+def test_custom_s3_domain(factories, settings):
+    """See #2220"""
+    settings.DEFAULT_FILE_STORAGE = "funkwhale_api.common.storage.ASCIIS3Boto3Storage"
+    settings.AWS_S3_CUSTOM_DOMAIN = "my.custom.domain.tld"
+    f = factories["music.Upload"].build(audio_file__filename="test.mp3")
+    print(f.audio_file.url)
+
+    assert f.audio_file.url.startswith("https://")

docs/redirects.txt

@@ -15,7 +15,6 @@ users/followchannel.html, ../user/channels/follow.html
 users/follow.html, ../user/libraries/follow.html
 users/reports.html, ../user/reports/index.html
 users/builtinplugins.html, ../user/plugins/index.html
-moderator/index.html, ../moderator/index.html
 moderator/reports.html, ../moderator/reports/index.html
 moderator/domains.html, ../moderator/domains/index.html
 moderator/users.html, ../moderator/users/index.html

docs/user/channels/delete.md

@@ -1,7 +1,7 @@
 # Delete a channel
 
 ```{warning}
-Deleting a channel is irreversible. If you delete a channel you also delete the content associated with it. Users won't be able to access the channel any more. You can't re-use the channel's __Fediverse handle__ for another channel.
+Deleting a channel is irreversible. If you delete a channel you also delete the content associated with it. Users won't be able to access the channel any more. You can't reuse the channel's __Fediverse handle__ for another channel.
 ```
 
 If you want to delete your channel, follow these steps:

front/package.json

@@ -32,15 +32,14 @@
     "diff": "5.1.0",
     "dompurify": "2.4.7",
     "focus-trap": "7.2.0",
-    "fomantic-ui-css": "2.9.2",
-    "howler": "2.2.3",
+    "fomantic-ui-css": "2.9.3",
     "idb-keyval": "6.2.1",
     "lodash-es": "4.17.21",
     "lru-cache": "7.14.1",
     "moment": "2.29.4",
     "showdown": "2.1.0",
     "stacktrace-js": "2.0.2",
-    "standardized-audio-context": "25.3.55",
+    "standardized-audio-context": "25.3.58",
     "text-clipper": "2.2.0",
     "transliteration": "2.3.5",
     "universal-cookie": "4.0.4",
@@ -62,7 +61,6 @@
     "@intlify/unplugin-vue-i18n": "0.8.2",
     "@types/diff": "5.0.3",
     "@types/dompurify": "2.4.0",
-    "@types/howler": "2.2.7",
     "@types/jquery": "3.5.16",
     "@types/lodash-es": "4.17.7",
     "@types/moxios": "0.4.15",