merge: avoid await at top-level in setup - fixes frontend tests (!534)

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/534

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
This commit is contained in:
Amelia Yukii 2024-06-03 16:28:25 +00:00
commit 9520a14cb9
2 changed files with 17 additions and 15 deletions

View file

@ -22,7 +22,7 @@
style-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline';
img-src 'self' data: blob: www.google.com xn--931a.moe launcher.moe localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000 activitypub.software secure.gravatar.com avatars.githubusercontent.com; img-src 'self' data: blob: www.google.com xn--931a.moe launcher.moe localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000 activitypub.software secure.gravatar.com avatars.githubusercontent.com;
media-src 'self' localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000; media-src 'self' localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000;
connect-src 'self' localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000 https://newassets.hcaptcha.com; connect-src 'self' localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000 https://newassets.hcaptcha.com https://api.listenbrainz.org;
frame-src *;" frame-src *;"
/> />
<meta property="og:site_name" content="[DEV BUILD] Misskey" /> <meta property="og:site_name" content="[DEV BUILD] Misskey" />

View file

@ -236,8 +236,9 @@ const moderationNote = ref(props.user.moderationNote);
const editModerationNote = ref(false); const editModerationNote = ref(false);
const noteview = ref<string | null>(null); const noteview = ref<string | null>(null);
let listenbrainzdata = false; const listenbrainzdata = ref(false);
if (props.user.listenbrainz) { if (props.user.listenbrainz) {
(async function() {
try { try {
const response = await fetch(`https://api.listenbrainz.org/1/user/${props.user.listenbrainz}/playing-now`, { const response = await fetch(`https://api.listenbrainz.org/1/user/${props.user.listenbrainz}/playing-now`, {
method: 'GET', method: 'GET',
@ -247,11 +248,12 @@ if (props.user.listenbrainz) {
}); });
const data = await response.json(); const data = await response.json();
if (data.payload.listens && data.payload.listens.length !== 0) { if (data.payload.listens && data.payload.listens.length !== 0) {
listenbrainzdata = true; listenbrainzdata.value = true;
} }
} catch (err) { } catch (err) {
listenbrainzdata = false; listenbrainzdata.value = false;
} }
})()
} }
const background = computed(() => { const background = computed(() => {