Bläddra i källkod

refactor: changed default song thumbnail and frontend validation

Kristian Vos 5 år sedan
förälder
incheckning
56b85e6459
2 ändrade filer med 16 tillägg och 3 borttagningar
  1. 1 1
      backend/logic/actions/queueSongs.js
  2. 15 2
      frontend/components/Modals/EditSong.vue

+ 1 - 1
backend/logic/actions/queueSongs.js

@@ -160,7 +160,7 @@ let lib = {
 					song.artists = [];
 					song.genres = [];
 					song.skipDuration = 0;
-					song.thumbnail = 'empty';
+					song.thumbnail = `${config.get("domain")}/assets/notes.png`;
 					song.explicit = false;
 					song.requestedBy = userId;
 					song.requestedAt = requestedAt;

+ 15 - 2
frontend/components/Modals/EditSong.vue

@@ -294,7 +294,8 @@ export default {
 			},
 			youtubeVideoDuration: 0.0,
 			youtubeVideoCurrentTime: 0.0,
-			youtubeVideoNote: ""
+			youtubeVideoNote: "",
+			useHTTPS: false
 		};
 	},
 	computed: {
@@ -382,11 +383,19 @@ export default {
 					"Thumbnail must have between 8 and 256 characters.",
 					8000
 				);
-			if (song.thumbnail.indexOf("https://") !== 0)
+			if (this.useHTTPS && song.thumbnail.indexOf("https://") !== 0) {
 				return Toast.methods.addToast(
 					'Thumbnail must start with "https://".',
 					8000
 				);
+			}
+
+			if (!this.useHTTPS && song.thumbnail.indexOf("http://") !== 0) {
+				return Toast.methods.addToast(
+					'Thumbnail must start with "http://".',
+					8000
+				);
+			}
 
 			this.socket.emit(
 				`${_this.editing.type}.update`,
@@ -507,6 +516,10 @@ export default {
 		//   this.editing.song.skipDuration
 		// );
 
+		lofig.get("cookie.secure", res => {
+			_this.useHTTPS = res;
+		});
+
 		io.getSocket(socket => (_this.socket = socket));
 
 		setInterval(() => {