refactor: more changes to hide actions for SoundCloud songs when disabled, and allow deleting from playlist always

backend/logic/actions/playlists.js

@@ -2532,17 +2532,20 @@ export default {
 				},
 
 				(playlist, next) => {
-					MediaModule.runJob("GET_MEDIA", { mediaSource }, this)
+					let normalizedSong = null;
-						.then(res =>
+
-							next(null, playlist, {
+					const song = playlist.songs.find(song => song.mediaSource === mediaSource);
-								_id: res.song._id,
+					if (song) {
-								title: res.song.title,
+						normalizedSong = {
-								thumbnail: res.song.thumbnail,
+							_id: song._id,
-								artists: res.song.artists,
+							title: song.title,
-								mediaSource: res.song.mediaSource
+							thumbnail: song.thumbnail,
-							})
+							artists: song.artists,
-						)
+							mediaSource: song.mediaSource
-						.catch(next);
+						};
+					}
+
+					next(null, playlist, normalizedSong);
 				},
 
 				(playlist, newSong, next) => {

frontend/src/components/MediaItem.vue

@@ -263,12 +263,7 @@ onUnmounted(() => {
 			</p>
 			<div
 				class="universal-item-actions"
-				v-if="
+				v-if="disabledActions.indexOf('all') === -1"
-					disabledActions.indexOf('all') === -1 &&
-					(songMediaType !== 'soundcloud' ||
-						experimental.soundcloud ||
-						song._id)
-				"
 			>
 				<tippy
 					v-if="loggedIn && hoveredTippy"

frontend/src/components/modals/EditPlaylist/index.vue

@@ -37,6 +37,7 @@ const props = defineProps({
 
 const { socket } = useWebsocketsStore();
 const configStore = useConfigStore();
+const { experimental } = configStore;
 const editPlaylistStore = useEditPlaylistStore({ modalUuid: props.modalUuid });
 const stationStore = useStationStore();
 const userAuthStore = useUserAuthStore();
@@ -451,7 +452,7 @@ onBeforeUnmount(() => {
 								>
 									<template #tippyActions>
 										<i
-											class="material-icons add-to-queue-icon"
+											class="material-icons add-to-queue-icon kris111"
 											v-if="
 												station &&
 												station.requests &&
@@ -462,7 +463,11 @@ onBeforeUnmount(() => {
 														'owner' &&
 														(userRole === 'admin' ||
 															station.owner ===
-																userId)))
+																userId))) &&
+												(element.mediaSource.split(
+													':'
+												)[0] !== 'soundcloud' ||
+													experimental.soundcloud)
 											"
 											@click="
 												addSongToQueue(

frontend/src/pages/Station/Sidebar/History.vue

@@ -111,6 +111,13 @@ onMounted(async () => {});
 			<media-item
 				:song="historyItem.payload.song"
 				:requested-by="true"
+				:disabled-actions="
+					historyItem.payload.song.mediaSource.startsWith(
+						'soundcloud:'
+					) && !experimental.soundcloud
+						? ['all']
+						: []
+				"
 				:header="`Finished playing at ${formatDate(
 					historyItem.payload.skippedAt
 				)}${formatSkipReason(historyItem.payload.skipReason)}`"