MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(embed): Make sure embed has sane default image and correct link 

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2650>
This commit is contained in:
Georg Krause 2023-11-27 11:57:38 +00:00
parent 76362b020e
commit 69876867d5
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/config/settings/common.py
View File

@ -196,9 +196,7 @@ request errors related to this.
FUNKWHALE_SPA_HTML_CACHE_DURATION = env.int( FUNKWHALE_SPA_HTML_CACHE_DURATION = env.int(
"FUNKWHALE_SPA_HTML_CACHE_DURATION", default=60 * 15 "FUNKWHALE_SPA_HTML_CACHE_DURATION", default=60 * 15
) )
FUNKWHALE_EMBED_URL = env( FUNKWHALE_EMBED_URL = env("FUNKWHALE_EMBED_URL", default=FUNKWHALE_URL + "/embed.html")
"FUNKWHALE_EMBED_URL", default=FUNKWHALE_URL + "/front/embed.html"
)
FUNKWHALE_SPA_REWRITE_MANIFEST = env.bool( FUNKWHALE_SPA_REWRITE_MANIFEST = env.bool(
"FUNKWHALE_SPA_REWRITE_MANIFEST", default=True "FUNKWHALE_SPA_REWRITE_MANIFEST", default=True
) )

4
api/funkwhale_api/common/middleware.py
View File

@ -150,7 +150,9 @@ def get_default_head_tags(path):
{ {
"tag": "meta", "tag": "meta",
"property": "og:image", "property": "og:image",
"content": utils.join_url(settings.FUNKWHALE_URL, "/front/favicon.png"), "content": utils.join_url(
settings.FUNKWHALE_URL, "/android-chrome-512x512.png"
),
}, },
{ {
"tag": "meta", "tag": "meta",

2
api/tests/common/test_middleware.py
View File

@ -108,7 +108,7 @@ def test_get_default_head_tags(preferences, settings):
{ {
"tag": "meta", "tag": "meta",
"property": "og:image", "property": "og:image",
"content": settings.FUNKWHALE_URL + "/front/favicon.png", "content": settings.FUNKWHALE_URL + "/android-chrome-512x512.png",
}, },
{"tag": "meta", "property": "og:url", "content": settings.FUNKWHALE_URL + "/"}, {"tag": "meta", "property": "og:url", "content": settings.FUNKWHALE_URL + "/"},
] ]

1
changes/changelog.d/meta-tags-embed-player.fix Normal file
View File

@ -0,0 +1 @@
Make sure meta tags link to embedded player correctly