From cb883f14b8239f71132db10fc79e1a0e8cc64c57 Mon Sep 17 00:00:00 2001 From: Shin'ya Minazuki Date: Sat, 24 Jan 2026 19:54:33 -0300 Subject: [PATCH] Update import paths Signed-off-by: Shin'ya Minazuki --- api/funquail_api/__init__.py | 2 +- api/funquail_api/activity/apps.py | 2 +- api/funquail_api/activity/serializers.py | 2 +- api/funquail_api/activity/utils.py | 6 +-- api/funquail_api/activity/views.py | 4 +- api/funquail_api/audio/admin.py | 2 +- api/funquail_api/audio/factories.py | 8 ++-- api/funquail_api/audio/filters.py | 8 ++-- .../audio/migrations/0002_channel_metadata.py | 4 +- .../migrations/0004_alter_channel_metadata.py | 4 +- api/funquail_api/audio/models.py | 10 ++--- api/funquail_api/audio/renderers.py | 2 +- api/funquail_api/audio/serializers.py | 28 ++++++------- api/funquail_api/audio/spa_views.py | 6 +-- api/funquail_api/audio/tasks.py | 2 +- api/funquail_api/audio/views.py | 22 +++++----- api/funquail_api/cli/library.py | 2 +- api/funquail_api/cli/media.py | 4 +- api/funquail_api/cli/users.py | 4 +- api/funquail_api/cli/utils.py | 2 +- api/funquail_api/common/apps.py | 2 +- api/funquail_api/common/authentication.py | 2 +- api/funquail_api/common/consumers.py | 2 +- api/funquail_api/common/factories.py | 4 +- api/funquail_api/common/filters.py | 2 +- .../common/management/commands/gitpod.py | 8 ++-- .../management/commands/inplace_to_s3.py | 2 +- .../management/commands/load_test_data.py | 14 +++---- .../common/management/commands/script.py | 4 +- .../common/management/commands/testdata.py | 4 +- api/funquail_api/common/middleware.py | 2 +- .../migrations/0004_auto_20191111_1338.py | 6 +-- api/funquail_api/common/models.py | 2 +- api/funquail_api/common/permissions.py | 2 +- .../common/scripts/create_actors.py | 2 +- .../common/scripts/create_image_variations.py | 2 +- .../delete_pre_017_federated_uploads.py | 2 +- .../django_permissions_to_user_permissions.py | 2 +- .../scripts/migrate_to_user_libraries.py | 8 ++-- api/funquail_api/common/serializers.py | 2 +- api/funquail_api/common/session.py | 4 +- api/funquail_api/common/tasks.py | 4 +- api/funquail_api/common/utils.py | 2 +- api/funquail_api/common/views.py | 4 +- .../contrib/listenbrainz/funkwhale_ready.py | 4 +- .../0002_set_site_domain_and_name.py | 2 +- api/funquail_api/favorites/activities.py | 4 +- api/funquail_api/favorites/admin.py | 2 +- api/funquail_api/favorites/factories.py | 6 +-- api/funquail_api/favorites/filters.py | 6 +-- api/funquail_api/favorites/models.py | 2 +- api/funquail_api/favorites/serializers.py | 8 ++-- api/funquail_api/favorites/urls.py | 2 +- api/funquail_api/favorites/views.py | 10 ++--- api/funquail_api/federation/activity.py | 10 ++--- api/funquail_api/federation/actors.py | 4 +- api/funquail_api/federation/admin.py | 2 +- .../federation/api_serializers.py | 10 ++--- api/funquail_api/federation/api_urls.py | 2 +- api/funquail_api/federation/api_views.py | 14 +++---- api/funquail_api/federation/authentication.py | 4 +- api/funquail_api/federation/decorators.py | 2 +- api/funquail_api/federation/factories.py | 6 +-- api/funquail_api/federation/filters.py | 2 +- api/funquail_api/federation/library.py | 2 +- .../management/commands/fix_federation_ids.py | 6 +-- .../migrations/0005_auto_20180413_1723.py | 4 +- .../migrations/0009_auto_20180822_1956.py | 6 +-- .../migrations/0016_auto_20181227_1605.py | 4 +- .../migrations/0017_auto_20190130_0926.py | 8 ++-- .../federation/migrations/0018_fetch.py | 4 +- .../migrations/0019_auto_20190611_0851.py | 2 +- .../migrations/0020_auto_20190730_0846.py | 8 ++-- .../migrations/0027_auto_20220627_1915.py | 10 ++--- api/funquail_api/federation/models.py | 18 ++++---- api/funquail_api/federation/mrf_policies.py | 2 +- api/funquail_api/federation/routes.py | 2 +- api/funquail_api/federation/serializers.py | 22 +++++----- api/funquail_api/federation/spa_views.py | 4 +- api/funquail_api/federation/tasks.py | 14 +++---- api/funquail_api/federation/utils.py | 4 +- api/funquail_api/federation/views.py | 12 +++--- api/funquail_api/federation/webfinger.py | 2 +- api/funquail_api/history/activities.py | 4 +- api/funquail_api/history/admin.py | 2 +- api/funquail_api/history/factories.py | 6 +-- api/funquail_api/history/filters.py | 4 +- api/funquail_api/history/models.py | 2 +- api/funquail_api/history/serializers.py | 8 ++-- api/funquail_api/history/urls.py | 2 +- api/funquail_api/history/views.py | 10 ++--- api/funquail_api/instance/consumers.py | 2 +- api/funquail_api/instance/serializers.py | 2 +- api/funquail_api/instance/stats.py | 8 ++-- api/funquail_api/instance/urls.py | 2 +- api/funquail_api/instance/views.py | 16 +++---- api/funquail_api/main.py | 2 +- api/funquail_api/manage/filters.py | 24 +++++------ api/funquail_api/manage/serializers.py | 28 ++++++------- api/funquail_api/manage/urls.py | 2 +- api/funquail_api/manage/views.py | 36 ++++++++-------- api/funquail_api/moderation/admin.py | 2 +- api/funquail_api/moderation/apps.py | 2 +- .../dynamic_preferences_registry.py | 6 +-- api/funquail_api/moderation/factories.py | 8 ++-- .../management/commands/mrf_check.py | 6 +-- api/funquail_api/moderation/models.py | 6 +-- api/funquail_api/moderation/mrf_policies.py | 6 +-- api/funquail_api/moderation/serializers.py | 14 +++---- api/funquail_api/moderation/tasks.py | 10 ++--- api/funquail_api/moderation/urls.py | 2 +- api/funquail_api/moderation/utils.py | 2 +- api/funquail_api/moderation/views.py | 4 +- api/funquail_api/music/admin.py | 2 +- api/funquail_api/music/factories.py | 14 +++---- api/funquail_api/music/fake_data.py | 2 +- api/funquail_api/music/filters.py | 14 +++---- .../commands/check_inplace_files.py | 2 +- .../management/commands/check_licenses.py | 2 +- .../management/commands/create_library.py | 4 +- .../music/management/commands/fix_uploads.py | 4 +- .../commands/generate_typesense_index.py | 2 +- .../music/management/commands/import_files.py | 4 +- .../management/commands/prune_library.py | 2 +- .../commands/prune_skipped_uploads.py | 2 +- .../commands/rebuild_music_permissions.py | 4 +- api/funquail_api/music/metadata.py | 2 +- .../migrations/0019_populate_mimetypes.py | 2 +- .../migrations/0021_populate_batch_status.py | 2 +- .../migrations/0030_auto_20180825_1411.py | 12 +++--- .../migrations/0033_auto_20181023_1837.py | 4 +- .../migrations/0040_auto_20191021_1318.py | 2 +- .../migrations/0041_auto_20191021_1705.py | 8 ++-- .../0053_denormalize_audio_permissions.py | 4 +- .../migrations/0055_auto_20220627_1915.py | 8 ++-- api/funquail_api/music/models.py | 20 ++++----- api/funquail_api/music/mutations.py | 14 +++---- api/funquail_api/music/serializers.py | 24 +++++------ api/funquail_api/music/spa_views.py | 4 +- api/funquail_api/music/tasks.py | 22 +++++----- api/funquail_api/music/utils.py | 8 ++-- api/funquail_api/music/views.py | 30 ++++++------- api/funquail_api/musicbrainz/client.py | 2 +- api/funquail_api/musicbrainz/urls.py | 2 +- api/funquail_api/musicbrainz/views.py | 2 +- api/funquail_api/playlists/admin.py | 2 +- api/funquail_api/playlists/factories.py | 6 +-- api/funquail_api/playlists/filters.py | 6 +-- api/funquail_api/playlists/models.py | 4 +- api/funquail_api/playlists/serializers.py | 8 ++-- api/funquail_api/playlists/views.py | 6 +-- api/funquail_api/providers/urls.py | 2 +- api/funquail_api/radios/admin.py | 2 +- api/funquail_api/radios/factories.py | 4 +- api/funquail_api/radios/filters.py | 4 +- api/funquail_api/radios/filtersets.py | 4 +- api/funquail_api/radios/lb_recommendations.py | 4 +- api/funquail_api/radios/models.py | 2 +- api/funquail_api/radios/radios.py | 10 ++--- api/funquail_api/radios/radios_v2.py | 10 ++--- api/funquail_api/radios/serializers.py | 4 +- api/funquail_api/radios/urls.py | 2 +- api/funquail_api/radios/urls_v2.py | 2 +- api/funquail_api/radios/views.py | 8 ++-- api/funquail_api/subsonic/authentication.py | 2 +- api/funquail_api/subsonic/filters.py | 2 +- api/funquail_api/subsonic/renderers.py | 4 +- api/funquail_api/subsonic/serializers.py | 6 +-- api/funquail_api/subsonic/views.py | 42 +++++++++---------- api/funquail_api/tags/admin.py | 2 +- api/funquail_api/tags/factories.py | 2 +- api/funquail_api/tags/filters.py | 2 +- api/funquail_api/tags/views.py | 2 +- api/funquail_api/taskapp/celery.py | 4 +- api/funquail_api/typesense/tasks.py | 4 +- api/funquail_api/typesense/utils.py | 2 +- api/funquail_api/users/admin.py | 2 +- api/funquail_api/users/api_urls.py | 2 +- api/funquail_api/users/auth_backends.py | 2 +- .../users/dynamic_preferences_registry.py | 2 +- api/funquail_api/users/factories.py | 4 +- .../users/migrations/0010_user_avatar.py | 8 ++-- .../migrations/0011_auto_20180721_1317.py | 10 ++--- .../migrations/0016_auto_20190920_0857.py | 6 +-- .../migrations/0018_auto_20200705_0829.py | 4 +- api/funquail_api/users/models.py | 12 +++--- api/funquail_api/users/mutations.py | 4 +- api/funquail_api/users/oauth/permissions.py | 2 +- api/funquail_api/users/oauth/scopes.py | 2 +- api/funquail_api/users/oauth/server.py | 2 +- api/funquail_api/users/oauth/tasks.py | 2 +- api/funquail_api/users/oauth/urls.py | 2 +- api/funquail_api/users/oauth/views.py | 2 +- api/funquail_api/users/serializers.py | 18 ++++---- api/funquail_api/users/tasks.py | 4 +- api/funquail_api/users/views.py | 2 +- api/manage.py | 6 +-- 197 files changed, 584 insertions(+), 584 deletions(-) diff --git a/api/funquail_api/__init__.py b/api/funquail_api/__init__.py index 646b6149e..65f51f90b 100644 --- a/api/funquail_api/__init__.py +++ b/api/funquail_api/__init__.py @@ -1,4 +1,4 @@ from importlib.metadata import version as get_version -version = get_version("funkwhale_api") +version = get_version("funquail_api") __version__ = version diff --git a/api/funquail_api/activity/apps.py b/api/funquail_api/activity/apps.py index 9ca0ccc91..a9d36d4b4 100644 --- a/api/funquail_api/activity/apps.py +++ b/api/funquail_api/activity/apps.py @@ -4,7 +4,7 @@ from . import record class ActivityConfig(AppConfig): - name = "funkwhale_api.activity" + name = "funquail_api.activity" def ready(self): super().ready() diff --git a/api/funquail_api/activity/serializers.py b/api/funquail_api/activity/serializers.py index 6df3a5870..ee6ce3337 100644 --- a/api/funquail_api/activity/serializers.py +++ b/api/funquail_api/activity/serializers.py @@ -1,6 +1,6 @@ from rest_framework import serializers -from funkwhale_api.activity import record +from funquail_api.activity import record class ModelSerializer(serializers.ModelSerializer): diff --git a/api/funquail_api/activity/utils.py b/api/funquail_api/activity/utils.py index 8d7cb3bd3..69d273bf1 100644 --- a/api/funquail_api/activity/utils.py +++ b/api/funquail_api/activity/utils.py @@ -1,8 +1,8 @@ from django.db import models -from funkwhale_api.common import fields -from funkwhale_api.favorites.models import TrackFavorite -from funkwhale_api.history.models import Listening +from funquail_api.common import fields +from funquail_api.favorites.models import TrackFavorite +from funquail_api.history.models import Listening def combined_recent(limit, **kwargs): diff --git a/api/funquail_api/activity/views.py b/api/funquail_api/activity/views.py index 4938301a5..48671cd14 100644 --- a/api/funquail_api/activity/views.py +++ b/api/funquail_api/activity/views.py @@ -2,8 +2,8 @@ from drf_spectacular.utils import extend_schema from rest_framework import viewsets from rest_framework.response import Response -from funkwhale_api.common.permissions import ConditionalAuthentication -from funkwhale_api.favorites.models import TrackFavorite +from funquail_api.common.permissions import ConditionalAuthentication +from funquail_api.favorites.models import TrackFavorite from . import serializers, utils diff --git a/api/funquail_api/audio/admin.py b/api/funquail_api/audio/admin.py index 5cde8cc87..ba36e6cf5 100644 --- a/api/funquail_api/audio/admin.py +++ b/api/funquail_api/audio/admin.py @@ -1,4 +1,4 @@ -from funkwhale_api.common import admin +from funquail_api.common import admin from . import models diff --git a/api/funquail_api/audio/factories.py b/api/funquail_api/audio/factories.py index a08340e85..79a406db9 100644 --- a/api/funquail_api/audio/factories.py +++ b/api/funquail_api/audio/factories.py @@ -2,10 +2,10 @@ import uuid import factory -from funkwhale_api.factories import NoUpdateOnCreate, registry -from funkwhale_api.federation import actors -from funkwhale_api.federation import factories as federation_factories -from funkwhale_api.music import factories as music_factories +from funquail_api.factories import NoUpdateOnCreate, registry +from funquail_api.federation import actors +from funquail_api.federation import factories as federation_factories +from funquail_api.music import factories as music_factories from . import models diff --git a/api/funquail_api/audio/filters.py b/api/funquail_api/audio/filters.py index eb9960031..e88b66f41 100644 --- a/api/funquail_api/audio/filters.py +++ b/api/funquail_api/audio/filters.py @@ -1,10 +1,10 @@ import django_filters from django.db.models import Q -from funkwhale_api.common import fields -from funkwhale_api.common import filters as common_filters -from funkwhale_api.federation import actors -from funkwhale_api.moderation import filters as moderation_filters +from funquail_api.common import fields +from funquail_api.common import filters as common_filters +from funquail_api.federation import actors +from funquail_api.moderation import filters as moderation_filters from . import models diff --git a/api/funquail_api/audio/migrations/0002_channel_metadata.py b/api/funquail_api/audio/migrations/0002_channel_metadata.py index c7a1806f1..c5e8bd713 100644 --- a/api/funquail_api/audio/migrations/0002_channel_metadata.py +++ b/api/funquail_api/audio/migrations/0002_channel_metadata.py @@ -3,7 +3,7 @@ import django.contrib.postgres.fields.jsonb import django.core.serializers.json from django.db import migrations -import funkwhale_api.audio.models +import funquail_api.audio.models class Migration(migrations.Migration): @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='channel', name='metadata', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funkwhale_api.audio.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funquail_api.audio.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), ), ] diff --git a/api/funquail_api/audio/migrations/0004_alter_channel_metadata.py b/api/funquail_api/audio/migrations/0004_alter_channel_metadata.py index 64001dcb3..41b462846 100644 --- a/api/funquail_api/audio/migrations/0004_alter_channel_metadata.py +++ b/api/funquail_api/audio/migrations/0004_alter_channel_metadata.py @@ -2,7 +2,7 @@ import django.core.serializers.json from django.db import migrations, models -import funkwhale_api.audio.models +import funquail_api.audio.models class Migration(migrations.Migration): @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='channel', name='metadata', - field=models.JSONField(blank=True, default=funkwhale_api.audio.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), + field=models.JSONField(blank=True, default=funquail_api.audio.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), ), ] diff --git a/api/funquail_api/audio/models.py b/api/funquail_api/audio/models.py index 93a4d873d..68e947021 100644 --- a/api/funquail_api/audio/models.py +++ b/api/funquail_api/audio/models.py @@ -9,10 +9,10 @@ from django.dispatch import receiver from django.urls import reverse from django.utils import timezone -from funkwhale_api.federation import keys -from funkwhale_api.federation import models as federation_models -from funkwhale_api.federation import utils as federation_utils -from funkwhale_api.users import models as user_models +from funquail_api.federation import keys +from funquail_api.federation import models as federation_models +from funquail_api.federation import utils as federation_utils +from funquail_api.users import models as user_models def empty_dict(): @@ -21,7 +21,7 @@ def empty_dict(): class ChannelQuerySet(models.QuerySet): def external_rss(self, include=True): - from funkwhale_api.federation import actors + from funquail_api.federation import actors query = models.Q( attributed_to=actors.get_service_actor(), diff --git a/api/funquail_api/audio/renderers.py b/api/funquail_api/audio/renderers.py index 79294ca3d..f24cebcb1 100644 --- a/api/funquail_api/audio/renderers.py +++ b/api/funquail_api/audio/renderers.py @@ -2,7 +2,7 @@ import xml.etree.ElementTree as ET from rest_framework import negotiation, renderers -from funkwhale_api.subsonic.renderers import dict_to_xml_tree +from funquail_api.subsonic.renderers import dict_to_xml_tree class PodcastRSSRenderer(renderers.JSONRenderer): diff --git a/api/funquail_api/audio/serializers.py b/api/funquail_api/audio/serializers.py index 3c830fd80..e8357dca6 100644 --- a/api/funquail_api/audio/serializers.py +++ b/api/funquail_api/audio/serializers.py @@ -16,20 +16,20 @@ from drf_spectacular.types import OpenApiTypes from drf_spectacular.utils import extend_schema_field from rest_framework import serializers -from funkwhale_api.common import locales, preferences -from funkwhale_api.common import serializers as common_serializers -from funkwhale_api.common import session -from funkwhale_api.common import utils as common_utils -from funkwhale_api.federation import actors -from funkwhale_api.federation import models as federation_models -from funkwhale_api.federation import serializers as federation_serializers -from funkwhale_api.federation import utils as federation_utils -from funkwhale_api.moderation import mrf -from funkwhale_api.music import models as music_models -from funkwhale_api.music.serializers import COVER_WRITE_FIELD, CoverField -from funkwhale_api.tags import models as tags_models -from funkwhale_api.tags import serializers as tags_serializers -from funkwhale_api.users import serializers as users_serializers +from funquail_api.common import locales, preferences +from funquail_api.common import serializers as common_serializers +from funquail_api.common import session +from funquail_api.common import utils as common_utils +from funquail_api.federation import actors +from funquail_api.federation import models as federation_models +from funquail_api.federation import serializers as federation_serializers +from funquail_api.federation import utils as federation_utils +from funquail_api.moderation import mrf +from funquail_api.music import models as music_models +from funquail_api.music.serializers import COVER_WRITE_FIELD, CoverField +from funquail_api.tags import models as tags_models +from funquail_api.tags import serializers as tags_serializers +from funquail_api.users import serializers as users_serializers from . import categories, models diff --git a/api/funquail_api/audio/spa_views.py b/api/funquail_api/audio/spa_views.py index 1ca0cfe09..432988daf 100644 --- a/api/funquail_api/audio/spa_views.py +++ b/api/funquail_api/audio/spa_views.py @@ -5,9 +5,9 @@ from django.db.models import Q from django.urls import reverse from rest_framework import serializers -from funkwhale_api.common import middleware, preferences, utils -from funkwhale_api.federation import utils as federation_utils -from funkwhale_api.music import spa_views +from funquail_api.common import middleware, preferences, utils +from funquail_api.federation import utils as federation_utils +from funquail_api.music import spa_views from . import models diff --git a/api/funquail_api/audio/tasks.py b/api/funquail_api/audio/tasks.py index 0d117eaae..6f20b7531 100644 --- a/api/funquail_api/audio/tasks.py +++ b/api/funquail_api/audio/tasks.py @@ -5,7 +5,7 @@ from django.conf import settings from django.db import transaction from django.utils import timezone -from funkwhale_api.taskapp import celery +from funquail_api.taskapp import celery from . import models, serializers diff --git a/api/funquail_api/audio/views.py b/api/funquail_api/audio/views.py index 3333e26a5..2aeeb9406 100644 --- a/api/funquail_api/audio/views.py +++ b/api/funquail_api/audio/views.py @@ -7,17 +7,17 @@ from rest_framework import decorators, exceptions, mixins from rest_framework import permissions as rest_permissions from rest_framework import response, viewsets -from funkwhale_api.common import locales, permissions, preferences -from funkwhale_api.common import utils as common_utils -from funkwhale_api.common.mixins import MultipleLookupDetailMixin -from funkwhale_api.federation import actors -from funkwhale_api.federation import models as federation_models -from funkwhale_api.federation import routes -from funkwhale_api.federation import tasks as federation_tasks -from funkwhale_api.federation import utils as federation_utils -from funkwhale_api.music import models as music_models -from funkwhale_api.music import views as music_views -from funkwhale_api.users.oauth import permissions as oauth_permissions +from funquail_api.common import locales, permissions, preferences +from funquail_api.common import utils as common_utils +from funquail_api.common.mixins import MultipleLookupDetailMixin +from funquail_api.federation import actors +from funquail_api.federation import models as federation_models +from funquail_api.federation import routes +from funquail_api.federation import tasks as federation_tasks +from funquail_api.federation import utils as federation_utils +from funquail_api.music import models as music_models +from funquail_api.music import views as music_views +from funquail_api.users.oauth import permissions as oauth_permissions from . import categories, filters, models, renderers, serializers diff --git a/api/funquail_api/cli/library.py b/api/funquail_api/cli/library.py index 14b5ef038..8400cb40b 100644 --- a/api/funquail_api/cli/library.py +++ b/api/funquail_api/cli/library.py @@ -1,6 +1,6 @@ import click -from funkwhale_api.music import tasks +from funquail_api.music import tasks from . import base diff --git a/api/funquail_api/cli/media.py b/api/funquail_api/cli/media.py index 57be179c2..9ddcf30e9 100644 --- a/api/funquail_api/cli/media.py +++ b/api/funquail_api/cli/media.py @@ -5,8 +5,8 @@ from django.core.files.storage import default_storage from versatileimagefield import settings as vif_settings from versatileimagefield.image_warmer import VersatileImageFieldWarmer -from funkwhale_api.common import utils as common_utils -from funkwhale_api.common.models import Attachment +from funquail_api.common import utils as common_utils +from funquail_api.common.models import Attachment from . import base diff --git a/api/funquail_api/cli/users.py b/api/funquail_api/cli/users.py index 53054b587..765130da0 100644 --- a/api/funquail_api/cli/users.py +++ b/api/funquail_api/cli/users.py @@ -1,8 +1,8 @@ import click from django.db import transaction -from funkwhale_api.federation import models as federation_models -from funkwhale_api.users import models, serializers, tasks +from funquail_api.federation import models as federation_models +from funquail_api.users import models, serializers, tasks from . import base, utils diff --git a/api/funquail_api/cli/utils.py b/api/funquail_api/cli/utils.py index 08dd1a6fa..ddad9ada3 100644 --- a/api/funquail_api/cli/utils.py +++ b/api/funquail_api/cli/utils.py @@ -1,3 +1,3 @@ import logging -logger = logging.getLogger("funkwhale_api.cli") +logger = logging.getLogger("funquail_api.cli") diff --git a/api/funquail_api/common/apps.py b/api/funquail_api/common/apps.py index e60966248..5521f24b5 100644 --- a/api/funquail_api/common/apps.py +++ b/api/funquail_api/common/apps.py @@ -7,7 +7,7 @@ from . import mutations, utils class CommonConfig(AppConfig): - name = "funkwhale_api.common" + name = "funquail_api.common" def ready(self): super().ready() diff --git a/api/funquail_api/common/authentication.py b/api/funquail_api/common/authentication.py index 9e63d580d..b183a8e6a 100644 --- a/api/funquail_api/common/authentication.py +++ b/api/funquail_api/common/authentication.py @@ -6,7 +6,7 @@ from oauth2_provider.contrib.rest_framework.authentication import ( ) from rest_framework import exceptions -from funkwhale_api.users import models as users_models +from funquail_api.users import models as users_models class UnverifiedEmail(Exception): diff --git a/api/funquail_api/common/consumers.py b/api/funquail_api/common/consumers.py index 9db4138ff..6445e6b18 100644 --- a/api/funquail_api/common/consumers.py +++ b/api/funquail_api/common/consumers.py @@ -1,6 +1,6 @@ from channels.generic.websocket import JsonWebsocketConsumer -from funkwhale_api.common import channels +from funquail_api.common import channels class JsonAuthConsumer(JsonWebsocketConsumer): diff --git a/api/funquail_api/common/factories.py b/api/funquail_api/common/factories.py index 4f64af654..cf83a225b 100644 --- a/api/funquail_api/common/factories.py +++ b/api/funquail_api/common/factories.py @@ -1,7 +1,7 @@ import factory -from funkwhale_api.factories import NoUpdateOnCreate, registry -from funkwhale_api.federation import factories as federation_factories +from funquail_api.factories import NoUpdateOnCreate, registry +from funquail_api.federation import factories as federation_factories @registry.register diff --git a/api/funquail_api/common/filters.py b/api/funquail_api/common/filters.py index 65f5e008d..891f2883f 100644 --- a/api/funquail_api/common/filters.py +++ b/api/funquail_api/common/filters.py @@ -198,7 +198,7 @@ class ActorScopeFilter(filters.CharFilter): return queryset.filter(query).distinct() def get_query(self, scope, user, actor): - from funkwhale_api.federation import models as federation_models + from funquail_api.federation import models as federation_models if scope == "me": return self.filter_me(actor) diff --git a/api/funquail_api/common/management/commands/gitpod.py b/api/funquail_api/common/management/commands/gitpod.py index c07d44c56..d5762182a 100644 --- a/api/funquail_api/common/management/commands/gitpod.py +++ b/api/funquail_api/common/management/commands/gitpod.py @@ -5,9 +5,9 @@ import uvicorn from django.core.management import call_command from django.core.management.commands.migrate import Command as BaseCommand -from funkwhale_api.common import preferences -from funkwhale_api.music.models import Library -from funkwhale_api.users.models import User +from funquail_api.common import preferences +from funquail_api.music.models import Library +from funquail_api.users.models import User class Command(BaseCommand): @@ -73,6 +73,6 @@ class Command(BaseCommand): reload=True, reload_dirs=[ "/workspace/funkwhale/api/config/", - "/workspace/funkwhale/api/funkwhale_api/", + "/workspace/funkwhale/api/funquail_api/", ], ) diff --git a/api/funquail_api/common/management/commands/inplace_to_s3.py b/api/funquail_api/common/management/commands/inplace_to_s3.py index e973b8466..8581bb726 100644 --- a/api/funquail_api/common/management/commands/inplace_to_s3.py +++ b/api/funquail_api/common/management/commands/inplace_to_s3.py @@ -4,7 +4,7 @@ from argparse import RawTextHelpFormatter from django.core.management.base import BaseCommand from django.db import transaction -from funkwhale_api.music import models +from funquail_api.music import models class Command(BaseCommand): diff --git a/api/funquail_api/common/management/commands/load_test_data.py b/api/funquail_api/common/management/commands/load_test_data.py index f9997a331..dc2c79bf6 100644 --- a/api/funquail_api/common/management/commands/load_test_data.py +++ b/api/funquail_api/common/management/commands/load_test_data.py @@ -5,11 +5,11 @@ from django.conf import settings from django.core.management.base import BaseCommand from django.db import transaction -from funkwhale_api.federation import keys -from funkwhale_api.federation import models as federation_models -from funkwhale_api.music import models as music_models -from funkwhale_api.tags import models as tags_models -from funkwhale_api.users import models as users_models +from funquail_api.federation import keys +from funquail_api.federation import models as federation_models +from funquail_api.music import models as music_models +from funquail_api.tags import models as tags_models +from funquail_api.users import models as users_models BATCH_SIZE = 500 @@ -236,7 +236,7 @@ class Command(BaseCommand): def handle(self, *args, **options): from django.apps import apps - from funkwhale_api import factories + from funquail_api import factories app_names = [app.name for app in apps.app_configs.values()] factories.registry.autodiscover(app_names) @@ -267,7 +267,7 @@ class Command(BaseCommand): self.stdout.write(self.style.SUCCESS("Done!")) def create_batch(self, row, results, options, count): - from funkwhale_api import factories + from funquail_api import factories if row["id"] in results: # already generated diff --git a/api/funquail_api/common/management/commands/script.py b/api/funquail_api/common/management/commands/script.py index ab165f626..887764f5c 100644 --- a/api/funquail_api/common/management/commands/script.py +++ b/api/funquail_api/common/management/commands/script.py @@ -1,10 +1,10 @@ from django.core.management.base import BaseCommand, CommandError -from funkwhale_api.common import scripts +from funquail_api.common import scripts class Command(BaseCommand): - help = "Run a specific script from funkwhale_api/common/scripts/" + help = "Run a specific script from funquail_api/common/scripts/" def add_arguments(self, parser): parser.add_argument("script_name", nargs="?", type=str) diff --git a/api/funquail_api/common/management/commands/testdata.py b/api/funquail_api/common/management/commands/testdata.py index fa7ae631b..cb21cb0cc 100644 --- a/api/funquail_api/common/management/commands/testdata.py +++ b/api/funquail_api/common/management/commands/testdata.py @@ -1,7 +1,7 @@ from django.core.management.commands.migrate import Command as BaseCommand -from funkwhale_api.federation import factories -from funkwhale_api.federation.models import Actor +from funquail_api.federation import factories +from funquail_api.federation.models import Actor class Command(BaseCommand): diff --git a/api/funquail_api/common/middleware.py b/api/funquail_api/common/middleware.py index d0944e5d4..1a73b4a74 100644 --- a/api/funquail_api/common/middleware.py +++ b/api/funquail_api/common/middleware.py @@ -15,7 +15,7 @@ from django.core.cache import caches from django.middleware import csrf from rest_framework import views -from funkwhale_api.federation import utils as federation_utils +from funquail_api.federation import utils as federation_utils from . import preferences, session, throttling, utils diff --git a/api/funquail_api/common/migrations/0004_auto_20191111_1338.py b/api/funquail_api/common/migrations/0004_auto_20191111_1338.py index f35c9e11f..164569ac4 100644 --- a/api/funquail_api/common/migrations/0004_auto_20191111_1338.py +++ b/api/funquail_api/common/migrations/0004_auto_20191111_1338.py @@ -5,8 +5,8 @@ import django.core.serializers.json from django.db import migrations, models import django.db.models.deletion import django.utils.timezone -import funkwhale_api.common.models -import funkwhale_api.common.validators +import funquail_api.common.models +import funquail_api.common.validators import uuid import versatileimagefield.fields @@ -28,7 +28,7 @@ class Migration(migrations.Migration): ('last_fetch_date', models.DateTimeField(blank=True, null=True)), ('size', models.IntegerField(blank=True, null=True)), ('mimetype', models.CharField(blank=True, max_length=200, null=True)), - ('file', versatileimagefield.fields.VersatileImageField(max_length=255, upload_to=funkwhale_api.common.models.get_file_path, validators=[funkwhale_api.common.validators.ImageDimensionsValidator(min_height=50, min_width=50), funkwhale_api.common.validators.FileValidator(allowed_extensions=['png', 'jpg', 'jpeg'], max_size=5242880)])), + ('file', versatileimagefield.fields.VersatileImageField(max_length=255, upload_to=funquail_api.common.models.get_file_path, validators=[funquail_api.common.validators.ImageDimensionsValidator(min_height=50, min_width=50), funquail_api.common.validators.FileValidator(allowed_extensions=['png', 'jpg', 'jpeg'], max_size=5242880)])), ('actor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='attachments', to='federation.Actor', null=True)), ], ), diff --git a/api/funquail_api/common/models.py b/api/funquail_api/common/models.py index ebd705813..eac4cc33e 100644 --- a/api/funquail_api/common/models.py +++ b/api/funquail_api/common/models.py @@ -16,7 +16,7 @@ from django.utils import timezone from versatileimagefield.fields import VersatileImageField from versatileimagefield.image_warmer import VersatileImageFieldWarmer -from funkwhale_api.federation import utils as federation_utils +from funquail_api.federation import utils as federation_utils from . import utils, validators diff --git a/api/funquail_api/common/permissions.py b/api/funquail_api/common/permissions.py index 13ff696c8..dcdcfece4 100644 --- a/api/funquail_api/common/permissions.py +++ b/api/funquail_api/common/permissions.py @@ -4,7 +4,7 @@ from django.core.exceptions import ObjectDoesNotExist from django.http import Http404 from rest_framework.permissions import BasePermission -from funkwhale_api.common import preferences +from funquail_api.common import preferences class ConditionalAuthentication(BasePermission): diff --git a/api/funquail_api/common/scripts/create_actors.py b/api/funquail_api/common/scripts/create_actors.py index 920ec6cb1..3ac8bd016 100644 --- a/api/funquail_api/common/scripts/create_actors.py +++ b/api/funquail_api/common/scripts/create_actors.py @@ -3,7 +3,7 @@ Compute different sizes of image used for Album covers and User avatars """ from django.db.utils import IntegrityError -from funkwhale_api.users.models import User, create_actor +from funquail_api.users.models import User, create_actor def main(command, **kwargs): diff --git a/api/funquail_api/common/scripts/create_image_variations.py b/api/funquail_api/common/scripts/create_image_variations.py index 45b1b3880..5337aceb1 100644 --- a/api/funquail_api/common/scripts/create_image_variations.py +++ b/api/funquail_api/common/scripts/create_image_variations.py @@ -4,7 +4,7 @@ Compute different sizes of image used for Album covers and User avatars from versatileimagefield.image_warmer import VersatileImageFieldWarmer -from funkwhale_api.common.models import Attachment +from funquail_api.common.models import Attachment MODELS = [ (Attachment, "file", "attachment_square"), diff --git a/api/funquail_api/common/scripts/delete_pre_017_federated_uploads.py b/api/funquail_api/common/scripts/delete_pre_017_federated_uploads.py index c27a0a5f8..2158fb42c 100644 --- a/api/funquail_api/common/scripts/delete_pre_017_federated_uploads.py +++ b/api/funquail_api/common/scripts/delete_pre_017_federated_uploads.py @@ -2,7 +2,7 @@ Compute different sizes of image used for Album covers and User avatars """ -from funkwhale_api.music.models import Upload +from funquail_api.music.models import Upload def main(command, **kwargs): diff --git a/api/funquail_api/common/scripts/django_permissions_to_user_permissions.py b/api/funquail_api/common/scripts/django_permissions_to_user_permissions.py index 8fb15f06b..64837a5f9 100644 --- a/api/funquail_api/common/scripts/django_permissions_to_user_permissions.py +++ b/api/funquail_api/common/scripts/django_permissions_to_user_permissions.py @@ -5,7 +5,7 @@ following the work done in #152. from django.contrib.auth.models import Permission from django.db.models import Q -from funkwhale_api.users import models +from funquail_api.users import models mapping = { "dynamic_preferences.change_globalpreferencemodel": "settings", diff --git a/api/funquail_api/common/scripts/migrate_to_user_libraries.py b/api/funquail_api/common/scripts/migrate_to_user_libraries.py index d68093021..cea24e170 100644 --- a/api/funquail_api/common/scripts/migrate_to_user_libraries.py +++ b/api/funquail_api/common/scripts/migrate_to_user_libraries.py @@ -14,10 +14,10 @@ This command will also generate federation ids for existing resources. from django.conf import settings from django.db.models import CharField, F, Value, functions -from funkwhale_api.common import preferences -from funkwhale_api.federation import models as federation_models -from funkwhale_api.music import models -from funkwhale_api.users.models import User +from funquail_api.common import preferences +from funquail_api.federation import models as federation_models +from funquail_api.music import models +from funquail_api.users.models import User def create_libraries(open_api, stdout): diff --git a/api/funquail_api/common/serializers.py b/api/funquail_api/common/serializers.py index 96f5beddd..a8082d680 100644 --- a/api/funquail_api/common/serializers.py +++ b/api/funquail_api/common/serializers.py @@ -230,7 +230,7 @@ class StripExifImageField(serializers.ImageField): ) -from funkwhale_api.federation import serializers as federation_serializers # noqa +from funquail_api.federation import serializers as federation_serializers # noqa TARGET_ID_TYPE_MAPPING = { "music.Track": ("id", "track"), diff --git a/api/funquail_api/common/session.py b/api/funquail_api/common/session.py index 2d1d96a6d..9b1315094 100644 --- a/api/funquail_api/common/session.py +++ b/api/funquail_api/common/session.py @@ -1,7 +1,7 @@ import requests from django.conf import settings -import funkwhale_api +import funquail_api class FunQuailSession(requests.Session): @@ -13,7 +13,7 @@ class FunQuailSession(requests.Session): def get_user_agent(): return "python-requests (funkwhale/{}; +{})".format( - funkwhale_api.__version__, settings.FUNQUAIL_URL + funquail_api.__version__, settings.FUNQUAIL_URL ) diff --git a/api/funquail_api/common/tasks.py b/api/funquail_api/common/tasks.py index b91b96abc..ee44e7343 100644 --- a/api/funquail_api/common/tasks.py +++ b/api/funquail_api/common/tasks.py @@ -8,8 +8,8 @@ from django.db import transaction from django.dispatch import receiver from django.utils import timezone -from funkwhale_api.common import channels -from funkwhale_api.taskapp import celery +from funquail_api.common import channels +from funquail_api.taskapp import celery from . import models, serializers, session, signals diff --git a/api/funquail_api/common/utils.py b/api/funquail_api/common/utils.py index cdc1cc505..4e7cdcbb4 100644 --- a/api/funquail_api/common/utils.py +++ b/api/funquail_api/common/utils.py @@ -155,7 +155,7 @@ def media_url(path): ): return join_url(settings.MEDIA_URL, path) - from funkwhale_api.federation import utils as federation_utils + from funquail_api.federation import utils as federation_utils return federation_utils.full_url(path) diff --git a/api/funquail_api/common/views.py b/api/funquail_api/common/views.py index 51c46e2e0..ae1db9764 100644 --- a/api/funquail_api/common/views.py +++ b/api/funquail_api/common/views.py @@ -16,11 +16,11 @@ from rest_framework import ( from rest_framework.decorators import action from config import plugins -from funkwhale_api.common.serializers import ( +from funquail_api.common.serializers import ( ErrorDetailSerializer, TextPreviewSerializer, ) -from funkwhale_api.users.oauth import permissions as oauth_permissions +from funquail_api.users.oauth import permissions as oauth_permissions from . import filters, models, mutations, serializers, signals, tasks, throttling, utils diff --git a/api/funquail_api/contrib/listenbrainz/funkwhale_ready.py b/api/funquail_api/contrib/listenbrainz/funkwhale_ready.py index e67590f40..517c12674 100644 --- a/api/funquail_api/contrib/listenbrainz/funkwhale_ready.py +++ b/api/funquail_api/contrib/listenbrainz/funkwhale_ready.py @@ -1,4 +1,4 @@ -import funkwhale_api +import funquail_api from config import plugins from .client import ListenBrainzClient, Track @@ -24,7 +24,7 @@ def get_track(track): album = None additional_info = { "media_player": "FunQuail", - "media_player_version": funkwhale_api.__version__, + "media_player_version": funquail_api.__version__, "submission_client": "FunQuail ListenBrainz plugin", "submission_client_version": PLUGIN["version"], "tracknumber": track.position, diff --git a/api/funquail_api/contrib/sites/migrations/0002_set_site_domain_and_name.py b/api/funquail_api/contrib/sites/migrations/0002_set_site_domain_and_name.py index 7b091708c..6fe9af0dc 100644 --- a/api/funquail_api/contrib/sites/migrations/0002_set_site_domain_and_name.py +++ b/api/funquail_api/contrib/sites/migrations/0002_set_site_domain_and_name.py @@ -10,7 +10,7 @@ def update_site_forward(apps, schema_editor): Site = apps.get_model("sites", "Site") Site.objects.update_or_create( id=settings.SITE_ID, - defaults={"domain": "funkwhale.io", "name": "funkwhale_api"}, + defaults={"domain": "funkwhale.io", "name": "funquail_api"}, ) diff --git a/api/funquail_api/favorites/activities.py b/api/funquail_api/favorites/activities.py index 294194e06..108705aad 100644 --- a/api/funquail_api/favorites/activities.py +++ b/api/funquail_api/favorites/activities.py @@ -1,5 +1,5 @@ -from funkwhale_api.activity import record -from funkwhale_api.common import channels +from funquail_api.activity import record +from funquail_api.common import channels from . import serializers diff --git a/api/funquail_api/favorites/admin.py b/api/funquail_api/favorites/admin.py index 05530b0c6..9a42e7a5c 100644 --- a/api/funquail_api/favorites/admin.py +++ b/api/funquail_api/favorites/admin.py @@ -1,4 +1,4 @@ -from funkwhale_api.common import admin +from funquail_api.common import admin from . import models diff --git a/api/funquail_api/favorites/factories.py b/api/funquail_api/favorites/factories.py index df2f47335..818aa8e4b 100644 --- a/api/funquail_api/favorites/factories.py +++ b/api/funquail_api/favorites/factories.py @@ -1,8 +1,8 @@ import factory -from funkwhale_api.factories import NoUpdateOnCreate, registry -from funkwhale_api.music.factories import TrackFactory -from funkwhale_api.users.factories import UserFactory +from funquail_api.factories import NoUpdateOnCreate, registry +from funquail_api.music.factories import TrackFactory +from funquail_api.users.factories import UserFactory @registry.register diff --git a/api/funquail_api/favorites/filters.py b/api/funquail_api/favorites/filters.py index 32c07a646..1cee53200 100644 --- a/api/funquail_api/favorites/filters.py +++ b/api/funquail_api/favorites/filters.py @@ -1,6 +1,6 @@ -from funkwhale_api.common import fields -from funkwhale_api.common import filters as common_filters -from funkwhale_api.moderation import filters as moderation_filters +from funquail_api.common import fields +from funquail_api.common import filters as common_filters +from funquail_api.moderation import filters as moderation_filters from . import models diff --git a/api/funquail_api/favorites/models.py b/api/funquail_api/favorites/models.py index 5cba39f35..6f29a9008 100644 --- a/api/funquail_api/favorites/models.py +++ b/api/funquail_api/favorites/models.py @@ -1,7 +1,7 @@ from django.db import models from django.utils import timezone -from funkwhale_api.music.models import Track +from funquail_api.music.models import Track class TrackFavorite(models.Model): diff --git a/api/funquail_api/favorites/serializers.py b/api/funquail_api/favorites/serializers.py index 205732b74..3eb4107ff 100644 --- a/api/funquail_api/favorites/serializers.py +++ b/api/funquail_api/favorites/serializers.py @@ -1,10 +1,10 @@ from drf_spectacular.utils import extend_schema_field from rest_framework import serializers -from funkwhale_api.activity import serializers as activity_serializers -from funkwhale_api.federation import serializers as federation_serializers -from funkwhale_api.music.serializers import TrackActivitySerializer, TrackSerializer -from funkwhale_api.users.serializers import UserActivitySerializer, UserBasicSerializer +from funquail_api.activity import serializers as activity_serializers +from funquail_api.federation import serializers as federation_serializers +from funquail_api.music.serializers import TrackActivitySerializer, TrackSerializer +from funquail_api.users.serializers import UserActivitySerializer, UserBasicSerializer from . import models diff --git a/api/funquail_api/favorites/urls.py b/api/funquail_api/favorites/urls.py index 51f307803..ec49f95d1 100644 --- a/api/funquail_api/favorites/urls.py +++ b/api/funquail_api/favorites/urls.py @@ -1,4 +1,4 @@ -from funkwhale_api.common import routers +from funquail_api.common import routers from . import views diff --git a/api/funquail_api/favorites/views.py b/api/funquail_api/favorites/views.py index 6a87d3b15..b2414c692 100644 --- a/api/funquail_api/favorites/views.py +++ b/api/funquail_api/favorites/views.py @@ -4,11 +4,11 @@ from rest_framework import mixins, status, viewsets from rest_framework.decorators import action from rest_framework.response import Response -from funkwhale_api.activity import record -from funkwhale_api.common import fields, permissions -from funkwhale_api.music import utils as music_utils -from funkwhale_api.music.models import Track -from funkwhale_api.users.oauth import permissions as oauth_permissions +from funquail_api.activity import record +from funquail_api.common import fields, permissions +from funquail_api.music import utils as music_utils +from funquail_api.music.models import Track +from funquail_api.users.oauth import permissions as oauth_permissions from . import filters, models, serializers diff --git a/api/funquail_api/federation/activity.py b/api/funquail_api/federation/activity.py index 593ab0dd0..13d7418de 100644 --- a/api/funquail_api/federation/activity.py +++ b/api/funquail_api/federation/activity.py @@ -7,8 +7,8 @@ from django.core.cache import cache from django.db import IntegrityError, transaction from django.db.models import Q -from funkwhale_api.common import channels -from funkwhale_api.common import utils as funkwhale_utils +from funquail_api.common import channels +from funquail_api.common import utils as funkwhale_utils from . import contexts @@ -91,7 +91,7 @@ def should_reject(fid, actor_id=None, payload={}): if fid is None and actor_id is None: return False - from funkwhale_api.moderation import models as moderation_models + from funquail_api.moderation import models as moderation_models policies = moderation_models.InstancePolicy.objects.active() @@ -119,7 +119,7 @@ def should_reject(fid, actor_id=None, payload={}): @transaction.atomic def receive(activity, on_behalf_of, inbox_actor=None): - from funkwhale_api.moderation import mrf + from funquail_api.moderation import mrf from . import models, serializers, tasks from .routes import inbox @@ -301,7 +301,7 @@ class OutboxRouter(Router): and may yield data that should be persisted in the Activity model for further delivery. """ - from funkwhale_api.common import preferences + from funquail_api.common import preferences from . import models, tasks diff --git a/api/funquail_api/federation/actors.py b/api/funquail_api/federation/actors.py index 86864d591..319571ebf 100644 --- a/api/funquail_api/federation/actors.py +++ b/api/funquail_api/federation/actors.py @@ -4,8 +4,8 @@ import logging from django.conf import settings from django.utils import timezone -from funkwhale_api.common import preferences, session -from funkwhale_api.users import models as users_models +from funquail_api.common import preferences, session +from funquail_api.users import models as users_models from . import keys, models, serializers diff --git a/api/funquail_api/federation/admin.py b/api/funquail_api/federation/admin.py index f7d079c93..33ca59e38 100644 --- a/api/funquail_api/federation/admin.py +++ b/api/funquail_api/federation/admin.py @@ -1,4 +1,4 @@ -from funkwhale_api.common import admin +from funquail_api.common import admin from . import models, tasks diff --git a/api/funquail_api/federation/api_serializers.py b/api/funquail_api/federation/api_serializers.py index bee31bbeb..ea2ecf85c 100644 --- a/api/funquail_api/federation/api_serializers.py +++ b/api/funquail_api/federation/api_serializers.py @@ -8,11 +8,11 @@ from drf_spectacular.types import OpenApiTypes from drf_spectacular.utils import extend_schema_field from rest_framework import serializers -from funkwhale_api.audio import models as audio_models -from funkwhale_api.common import fields as common_fields -from funkwhale_api.common import serializers as common_serializers -from funkwhale_api.music import models as music_models -from funkwhale_api.users import serializers as users_serializers +from funquail_api.audio import models as audio_models +from funquail_api.common import fields as common_fields +from funquail_api.common import serializers as common_serializers +from funquail_api.music import models as music_models +from funquail_api.users import serializers as users_serializers from . import filters, models from . import serializers as federation_serializers diff --git a/api/funquail_api/federation/api_urls.py b/api/funquail_api/federation/api_urls.py index df5bfb2f0..6bc945026 100644 --- a/api/funquail_api/federation/api_urls.py +++ b/api/funquail_api/federation/api_urls.py @@ -1,4 +1,4 @@ -from funkwhale_api.common import routers +from funquail_api.common import routers from . import api_views diff --git a/api/funquail_api/federation/api_views.py b/api/funquail_api/federation/api_views.py index 94d9817f3..642890762 100644 --- a/api/funquail_api/federation/api_views.py +++ b/api/funquail_api/federation/api_views.py @@ -5,13 +5,13 @@ from django.db.models import Count, Q from drf_spectacular.utils import extend_schema, extend_schema_view from rest_framework import decorators, mixins, permissions, response, viewsets -from funkwhale_api.common import preferences -from funkwhale_api.common import utils as common_utils -from funkwhale_api.common.permissions import ConditionalAuthentication -from funkwhale_api.music import models as music_models -from funkwhale_api.music import serializers as music_serializers -from funkwhale_api.music import views as music_views -from funkwhale_api.users.oauth import permissions as oauth_permissions +from funquail_api.common import preferences +from funquail_api.common import utils as common_utils +from funquail_api.common.permissions import ConditionalAuthentication +from funquail_api.music import models as music_models +from funquail_api.music import serializers as music_serializers +from funquail_api.music import views as music_views +from funquail_api.users.oauth import permissions as oauth_permissions from . import ( activity, diff --git a/api/funquail_api/federation/authentication.py b/api/funquail_api/federation/authentication.py index 171b66106..b7ab580ec 100644 --- a/api/funquail_api/federation/authentication.py +++ b/api/funquail_api/federation/authentication.py @@ -8,8 +8,8 @@ from django.utils import timezone from rest_framework import authentication from rest_framework import exceptions as rest_exceptions -from funkwhale_api.common import preferences -from funkwhale_api.moderation import models as moderation_models +from funquail_api.common import preferences +from funquail_api.moderation import models as moderation_models from . import actors, exceptions, keys, models, signing, tasks, utils diff --git a/api/funquail_api/federation/decorators.py b/api/funquail_api/federation/decorators.py index 756054e39..88ffba0f6 100644 --- a/api/funquail_api/federation/decorators.py +++ b/api/funquail_api/federation/decorators.py @@ -2,7 +2,7 @@ from django.db import transaction from drf_spectacular.utils import OpenApiParameter, extend_schema from rest_framework import decorators, permissions, response, status -from funkwhale_api.common import utils as common_utils +from funquail_api.common import utils as common_utils from . import api_serializers, filters, models, tasks, utils diff --git a/api/funquail_api/federation/factories.py b/api/funquail_api/federation/factories.py index f6a20990b..280ae5fca 100644 --- a/api/funquail_api/federation/factories.py +++ b/api/funquail_api/federation/factories.py @@ -7,8 +7,8 @@ from django.conf import settings from django.utils import timezone from django.utils.http import http_date -from funkwhale_api.factories import NoUpdateOnCreate, registry -from funkwhale_api.users import factories as user_factories +from funquail_api.factories import NoUpdateOnCreate, registry +from funquail_api.users import factories as user_factories from . import keys, models @@ -137,7 +137,7 @@ class ActorFactory(NoUpdateOnCreate, factory.django.DjangoModelFactory): def local(self, create, extracted, **kwargs): if not extracted and not kwargs: return - from funkwhale_api.users.factories import UserFactory + from funquail_api.users.factories import UserFactory self.domain = models.Domain.objects.get_or_create( name=settings.FEDERATION_HOSTNAME diff --git a/api/funquail_api/federation/filters.py b/api/funquail_api/federation/filters.py index a57bc4071..b4124282f 100644 --- a/api/funquail_api/federation/filters.py +++ b/api/funquail_api/federation/filters.py @@ -1,6 +1,6 @@ import django_filters.widgets -from funkwhale_api.common import fields +from funquail_api.common import fields from . import models diff --git a/api/funquail_api/federation/library.py b/api/funquail_api/federation/library.py index abd82d097..7a7e8a518 100644 --- a/api/funquail_api/federation/library.py +++ b/api/funquail_api/federation/library.py @@ -1,6 +1,6 @@ import requests -from funkwhale_api.common import session +from funquail_api.common import session from . import serializers, signing diff --git a/api/funquail_api/federation/management/commands/fix_federation_ids.py b/api/funquail_api/federation/management/commands/fix_federation_ids.py index 2ee2eb8a1..1308374c4 100644 --- a/api/funquail_api/federation/management/commands/fix_federation_ids.py +++ b/api/funquail_api/federation/management/commands/fix_federation_ids.py @@ -1,8 +1,8 @@ from django.core.management.base import BaseCommand, CommandError -from funkwhale_api.common import utils -from funkwhale_api.federation import models as federation_models -from funkwhale_api.music import models as music_models +from funquail_api.common import utils +from funquail_api.federation import models as federation_models +from funquail_api.music import models as music_models MODELS = [ (music_models.Artist, ["fid"]), diff --git a/api/funquail_api/federation/migrations/0005_auto_20180413_1723.py b/api/funquail_api/federation/migrations/0005_auto_20180413_1723.py index 0b2029e95..60c9ec0b8 100644 --- a/api/funquail_api/federation/migrations/0005_auto_20180413_1723.py +++ b/api/funquail_api/federation/migrations/0005_auto_20180413_1723.py @@ -3,7 +3,7 @@ import django.contrib.postgres.fields.jsonb import django.core.serializers.json from django.db import migrations, models -import funkwhale_api.federation.models +import funquail_api.federation.models class Migration(migrations.Migration): @@ -17,7 +17,7 @@ class Migration(migrations.Migration): field=models.FileField( blank=True, null=True, - upload_to=funkwhale_api.federation.models.get_file_path, + upload_to=funquail_api.federation.models.get_file_path, ), ), migrations.AlterField( diff --git a/api/funquail_api/federation/migrations/0009_auto_20180822_1956.py b/api/funquail_api/federation/migrations/0009_auto_20180822_1956.py index 042a86143..6e49c726a 100644 --- a/api/funquail_api/federation/migrations/0009_auto_20180822_1956.py +++ b/api/funquail_api/federation/migrations/0009_auto_20180822_1956.py @@ -4,7 +4,7 @@ import django.contrib.postgres.fields.jsonb import django.core.serializers.json from django.db import migrations, models import django.db.models.deletion -import funkwhale_api.federation.models +import funquail_api.federation.models class Migration(migrations.Migration): @@ -27,7 +27,7 @@ class Migration(migrations.Migration): model_name="activity", name="payload", field=django.contrib.postgres.fields.jsonb.JSONField( - default=funkwhale_api.federation.models.empty_dict, + default=funquail_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000, ), @@ -36,7 +36,7 @@ class Migration(migrations.Migration): model_name="librarytrack", name="metadata", field=django.contrib.postgres.fields.jsonb.JSONField( - default=funkwhale_api.federation.models.empty_dict, + default=funquail_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=10000, ), diff --git a/api/funquail_api/federation/migrations/0016_auto_20181227_1605.py b/api/funquail_api/federation/migrations/0016_auto_20181227_1605.py index 8b705e72f..3fe75be9c 100644 --- a/api/funquail_api/federation/migrations/0016_auto_20181227_1605.py +++ b/api/funquail_api/federation/migrations/0016_auto_20181227_1605.py @@ -2,7 +2,7 @@ import django.contrib.postgres.fields.jsonb from django.db import migrations, models -import funkwhale_api.federation.models +import funquail_api.federation.models class Migration(migrations.Migration): @@ -14,7 +14,7 @@ class Migration(migrations.Migration): model_name="domain", name="nodeinfo", field=django.contrib.postgres.fields.jsonb.JSONField( - default=funkwhale_api.federation.models.empty_dict, max_length=50000 + default=funquail_api.federation.models.empty_dict, max_length=50000 ), ), migrations.AddField( diff --git a/api/funquail_api/federation/migrations/0017_auto_20190130_0926.py b/api/funquail_api/federation/migrations/0017_auto_20190130_0926.py index 7c025fa48..194010242 100644 --- a/api/funquail_api/federation/migrations/0017_auto_20190130_0926.py +++ b/api/funquail_api/federation/migrations/0017_auto_20190130_0926.py @@ -3,8 +3,8 @@ import django.contrib.postgres.fields.jsonb from django.db import migrations, models import django.db.models.deletion -import funkwhale_api.common.validators -import funkwhale_api.federation.models +import funquail_api.common.validators +import funquail_api.federation.models class Migration(migrations.Migration): @@ -26,11 +26,11 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='domain', name='name', - field=models.CharField(max_length=255, primary_key=True, serialize=False, validators=[funkwhale_api.common.validators.DomainValidator()]), + field=models.CharField(max_length=255, primary_key=True, serialize=False, validators=[funquail_api.common.validators.DomainValidator()]), ), migrations.AlterField( model_name='domain', name='nodeinfo', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funkwhale_api.federation.models.empty_dict, max_length=50000), + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funquail_api.federation.models.empty_dict, max_length=50000), ), ] diff --git a/api/funquail_api/federation/migrations/0018_fetch.py b/api/funquail_api/federation/migrations/0018_fetch.py index 11789024f..010672b19 100644 --- a/api/funquail_api/federation/migrations/0018_fetch.py +++ b/api/funquail_api/federation/migrations/0018_fetch.py @@ -5,7 +5,7 @@ import django.core.serializers.json from django.db import migrations, models import django.db.models.deletion import django.utils.timezone -import funkwhale_api.federation.models +import funquail_api.federation.models class Migration(migrations.Migration): @@ -25,7 +25,7 @@ class Migration(migrations.Migration): ('fetch_date', models.DateTimeField(blank=True, null=True)), ('object_id', models.IntegerField(null=True)), ('status', models.CharField(choices=[('pending', 'Pending'), ('errored', 'Errored'), ('finished', 'Finished'), ('skipped', 'Skipped')], default='pending', max_length=20)), - ('detail', django.contrib.postgres.fields.jsonb.JSONField(default=funkwhale_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000)), + ('detail', django.contrib.postgres.fields.jsonb.JSONField(default=funquail_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000)), ('actor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='fetches', to='federation.Actor')), ('object_content_type', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')), ], diff --git a/api/funquail_api/federation/migrations/0019_auto_20190611_0851.py b/api/funquail_api/federation/migrations/0019_auto_20190611_0851.py index 4ae5e31fb..1c72d4bb4 100644 --- a/api/funquail_api/federation/migrations/0019_auto_20190611_0851.py +++ b/api/funquail_api/federation/migrations/0019_auto_20190611_0851.py @@ -3,7 +3,7 @@ import django.contrib.postgres.fields.jsonb import django.core.serializers.json from django.db import migrations, models -import funkwhale_api.federation.models +import funquail_api.federation.models class Migration(migrations.Migration): diff --git a/api/funquail_api/federation/migrations/0020_auto_20190730_0846.py b/api/funquail_api/federation/migrations/0020_auto_20190730_0846.py index efed1d306..1ab5dab0b 100644 --- a/api/funquail_api/federation/migrations/0020_auto_20190730_0846.py +++ b/api/funquail_api/federation/migrations/0020_auto_20190730_0846.py @@ -3,7 +3,7 @@ import django.contrib.postgres.fields.jsonb import django.core.serializers.json from django.db import migrations -import funkwhale_api.federation.models +import funquail_api.federation.models class Migration(migrations.Migration): @@ -16,16 +16,16 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='activity', name='payload', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funkwhale_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funquail_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), ), migrations.AlterField( model_name='fetch', name='detail', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funkwhale_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funquail_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), ), migrations.AlterField( model_name='librarytrack', name='metadata', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funkwhale_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=10000), + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funquail_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=10000), ), ] diff --git a/api/funquail_api/federation/migrations/0027_auto_20220627_1915.py b/api/funquail_api/federation/migrations/0027_auto_20220627_1915.py index 1ec4e49f2..eb5250a1a 100644 --- a/api/funquail_api/federation/migrations/0027_auto_20220627_1915.py +++ b/api/funquail_api/federation/migrations/0027_auto_20220627_1915.py @@ -2,7 +2,7 @@ import django.core.serializers.json from django.db import migrations, models -import funkwhale_api.federation.models +import funquail_api.federation.models class Migration(migrations.Migration): @@ -15,7 +15,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='activity', name='payload', - field=models.JSONField(blank=True, default=funkwhale_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), + field=models.JSONField(blank=True, default=funquail_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), ), migrations.AlterField( model_name='actor', @@ -25,12 +25,12 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='domain', name='nodeinfo', - field=models.JSONField(blank=True, default=funkwhale_api.federation.models.empty_dict, max_length=50000), + field=models.JSONField(blank=True, default=funquail_api.federation.models.empty_dict, max_length=50000), ), migrations.AlterField( model_name='fetch', name='detail', - field=models.JSONField(blank=True, default=funkwhale_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), + field=models.JSONField(blank=True, default=funquail_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), ), migrations.AlterField( model_name='follow', @@ -45,6 +45,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='librarytrack', name='metadata', - field=models.JSONField(blank=True, default=funkwhale_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=10000), + field=models.JSONField(blank=True, default=funquail_api.federation.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=10000), ), ] diff --git a/api/funquail_api/federation/models.py b/api/funquail_api/federation/models.py index 8ead384df..25f737a1f 100644 --- a/api/funquail_api/federation/models.py +++ b/api/funquail_api/federation/models.py @@ -14,10 +14,10 @@ from django.dispatch import receiver from django.urls import reverse from django.utils import timezone -from funkwhale_api.common import session -from funkwhale_api.common import utils as common_utils -from funkwhale_api.common import validators as common_validators -from funkwhale_api.music import utils as music_utils +from funquail_api.common import session +from funquail_api.common import utils as common_utils +from funquail_api.common import validators as common_validators +from funquail_api.music import utils as music_utils from . import utils as federation_utils @@ -144,7 +144,7 @@ class Domain(models.Model): super().save(**kwargs) def get_stats(self): - from funkwhale_api.music import models as music_models + from funquail_api.music import models as music_models data = Domain.objects.filter(pk=self.pk).aggregate( outbox_activities=models.Count("actors__outbox_activities", distinct=True), @@ -283,8 +283,8 @@ class Actor(models.Model): return data def get_stats(self): - from funkwhale_api.moderation import models as moderation_models - from funkwhale_api.music import models as music_models + from funquail_api.moderation import models as moderation_models + from funquail_api.music import models as music_models data = Actor.objects.filter(pk=self.pk).aggregate( outbox_activities=models.Count("outbox_activities", distinct=True), @@ -618,7 +618,7 @@ def set_approved_updated(sender, instance, update_fields, **kwargs): @receiver(post_save, sender=LibraryFollow) def update_denormalization_follow_approved(sender, instance, created, **kwargs): - from funkwhale_api.music import models as music_models + from funquail_api.music import models as music_models updated = getattr(instance, "_approved_updated", False) @@ -632,7 +632,7 @@ def update_denormalization_follow_approved(sender, instance, created, **kwargs): @receiver(post_delete, sender=LibraryFollow) def update_denormalization_follow_deleted(sender, instance, **kwargs): - from funkwhale_api.music import models as music_models + from funquail_api.music import models as music_models if instance.actor.is_local: music_models.TrackActor.objects.filter( diff --git a/api/funquail_api/federation/mrf_policies.py b/api/funquail_api/federation/mrf_policies.py index df0ebd7a6..ffed293f0 100644 --- a/api/funquail_api/federation/mrf_policies.py +++ b/api/funquail_api/federation/mrf_policies.py @@ -1,4 +1,4 @@ -from funkwhale_api.moderation import mrf +from funquail_api.moderation import mrf from . import activity diff --git a/api/funquail_api/federation/routes.py b/api/funquail_api/federation/routes.py index cd0b94b5c..5ddec76f6 100644 --- a/api/funquail_api/federation/routes.py +++ b/api/funquail_api/federation/routes.py @@ -3,7 +3,7 @@ import uuid from django.db.models import Q -from funkwhale_api.music import models as music_models +from funquail_api.music import models as music_models from . import activity, actors, models, serializers diff --git a/api/funquail_api/federation/serializers.py b/api/funquail_api/federation/serializers.py index c96cd8f38..ee7cc32a5 100644 --- a/api/funquail_api/federation/serializers.py +++ b/api/funquail_api/federation/serializers.py @@ -10,15 +10,15 @@ from django.urls import reverse from django.utils import timezone from rest_framework import serializers -from funkwhale_api.common import models as common_models -from funkwhale_api.common import utils as common_utils -from funkwhale_api.moderation import models as moderation_models -from funkwhale_api.moderation import serializers as moderation_serializers -from funkwhale_api.moderation import signals as moderation_signals -from funkwhale_api.music import licenses -from funkwhale_api.music import models as music_models -from funkwhale_api.music import tasks as music_tasks -from funkwhale_api.tags import models as tags_models +from funquail_api.common import models as common_models +from funquail_api.common import utils as common_utils +from funquail_api.moderation import models as moderation_models +from funquail_api.moderation import serializers as moderation_serializers +from funquail_api.moderation import signals as moderation_signals +from funquail_api.music import licenses +from funquail_api.music import models as music_models +from funquail_api.music import tasks as music_tasks +from funquail_api.tags import models as tags_models from . import activity, actors, contexts, jsonld, models, utils @@ -471,7 +471,7 @@ class ActorSerializer(jsonld.JsonLdSerializer): def create_or_update_channel(actor, rss_url, attributed_to_fid, **validated_data): - from funkwhale_api.audio import models as audio_models + from funquail_api.audio import models as audio_models attributed_to = actors.get_actor(attributed_to_fid) artist_defaults = { @@ -1476,7 +1476,7 @@ class TrackSerializer(MusicEntitySerializer): return d def create(self, validated_data): - from funkwhale_api.music import tasks as music_tasks + from funquail_api.music import tasks as music_tasks references = {} actors_to_fetch = set() diff --git a/api/funquail_api/federation/spa_views.py b/api/funquail_api/federation/spa_views.py index caf62d876..bb8d9b2be 100644 --- a/api/funquail_api/federation/spa_views.py +++ b/api/funquail_api/federation/spa_views.py @@ -1,8 +1,8 @@ from django.conf import settings from rest_framework import serializers -from funkwhale_api.common import middleware, preferences, utils -from funkwhale_api.federation import utils as federation_utils +from funquail_api.common import middleware, preferences, utils +from funquail_api.federation import utils as federation_utils from . import models diff --git a/api/funquail_api/federation/tasks.py b/api/funquail_api/federation/tasks.py index b0f638fc0..7b126f896 100644 --- a/api/funquail_api/federation/tasks.py +++ b/api/funquail_api/federation/tasks.py @@ -12,13 +12,13 @@ from django.utils import timezone from dynamic_preferences.registries import global_preferences_registry from requests.exceptions import RequestException -from funkwhale_api.audio import models as audio_models -from funkwhale_api.common import models as common_models -from funkwhale_api.common import preferences, session -from funkwhale_api.common import utils as common_utils -from funkwhale_api.moderation import mrf -from funkwhale_api.music import models as music_models -from funkwhale_api.taskapp import celery +from funquail_api.audio import models as audio_models +from funquail_api.common import models as common_models +from funquail_api.common import preferences, session +from funquail_api.common import utils as common_utils +from funquail_api.moderation import mrf +from funquail_api.music import models as music_models +from funquail_api.taskapp import celery from . import ( activity, diff --git a/api/funquail_api/federation/utils.py b/api/funquail_api/federation/utils.py index 2f6eb5706..4ad9f5b4a 100644 --- a/api/funquail_api/federation/utils.py +++ b/api/funquail_api/federation/utils.py @@ -8,8 +8,8 @@ from django.conf import settings from django.core.exceptions import ObjectDoesNotExist from django.db.models import CharField, Q, Value -from funkwhale_api.common import session -from funkwhale_api.moderation import mrf +from funquail_api.common import session +from funquail_api.moderation import mrf from . import exceptions, signing diff --git a/api/funquail_api/federation/views.py b/api/funquail_api/federation/views.py index 99c988d51..655df18c5 100644 --- a/api/funquail_api/federation/views.py +++ b/api/funquail_api/federation/views.py @@ -7,12 +7,12 @@ from django.urls import reverse from rest_framework import exceptions, mixins, permissions, response, viewsets from rest_framework.decorators import action -from funkwhale_api.common import preferences -from funkwhale_api.common import utils as common_utils -from funkwhale_api.federation import utils as federation_utils -from funkwhale_api.moderation import models as moderation_models -from funkwhale_api.music import models as music_models -from funkwhale_api.music import utils as music_utils +from funquail_api.common import preferences +from funquail_api.common import utils as common_utils +from funquail_api.federation import utils as federation_utils +from funquail_api.moderation import models as moderation_models +from funquail_api.music import models as music_models +from funquail_api.music import utils as music_utils from . import ( activity, diff --git a/api/funquail_api/federation/webfinger.py b/api/funquail_api/federation/webfinger.py index 1d46961f1..0579eb0fc 100644 --- a/api/funquail_api/federation/webfinger.py +++ b/api/funquail_api/federation/webfinger.py @@ -1,7 +1,7 @@ from django import forms from django.conf import settings -from funkwhale_api.common import session +from funquail_api.common import session from . import serializers diff --git a/api/funquail_api/history/activities.py b/api/funquail_api/history/activities.py index b63de1f26..c268ab85b 100644 --- a/api/funquail_api/history/activities.py +++ b/api/funquail_api/history/activities.py @@ -1,5 +1,5 @@ -from funkwhale_api.activity import record -from funkwhale_api.common import channels +from funquail_api.activity import record +from funquail_api.common import channels from . import serializers diff --git a/api/funquail_api/history/admin.py b/api/funquail_api/history/admin.py index 6aac94d0a..e84efa834 100644 --- a/api/funquail_api/history/admin.py +++ b/api/funquail_api/history/admin.py @@ -1,4 +1,4 @@ -from funkwhale_api.common import admin +from funquail_api.common import admin from . import models diff --git a/api/funquail_api/history/factories.py b/api/funquail_api/history/factories.py index bae8da505..ed8afed33 100644 --- a/api/funquail_api/history/factories.py +++ b/api/funquail_api/history/factories.py @@ -1,8 +1,8 @@ import factory -from funkwhale_api.factories import NoUpdateOnCreate, registry -from funkwhale_api.music import factories -from funkwhale_api.users.factories import UserFactory +from funquail_api.factories import NoUpdateOnCreate, registry +from funquail_api.music import factories +from funquail_api.users.factories import UserFactory @registry.register diff --git a/api/funquail_api/history/filters.py b/api/funquail_api/history/filters.py index 1e88f1b22..1c9de9027 100644 --- a/api/funquail_api/history/filters.py +++ b/api/funquail_api/history/filters.py @@ -1,7 +1,7 @@ import django_filters -from funkwhale_api.common import filters as common_filters -from funkwhale_api.moderation import filters as moderation_filters +from funquail_api.common import filters as common_filters +from funquail_api.moderation import filters as moderation_filters from . import models diff --git a/api/funquail_api/history/models.py b/api/funquail_api/history/models.py index 648c16cd8..d78d19520 100644 --- a/api/funquail_api/history/models.py +++ b/api/funquail_api/history/models.py @@ -1,7 +1,7 @@ from django.db import models from django.utils import timezone -from funkwhale_api.music.models import Track +from funquail_api.music.models import Track class Listening(models.Model): diff --git a/api/funquail_api/history/serializers.py b/api/funquail_api/history/serializers.py index 66ce34f21..910c2adc1 100644 --- a/api/funquail_api/history/serializers.py +++ b/api/funquail_api/history/serializers.py @@ -1,10 +1,10 @@ from drf_spectacular.utils import extend_schema_field from rest_framework import serializers -from funkwhale_api.activity import serializers as activity_serializers -from funkwhale_api.federation import serializers as federation_serializers -from funkwhale_api.music.serializers import TrackActivitySerializer, TrackSerializer -from funkwhale_api.users.serializers import UserActivitySerializer, UserBasicSerializer +from funquail_api.activity import serializers as activity_serializers +from funquail_api.federation import serializers as federation_serializers +from funquail_api.music.serializers import TrackActivitySerializer, TrackSerializer +from funquail_api.users.serializers import UserActivitySerializer, UserBasicSerializer from . import models diff --git a/api/funquail_api/history/urls.py b/api/funquail_api/history/urls.py index c22e58062..55b9430b3 100644 --- a/api/funquail_api/history/urls.py +++ b/api/funquail_api/history/urls.py @@ -1,4 +1,4 @@ -from funkwhale_api.common import routers +from funquail_api.common import routers from . import views diff --git a/api/funquail_api/history/views.py b/api/funquail_api/history/views.py index 812ed38ae..563d7bb2f 100644 --- a/api/funquail_api/history/views.py +++ b/api/funquail_api/history/views.py @@ -2,11 +2,11 @@ from django.db.models import Prefetch from rest_framework import mixins, viewsets from config import plugins -from funkwhale_api.activity import record -from funkwhale_api.common import fields, permissions -from funkwhale_api.music import utils as music_utils -from funkwhale_api.music.models import Track -from funkwhale_api.users.oauth import permissions as oauth_permissions +from funquail_api.activity import record +from funquail_api.common import fields, permissions +from funquail_api.music import utils as music_utils +from funquail_api.music.models import Track +from funquail_api.users.oauth import permissions as oauth_permissions from . import filters, models, serializers diff --git a/api/funquail_api/instance/consumers.py b/api/funquail_api/instance/consumers.py index bb213a001..61a2bbe91 100644 --- a/api/funquail_api/instance/consumers.py +++ b/api/funquail_api/instance/consumers.py @@ -1,4 +1,4 @@ -from funkwhale_api.common.consumers import JsonAuthConsumer +from funquail_api.common.consumers import JsonAuthConsumer class InstanceActivityConsumer(JsonAuthConsumer): diff --git a/api/funquail_api/instance/serializers.py b/api/funquail_api/instance/serializers.py index b5a2c50ad..33ccc7e63 100644 --- a/api/funquail_api/instance/serializers.py +++ b/api/funquail_api/instance/serializers.py @@ -1,7 +1,7 @@ from drf_spectacular.utils import extend_schema_field from rest_framework import serializers -from funkwhale_api.federation.utils import full_url +from funquail_api.federation.utils import full_url class SoftwareSerializer(serializers.Serializer): diff --git a/api/funquail_api/instance/stats.py b/api/funquail_api/instance/stats.py index 9353eb53e..0b588ed4b 100644 --- a/api/funquail_api/instance/stats.py +++ b/api/funquail_api/instance/stats.py @@ -3,10 +3,10 @@ import datetime from django.db.models import Count, F, Sum from django.utils import timezone -from funkwhale_api.favorites.models import TrackFavorite -from funkwhale_api.history.models import Listening -from funkwhale_api.music import models -from funkwhale_api.users.models import User +from funquail_api.favorites.models import TrackFavorite +from funquail_api.history.models import Listening +from funquail_api.music import models +from funquail_api.users.models import User def get(): diff --git a/api/funquail_api/instance/urls.py b/api/funquail_api/instance/urls.py index 62baa5021..0bc15a7bb 100644 --- a/api/funquail_api/instance/urls.py +++ b/api/funquail_api/instance/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url -from funkwhale_api.common import routers +from funquail_api.common import routers from . import views diff --git a/api/funquail_api/instance/views.py b/api/funquail_api/instance/views.py index 3272a95d8..f309d51ab 100644 --- a/api/funquail_api/instance/views.py +++ b/api/funquail_api/instance/views.py @@ -14,14 +14,14 @@ from rest_framework import generics, views from rest_framework.renderers import JSONRenderer from rest_framework.response import Response -from funkwhale_api import __version__ as funkwhale_version -from funkwhale_api.common import preferences -from funkwhale_api.common.renderers import ActivityStreamRenderer -from funkwhale_api.federation.actors import get_service_actor -from funkwhale_api.federation.models import Domain -from funkwhale_api.moderation.models import REPORT_TYPES -from funkwhale_api.music.utils import SUPPORTED_EXTENSIONS -from funkwhale_api.users.oauth import permissions as oauth_permissions +from funquail_api import __version__ as funkwhale_version +from funquail_api.common import preferences +from funquail_api.common.renderers import ActivityStreamRenderer +from funquail_api.federation.actors import get_service_actor +from funquail_api.federation.models import Domain +from funquail_api.moderation.models import REPORT_TYPES +from funquail_api.music.utils import SUPPORTED_EXTENSIONS +from funquail_api.users.oauth import permissions as oauth_permissions from . import serializers, stats diff --git a/api/funquail_api/main.py b/api/funquail_api/main.py index 2a6ab18c2..b56628ef6 100755 --- a/api/funquail_api/main.py +++ b/api/funquail_api/main.py @@ -21,7 +21,7 @@ def main(): if len(sys.argv) > 1 and sys.argv[1] in ["fw", "funkwhale"]: django.setup() - from funkwhale_api.cli import main as cli + from funquail_api.cli import main as cli sys.argv = sys.argv[1:] cli.invoke() diff --git a/api/funquail_api/manage/filters.py b/api/funquail_api/manage/filters.py index fb283de99..2132a0660 100644 --- a/api/funquail_api/manage/filters.py +++ b/api/funquail_api/manage/filters.py @@ -3,18 +3,18 @@ from django import forms from django.db.models import Q from django_filters import rest_framework as filters -from funkwhale_api.audio import models as audio_models -from funkwhale_api.common import fields -from funkwhale_api.common import filters as common_filters -from funkwhale_api.common import search -from funkwhale_api.federation import models as federation_models -from funkwhale_api.federation import utils as federation_utils -from funkwhale_api.moderation import models as moderation_models -from funkwhale_api.moderation import serializers as moderation_serializers -from funkwhale_api.moderation import utils as moderation_utils -from funkwhale_api.music import models as music_models -from funkwhale_api.tags import models as tags_models -from funkwhale_api.users import models as users_models +from funquail_api.audio import models as audio_models +from funquail_api.common import fields +from funquail_api.common import filters as common_filters +from funquail_api.common import search +from funquail_api.federation import models as federation_models +from funquail_api.federation import utils as federation_utils +from funquail_api.moderation import models as moderation_models +from funquail_api.moderation import serializers as moderation_serializers +from funquail_api.moderation import utils as moderation_utils +from funquail_api.music import models as music_models +from funquail_api.tags import models as tags_models +from funquail_api.users import models as users_models class ActorField(forms.CharField): diff --git a/api/funquail_api/manage/serializers.py b/api/funquail_api/manage/serializers.py index e097fc88f..70e68e1c8 100644 --- a/api/funquail_api/manage/serializers.py +++ b/api/funquail_api/manage/serializers.py @@ -4,20 +4,20 @@ from drf_spectacular.types import OpenApiTypes from drf_spectacular.utils import extend_schema_field from rest_framework import serializers -from funkwhale_api.audio import models as audio_models -from funkwhale_api.common import fields as common_fields -from funkwhale_api.common import serializers as common_serializers -from funkwhale_api.common import utils as common_utils -from funkwhale_api.federation import fields as federation_fields -from funkwhale_api.federation import models as federation_models -from funkwhale_api.federation import tasks as federation_tasks -from funkwhale_api.moderation import models as moderation_models -from funkwhale_api.moderation import serializers as moderation_serializers -from funkwhale_api.moderation import utils as moderation_utils -from funkwhale_api.music import models as music_models -from funkwhale_api.music import serializers as music_serializers -from funkwhale_api.tags import models as tags_models -from funkwhale_api.users import models as users_models +from funquail_api.audio import models as audio_models +from funquail_api.common import fields as common_fields +from funquail_api.common import serializers as common_serializers +from funquail_api.common import utils as common_utils +from funquail_api.federation import fields as federation_fields +from funquail_api.federation import models as federation_models +from funquail_api.federation import tasks as federation_tasks +from funquail_api.moderation import models as moderation_models +from funquail_api.moderation import serializers as moderation_serializers +from funquail_api.moderation import utils as moderation_utils +from funquail_api.music import models as music_models +from funquail_api.music import serializers as music_serializers +from funquail_api.tags import models as tags_models +from funquail_api.users import models as users_models from . import filters diff --git a/api/funquail_api/manage/urls.py b/api/funquail_api/manage/urls.py index 9cf6acced..6b619338d 100644 --- a/api/funquail_api/manage/urls.py +++ b/api/funquail_api/manage/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import include, url -from funkwhale_api.common import routers +from funquail_api.common import routers from . import views diff --git a/api/funquail_api/manage/views.py b/api/funquail_api/manage/views.py index 4de9b5e96..6b55b33bd 100644 --- a/api/funquail_api/manage/views.py +++ b/api/funquail_api/manage/views.py @@ -6,24 +6,24 @@ from drf_spectacular.utils import extend_schema from rest_framework import decorators as rest_decorators from rest_framework import mixins, response, viewsets -from funkwhale_api.audio import models as audio_models -from funkwhale_api.common import decorators -from funkwhale_api.common import models as common_models -from funkwhale_api.common import preferences -from funkwhale_api.common import utils as common_utils -from funkwhale_api.common.mixins import MultipleLookupDetailMixin -from funkwhale_api.favorites import models as favorites_models -from funkwhale_api.federation import models as federation_models -from funkwhale_api.federation import tasks as federation_tasks -from funkwhale_api.federation import utils as federation_utils -from funkwhale_api.history import models as history_models -from funkwhale_api.moderation import models as moderation_models -from funkwhale_api.moderation import tasks as moderation_tasks -from funkwhale_api.music import models as music_models -from funkwhale_api.music import views as music_views -from funkwhale_api.playlists import models as playlists_models -from funkwhale_api.tags import models as tags_models -from funkwhale_api.users import models as users_models +from funquail_api.audio import models as audio_models +from funquail_api.common import decorators +from funquail_api.common import models as common_models +from funquail_api.common import preferences +from funquail_api.common import utils as common_utils +from funquail_api.common.mixins import MultipleLookupDetailMixin +from funquail_api.favorites import models as favorites_models +from funquail_api.federation import models as federation_models +from funquail_api.federation import tasks as federation_tasks +from funquail_api.federation import utils as federation_utils +from funquail_api.history import models as history_models +from funquail_api.moderation import models as moderation_models +from funquail_api.moderation import tasks as moderation_tasks +from funquail_api.music import models as music_models +from funquail_api.music import views as music_views +from funquail_api.playlists import models as playlists_models +from funquail_api.tags import models as tags_models +from funquail_api.users import models as users_models from . import filters, serializers diff --git a/api/funquail_api/moderation/admin.py b/api/funquail_api/moderation/admin.py index 1a44ea283..88cf4b5bd 100644 --- a/api/funquail_api/moderation/admin.py +++ b/api/funquail_api/moderation/admin.py @@ -1,4 +1,4 @@ -from funkwhale_api.common import admin +from funquail_api.common import admin from . import models diff --git a/api/funquail_api/moderation/apps.py b/api/funquail_api/moderation/apps.py index 840393af1..8c8e52623 100644 --- a/api/funquail_api/moderation/apps.py +++ b/api/funquail_api/moderation/apps.py @@ -4,7 +4,7 @@ from . import mrf class ModerationConfig(AppConfig): - name = "funkwhale_api.moderation" + name = "funquail_api.moderation" def ready(self): super().ready() diff --git a/api/funquail_api/moderation/dynamic_preferences_registry.py b/api/funquail_api/moderation/dynamic_preferences_registry.py index bda9b5952..ba3157384 100644 --- a/api/funquail_api/moderation/dynamic_preferences_registry.py +++ b/api/funquail_api/moderation/dynamic_preferences_registry.py @@ -3,9 +3,9 @@ from dynamic_preferences import types from dynamic_preferences.registries import global_preferences_registry from rest_framework import serializers -from funkwhale_api.common import preferences as common_preferences -from funkwhale_api.common import serializers as common_serializers -from funkwhale_api.common import utils as common_utils +from funquail_api.common import preferences as common_preferences +from funquail_api.common import serializers as common_serializers +from funquail_api.common import utils as common_utils from . import models diff --git a/api/funquail_api/moderation/factories.py b/api/funquail_api/moderation/factories.py index 5b681c6dd..6289b7f4b 100644 --- a/api/funquail_api/moderation/factories.py +++ b/api/funquail_api/moderation/factories.py @@ -1,9 +1,9 @@ import factory -from funkwhale_api.factories import NoUpdateOnCreate, registry -from funkwhale_api.federation import factories as federation_factories -from funkwhale_api.music import factories as music_factories -from funkwhale_api.users import factories as users_factories +from funquail_api.factories import NoUpdateOnCreate, registry +from funquail_api.federation import factories as federation_factories +from funquail_api.music import factories as music_factories +from funquail_api.users import factories as users_factories from . import serializers diff --git a/api/funquail_api/moderation/management/commands/mrf_check.py b/api/funquail_api/moderation/management/commands/mrf_check.py index 72594c65c..408339e8e 100644 --- a/api/funquail_api/moderation/management/commands/mrf_check.py +++ b/api/funquail_api/moderation/management/commands/mrf_check.py @@ -6,9 +6,9 @@ import uuid from django.core import validators from django.core.management.base import BaseCommand, CommandError -from funkwhale_api.common import session -from funkwhale_api.federation import models -from funkwhale_api.moderation import mrf +from funquail_api.common import session +from funquail_api.federation import models +from funquail_api.moderation import mrf def is_uuid(v): diff --git a/api/funquail_api/moderation/models.py b/api/funquail_api/moderation/models.py index f45441dbe..cdea7af56 100644 --- a/api/funquail_api/moderation/models.py +++ b/api/funquail_api/moderation/models.py @@ -10,9 +10,9 @@ from django.dispatch import receiver from django.urls import reverse from django.utils import timezone -from funkwhale_api.common import models as common_models -from funkwhale_api.federation import models as federation_models -from funkwhale_api.federation import utils as federation_utils +from funquail_api.common import models as common_models +from funquail_api.federation import models as federation_models +from funquail_api.federation import utils as federation_utils class InstancePolicyQuerySet(models.QuerySet): diff --git a/api/funquail_api/moderation/mrf_policies.py b/api/funquail_api/moderation/mrf_policies.py index 264baed37..9958ccf54 100644 --- a/api/funquail_api/moderation/mrf_policies.py +++ b/api/funquail_api/moderation/mrf_policies.py @@ -1,8 +1,8 @@ import urllib.parse -from funkwhale_api.common import preferences, utils -from funkwhale_api.federation import models as federation_models -from funkwhale_api.moderation import mrf +from funquail_api.common import preferences, utils +from funquail_api.federation import models as federation_models +from funquail_api.moderation import mrf @mrf.inbox.register(name="allow_list") diff --git a/api/funquail_api/moderation/serializers.py b/api/funquail_api/moderation/serializers.py index 382d81aa8..775c021be 100644 --- a/api/funquail_api/moderation/serializers.py +++ b/api/funquail_api/moderation/serializers.py @@ -6,13 +6,13 @@ from django.conf import settings from django.core.serializers.json import DjangoJSONEncoder from rest_framework import serializers -from funkwhale_api.audio import models as audio_models -from funkwhale_api.common import fields as common_fields -from funkwhale_api.common import preferences -from funkwhale_api.federation import models as federation_models -from funkwhale_api.federation import utils as federation_utils -from funkwhale_api.music import models as music_models -from funkwhale_api.playlists import models as playlists_models +from funquail_api.audio import models as audio_models +from funquail_api.common import fields as common_fields +from funquail_api.common import preferences +from funquail_api.federation import models as federation_models +from funquail_api.federation import utils as federation_utils +from funquail_api.music import models as music_models +from funquail_api.playlists import models as playlists_models from . import models, tasks diff --git a/api/funquail_api/moderation/tasks.py b/api/funquail_api/moderation/tasks.py index 1984d0aa7..9cf2dd2d9 100644 --- a/api/funquail_api/moderation/tasks.py +++ b/api/funquail_api/moderation/tasks.py @@ -5,10 +5,10 @@ from django.core import mail from django.db import transaction from django.dispatch import receiver -from funkwhale_api.common import channels, preferences, utils -from funkwhale_api.federation import utils as federation_utils -from funkwhale_api.taskapp import celery -from funkwhale_api.users import models as users_models +from funquail_api.common import channels, preferences, utils +from funquail_api.federation import utils as federation_utils +from funquail_api.taskapp import celery +from funquail_api.users import models as users_models from . import models, signals @@ -145,7 +145,7 @@ def user_request_handle(user_request, new_status, old_status=None): def broadcast_user_request_created(user_request): - from funkwhale_api.manage import serializers as manage_serializers + from funquail_api.manage import serializers as manage_serializers channels.group_send( "admin.moderation", diff --git a/api/funquail_api/moderation/urls.py b/api/funquail_api/moderation/urls.py index 597aacadb..e64c039a1 100644 --- a/api/funquail_api/moderation/urls.py +++ b/api/funquail_api/moderation/urls.py @@ -1,4 +1,4 @@ -from funkwhale_api.common import routers +from funquail_api.common import routers from . import views diff --git a/api/funquail_api/moderation/utils.py b/api/funquail_api/moderation/utils.py index a08bc1ea0..1a5dd753b 100644 --- a/api/funquail_api/moderation/utils.py +++ b/api/funquail_api/moderation/utils.py @@ -1,6 +1,6 @@ from rest_framework import serializers -from funkwhale_api.federation import models as federation_models +from funquail_api.federation import models as federation_models from . import models from . import serializers as moderation_serializers diff --git a/api/funquail_api/moderation/views.py b/api/funquail_api/moderation/views.py index 71e139bc7..6e523aabe 100644 --- a/api/funquail_api/moderation/views.py +++ b/api/funquail_api/moderation/views.py @@ -1,8 +1,8 @@ from django.db import IntegrityError from rest_framework import mixins, response, status, viewsets -from funkwhale_api.federation import routes -from funkwhale_api.federation import utils as federation_utils +from funquail_api.federation import routes +from funquail_api.federation import utils as federation_utils from . import models, serializers diff --git a/api/funquail_api/music/admin.py b/api/funquail_api/music/admin.py index 7e6a79450..382d78101 100644 --- a/api/funquail_api/music/admin.py +++ b/api/funquail_api/music/admin.py @@ -1,4 +1,4 @@ -from funkwhale_api.common import admin +from funquail_api.common import admin from . import models diff --git a/api/funquail_api/music/factories.py b/api/funquail_api/music/factories.py index cf9b11a0a..b9b82f104 100644 --- a/api/funquail_api/music/factories.py +++ b/api/funquail_api/music/factories.py @@ -2,12 +2,12 @@ import os import factory -from funkwhale_api.common import factories as common_factories -from funkwhale_api.factories import NoUpdateOnCreate, registry -from funkwhale_api.federation import factories as federation_factories -from funkwhale_api.music import licenses -from funkwhale_api.tags import factories as tags_factories -from funkwhale_api.users import factories as users_factories +from funquail_api.common import factories as common_factories +from funquail_api.factories import NoUpdateOnCreate, registry +from funquail_api.federation import factories as federation_factories +from funquail_api.music import licenses +from funquail_api.tags import factories as tags_factories +from funquail_api.users import factories as users_factories SAMPLES_PATH = os.path.join( os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))), @@ -191,7 +191,7 @@ class UploadFactory(NoUpdateOnCreate, factory.django.DjangoModelFactory): def channel(self, created, extracted, **kwargs): if not extracted: return - from funkwhale_api.audio import factories as audio_factories + from funquail_api.audio import factories as audio_factories audio_factories.ChannelFactory( library=self.library, artist=self.track.artist, **kwargs diff --git a/api/funquail_api/music/fake_data.py b/api/funquail_api/music/fake_data.py index 204060404..2a4b8a8e0 100644 --- a/api/funquail_api/music/fake_data.py +++ b/api/funquail_api/music/fake_data.py @@ -3,7 +3,7 @@ Populates the database with fake data """ import random -from funkwhale_api.music import factories +from funquail_api.music import factories def create_data(count=25): diff --git a/api/funquail_api/music/filters.py b/api/funquail_api/music/filters.py index 94fa15e14..a6c968c14 100644 --- a/api/funquail_api/music/filters.py +++ b/api/funquail_api/music/filters.py @@ -2,13 +2,13 @@ import django_filters from django.db.models import Q from django_filters import rest_framework as filters -from funkwhale_api.audio import filters as audio_filters -from funkwhale_api.audio import models as audio_models -from funkwhale_api.common import fields -from funkwhale_api.common import filters as common_filters -from funkwhale_api.common import search -from funkwhale_api.moderation import filters as moderation_filters -from funkwhale_api.tags import filters as tags_filters +from funquail_api.audio import filters as audio_filters +from funquail_api.audio import models as audio_models +from funquail_api.common import fields +from funquail_api.common import filters as common_filters +from funquail_api.common import search +from funquail_api.moderation import filters as moderation_filters +from funquail_api.tags import filters as tags_filters from . import models, utils diff --git a/api/funquail_api/music/management/commands/check_inplace_files.py b/api/funquail_api/music/management/commands/check_inplace_files.py index 6754a2592..e0f3de0fd 100644 --- a/api/funquail_api/music/management/commands/check_inplace_files.py +++ b/api/funquail_api/music/management/commands/check_inplace_files.py @@ -4,7 +4,7 @@ from argparse import RawTextHelpFormatter from django.core.management.base import BaseCommand from django.db import transaction -from funkwhale_api.music import models +from funquail_api.music import models def progress(buffer, count, total, status=""): diff --git a/api/funquail_api/music/management/commands/check_licenses.py b/api/funquail_api/music/management/commands/check_licenses.py index 9fe3c7179..dff6798b0 100644 --- a/api/funquail_api/music/management/commands/check_licenses.py +++ b/api/funquail_api/music/management/commands/check_licenses.py @@ -1,7 +1,7 @@ import requests.exceptions from django.core.management.base import BaseCommand, CommandError -from funkwhale_api.music import licenses +from funquail_api.music import licenses class Command(BaseCommand): diff --git a/api/funquail_api/music/management/commands/create_library.py b/api/funquail_api/music/management/commands/create_library.py index 8b2073947..4a4f428c0 100644 --- a/api/funquail_api/music/management/commands/create_library.py +++ b/api/funquail_api/music/management/commands/create_library.py @@ -1,7 +1,7 @@ from django.core.management.base import BaseCommand -from funkwhale_api.federation.models import Actor -from funkwhale_api.music.models import Library +from funquail_api.federation.models import Actor +from funquail_api.music.models import Library class Command(BaseCommand): diff --git a/api/funquail_api/music/management/commands/fix_uploads.py b/api/funquail_api/music/management/commands/fix_uploads.py index bd87328d6..6c9ec21df 100644 --- a/api/funquail_api/music/management/commands/fix_uploads.py +++ b/api/funquail_api/music/management/commands/fix_uploads.py @@ -2,8 +2,8 @@ from django.core.management.base import BaseCommand from django.db import transaction from django.db.models import Q -from funkwhale_api.common import utils as common_utils -from funkwhale_api.music import models, utils +from funquail_api.common import utils as common_utils +from funquail_api.music import models, utils class Command(BaseCommand): diff --git a/api/funquail_api/music/management/commands/generate_typesense_index.py b/api/funquail_api/music/management/commands/generate_typesense_index.py index 6bf5f4b0c..3537fb966 100644 --- a/api/funquail_api/music/management/commands/generate_typesense_index.py +++ b/api/funquail_api/music/management/commands/generate_typesense_index.py @@ -1,6 +1,6 @@ from django.core.management.base import BaseCommand -from funkwhale_api.typesense import tasks +from funquail_api.typesense import tasks class Command(BaseCommand): diff --git a/api/funquail_api/music/management/commands/import_files.py b/api/funquail_api/music/management/commands/import_files.py index 3fc5fd9df..a9b858773 100644 --- a/api/funquail_api/music/management/commands/import_files.py +++ b/api/funquail_api/music/management/commands/import_files.py @@ -20,8 +20,8 @@ from django.db.utils import IntegrityError from django.utils import timezone from rest_framework import serializers -from funkwhale_api.common import utils as common_utils -from funkwhale_api.music import models, tasks, utils +from funquail_api.common import utils as common_utils +from funquail_api.music import models, tasks, utils def crawl_dir(dir, extensions, recursive=True, ignored=[]): diff --git a/api/funquail_api/music/management/commands/prune_library.py b/api/funquail_api/music/management/commands/prune_library.py index 512afe875..79d048187 100644 --- a/api/funquail_api/music/management/commands/prune_library.py +++ b/api/funquail_api/music/management/commands/prune_library.py @@ -3,7 +3,7 @@ from argparse import RawTextHelpFormatter from django.core.management.base import BaseCommand, CommandError from django.db import transaction -from funkwhale_api.music import models, tasks +from funquail_api.music import models, tasks class Command(BaseCommand): diff --git a/api/funquail_api/music/management/commands/prune_skipped_uploads.py b/api/funquail_api/music/management/commands/prune_skipped_uploads.py index 604cba36c..5fcc13056 100644 --- a/api/funquail_api/music/management/commands/prune_skipped_uploads.py +++ b/api/funquail_api/music/management/commands/prune_skipped_uploads.py @@ -1,7 +1,7 @@ from django.core.management.base import BaseCommand from django.db import transaction -from funkwhale_api.music import models +from funquail_api.music import models class Command(BaseCommand): diff --git a/api/funquail_api/music/management/commands/rebuild_music_permissions.py b/api/funquail_api/music/management/commands/rebuild_music_permissions.py index 96b7e61cb..e90d18e0b 100644 --- a/api/funquail_api/music/management/commands/rebuild_music_permissions.py +++ b/api/funquail_api/music/management/commands/rebuild_music_permissions.py @@ -4,8 +4,8 @@ from django.core.management.base import BaseCommand, CommandError from django.db import transaction from django.db.models import Q -from funkwhale_api.federation.models import Actor -from funkwhale_api.music.models import Library, TrackActor +from funquail_api.federation.models import Actor +from funquail_api.music.models import Library, TrackActor class Command(BaseCommand): diff --git a/api/funquail_api/music/metadata.py b/api/funquail_api/music/metadata.py index 479e210e0..a3b989c27 100644 --- a/api/funquail_api/music/metadata.py +++ b/api/funquail_api/music/metadata.py @@ -10,7 +10,7 @@ import mutagen.oggtheora import mutagen.oggvorbis from rest_framework import serializers -from funkwhale_api.tags import models as tags_models +from funquail_api.tags import models as tags_models logger = logging.getLogger(__name__) NODEFAULT = object() diff --git a/api/funquail_api/music/migrations/0019_populate_mimetypes.py b/api/funquail_api/music/migrations/0019_populate_mimetypes.py index 11678efbc..149151de1 100644 --- a/api/funquail_api/music/migrations/0019_populate_mimetypes.py +++ b/api/funquail_api/music/migrations/0019_populate_mimetypes.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import migrations -from funkwhale_api.music.utils import guess_mimetype +from funquail_api.music.utils import guess_mimetype def populate_mimetype(apps, schema_editor): diff --git a/api/funquail_api/music/migrations/0021_populate_batch_status.py b/api/funquail_api/music/migrations/0021_populate_batch_status.py index 065384a97..9684b71d7 100644 --- a/api/funquail_api/music/migrations/0021_populate_batch_status.py +++ b/api/funquail_api/music/migrations/0021_populate_batch_status.py @@ -5,7 +5,7 @@ from django.db import migrations def populate_status(apps, schema_editor): - from funkwhale_api.music.utils import compute_status + from funquail_api.music.utils import compute_status ImportBatch = apps.get_model("music", "ImportBatch") diff --git a/api/funquail_api/music/migrations/0030_auto_20180825_1411.py b/api/funquail_api/music/migrations/0030_auto_20180825_1411.py index 8c799dacb..c28557a4c 100644 --- a/api/funquail_api/music/migrations/0030_auto_20180825_1411.py +++ b/api/funquail_api/music/migrations/0030_auto_20180825_1411.py @@ -5,7 +5,7 @@ import django.core.serializers.json from django.db import migrations, models import django.db.models.deletion import django.utils.timezone -import funkwhale_api.music.models +import funquail_api.music.models class Migration(migrations.Migration): @@ -68,7 +68,7 @@ class Migration(migrations.Migration): model_name="trackfile", name="import_details", field=django.contrib.postgres.fields.jsonb.JSONField( - default=funkwhale_api.music.models.empty_dict, + default=funquail_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000, ), @@ -77,7 +77,7 @@ class Migration(migrations.Migration): model_name="trackfile", name="import_metadata", field=django.contrib.postgres.fields.jsonb.JSONField( - default=funkwhale_api.music.models.empty_dict, + default=funquail_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000, ), @@ -86,7 +86,7 @@ class Migration(migrations.Migration): model_name="trackfile", name="import_reference", field=models.CharField( - default=funkwhale_api.music.models.get_import_reference, max_length=50 + default=funquail_api.music.models.get_import_reference, max_length=50 ), ), migrations.AddField( @@ -107,7 +107,7 @@ class Migration(migrations.Migration): model_name="trackfile", name="metadata", field=django.contrib.postgres.fields.jsonb.JSONField( - default=funkwhale_api.music.models.empty_dict, + default=funquail_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000, ), @@ -121,7 +121,7 @@ class Migration(migrations.Migration): model_name="trackfile", name="audio_file", field=models.FileField( - max_length=255, upload_to=funkwhale_api.music.models.get_file_path + max_length=255, upload_to=funquail_api.music.models.get_file_path ), ), migrations.AlterField( diff --git a/api/funquail_api/music/migrations/0033_auto_20181023_1837.py b/api/funquail_api/music/migrations/0033_auto_20181023_1837.py index 003349b53..56382a963 100644 --- a/api/funquail_api/music/migrations/0033_auto_20181023_1837.py +++ b/api/funquail_api/music/migrations/0033_auto_20181023_1837.py @@ -3,7 +3,7 @@ from django.db import migrations, models import django.db.models.deletion import django.utils.timezone -import funkwhale_api.music.models +import funquail_api.music.models class Migration(migrations.Migration): @@ -20,7 +20,7 @@ class Migration(migrations.Migration): ('mimetype', models.CharField(choices=[('audio/ogg', 'ogg'), ('audio/mpeg', 'mp3'), ('audio/x-flac', 'flac')], max_length=50)), ('creation_date', models.DateTimeField(default=django.utils.timezone.now)), ('accessed_date', models.DateTimeField(blank=True, null=True)), - ('audio_file', models.FileField(max_length=255, upload_to=funkwhale_api.music.models.get_file_path)), + ('audio_file', models.FileField(max_length=255, upload_to=funquail_api.music.models.get_file_path)), ('bitrate', models.PositiveIntegerField()), ('size', models.IntegerField()), ('upload', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='versions', to='music.Upload')), diff --git a/api/funquail_api/music/migrations/0040_auto_20191021_1318.py b/api/funquail_api/music/migrations/0040_auto_20191021_1318.py index eb5e6abc0..8d6a41abe 100644 --- a/api/funquail_api/music/migrations/0040_auto_20191021_1318.py +++ b/api/funquail_api/music/migrations/0040_auto_20191021_1318.py @@ -5,7 +5,7 @@ import django.contrib.postgres.fields.jsonb import django.core.serializers.json from django.db import migrations, models import django.db.models.deletion -import funkwhale_api.music.models +import funquail_api.music.models class Migration(migrations.Migration): diff --git a/api/funquail_api/music/migrations/0041_auto_20191021_1705.py b/api/funquail_api/music/migrations/0041_auto_20191021_1705.py index cd98e7707..d9b5d981b 100644 --- a/api/funquail_api/music/migrations/0041_auto_20191021_1705.py +++ b/api/funquail_api/music/migrations/0041_auto_20191021_1705.py @@ -4,7 +4,7 @@ import django.contrib.postgres.fields.jsonb import django.core.serializers.json from django.db import migrations, models import django.db.models.deletion -import funkwhale_api.music.models +import funquail_api.music.models class Migration(migrations.Migration): @@ -27,17 +27,17 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='upload', name='import_details', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funkwhale_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funquail_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), ), migrations.AlterField( model_name='upload', name='import_metadata', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funkwhale_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funquail_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), ), migrations.AlterField( model_name='upload', name='metadata', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funkwhale_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=funquail_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), ), migrations.AlterField( model_name='uploadversion', diff --git a/api/funquail_api/music/migrations/0053_denormalize_audio_permissions.py b/api/funquail_api/music/migrations/0053_denormalize_audio_permissions.py index 374cda1d5..1a88903c0 100644 --- a/api/funquail_api/music/migrations/0053_denormalize_audio_permissions.py +++ b/api/funquail_api/music/migrations/0053_denormalize_audio_permissions.py @@ -5,7 +5,7 @@ This migration is disabled until settings.MUSIC_USE_DENORMALIZATION is set to de from __future__ import unicode_literals from django.db import migrations -from funkwhale_api.music.utils import guess_mimetype +from funquail_api.music.utils import guess_mimetype def denormalize(apps, schema_editor): @@ -13,7 +13,7 @@ def denormalize(apps, schema_editor): if not Upload.objects.count(): print('Skipping…') - from funkwhale_api.music.models import TrackActor, Library + from funquail_api.music.models import TrackActor, Library libraries = Library.objects.all() objs = [] total_libraries = len(libraries) diff --git a/api/funquail_api/music/migrations/0055_auto_20220627_1915.py b/api/funquail_api/music/migrations/0055_auto_20220627_1915.py index 8ebed5c8c..a71dcadc4 100644 --- a/api/funquail_api/music/migrations/0055_auto_20220627_1915.py +++ b/api/funquail_api/music/migrations/0055_auto_20220627_1915.py @@ -2,7 +2,7 @@ import django.core.serializers.json from django.db import migrations, models -import funkwhale_api.music.models +import funquail_api.music.models class Migration(migrations.Migration): @@ -15,16 +15,16 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='upload', name='import_details', - field=models.JSONField(blank=True, default=funkwhale_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), + field=models.JSONField(blank=True, default=funquail_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), ), migrations.AlterField( model_name='upload', name='import_metadata', - field=models.JSONField(blank=True, default=funkwhale_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), + field=models.JSONField(blank=True, default=funquail_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), ), migrations.AlterField( model_name='upload', name='metadata', - field=models.JSONField(blank=True, default=funkwhale_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), + field=models.JSONField(blank=True, default=funquail_api.music.models.empty_dict, encoder=django.core.serializers.json.DjangoJSONEncoder, max_length=50000), ), ] diff --git a/api/funquail_api/music/models.py b/api/funquail_api/music/models.py index e715b4b90..873862427 100644 --- a/api/funquail_api/music/models.py +++ b/api/funquail_api/music/models.py @@ -23,14 +23,14 @@ from django.dispatch import receiver from django.urls import reverse from django.utils import timezone -from funkwhale_api import musicbrainz -from funkwhale_api.common import fields -from funkwhale_api.common import models as common_models -from funkwhale_api.common import session -from funkwhale_api.common import utils as common_utils -from funkwhale_api.federation import models as federation_models -from funkwhale_api.federation import utils as federation_utils -from funkwhale_api.tags import models as tags_models +from funquail_api import musicbrainz +from funquail_api.common import fields +from funquail_api.common import models as common_models +from funquail_api.common import session +from funquail_api.common import utils as common_utils +from funquail_api.federation import models as federation_models +from funquail_api.federation import utils as federation_utils +from funquail_api.tags import models as tags_models from . import importers, metadata, utils @@ -783,7 +783,7 @@ class Upload(models.Model): return parsed.hostname def download_audio_from_remote(self, actor): - from funkwhale_api.federation import signing + from funquail_api.federation import signing if actor: auth = signing.get_auth(actor.private_key, actor.private_key_id) @@ -1153,7 +1153,7 @@ class LibraryQuerySet(models.QuerySet): ) def viewable_by(self, actor): - from funkwhale_api.federation.models import Follow, LibraryFollow + from funquail_api.federation.models import Follow, LibraryFollow if actor is None: return self.filter(privacy_level="everyone") diff --git a/api/funquail_api/music/mutations.py b/api/funquail_api/music/mutations.py index 7cd2918d6..193ff6c0d 100644 --- a/api/funquail_api/music/mutations.py +++ b/api/funquail_api/music/mutations.py @@ -1,10 +1,10 @@ -from funkwhale_api.common import models as common_models -from funkwhale_api.common import mutations -from funkwhale_api.common import serializers as common_serializers -from funkwhale_api.common import utils as common_utils -from funkwhale_api.federation import routes -from funkwhale_api.tags import models as tags_models -from funkwhale_api.tags import serializers as tags_serializers +from funquail_api.common import models as common_models +from funquail_api.common import mutations +from funquail_api.common import serializers as common_serializers +from funquail_api.common import utils as common_utils +from funquail_api.federation import routes +from funquail_api.tags import models as tags_models +from funquail_api.tags import serializers as tags_serializers from . import models diff --git a/api/funquail_api/music/serializers.py b/api/funquail_api/music/serializers.py index 22a163e0b..45481fbdd 100644 --- a/api/funquail_api/music/serializers.py +++ b/api/funquail_api/music/serializers.py @@ -7,16 +7,16 @@ from drf_spectacular.types import OpenApiTypes from drf_spectacular.utils import extend_schema_field from rest_framework import serializers -from funkwhale_api.activity import serializers as activity_serializers -from funkwhale_api.common import models as common_models -from funkwhale_api.common import serializers as common_serializers -from funkwhale_api.common import utils as common_utils -from funkwhale_api.federation import routes -from funkwhale_api.federation import utils as federation_utils -from funkwhale_api.federation.serializers import APIActorSerializer -from funkwhale_api.playlists import models as playlists_models -from funkwhale_api.tags import models as tag_models -from funkwhale_api.tags import serializers as tags_serializers +from funquail_api.activity import serializers as activity_serializers +from funquail_api.common import models as common_models +from funquail_api.common import serializers as common_serializers +from funquail_api.common import utils as common_utils +from funquail_api.federation import routes +from funquail_api.federation import utils as federation_utils +from funquail_api.federation.serializers import APIActorSerializer +from funquail_api.playlists import models as playlists_models +from funquail_api.tags import models as tag_models +from funquail_api.tags import serializers as tags_serializers from . import filters, models, tasks, utils @@ -339,7 +339,7 @@ class LibraryForOwnerSerializer(serializers.ModelSerializer): class UploadSerializer(serializers.ModelSerializer): - from funkwhale_api.audio.serializers import ChannelSerializer + from funquail_api.audio.serializers import ChannelSerializer track = TrackSerializer(required=False, allow_null=True) library = common_serializers.RelatedField( @@ -693,7 +693,7 @@ class OembedSerializer(serializers.Serializer): common_utils.spa_reverse("library_artist", kwargs={"pk": artist.pk}) ) elif match.url_name == "channel_detail": - from funkwhale_api.audio.models import Channel + from funquail_api.audio.models import Channel kwargs = {} if "uuid" in match.kwargs: diff --git a/api/funquail_api/music/spa_views.py b/api/funquail_api/music/spa_views.py index 31e7edef3..8696ad825 100644 --- a/api/funquail_api/music/spa_views.py +++ b/api/funquail_api/music/spa_views.py @@ -4,8 +4,8 @@ from django.conf import settings from django.db.models import Q from django.urls import reverse -from funkwhale_api.common import middleware, preferences, utils -from funkwhale_api.playlists import models as playlists_models +from funquail_api.common import middleware, preferences, utils +from funquail_api.playlists import models as playlists_models from . import models, serializers diff --git a/api/funquail_api/music/tasks.py b/api/funquail_api/music/tasks.py index 54801967c..8915656f9 100644 --- a/api/funquail_api/music/tasks.py +++ b/api/funquail_api/music/tasks.py @@ -12,16 +12,16 @@ from django.utils import timezone from musicbrainzngs import ResponseError from requests.exceptions import RequestException -from funkwhale_api import musicbrainz -from funkwhale_api.common import channels, preferences -from funkwhale_api.common import utils as common_utils -from funkwhale_api.federation import library as lb -from funkwhale_api.federation import routes -from funkwhale_api.federation import utils as federation_utils -from funkwhale_api.music.management.commands import import_files -from funkwhale_api.tags import models as tags_models -from funkwhale_api.tags import tasks as tags_tasks -from funkwhale_api.taskapp import celery +from funquail_api import musicbrainz +from funquail_api.common import channels, preferences +from funquail_api.common import utils as common_utils +from funquail_api.federation import library as lb +from funquail_api.federation import routes +from funquail_api.federation import utils as federation_utils +from funquail_api.music.management.commands import import_files +from funquail_api.tags import models as tags_models +from funquail_api.tags import tasks as tags_tasks +from funquail_api.taskapp import celery from . import licenses, metadata, models, signals @@ -77,7 +77,7 @@ def get_cover_from_fs(dir_path): @celery.app.task(name="music.library.schedule_remote_scan") def schedule_scan_for_all_remote_libraries(): - from funkwhale_api.federation import actors + from funquail_api.federation import actors libraries = models.Library.objects.all().prefetch_related() actor = actors.get_service_actor() diff --git a/api/funquail_api/music/utils.py b/api/funquail_api/music/utils.py index a81e2cff0..61b85f10a 100644 --- a/api/funquail_api/music/utils.py +++ b/api/funquail_api/music/utils.py @@ -9,10 +9,10 @@ from django.conf import settings from django.core.cache import cache from django.db.models import F -from funkwhale_api.common import throttling -from funkwhale_api.common.search import get_fts_query # noqa -from funkwhale_api.common.search import get_query # noqa -from funkwhale_api.common.search import normalize_query # noqa +from funquail_api.common import throttling +from funquail_api.common.search import get_fts_query # noqa +from funquail_api.common.search import get_query # noqa +from funquail_api.common.search import normalize_query # noqa def guess_mimetype(f): diff --git a/api/funquail_api/music/views.py b/api/funquail_api/music/views.py index 20942a952..78b813392 100644 --- a/api/funquail_api/music/views.py +++ b/api/funquail_api/music/views.py @@ -17,21 +17,21 @@ from rest_framework import views, viewsets from rest_framework.decorators import action from rest_framework.response import Response -from funkwhale_api.common import decorators as common_decorators -from funkwhale_api.common import permissions as common_permissions -from funkwhale_api.common import preferences -from funkwhale_api.common import utils as common_utils -from funkwhale_api.common import views as common_views -from funkwhale_api.federation import actors -from funkwhale_api.federation import api_serializers as federation_api_serializers -from funkwhale_api.federation import decorators as federation_decorators -from funkwhale_api.federation import models as federation_models -from funkwhale_api.federation import routes -from funkwhale_api.federation import tasks as federation_tasks -from funkwhale_api.federation.authentication import SignatureAuthentication -from funkwhale_api.tags.models import Tag, TaggedItem -from funkwhale_api.users.authentication import ScopedTokenAuthentication -from funkwhale_api.users.oauth import permissions as oauth_permissions +from funquail_api.common import decorators as common_decorators +from funquail_api.common import permissions as common_permissions +from funquail_api.common import preferences +from funquail_api.common import utils as common_utils +from funquail_api.common import views as common_views +from funquail_api.federation import actors +from funquail_api.federation import api_serializers as federation_api_serializers +from funquail_api.federation import decorators as federation_decorators +from funquail_api.federation import models as federation_models +from funquail_api.federation import routes +from funquail_api.federation import tasks as federation_tasks +from funquail_api.federation.authentication import SignatureAuthentication +from funquail_api.tags.models import Tag, TaggedItem +from funquail_api.users.authentication import ScopedTokenAuthentication +from funquail_api.users.oauth import permissions as oauth_permissions from . import filters, licenses, models, serializers, tasks, utils diff --git a/api/funquail_api/musicbrainz/client.py b/api/funquail_api/musicbrainz/client.py index 189580ae3..af79b40b7 100644 --- a/api/funquail_api/musicbrainz/client.py +++ b/api/funquail_api/musicbrainz/client.py @@ -2,7 +2,7 @@ import musicbrainzngs from cache_memoize import cache_memoize from django.conf import settings -from funkwhale_api import __version__ +from funquail_api import __version__ _api = musicbrainzngs _api.set_useragent("funkwhale", str(__version__), settings.FUNQUAIL_URL) diff --git a/api/funquail_api/musicbrainz/urls.py b/api/funquail_api/musicbrainz/urls.py index aac5cf6ec..233d6ace6 100644 --- a/api/funquail_api/musicbrainz/urls.py +++ b/api/funquail_api/musicbrainz/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url -from funkwhale_api.common import routers +from funquail_api.common import routers from . import views diff --git a/api/funquail_api/musicbrainz/views.py b/api/funquail_api/musicbrainz/views.py index 43d285784..07a5f770f 100644 --- a/api/funquail_api/musicbrainz/views.py +++ b/api/funquail_api/musicbrainz/views.py @@ -3,7 +3,7 @@ from rest_framework.decorators import action from rest_framework.response import Response from rest_framework.views import APIView -from funkwhale_api.common.permissions import ConditionalAuthentication +from funquail_api.common.permissions import ConditionalAuthentication from .client import api diff --git a/api/funquail_api/playlists/admin.py b/api/funquail_api/playlists/admin.py index 056535270..4d0309e50 100644 --- a/api/funquail_api/playlists/admin.py +++ b/api/funquail_api/playlists/admin.py @@ -1,4 +1,4 @@ -from funkwhale_api.common import admin +from funquail_api.common import admin from . import models diff --git a/api/funquail_api/playlists/factories.py b/api/funquail_api/playlists/factories.py index 5fbddd997..209f72ce3 100644 --- a/api/funquail_api/playlists/factories.py +++ b/api/funquail_api/playlists/factories.py @@ -1,8 +1,8 @@ import factory -from funkwhale_api.factories import NoUpdateOnCreate, registry -from funkwhale_api.music.factories import TrackFactory -from funkwhale_api.users.factories import UserFactory +from funquail_api.factories import NoUpdateOnCreate, registry +from funquail_api.music.factories import TrackFactory +from funquail_api.users.factories import UserFactory @registry.register diff --git a/api/funquail_api/playlists/filters.py b/api/funquail_api/playlists/filters.py index 5270eee80..9c5789c09 100644 --- a/api/funquail_api/playlists/filters.py +++ b/api/funquail_api/playlists/filters.py @@ -1,9 +1,9 @@ from django.db.models import Count from django_filters import rest_framework as filters -from funkwhale_api.common import filters as common_filters -from funkwhale_api.music import models as music_models -from funkwhale_api.music import utils +from funquail_api.common import filters as common_filters +from funquail_api.music import models as music_models +from funquail_api.music import utils from . import models diff --git a/api/funquail_api/playlists/models.py b/api/funquail_api/playlists/models.py index 74172e8b6..a68dad119 100644 --- a/api/funquail_api/playlists/models.py +++ b/api/funquail_api/playlists/models.py @@ -4,8 +4,8 @@ from django.db.models.expressions import OuterRef, Subquery from django.utils import timezone from rest_framework import exceptions -from funkwhale_api.common import fields, preferences -from funkwhale_api.music import models as music_models +from funquail_api.common import fields, preferences +from funquail_api.music import models as music_models class PlaylistQuerySet(models.QuerySet): diff --git a/api/funquail_api/playlists/serializers.py b/api/funquail_api/playlists/serializers.py index 09582774e..b5e9ac1f4 100644 --- a/api/funquail_api/playlists/serializers.py +++ b/api/funquail_api/playlists/serializers.py @@ -2,10 +2,10 @@ from drf_spectacular.types import OpenApiTypes from drf_spectacular.utils import extend_schema_field from rest_framework import serializers -from funkwhale_api.federation import serializers as federation_serializers -from funkwhale_api.music.models import Track -from funkwhale_api.music.serializers import TrackSerializer -from funkwhale_api.users.serializers import UserBasicSerializer +from funquail_api.federation import serializers as federation_serializers +from funquail_api.music.models import Track +from funquail_api.music.serializers import TrackSerializer +from funquail_api.users.serializers import UserBasicSerializer from . import models diff --git a/api/funquail_api/playlists/views.py b/api/funquail_api/playlists/views.py index 0b57a6ef9..179c29875 100644 --- a/api/funquail_api/playlists/views.py +++ b/api/funquail_api/playlists/views.py @@ -5,9 +5,9 @@ from rest_framework import exceptions, mixins, viewsets from rest_framework.decorators import action from rest_framework.response import Response -from funkwhale_api.common import fields, permissions -from funkwhale_api.music import utils as music_utils -from funkwhale_api.users.oauth import permissions as oauth_permissions +from funquail_api.common import fields, permissions +from funquail_api.music import utils as music_utils +from funquail_api.users.oauth import permissions as oauth_permissions from . import filters, models, serializers diff --git a/api/funquail_api/providers/urls.py b/api/funquail_api/providers/urls.py index dc8afeee7..8dce65591 100644 --- a/api/funquail_api/providers/urls.py +++ b/api/funquail_api/providers/urls.py @@ -4,7 +4,7 @@ urlpatterns = [ url( r"^musicbrainz/", include( - ("funkwhale_api.musicbrainz.urls", "musicbrainz"), namespace="musicbrainz" + ("funquail_api.musicbrainz.urls", "musicbrainz"), namespace="musicbrainz" ), ) ] diff --git a/api/funquail_api/radios/admin.py b/api/funquail_api/radios/admin.py index 0cfd5d925..499f6b9a9 100644 --- a/api/funquail_api/radios/admin.py +++ b/api/funquail_api/radios/admin.py @@ -1,4 +1,4 @@ -from funkwhale_api.common import admin +from funquail_api.common import admin from . import models diff --git a/api/funquail_api/radios/factories.py b/api/funquail_api/radios/factories.py index f8ff6f6ac..8dc54fa23 100644 --- a/api/funquail_api/radios/factories.py +++ b/api/funquail_api/radios/factories.py @@ -1,7 +1,7 @@ import factory -from funkwhale_api.factories import NoUpdateOnCreate, registry -from funkwhale_api.users.factories import UserFactory +from funquail_api.factories import NoUpdateOnCreate, registry +from funquail_api.users.factories import UserFactory @registry.register diff --git a/api/funquail_api/radios/filters.py b/api/funquail_api/radios/filters.py index 114236ee0..cecdefaec 100644 --- a/api/funquail_api/radios/filters.py +++ b/api/funquail_api/radios/filters.py @@ -5,8 +5,8 @@ from django.core.exceptions import ValidationError from django.db.models import Q, functions from django.urls import reverse_lazy -from funkwhale_api.music import models -from funkwhale_api.playlists import models as plt_models +from funquail_api.music import models +from funquail_api.playlists import models as plt_models class RadioFilterRegistry(persisting_theory.Registry): diff --git a/api/funquail_api/radios/filtersets.py b/api/funquail_api/radios/filtersets.py index 366da9973..f6a8a7afe 100644 --- a/api/funquail_api/radios/filtersets.py +++ b/api/funquail_api/radios/filtersets.py @@ -1,8 +1,8 @@ import django_filters from django_filters import rest_framework as filters -from funkwhale_api.common import filters as common_filters -from funkwhale_api.music import utils +from funquail_api.common import filters as common_filters +from funquail_api.music import utils from . import models diff --git a/api/funquail_api/radios/lb_recommendations.py b/api/funquail_api/radios/lb_recommendations.py index 6466915b0..4be00f4d3 100644 --- a/api/funquail_api/radios/lb_recommendations.py +++ b/api/funquail_api/radios/lb_recommendations.py @@ -8,8 +8,8 @@ # from django.db.models import Q # from requests.exceptions import ConnectTimeout -# from funkwhale_api.music import models as music_models -# from funkwhale_api.typesense import utils +# from funquail_api.music import models as music_models +# from funquail_api.typesense import utils # logger = logging.getLogger(__name__) diff --git a/api/funquail_api/radios/models.py b/api/funquail_api/radios/models.py index fdd6cd481..1ba761c51 100644 --- a/api/funquail_api/radios/models.py +++ b/api/funquail_api/radios/models.py @@ -5,7 +5,7 @@ from django.db import models from django.db.models import JSONField from django.utils import timezone -from funkwhale_api.music.models import Track +from funquail_api.music.models import Track from . import filters diff --git a/api/funquail_api/radios/radios.py b/api/funquail_api/radios/radios.py index 1f97c29c3..34d8355f5 100644 --- a/api/funquail_api/radios/radios.py +++ b/api/funquail_api/radios/radios.py @@ -9,11 +9,11 @@ from django.db import connection from django.db.models import Q from rest_framework import serializers -from funkwhale_api.federation import fields as federation_fields -from funkwhale_api.federation import models as federation_models -from funkwhale_api.moderation import filters as moderation_filters -from funkwhale_api.music.models import Artist, Library, Track, Upload -from funkwhale_api.tags.models import Tag +from funquail_api.federation import fields as federation_fields +from funquail_api.federation import models as federation_models +from funquail_api.moderation import filters as moderation_filters +from funquail_api.music.models import Artist, Library, Track, Upload +from funquail_api.tags.models import Tag from . import filters, lb_recommendations, models from .registries import registry diff --git a/api/funquail_api/radios/radios_v2.py b/api/funquail_api/radios/radios_v2.py index 06a0d4e7f..617c1391f 100644 --- a/api/funquail_api/radios/radios_v2.py +++ b/api/funquail_api/radios/radios_v2.py @@ -11,11 +11,11 @@ from django.db import connection from django.db.models import Q from rest_framework import serializers -from funkwhale_api.federation import fields as federation_fields -from funkwhale_api.federation import models as federation_models -from funkwhale_api.moderation import filters as moderation_filters -from funkwhale_api.music.models import Artist, Library, Track, Upload -from funkwhale_api.tags.models import Tag +from funquail_api.federation import fields as federation_fields +from funquail_api.federation import models as federation_models +from funquail_api.moderation import filters as moderation_filters +from funquail_api.music.models import Artist, Library, Track, Upload +from funquail_api.tags.models import Tag from . import filters, lb_recommendations, models from .registries_v2 import registry diff --git a/api/funquail_api/radios/serializers.py b/api/funquail_api/radios/serializers.py index 16886f818..87df6f37e 100644 --- a/api/funquail_api/radios/serializers.py +++ b/api/funquail_api/radios/serializers.py @@ -1,7 +1,7 @@ from rest_framework import serializers -from funkwhale_api.music.serializers import TrackSerializer -from funkwhale_api.users.serializers import UserBasicSerializer +from funquail_api.music.serializers import TrackSerializer +from funquail_api.users.serializers import UserBasicSerializer from . import filters, models from .radios import registry diff --git a/api/funquail_api/radios/urls.py b/api/funquail_api/radios/urls.py index 7f1e3864b..2cde64923 100644 --- a/api/funquail_api/radios/urls.py +++ b/api/funquail_api/radios/urls.py @@ -1,4 +1,4 @@ -from funkwhale_api.common import routers +from funquail_api.common import routers from . import views diff --git a/api/funquail_api/radios/urls_v2.py b/api/funquail_api/radios/urls_v2.py index bac76f998..d225f3523 100644 --- a/api/funquail_api/radios/urls_v2.py +++ b/api/funquail_api/radios/urls_v2.py @@ -1,4 +1,4 @@ -from funkwhale_api.common import routers +from funquail_api.common import routers from . import views diff --git a/api/funquail_api/radios/views.py b/api/funquail_api/radios/views.py index 07138ee35..cf0f51c2e 100644 --- a/api/funquail_api/radios/views.py +++ b/api/funquail_api/radios/views.py @@ -7,10 +7,10 @@ from rest_framework import mixins, status, viewsets from rest_framework.decorators import action from rest_framework.response import Response -from funkwhale_api.common import permissions as common_permissions -from funkwhale_api.music import utils as music_utils -from funkwhale_api.music.serializers import TrackSerializer -from funkwhale_api.users.oauth import permissions as oauth_permissions +from funquail_api.common import permissions as common_permissions +from funquail_api.music import utils as music_utils +from funquail_api.music.serializers import TrackSerializer +from funquail_api.users.oauth import permissions as oauth_permissions from . import filters, filtersets, models, serializers diff --git a/api/funquail_api/subsonic/authentication.py b/api/funquail_api/subsonic/authentication.py index 195f43d62..c67d32d82 100644 --- a/api/funquail_api/subsonic/authentication.py +++ b/api/funquail_api/subsonic/authentication.py @@ -3,7 +3,7 @@ import hashlib from rest_framework import authentication, exceptions -from funkwhale_api.users.models import User +from funquail_api.users.models import User def get_token(salt, password): diff --git a/api/funquail_api/subsonic/filters.py b/api/funquail_api/subsonic/filters.py index f3fc81111..77a93e617 100644 --- a/api/funquail_api/subsonic/filters.py +++ b/api/funquail_api/subsonic/filters.py @@ -1,6 +1,6 @@ from django_filters import rest_framework as filters -from funkwhale_api.music import models as music_models +from funquail_api.music import models as music_models class AlbumList2FilterSet(filters.FilterSet): diff --git a/api/funquail_api/subsonic/renderers.py b/api/funquail_api/subsonic/renderers.py index f11940222..ea06834c0 100644 --- a/api/funquail_api/subsonic/renderers.py +++ b/api/funquail_api/subsonic/renderers.py @@ -3,7 +3,7 @@ import xml.etree.ElementTree as ET from rest_framework import renderers -import funkwhale_api +import funquail_api # from https://stackoverflow.com/a/8915039 @@ -31,7 +31,7 @@ ET._serialize_xml = ET._serialize["xml"] = _serialize_xml def structure_payload(data): payload = { - "funkwhaleVersion": funkwhale_api.__version__, + "funkwhaleVersion": funquail_api.__version__, "status": "ok", "type": "funkwhale", "version": "1.16.0", diff --git a/api/funquail_api/subsonic/serializers.py b/api/funquail_api/subsonic/serializers.py index 5a615126b..efff6c5e3 100644 --- a/api/funquail_api/subsonic/serializers.py +++ b/api/funquail_api/subsonic/serializers.py @@ -3,9 +3,9 @@ import collections from django.db.models import Count, functions from rest_framework import serializers -from funkwhale_api.history import models as history_models -from funkwhale_api.music import models as music_models -from funkwhale_api.music import utils as music_utils +from funquail_api.history import models as history_models +from funquail_api.music import models as music_models +from funquail_api.music import utils as music_utils def to_subsonic_date(date): diff --git a/api/funquail_api/subsonic/views.py b/api/funquail_api/subsonic/views.py index 316cce706..bb2fe22a9 100644 --- a/api/funquail_api/subsonic/views.py +++ b/api/funquail_api/subsonic/views.py @@ -15,27 +15,27 @@ from rest_framework import renderers, response, viewsets from rest_framework.decorators import action from rest_framework.serializers import ValidationError -import funkwhale_api +import funquail_api from config import plugins -from funkwhale_api.activity import record -from funkwhale_api.audio import models as audio_models -from funkwhale_api.audio import serializers as audio_serializers -from funkwhale_api.audio import views as audio_views -from funkwhale_api.common import fields -from funkwhale_api.common import models as common_models -from funkwhale_api.common import preferences -from funkwhale_api.common import tasks as common_tasks -from funkwhale_api.common import utils as common_utils -from funkwhale_api.favorites.models import TrackFavorite -from funkwhale_api.federation import models as federation_models -from funkwhale_api.moderation import filters as moderation_filters -from funkwhale_api.music import models as music_models -from funkwhale_api.music import serializers as music_serializers -from funkwhale_api.music import utils -from funkwhale_api.music import views as music_views -from funkwhale_api.playlists import models as playlists_models -from funkwhale_api.tags import models as tags_models -from funkwhale_api.users import models as users_models +from funquail_api.activity import record +from funquail_api.audio import models as audio_models +from funquail_api.audio import serializers as audio_serializers +from funquail_api.audio import views as audio_views +from funquail_api.common import fields +from funquail_api.common import models as common_models +from funquail_api.common import preferences +from funquail_api.common import tasks as common_tasks +from funquail_api.common import utils as common_utils +from funquail_api.favorites.models import TrackFavorite +from funquail_api.federation import models as federation_models +from funquail_api.moderation import filters as moderation_filters +from funquail_api.music import models as music_models +from funquail_api.music import serializers as music_serializers +from funquail_api.music import utils +from funquail_api.music import views as music_views +from funquail_api.playlists import models as playlists_models +from funquail_api.tags import models as tags_models +from funquail_api.users import models as users_models from . import authentication, filters, negotiation, serializers @@ -171,7 +171,7 @@ class SubsonicViewSet(viewsets.GenericViewSet): "status": "ok", "version": "1.16.0", "type": "funkwhale", - "funkwhaleVersion": funkwhale_api.__version__, + "funkwhaleVersion": funquail_api.__version__, "license": { "valid": "true", "email": "valid@valid.license", diff --git a/api/funquail_api/tags/admin.py b/api/funquail_api/tags/admin.py index bead39331..0e76d46b6 100644 --- a/api/funquail_api/tags/admin.py +++ b/api/funquail_api/tags/admin.py @@ -1,4 +1,4 @@ -from funkwhale_api.common import admin +from funquail_api.common import admin from . import models diff --git a/api/funquail_api/tags/factories.py b/api/funquail_api/tags/factories.py index c0c2096df..3d14dc1ab 100644 --- a/api/funquail_api/tags/factories.py +++ b/api/funquail_api/tags/factories.py @@ -1,6 +1,6 @@ import factory -from funkwhale_api.factories import NoUpdateOnCreate, registry +from funquail_api.factories import NoUpdateOnCreate, registry from . import models diff --git a/api/funquail_api/tags/filters.py b/api/funquail_api/tags/filters.py index bcd6894af..a2d7a9130 100644 --- a/api/funquail_api/tags/filters.py +++ b/api/funquail_api/tags/filters.py @@ -2,7 +2,7 @@ import django_filters from django.db import models as dj_models from django_filters import rest_framework as filters -from funkwhale_api.common import fields +from funquail_api.common import fields from . import models diff --git a/api/funquail_api/tags/views.py b/api/funquail_api/tags/views.py index 91c94840c..f88316448 100644 --- a/api/funquail_api/tags/views.py +++ b/api/funquail_api/tags/views.py @@ -2,7 +2,7 @@ import django_filters.rest_framework from django.db.models import functions from rest_framework import viewsets -from funkwhale_api.users.oauth import permissions as oauth_permissions +from funquail_api.users.oauth import permissions as oauth_permissions from . import filters, models, serializers diff --git a/api/funquail_api/taskapp/celery.py b/api/funquail_api/taskapp/celery.py index c271fe20d..828de0649 100644 --- a/api/funquail_api/taskapp/celery.py +++ b/api/funquail_api/taskapp/celery.py @@ -15,7 +15,7 @@ if not settings.configured: "DJANGO_SETTINGS_MODULE", "config.settings.production" ) # pragma: no cover -app = celery.Celery("funkwhale_api") +app = celery.Celery("funquail_api") @celery.signals.task_failure.connect @@ -25,7 +25,7 @@ def process_failure(sender, task_id, exception, args, kwargs, traceback, einfo, class CeleryConfig(AppConfig): - name = "funkwhale_api.taskapp" + name = "funquail_api.taskapp" verbose_name = "Celery Config" def ready(self): diff --git a/api/funquail_api/typesense/tasks.py b/api/funquail_api/typesense/tasks.py index febb96eea..05caa3b03 100644 --- a/api/funquail_api/typesense/tasks.py +++ b/api/funquail_api/typesense/tasks.py @@ -2,8 +2,8 @@ import logging from django.conf import settings -from funkwhale_api.music import models as music_models -from funkwhale_api.taskapp import celery +from funquail_api.music import models as music_models +from funquail_api.taskapp import celery from . import utils diff --git a/api/funquail_api/typesense/utils.py b/api/funquail_api/typesense/utils.py index 81f389d56..f5ac7d861 100644 --- a/api/funquail_api/typesense/utils.py +++ b/api/funquail_api/typesense/utils.py @@ -6,7 +6,7 @@ # from django.core.cache import cache # from lb_matching_tools.cleaner import MetadataCleaner -# from funkwhale_api.music import models as music_models +# from funquail_api.music import models as music_models # logger = logging.getLogger(__name__) diff --git a/api/funquail_api/users/admin.py b/api/funquail_api/users/admin.py index b5c3bde36..2daf58ba1 100644 --- a/api/funquail_api/users/admin.py +++ b/api/funquail_api/users/admin.py @@ -3,7 +3,7 @@ from django.contrib.auth.admin import UserAdmin as AuthUserAdmin from django.contrib.auth.forms import UserChangeForm, UserCreationForm from django.utils.translation import ugettext_lazy as _ -from funkwhale_api.common import admin +from funquail_api.common import admin from . import models diff --git a/api/funquail_api/users/api_urls.py b/api/funquail_api/users/api_urls.py index b0a057028..275854b7d 100644 --- a/api/funquail_api/users/api_urls.py +++ b/api/funquail_api/users/api_urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url -from funkwhale_api.common import routers +from funquail_api.common import routers from . import views diff --git a/api/funquail_api/users/auth_backends.py b/api/funquail_api/users/auth_backends.py index 2eb7b08e8..6b4abb5d4 100644 --- a/api/funquail_api/users/auth_backends.py +++ b/api/funquail_api/users/auth_backends.py @@ -1,7 +1,7 @@ from allauth.account import auth_backends from django.contrib.auth import backends, get_user_model -from funkwhale_api.common import authentication +from funquail_api.common import authentication # ugly but allauth doesn't offer an easy way to override the querysets diff --git a/api/funquail_api/users/dynamic_preferences_registry.py b/api/funquail_api/users/dynamic_preferences_registry.py index 03090f944..3a2651cae 100644 --- a/api/funquail_api/users/dynamic_preferences_registry.py +++ b/api/funquail_api/users/dynamic_preferences_registry.py @@ -1,7 +1,7 @@ from dynamic_preferences import types from dynamic_preferences.registries import global_preferences_registry -from funkwhale_api.common import preferences as common_preferences +from funquail_api.common import preferences as common_preferences from . import models diff --git a/api/funquail_api/users/factories.py b/api/funquail_api/users/factories.py index aa1ab4ca5..ec403acda 100644 --- a/api/funquail_api/users/factories.py +++ b/api/funquail_api/users/factories.py @@ -4,7 +4,7 @@ import factory from django.contrib.auth.models import Permission from django.utils import timezone -from funkwhale_api.factories import ManyToManyFromList, NoUpdateOnCreate, registry +from funquail_api.factories import ManyToManyFromList, NoUpdateOnCreate, registry from . import models @@ -65,7 +65,7 @@ class InvitationFactory(NoUpdateOnCreate, factory.django.DjangoModelFactory): class Params: expired = factory.Trait(expiration_date=factory.LazyFunction(timezone.now)) with_invited_user = factory.Trait( - invited_user=factory.SubFactory("funkwhale_api.users.factories.UserFactory") + invited_user=factory.SubFactory("funquail_api.users.factories.UserFactory") ) diff --git a/api/funquail_api/users/migrations/0010_user_avatar.py b/api/funquail_api/users/migrations/0010_user_avatar.py index e50aa4061..4eaca63b3 100644 --- a/api/funquail_api/users/migrations/0010_user_avatar.py +++ b/api/funquail_api/users/migrations/0010_user_avatar.py @@ -1,8 +1,8 @@ # Generated by Django 2.0.6 on 2018-07-10 20:09 from django.db import migrations, models -import funkwhale_api.common.utils -import funkwhale_api.common.validators +import funquail_api.common.utils +import funquail_api.common.validators class Migration(migrations.Migration): @@ -17,9 +17,9 @@ class Migration(migrations.Migration): blank=True, max_length=150, null=True, - upload_to=funkwhale_api.common.utils.ChunkedPath("users/avatars"), + upload_to=funquail_api.common.utils.ChunkedPath("users/avatars"), validators=[ - funkwhale_api.common.validators.ImageDimensionsValidator( + funquail_api.common.validators.ImageDimensionsValidator( max_height=400, max_width=400, min_height=50, min_width=50 ) ], diff --git a/api/funquail_api/users/migrations/0011_auto_20180721_1317.py b/api/funquail_api/users/migrations/0011_auto_20180721_1317.py index 5115eed86..139d2475e 100644 --- a/api/funquail_api/users/migrations/0011_auto_20180721_1317.py +++ b/api/funquail_api/users/migrations/0011_auto_20180721_1317.py @@ -2,8 +2,8 @@ from django.db import migrations, models import django.db.models.deletion -import funkwhale_api.common.utils -import funkwhale_api.common.validators +import funquail_api.common.utils +import funquail_api.common.validators import versatileimagefield.fields @@ -33,14 +33,14 @@ class Migration(migrations.Migration): blank=True, max_length=150, null=True, - upload_to=funkwhale_api.common.utils.ChunkedPath( + upload_to=funquail_api.common.utils.ChunkedPath( "users/avatars", preserve_file_name=False ), validators=[ - funkwhale_api.common.validators.ImageDimensionsValidator( + funquail_api.common.validators.ImageDimensionsValidator( min_height=50, min_width=50 ), - funkwhale_api.common.validators.FileValidator( + funquail_api.common.validators.FileValidator( allowed_extensions=["png", "jpg", "jpeg", "gif"], max_size=2097152, ), diff --git a/api/funquail_api/users/migrations/0016_auto_20190920_0857.py b/api/funquail_api/users/migrations/0016_auto_20190920_0857.py index 5b0c4b2d9..31920376b 100644 --- a/api/funquail_api/users/migrations/0016_auto_20190920_0857.py +++ b/api/funquail_api/users/migrations/0016_auto_20190920_0857.py @@ -5,7 +5,7 @@ from django.conf import settings from django.db import migrations, models import django.utils.timezone -import funkwhale_api.users.models +import funquail_api.users.models def set_display_date(apps, schema_editor): @@ -36,12 +36,12 @@ class Migration(migrations.Migration): migrations.AddField( model_name='user', name='funkwhale_support_message_display_date', - field=models.DateTimeField(blank=True, null=True, default=funkwhale_api.users.models.get_default_funkwhale_support_message_display_date), + field=models.DateTimeField(blank=True, null=True, default=funquail_api.users.models.get_default_funkwhale_support_message_display_date), ), migrations.AddField( model_name='user', name='instance_support_message_display_date', - field=models.DateTimeField(blank=True, null=True, default=funkwhale_api.users.models.get_default_instance_support_message_display_date), + field=models.DateTimeField(blank=True, null=True, default=funquail_api.users.models.get_default_instance_support_message_display_date), ), migrations.RunPython(set_display_date, rewind), ] diff --git a/api/funquail_api/users/migrations/0018_auto_20200705_0829.py b/api/funquail_api/users/migrations/0018_auto_20200705_0829.py index d07f9aa5b..c6d4a8678 100644 --- a/api/funquail_api/users/migrations/0018_auto_20200705_0829.py +++ b/api/funquail_api/users/migrations/0018_auto_20200705_0829.py @@ -2,7 +2,7 @@ import django.contrib.postgres.fields.jsonb from django.db import migrations -import funkwhale_api.users.models +import funquail_api.users.models class Migration(migrations.Migration): @@ -15,7 +15,7 @@ class Migration(migrations.Migration): migrations.AlterModelManagers( name='user', managers=[ - ('objects', funkwhale_api.users.models.UserManager()), + ('objects', funquail_api.users.models.UserManager()), ], ), migrations.AddField( diff --git a/api/funquail_api/users/models.py b/api/funquail_api/users/models.py index c3da397d1..15d756ef6 100644 --- a/api/funquail_api/users/models.py +++ b/api/funquail_api/users/models.py @@ -18,12 +18,12 @@ from oauth2_provider import models as oauth2_models from oauth2_provider import validators as oauth2_validators from versatileimagefield.fields import VersatileImageField -from funkwhale_api.common import fields, preferences -from funkwhale_api.common import utils as common_utils -from funkwhale_api.common import validators as common_validators -from funkwhale_api.federation import keys -from funkwhale_api.federation import models as federation_models -from funkwhale_api.federation import utils as federation_utils +from funquail_api.common import fields, preferences +from funquail_api.common import utils as common_utils +from funquail_api.common import validators as common_validators +from funquail_api.federation import keys +from funquail_api.federation import models as federation_models +from funquail_api.federation import utils as federation_utils def get_token(length=5): diff --git a/api/funquail_api/users/mutations.py b/api/funquail_api/users/mutations.py index deec6ae77..25c44b112 100644 --- a/api/funquail_api/users/mutations.py +++ b/api/funquail_api/users/mutations.py @@ -2,8 +2,8 @@ import uuid from django.db import transaction -from funkwhale_api.common import mutations, utils -from funkwhale_api.federation import models +from funquail_api.common import mutations, utils +from funquail_api.federation import models from . import tasks diff --git a/api/funquail_api/users/oauth/permissions.py b/api/funquail_api/users/oauth/permissions.py index 1bae9a1f0..a4c89d693 100644 --- a/api/funquail_api/users/oauth/permissions.py +++ b/api/funquail_api/users/oauth/permissions.py @@ -1,7 +1,7 @@ from django.core.exceptions import ImproperlyConfigured from rest_framework import permissions -from funkwhale_api.common import preferences +from funquail_api.common import preferences from .. import models from . import scopes diff --git a/api/funquail_api/users/oauth/scopes.py b/api/funquail_api/users/oauth/scopes.py index d8ea4bcfd..9fcc32587 100644 --- a/api/funquail_api/users/oauth/scopes.py +++ b/api/funquail_api/users/oauth/scopes.py @@ -94,7 +94,7 @@ OAUTH_APP_SCOPES = COMMON_SCOPES def get_from_permissions(**permissions): - from funkwhale_api.users import models + from funquail_api.users import models final = LOGGED_IN_SCOPES for permission_name, value in permissions.items(): diff --git a/api/funquail_api/users/oauth/server.py b/api/funquail_api/users/oauth/server.py index 08e2e2917..c3b26646d 100644 --- a/api/funquail_api/users/oauth/server.py +++ b/api/funquail_api/users/oauth/server.py @@ -2,7 +2,7 @@ import urllib.parse import oauthlib.oauth2 -from funkwhale_api.common import authentication +from funquail_api.common import authentication def check(request): diff --git a/api/funquail_api/users/oauth/tasks.py b/api/funquail_api/users/oauth/tasks.py index c0ca1dcfc..07a3ff9f2 100644 --- a/api/funquail_api/users/oauth/tasks.py +++ b/api/funquail_api/users/oauth/tasks.py @@ -1,6 +1,6 @@ from oauth2_provider import models as oauth2_models -from funkwhale_api.taskapp import celery +from funquail_api.taskapp import celery @celery.app.task(name="oauth.clear_expired_tokens") diff --git a/api/funquail_api/users/oauth/urls.py b/api/funquail_api/users/oauth/urls.py index 98e1c114c..e2cc02bb9 100644 --- a/api/funquail_api/users/oauth/urls.py +++ b/api/funquail_api/users/oauth/urls.py @@ -1,7 +1,7 @@ from django.conf.urls import url from django.views.decorators.csrf import csrf_exempt -from funkwhale_api.common import routers +from funquail_api.common import routers from . import views diff --git a/api/funquail_api/users/oauth/views.py b/api/funquail_api/users/oauth/views.py index 9f0677cbf..1ca8cbf5f 100644 --- a/api/funquail_api/users/oauth/views.py +++ b/api/funquail_api/users/oauth/views.py @@ -12,7 +12,7 @@ from oauth2_provider.settings import oauth2_settings from rest_framework import mixins, permissions, response, views, viewsets from rest_framework.decorators import action -from funkwhale_api.common import throttling +from funquail_api.common import throttling from .. import models from . import serializers diff --git a/api/funquail_api/users/serializers.py b/api/funquail_api/users/serializers.py index 4a8747620..d22885df2 100644 --- a/api/funquail_api/users/serializers.py +++ b/api/funquail_api/users/serializers.py @@ -16,15 +16,15 @@ from drf_spectacular.utils import extend_schema_field from rest_framework import serializers from rest_framework.exceptions import ValidationError -from funkwhale_api.activity import serializers as activity_serializers -from funkwhale_api.common import models as common_models -from funkwhale_api.common import preferences -from funkwhale_api.common import serializers as common_serializers -from funkwhale_api.common import utils as common_utils -from funkwhale_api.federation import models as federation_models -from funkwhale_api.moderation import models as moderation_models -from funkwhale_api.moderation import tasks as moderation_tasks -from funkwhale_api.moderation import utils as moderation_utils +from funquail_api.activity import serializers as activity_serializers +from funquail_api.common import models as common_models +from funquail_api.common import preferences +from funquail_api.common import serializers as common_serializers +from funquail_api.common import utils as common_utils +from funquail_api.federation import models as federation_models +from funquail_api.moderation import models as moderation_models +from funquail_api.moderation import tasks as moderation_tasks +from funquail_api.moderation import utils as moderation_utils from . import adapters from . import authentication as users_authentication diff --git a/api/funquail_api/users/tasks.py b/api/funquail_api/users/tasks.py index cad4e50d1..322f19ecf 100644 --- a/api/funquail_api/users/tasks.py +++ b/api/funquail_api/users/tasks.py @@ -1,7 +1,7 @@ import logging -from funkwhale_api.federation import tasks as federation_tasks -from funkwhale_api.taskapp import celery +from funquail_api.federation import tasks as federation_tasks +from funquail_api.taskapp import celery from . import models diff --git a/api/funquail_api/users/views.py b/api/funquail_api/users/views.py index 0771e5d6e..69bc1d7b3 100644 --- a/api/funquail_api/users/views.py +++ b/api/funquail_api/users/views.py @@ -11,7 +11,7 @@ from rest_framework import mixins, viewsets from rest_framework.decorators import action from rest_framework.response import Response -from funkwhale_api.common import authentication, preferences, throttling +from funquail_api.common import authentication, preferences, throttling from . import models, serializers, tasks diff --git a/api/manage.py b/api/manage.py index 2c50c4082..ab2d5808d 100755 --- a/api/manage.py +++ b/api/manage.py @@ -2,12 +2,12 @@ import warnings -from funkwhale_api.main import main +from funquail_api.main import main warnings.warn( DeprecationWarning( - "the './manage.py' script has been deprecated, please use the 'funkwhale-manage' " - "entrypoint instead (e.g. 'funkwhale-manage migrate')" + "the './manage.py' script has been deprecated, please use the 'funquail-manage' " + "entrypoint instead (e.g. 'funquail-manage migrate')" ) )