Update users table info #94, Reorder libraries in config #95, Use dropdown for library menu #96, update mobi reader

server/objects/AudiobookProgress.js

@@ -1,6 +1,7 @@
 class AudiobookProgress {
   constructor(progress) {
     this.audiobookId = null
+    this.audiobookTitle = null
     this.totalDuration = null // seconds
     this.progress = null // 0 to 1
     this.currentTime = null // seconds
@@ -17,6 +18,7 @@ class AudiobookProgress {
   toJSON() {
     return {
       audiobookId: this.audiobookId,
+      audiobookTitle: this.audiobookTitle,
       totalDuration: this.totalDuration,
       progress: this.progress,
       currentTime: this.currentTime,
@@ -29,6 +31,7 @@ class AudiobookProgress {
 
   construct(progress) {
     this.audiobookId = progress.audiobookId
+    this.audiobookTitle = progress.audiobookTitle || null
     this.totalDuration = progress.totalDuration
     this.progress = progress.progress
     this.currentTime = progress.currentTime
@@ -40,6 +43,7 @@ class AudiobookProgress {
 
   updateFromStream(stream) {
     this.audiobookId = stream.audiobookId
+    this.audiobookTitle = stream.audiobookTitle
     this.totalDuration = stream.totalDuration
     this.progress = stream.clientProgress
     this.currentTime = stream.clientCurrentTime

server/objects/Library.js

@@ -5,6 +5,7 @@ class Library {
     this.id = null
     this.name = null
     this.folders = []
+    this.displayOrder = 1
     this.icon = 'database'
 
     this.lastScan = 0
@@ -25,6 +26,7 @@ class Library {
     this.id = library.id
     this.name = library.name
     this.folders = (library.folders || []).map(f => new Folder(f))
+    this.displayOrder = library.displayOrder || 1
     this.icon = library.icon || 'database'
 
     this.createdAt = library.createdAt
@@ -36,6 +38,7 @@ class Library {
       id: this.id,
       name: this.name,
       folders: (this.folders || []).map(f => f.toJSON()),
+      displayOrder: this.displayOrder,
       icon: this.icon,
       createdAt: this.createdAt,
       lastUpdate: this.lastUpdate
@@ -59,6 +62,7 @@ class Library {
         return newFolder
       })
     }
+    this.displayOrder = data.displayOrder || 1
     this.icon = data.icon || 'database'
     this.createdAt = Date.now()
     this.lastUpdate = Date.now()
@@ -70,6 +74,10 @@ class Library {
       this.name = payload.name
       hasUpdates = true
     }
+    if (!isNaN(payload.displayOrder) && payload.displayOrder !== this.displayOrder) {
+      this.displayOrder = Number(payload.displayOrder)
+      hasUpdates = true
+    }
     if (payload.folders) {
       var newFolders = payload.folders.filter(f => !f.id)
       var removedFolders = this.folders.filter(f => !payload.folders.find(_f => _f.id === f.id))

server/objects/User.js

@@ -10,6 +10,7 @@ class User {
     this.token = null
     this.isActive = true
     this.isLocked = false
+    this.lastSeen = null
     this.createdAt = null
     this.audiobooks = null
 
@@ -78,6 +79,7 @@ class User {
       audiobooks: this.audiobooksToJSON(),
       isActive: this.isActive,
       isLocked: this.isLocked,
+      lastSeen: this.lastSeen,
       createdAt: this.createdAt,
       settings: this.settings,
       permissions: this.permissions
@@ -94,12 +96,25 @@ class User {
       audiobooks: this.audiobooksToJSON(),
       isActive: this.isActive,
       isLocked: this.isLocked,
+      lastSeen: this.lastSeen,
       createdAt: this.createdAt,
       settings: this.settings,
       permissions: this.permissions
     }
   }
 
+  toJSONForPublic(streams) {
+    var stream = this.stream && streams ? streams.find(s => s.id === this.stream) : null
+    return {
+      id: this.id,
+      username: this.username,
+      type: this.type,
+      stream: stream ? stream.toJSON() : null,
+      lastSeen: this.lastSeen,
+      createdAt: this.createdAt
+    }
+  }
+
   construct(user) {
     this.id = user.id
     this.username = user.username
@@ -117,6 +132,7 @@ class User {
     }
     this.isActive = (user.isActive === undefined || user.type === 'root') ? true : !!user.isActive
     this.isLocked = user.type === 'root' ? false : !!user.isLocked
+    this.lastSeen = user.lastSeen || null
     this.createdAt = user.createdAt || Date.now()
     this.settings = user.settings || this.getDefaultUserSettings()
     this.permissions = user.permissions || this.getDefaultUserPermissions()