mirror
/
funkwhale
kopia lustrzana https://dev.funkwhale.audio/funkwhale/funkwhale
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'master' into develop

merge-requests/1094/merge
Agate 2020-05-07 09:56:33 +02:00
rodzic d32a9ccbfe 29c58d1ce5
commit 5d2e72e69e
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6B501DFD73514E14
7 zmienionych plików z 24 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
api/funkwhale_api/common/middleware.py
Wyświetl plik

@ -39,6 +39,9 @@ def serve_spa(request):
settings.FUNKWHALE_SPA_REWRITE_MANIFEST_URL settings.FUNKWHALE_SPA_REWRITE_MANIFEST_URL
or federation_utils.full_url(urls.reverse("api:v1:instance:spa-manifest")) or federation_utils.full_url(urls.reverse("api:v1:instance:spa-manifest"))
) )
title = preferences.get("instance__name")
if title:
head = replace_title(head, title)
head = replace_manifest_url(head, new_url) head = replace_manifest_url(head, new_url)
if not preferences.get("common__api_authentication_required"): if not preferences.get("common__api_authentication_required"):
@ -82,6 +85,7 @@ def serve_spa(request):
MANIFEST_LINK_REGEX = re.compile(r"<link [^>]*rel=(?:'|\")?manifest(?:'|\")?[^>]*>") MANIFEST_LINK_REGEX = re.compile(r"<link [^>]*rel=(?:'|\")?manifest(?:'|\")?[^>]*>")
TITLE_REGEX = re.compile(r"<title>.*</title>")
def replace_manifest_url(head, new_url): def replace_manifest_url(head, new_url):
@ -90,6 +94,12 @@ def replace_manifest_url(head, new_url):
return head return head
def replace_title(head, new_title):
replacement = "<title>{}</title>".format(html.escape(new_title))
head = TITLE_REGEX.sub(replacement, head)
return head
def get_spa_html(spa_url): def get_spa_html(spa_url):
return get_spa_file(spa_url, "index.html") return get_spa_file(spa_url, "index.html")

11
api/tests/common/test_middleware.py
Wyświetl plik

@ -1,6 +1,6 @@
import html
import time import time
import pytest import pytest
from django.http import HttpResponse from django.http import HttpResponse
from django.urls import reverse from django.urls import reverse
@ -55,10 +55,12 @@ def test_should_fallback(path, expected, mocker):
def test_serve_spa_from_cache(mocker, settings, preferences, no_api_auth): def test_serve_spa_from_cache(mocker, settings, preferences, no_api_auth):
preferences["instance__name"] = 'Best Funkwhale "pod"'
request = mocker.Mock(path="/") request = mocker.Mock(path="/")
get_spa_html = mocker.patch.object( get_spa_html = mocker.patch.object(
middleware, "get_spa_html", return_value="<html><head></head></html>" middleware,
"get_spa_html",
return_value="<html><head><title>Funkwhale</title></head></html>",
) )
mocker.patch.object( mocker.patch.object(
middleware, middleware,
@ -84,7 +86,8 @@ def test_serve_spa_from_cache(mocker, settings, preferences, no_api_auth):
assert response.status_code == 200 assert response.status_code == 200
expected = [ expected = [
"<html><head>", "<html><head>"
"<title>{}</title>".format(html.escape(preferences["instance__name"])),
'<meta content="custom title" property="og:title" />', '<meta content="custom title" property="og:title" />',
'<meta content="custom description" property="og:description" />', '<meta content="custom description" property="og:description" />',
'<meta content="default site name" property="og:site_name" />', '<meta content="default site name" property="og:site_name" />',

1
changes/changelog.d/1091.bugfix 100644
Wyświetl plik

@ -0,0 +1 @@
Fixed page not refreshing when switching between My Library and Explore sections (#1091)

1
changes/changelog.d/1107.enhancement 100644
Wyświetl plik

@ -0,0 +1 @@
Fix HTML <title> not including instance name in some situations (#1107)

4
front/src/App.vue
Wyświetl plik

@ -66,6 +66,7 @@ export default {
instanceUrl: null, instanceUrl: null,
showShortcutsModal: false, showShortcutsModal: false,
showSetInstanceModal: false, showSetInstanceModal: false,
initialTitle: document.title,
} }
}, },
async created () { async created () {
@ -147,7 +148,6 @@ export default {
}, },
mounted () { mounted () {
let self = this let self = this
// slight hack to allow use to have internal links in <translate> tags // slight hack to allow use to have internal links in <translate> tags
// while preserving router behaviour // while preserving router behaviour
document.documentElement.addEventListener('click', function (event) { document.documentElement.addEventListener('click', function (event) {
@ -281,7 +281,7 @@ export default {
if (this.$store.state.ui.pageTitle) { if (this.$store.state.ui.pageTitle) {
parts.push(this.$store.state.ui.pageTitle) parts.push(this.$store.state.ui.pageTitle)
} }
parts.push(this.$store.state.instance.settings.instance.name.value || 'Funkwhale') parts.push(this.initialTitle || 'Funkwhale')
document.title = parts.join(' – ') document.title = parts.join(' – ')
}, },

4
front/src/components/Footer.vue
Wyświetl plik

@ -4,10 +4,10 @@
<div class="ui stackable equal height stackable grid"> <div class="ui stackable equal height stackable grid">
<section class="four wide column"> <section class="four wide column">
<h4 v-if="podName" class="ui header ellipsis"> <h4 v-if="podName" class="ui header ellipsis">
<translate translate-context="Footer/About/Title" :translate-params="{instanceName: podName}" >About %{instanceName}</translate> <span v-translate="{instanceName: podName}" translate-context="Footer/About/Title">About %{instanceName}</span>
</h4> </h4>
<h4 v-else class="ui header ellipsis"> <h4 v-else class="ui header ellipsis">
<translate translate-context="Footer/About/Title" :translate-params="{instanceUrl: instanceHostname}" >About %{instanceUrl}</translate> <span v-translate="{instanceUrl: instanceHostname}" translate-context="Footer/About/Title">About %{instanceUrl}</span>
</h4> </h4>
<div class="ui link list"> <div class="ui link list">
<router-link class="item" to="/about"> <router-link class="item" to="/about">

2
front/src/components/library/Library.vue
Wyświetl plik

@ -1,6 +1,6 @@
<template> <template>
<div class="main library pusher"> <div class="main library pusher">
<router-view></router-view> <router-view :key="$router.currentRoute.name"></router-view>
</div> </div>
</template> </template>