woem.men/forkey
4
2
Fork 3
Code Issues 34 Pull requests 16 Projects Releases Packages Wiki Activity Actions

Cherrypick listenbrainz #52

Open
leah wants to merge 13 commits from cherrypick/listenbrainz into main
pull from: cherrypick/listenbrainz
merge into: woem.men:main
Conversation 0 Commits 13 Files changed 18 +24 -19
1 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0a0edca5c6 - Show all commits

43
packages/frontend/src/pages/user/home.vue
View file

@ -198,6 +198,9 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkLazy> <MkLazy>
<XActivity :key="user.id" :user="user"/> <XActivity :key="user.id" :user="user"/>
</MkLazy> </MkLazy>
<MkLazy v-if="user.listenbrainz && listenbrainzdata">
<XListenBrainz :key="user.id" :user="user" :collapsed="true"/>
</MkLazy>
</template> </template>
<div v-if="!disableNotes"> <div v-if="!disableNotes">
<MkLazy> <MkLazy>
@ -210,11 +213,11 @@ SPDX-License-Identifier: AGPL-3.0-only
<XFiles :key="user.id" :user="user"/> <XFiles :key="user.id" :user="user"/>
<XActivity :key="user.id" :user="user"/> <XActivity :key="user.id" :user="user"/>
<XListenBrainz <XListenBrainz
v-if="user.listenbrainz && listenbrainzdata" v-if="user.listenbrainz && listenbrainzdata"
:key="user.id" :key="user.id"
:user="user" :user="user"
style="margin-top: var(--margin)" style="margin-top: var(--margin)"
/> />
</div> </div>
</div> </div>
</MkSpacer> </MkSpacer>
@ -290,22 +293,24 @@ const moderationNote = ref(props.user.moderationNote);
const editModerationNote = ref(false); const editModerationNote = ref(false);
const movedFromLog = ref<null | {movedFromId:string;}[]>(null); const movedFromLog = ref<null | {movedFromId:string;}[]>(null);
let listenbrainzdata = false; let listenbrainzdata = ref(false);
if (props.user.listenbrainz) { if (props.user.listenbrainz) {
try { (async function() {
const response = await fetch(`https://api.listenbrainz.org/1/user/${props.user.listenbrainz}/playing-now`, { try {
method: 'GET', const response = await fetch(`https://api.listenbrainz.org/1/user/${props.user.listenbrainz}/playing-now`, {
headers: { method: 'GET',
'Content-Type': 'application/json' headers: {
}, 'Content-Type': 'application/json',
}); },
const data = await response.json(); });
if (data.payload.listens && data.payload.listens.length !== 0) { const data = await response.json();
listenbrainzdata = true; if (data.payload.listens && data.payload.listens.length !== 0) {
listenbrainzdata.value = true;
}
} catch (err) {
listenbrainzdata.value = false;
} }
} catch (err) { })();
listenbrainzdata = false;
}
} }
watch(moderationNote, async () => { watch(moderationNote, async () => {