Merge branch 'master' into issue1516

Author: ffont

.github/workflows/unit-tests.yml

@@ -45,9 +45,6 @@ jobs:
     - name: Pull docker images
       run: docker compose -f docker-compose.test.yml pull
 
-    - uses: jpribyl/[email protected]
-      continue-on-error: true
-
     - name: Build base image
       run: make -C docker
 

.gitignore

@@ -1,41 +1,18 @@
 freesound-data
-*.project
-*.pydevproject
 *.pyc
 *~
 *.DS_Store
-*settings_local.py
-\#*\#
-*.settings*
-utils/search/config*/data
-.amateras
 freesound/local_settings.py
-logger.ini
 _docs/api/build/
-*.initial_data.json
-*.settings.py
-*beta_release_mails.json
-*usernames_passwords.csv
-*jmeter.log
-*jmeter.jtl
-_sandbox/load_testing/results/
-_docs/freesound_logo/white background - red - black/freesound_logo_tshirt.ai
-freesound.komodoproject
 .idea/
 .env
-see_last_email
-build_static.sh
-create_caches.sh
-run_tests.sh
-clear_cache.sh
 .venv
 
-# BW fornt end
+# BW frontend
 .cache
 node_modules
 freesound/static/bw-frontend/dist/
 bw_static/
 npm-debug.log
 color-theme.scss
 dist-dark
-

README.md

@@ -74,6 +74,8 @@ Below are instructions for setting up a local Freesound installation for develop
        # or if the above command does not work, try this one 
        docker compose run --rm --no-TTY db psql -h db -U freesound -d freesound < freesound-data/db_dev_dump/freesound-small-dev-dump-2023-09.sql
 
+If you a prompted for a password, use `localfreesoundpgpassword`, this is defined in the `docker-compose.yml` file.
+
 10. Update database by running Django migrations
 
         docker compose run --rm web python manage.py migrate
@@ -84,7 +86,7 @@ Below are instructions for setting up a local Freesound installation for develop
 
 12. Install static build dependencies
 
-        docker compose run --rm web npm install --force
+        docker compose run --rm web npm install
 
 13. Build static files. Note that this step will need to be re-run every time there are changes in Freesound's static code (JS, CSS and static media files).
 

accounts/admin.py

@@ -140,7 +140,10 @@ class FreesoundUserAdmin(DjangoObjectActions, UserAdmin):
         ('Personal info', {'fields': ('email', )}),
         ('Permissions', {'fields': ('is_active', 'is_staff', 'is_superuser', 'groups')}),
         ('Important dates', {'fields': ('last_login', 'date_joined')}),
-     )
+    )
+    add_fieldsets = (
+        (None, {'fields': ('username', 'email', 'password1', 'password2')}),
+    )
 
     paginator = LargeTablePaginator
 

accounts/forms.py

@@ -363,7 +363,7 @@ def __init__(self, request, *args, **kwargs):
                         % (settings.USERNAME_CHANGE_MAX_TIMES - self.n_times_changed_username,
                            's' if (settings.USERNAME_CHANGE_MAX_TIMES - self.n_times_changed_username) != 1 else '')
         else:
-            help_text = "You already changed your username the maximum times allowed"
+            help_text = "You have already changed your username the maximum number of times allowed"
             self.fields['username'].disabled = True
         self.fields['username'].help_text += " " + help_text
 

accounts/tests/test_upload.py

@@ -234,8 +234,8 @@ def test_bulk_describe_view_permissions(self):
         resp = self.client.get(reverse('accounts-bulk-describe', args=[bulk.id]))
         self.assertEqual(resp.status_code, 200)  # After login, page loads normally (200 OK)
 
-        User.objects.create_user("testuser2", password="testpass", email='[email protected]')
-        self.client.login(username='testuser2', password='testpass')
+        user = User.objects.create_user("testuser2", email='[email protected]')
+        self.client.force_login(user)
         resp = self.client.get(reverse('accounts-bulk-describe', args=[bulk.id]))
         self.assertEqual(resp.status_code, 404)  # User without permission (not owner of object) gets 404
 

accounts/tests/test_user.py

@@ -921,8 +921,8 @@ def test_change_username_creates_old_username(self):
     @override_settings(USERNAME_CHANGE_MAX_TIMES=2)
     def test_change_username_form_profile_page(self):
         # Create user and login
-        userA = User.objects.create_user('userA', email='[email protected]', password='testpass')
-        self.client.login(username='userA', password='testpass')
+        userA = User.objects.create_user('userA', email='[email protected]')
+        self.client.force_login(userA)
 
         # Test save profile without changing username (note we set all mandatory fields)
         resp = self.client.post(reverse('accounts-edit'), data={'profile-username': ['userA'], 'profile-ui_theme_preference': 'f'})
@@ -990,11 +990,11 @@ def test_change_username_mark_sounds_dirty(self):
 
     @override_settings(USERNAME_CHANGE_MAX_TIMES=2)
     def test_change_username_form_admin(self):
-        User.objects.create_user('superuser', password='testpass', is_superuser=True, is_staff=True)
-        self.client.login(username='superuser', password='testpass')
+        superuser = User.objects.create_user('superuser', is_superuser=True, is_staff=True)
+        self.client.force_login(superuser)
 
         # Create user and get admin change url
-        userA = User.objects.create_user('userA', email='[email protected]', password='testpass')
+        userA = User.objects.create_user('userA', email='[email protected]')
         admin_change_url = reverse('admin:auth_user_change', args=[userA.id])
 
         post_data = {'username': 'userA',
@@ -1068,8 +1068,8 @@ def test_change_username_case_insensitiveness(self):
         OldUsername entry because usernames should be treated as case insensitive.
         """
         # Create user and login
-        userA = User.objects.create_user('userA', email='[email protected]', password='testpass')
-        self.client.login(username='userA', password='testpass')
+        userA = User.objects.create_user('userA', email='[email protected]')
+        self.client.force_login(userA)
 
         # Rename "userA" to "UserA", should not create OldUsername object
         resp = self.client.post(reverse('accounts-edit'), data={'profile-username': ['UserA'], 'profile-ui_theme_preference': 'f'})
@@ -1113,8 +1113,8 @@ def test_username_whitespace(self):
 class ChangeEmailViaAdminTestCase(TestCase):
 
     def test_change_email_form_admin(self):
-        User.objects.create_user('superuser', password='testpass', is_superuser=True, is_staff=True)
-        self.client.login(username='superuser', password='testpass')
+        superuser = User.objects.create_user('superuser', is_superuser=True, is_staff=True)
+        self.client.force_login(superuser)
 
         # Create user and get admin change url
         userA = User.objects.create_user('userA', email='[email protected]', password='testpass')

apiv2/exceptions.py

@@ -105,7 +105,7 @@ def __init__(self, msg="Server error", resource=None):
         errors_logger.info(apiv2.apiv2_utils.log_message_helper(summary_message, data_dict={
             'summary_message': summary_message, 'long_message': msg, 'status': self.status_code}, resource=resource))
         self.detail = msg
-        sentry_sdk.capture_exception(self)  # Manually capture exception so it has mroe info and Sentry can organize it properly
+        sentry_sdk.capture_exception(self)
 
 
 class OtherException(APIException):

comments/forms.py

@@ -25,7 +25,7 @@
 class CommentForm(forms.Form):
     comment = HtmlCleaningCharField(
         widget=forms.Textarea, max_length=4000, label='',
-        help_text="You can add comments with a timestamp using the syntax #minute:second (e.g., \"The sound in #1:34 is really neat\").")
+        help_text='You can add comments with a timestamp using the syntax #minute:second (e.g., "The sound at #1:34 is really neat").')
 
     def __init__(self, request, *args, **kwargs):
         self.request = request

docker-compose.yml

@@ -8,17 +8,16 @@ services:
 
     # Database server
     db:
-        image: postgres:12.1
+        image: postgres:16.6
         volumes:
             - pgdata:/var/lib/postgresql/data
             - ./freesound-data/db_dev_dump:/freesound-data/db_dev_dump
-        env_file:
-            - environment
         ports:
             - "${FS_BIND_HOST:-127.0.0.1}:${LOCAL_PORT_PREFIX}5432:5432"
         environment:
             - POSTGRES_USER=freesound
             - POSTGRES_DB=freesound
+            - POSTGRES_PASSWORD=localfreesoundpgpassword
             - FS_USER_ID
 
     # Web worker