Merge remote-tracking branch 'origin/polishing' into owen

backend/logic/db/index.js

@@ -52,13 +52,10 @@ class _DBModule extends CoreClass {
 
 			const mongoUrl = config.get("mongo").url;
 
-			mongoose.set("useFindAndModify", false);
-
 			mongoose
 				.connect(mongoUrl, {
 					useNewUrlParser: true,
-					useUnifiedTopology: true,
-					useCreateIndex: true
+					useUnifiedTopology: true
 				})
 				.then(async () => {
 					this.schemas = {

backend/logic/ws.js

@@ -4,7 +4,7 @@
 
 import config from "config";
 import async from "async";
-import WebSocket from "ws";
+import { WebSocket, WebSocketServer } from "ws";
 import { EventEmitter } from "events";
 
 import CoreClass from "../core";
@@ -51,7 +51,7 @@ class _WSModule extends CoreClass {
 
 		// this._io.origins(config.get("cors.origin"));
 
-		this._io = new WebSocket.Server({ server, path: "/ws" });
+		this._io = new WebSocketServer({ server, path: "/ws" });
 
 		this.rooms = {};
 

backend/package.json

@@ -15,8 +15,8 @@
     "lint": "npx eslint logic"
   },
   "dependencies": {
-    "async": "^3.2.0",
-    "axios": "^0.21.2",
+    "async": "^3.2.1",
+    "axios": "^0.22.0",
     "bcrypt": "^5.0.1",
     "bluebird": "^3.7.2",
     "body-parser": "^1.19.0",
@@ -25,23 +25,23 @@
     "cors": "^2.8.5",
     "express": "^4.17.1",
     "moment": "^2.29.1",
-    "mongoose": "^5.13.2",
-    "nodemailer": "^6.6.1",
+    "mongoose": "^6.0.10",
+    "nodemailer": "^6.7.0",
     "oauth": "^0.9.15",
     "redis": "^3.1.2",
-    "retry-axios": "^2.4.0",
+    "retry-axios": "^2.6.0",
     "sha256": "^0.2.0",
     "underscore": "^1.13.1",
-    "ws": "^7.5.3"
+    "ws": "^8.2.3"
   },
   "devDependencies": {
-    "eslint": "^7.30.0",
+    "eslint": "^7.32.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.23.0",
-    "eslint-plugin-jsdoc": "^35.4.3",
-    "eslint-plugin-prettier": "^3.4.0",
-    "prettier": "2.3.2",
+    "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-jsdoc": "^36.1.1",
+    "eslint-plugin-prettier": "^4.0.0",
+    "prettier": "2.4.1",
     "trace-unhandled": "^2.0.1"
   }
 }

frontend/src/components/SongItem.vue

@@ -47,15 +47,7 @@
 							:user-id="song.requestedBy"
 							:link="true"
 						/>
-						{{
-							formatDistance(
-								parseISO(song.requestedAt),
-								new Date(),
-								{
-									includeSeconds: true
-								}
-							)
-						}}
+						{{ formatedRequestedAt }}
 						ago
 					</strong>
 				</p>
@@ -197,7 +189,9 @@ export default {
 	},
 	data() {
 		return {
-			utils
+			utils,
+			formatedRequestedAt: null,
+			formatRequestedAtInterval: null
 		};
 	},
 	computed: {
@@ -206,7 +200,29 @@ export default {
 			userRole: state => state.user.auth.role
 		})
 	},
+	mounted() {
+		if (this.requestedBy) {
+			this.formatRequestedAt();
+			this.formatRequestedAtInterval = setInterval(() => {
+				this.formatRequestedAt();
+			}, 30000);
+		}
+	},
+	unmounted() {
+		clearInterval(this.formatRequestedAtInterval);
+	},
 	methods: {
+		formatRequestedAt() {
+			if (
+				this.requestedBy &&
+				this.song.requestedBy &&
+				this.song.requestedAt
+			)
+				this.formatedRequestedAt = this.formatDistance(
+					parseISO(this.song.requestedAt),
+					new Date()
+				);
+		},
 		formatArtists() {
 			if (this.song.artists.length === 1) {
 				return this.song.artists[0];

frontend/src/pages/404.vue

@@ -1,5 +1,6 @@
 <template>
 	<div>
+		<main-header />
 		<div class="wrapper">
 			<page-metadata title="404" />
 
@@ -14,10 +15,11 @@
 </template>
 
 <script>
+import MainHeader from "@/components/layout/MainHeader.vue";
 import MainFooter from "@/components/layout/MainFooter.vue";
 
 export default {
-	components: { MainFooter }
+	components: { MainHeader, MainFooter }
 };
 </script>