Commit 35e2cb24 authored by Agate's avatar Agate 💬
Browse files

Merge branch 'round-of-bugfixes' into 'develop'

Round of bugfixes for 0.21-rc2

Closes #1079

See merge request funkwhale/funkwhale!1100
parents 33006342 5913baeb
......@@ -4,6 +4,7 @@ import django_filters
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 . import models
......@@ -28,6 +29,7 @@ class ChannelFilter(moderation_filters.HiddenContentFilterSet):
subscribed = django_filters.BooleanFilter(
field_name="_", method="filter_subscribed"
)
external = django_filters.BooleanFilter(field_name="_", method="filter_external")
ordering = django_filters.OrderingFilter(
# tuple-mapping retains order
fields=(
......@@ -38,7 +40,7 @@ class ChannelFilter(moderation_filters.HiddenContentFilterSet):
class Meta:
model = models.Channel
fields = ["q", "scope", "tag", "subscribed", "ordering"]
fields = ["q", "scope", "tag", "subscribed", "ordering", "external"]
hidden_content_fields_mapping = moderation_filters.USER_FILTER_CONFIG["CHANNEL"]
def filter_subscribed(self, queryset, name, value):
......@@ -56,6 +58,18 @@ class ChannelFilter(moderation_filters.HiddenContentFilterSet):
else:
return queryset.exclude(query)
def filter_external(self, queryset, name, value):
query = Q(
attributed_to=actors.get_service_actor(),
actor__preferred_username__startswith="rssfeed-",
)
if value is True:
queryset = queryset.filter(query)
if value is False:
queryset = queryset.exclude(query)
return queryset
class IncludeChannelsFilterSet(django_filters.FilterSet):
"""
......
......@@ -200,11 +200,9 @@ class ChannelUpdateSerializer(serializers.Serializer):
obj.save(update_fields=["metadata"])
if "description" in validated_data:
description_obj = common_utils.attach_content(
common_utils.attach_content(
obj.artist, "description", validated_data["description"]
)
if description_obj:
actor_update_fields.append(("summary", description_obj.rendered))
if "name" in validated_data:
actor_update_fields.append(("name", validated_data["name"]))
......
......@@ -204,7 +204,8 @@ def get_api_response(request, url):
except urls.exceptions.Resolver404:
return http.HttpResponseNotFound()
response = match.func(request, *match.args, **match.kwargs)
response.render()
if hasattr(response, "render"):
response.render()
return response
......
import pytest
from funkwhale_api.audio import filters
from funkwhale_api.audio import models
......@@ -30,3 +32,17 @@ def test_channel_filter_subscribed_false(factories, mocker, queryset_equal_list)
)
assert filterset.qs == [other_channel]
@pytest.mark.parametrize("external, expected_index", [("true", 0), ("false", 1)])
def test_channel_filter_external(
external, expected_index, factories, mocker, queryset_equal_list
):
user = factories["users.User"](with_actor=True)
channels = [factories["audio.Channel"](external=True), factories["audio.Channel"]()]
qs = models.Channel.objects.all()
filterset = filters.ChannelFilter(
{"external": external}, request=mocker.Mock(user=user), queryset=qs
)
assert filterset.qs == [channels[expected_index]]
......@@ -184,9 +184,6 @@ def test_channel_serializer_update(factories, mocker):
sorted(channel.artist.tagged_items.values_list("tag__name", flat=True))
== data["tags"]
)
assert channel.actor.summary == common_utils.render_html(
data["description"]["text"], "text/markdown"
)
assert channel.artist.description.text == data["description"]["text"]
assert channel.artist.description.content_type == "text/markdown"
assert channel.actor.name == data["name"]
......
......@@ -352,7 +352,7 @@ $sidebar-color: #2D2F33;
.sidebar {
background: $sidebar-color;
z-index: auto;
z-index: 1;
@include media(">desktop") {
display: flex;
flex-direction: column;
......
......@@ -13,12 +13,11 @@
</button>
</template>
<template v-if="!isLoading && objects.length === 0">
<div class="ui placeholder segment">
<div class="ui icon header">
<i class="music icon"></i>
No results matching your query
</div>
</div>
<empty-state @refresh="fetchData('tracks/')" :refresh="true">
<p>
<translate translate-context="Content/Channels/*">You may need to subscribe to this channel to see its content.</translate>
</p>
</empty-state>
</template>
</div>
</template>
......
......@@ -18,12 +18,11 @@
</button>
</template>
<template v-if="!isLoading && objects.length === 0">
<div class="ui placeholder segment">
<div class="ui icon header">
<i class="compact disc icon"></i>
No results matching your query
</div>
</div>
<empty-state @refresh="fetchData('albums/')" :refresh="true">
<p>
<translate translate-context="Content/Channels/*">You may need to subscribe to this channel to see its contents.</translate>
</p>
</empty-state>
</template>
</div>
</template>
......
......@@ -30,7 +30,7 @@
<h3 class="ui header" >
<translate translate-context="*/*/*">New channels</translate>
</h3>
<channels-widget :show-modification-date="true" :limit="12" :filters="{ordering: '-creation_date'}"></channels-widget>
<channels-widget :show-modification-date="true" :limit="12" :filters="{ordering: '-creation_date', external: 'false'}"></channels-widget>
</template>
......
......@@ -6,7 +6,7 @@
<div class="ui head vertical stripe segment container">
<div class="ui stackable grid" v-if="object">
<div class="ui five wide column">
<div class="ui pointing dropdown icon small basic right floated button" ref="dropdown" v-dropdown="{direction: 'downward'}" style="position: absolute; right: 1em; top: 1em; z-index: 5">
<div class="ui pointing dropdown icon small basic right floated button" ref="dropdown" v-dropdown="{direction: 'downward'}" style="position: absolute; right: 1em; top: 1em;">
<i class="ellipsis vertical icon"></i>
<div class="menu">
<div
......
......@@ -4,7 +4,7 @@
<div v-if="isLoading" class="ui centered active inline loader"></div>
<div class="ui stackable grid" v-else-if="object">
<div class="ui five wide column">
<div class="ui pointing dropdown icon small basic right floated button" ref="dropdown" v-dropdown="{direction: 'downward'}" style="position: absolute; right: 1em; top: 1em; z-index: 5">
<div class="ui pointing dropdown icon small basic right floated button" ref="dropdown" v-dropdown="{direction: 'downward'}" style="position: absolute; right: 1em; top: 1em;">
<i class="ellipsis vertical icon"></i>
<div class="menu">
<div
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment