Merge branch 'polishing' of github.com:Musare/MusareNode into polishing

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

@@ -938,7 +938,7 @@ export default {
 
 		*/
 	},
-	onBeforeUnmount() {
+	beforeUnmount() {
 		this.playerReady = false;
 		clearInterval(this.interval);
 		clearInterval(this.activityWatchVideoDataInterval);

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

@@ -544,7 +544,7 @@ export default {
 			);
 		}
 	},
-	onBeforeUnmount() {
+	beforeUnmount() {
 		this.socket.dispatch(
 			"apis.leaveRoom",
 			`manage-station.${this.stationId}`,

frontend/src/pages/Admin/index.vue

@@ -175,7 +175,7 @@ export default {
 	mounted() {
 		this.changeTab(this.$route.path);
 	},
-	onBeforeUnmount() {
+	beforeUnmount() {
 		this.socket.dispatch("apis.leaveRooms", () => {});
 	},
 	methods: {

frontend/src/pages/Admin/tabs/VerifiedSongs.vue

@@ -409,7 +409,7 @@ export default {
 			}
 		);
 	},
-	onBeforeUnmount() {
+	beforeUnmount() {
 		const shortcutNames = [
 			"verifiedSongs.toggleKeyboardShortcutsHelper",
 			"verifiedSongs.resetKeyboardShortcutsHelper"

frontend/src/pages/Home.vue

@@ -689,7 +689,7 @@ export default {
 			this.orderOfFavoriteStations = res.data.order;
 		});
 	},
-	onBeforeUnmount() {
+	beforeUnmount() {
 		this.socket.dispatch("apis.leaveRoom", "home", () => {});
 	},
 	methods: {

frontend/src/pages/Profile/Tabs/Playlists.vue

@@ -141,7 +141,7 @@ export default {
 			this.orderOfPlaylists = this.calculatePlaylistOrder(); // order in regards to the database
 		});
 	},
-	onBeforeUnmount() {
+	beforeUnmount() {
 		this.socket.dispatch(
 			"apis.leaveRoom",
 			`profile.${this.userId}.playlists`,

frontend/src/pages/Profile/Tabs/RecentActivity.vue

@@ -123,7 +123,7 @@ export default {
 			this.offsettedFromNextSet = 0;
 		});
 	},
-	onBeforeUnmount() {
+	beforeUnmount() {
 		this.socket.dispatch(
 			"apis.leaveRoom",
 			`profile.${this.userId}.activities`,

frontend/src/pages/Station/index.vue

@@ -1034,7 +1034,7 @@ export default {
 			this.volumeSliderValue = volume * 100;
 		}
 	},
-	onBeforeUnmount() {
+	beforeUnmount() {
 		document.body.style.cssText = "";
 
 		/** Reset Songslist */
@@ -1087,6 +1087,7 @@ export default {
 		},
 		setNextCurrentSong(nextCurrentSong, skipSkipCheck = false) {
 			this.nextCurrentSong = nextCurrentSong;
+			// If skipSkipCheck is true, it won't try to skip the song
 			if (this.getTimeRemaining() <= 0 && !skipSkipCheck) {
 				this.skipSong();
 			}