From adba22cbd613b92e70aec67c21ac1b797f1bdd38 Mon Sep 17 00:00:00 2001 From: Ben Date: Sat, 3 Sep 2022 14:23:20 -0400 Subject: [PATCH] Apply suggestions from code review Thanks for all the tweaks @advplyr! Co-authored-by: advplyr <67830747+advplyr@users.noreply.github.com> --- client/components/app/SideRail.vue | 2 +- client/pages/social.vue | 32 +--------------------------- server/controllers/MiscController.js | 3 +-- 3 files changed, 3 insertions(+), 34 deletions(-) diff --git a/client/components/app/SideRail.vue b/client/components/app/SideRail.vue index 4e0f6e7f8..b95cc0024 100644 --- a/client/components/app/SideRail.vue +++ b/client/components/app/SideRail.vue @@ -68,7 +68,7 @@

Social

-
+
diff --git a/client/pages/social.vue b/client/pages/social.vue index 85e54fae8..d0726f3e4 100644 --- a/client/pages/social.vue +++ b/client/pages/social.vue @@ -51,11 +51,8 @@ export default { } }, computed: { - coverAspectRatio() { - return this.$store.getters['getServerSetting']('coverAspectRatio') - }, bookCoverAspectRatio() { - return this.coverAspectRatio === this.$constants.BookCoverAspectRatio.SQUARE ? 1 : 1.6 + return this.$store.getters['libraries/getBookCoverAspectRatio'] }, bookCoverWidth() { return 70 @@ -64,25 +61,6 @@ export default { if (!this.listeningStats) return [] return this.listeningStats.sort(function(a, b) {return b.latest.lastUpdate - a.latest.lastUpdate}) }, - userMediaProgress() { - return this.user.mediaProgress || [] - }, - userItemsFinished() { - if (!this.listeningStats) return [] - return this.listeningStats.itemsRead - }, - mostRecentListeningSessions() { - if (!this.listeningStats) return [] - return this.listeningStats.recentSessions || [] - }, - totalMinutesListening() { - if (!this.listeningStats) return 0 - return Math.round(this.listeningStats.totalTime / 60) - }, - totalDaysListened() { - if (!this.listeningStats) return 0 - return Object.values(this.listeningStats.days).length - }, usersOnline() { var usermap = {} this.$store.state.users.users.forEach((u) => (usermap[u.id] = { online: true, session: u.session })) @@ -109,14 +87,6 @@ export default { } this.listeningStats = listeningStats }, - async getLibraryItem(user) { - user.libraryItem = await this.$axios - .$get(`/api/items/${id}`) - .catch((error) => { - console.error('Failed', error) - return false - }) - }, changeSharingSetting() { this.$store.dispatch('user/updateUserSettings', { shareListeningActivity: !this.isSharingActivity }) this.init() diff --git a/server/controllers/MiscController.js b/server/controllers/MiscController.js index 854cbeedc..1e03c3540 100644 --- a/server/controllers/MiscController.js +++ b/server/controllers/MiscController.js @@ -260,10 +260,9 @@ class MiscController { } // GET: api/social async getSocialStats(req, res) { - if (this.db.serverSettings.sharedListeningStats == false) { + if (!this.db.serverSettings.sharedListeningStats) { return res.sendStatus(404) } - Logger.error(this.db.serverSettings.sharedListeningStats) var filteredUsers = this.db.users.filter(c => c.settings.shareListeningActivity == true) var userData = [] for (let i = 0; i < filteredUsers.length; i++) {