Update import paths

Signed-off-by: Shin'ya Minazuki <shinyoukai@laidback.moe>

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

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()

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):

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):

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
 

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
 

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
 

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
 

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),
         ),
     ]

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),
         ),
     ]

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(),

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):

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
 

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
 

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
 

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
 

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
 

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
 

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
 

api/funquail_api/cli/utils.py

@@ -1,3 +1,3 @@
 import logging
 
-logger = logging.getLogger("funkwhale_api.cli")
+logger = logging.getLogger("funquail_api.cli")

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()

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):

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):

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

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)

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/",
             ],
         )

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):

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

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)

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):

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
 

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)),
             ],
         ),

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
 

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):

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):

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"),

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):

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",

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):

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"),

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
     )
 
 

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
 

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)
 

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
 

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,

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"},
     )
 
 

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
 

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
 

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

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
 

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):

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
 

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
 

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
 

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
 

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
 

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
 

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

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
 

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,

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
 

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
 

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

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
 

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
 

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"]),

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(

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,
             ),

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(

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),
         ),
     ]

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')),
             ],

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):

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),
         ),
     ]

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),
         ),
     ]

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(

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
 

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
 

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()

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
 

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,

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
 

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,

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
 

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
 

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
 

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

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
 

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):

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
 

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
 

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
 

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):

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):

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():

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
 

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
 

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()

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):

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
 

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