router/index.js

@@ -12,6 +12,5 @@ exports.systemRouter = require("./system")
 exports.statusRouter = require("./status");
 exports.settingsRouter = require("./settings");
 exports.searchRouter = require("./search");
-exports.shareRouter = require("./share");
 // exports.activitypubRouter = require("./activitypub");
 // exports.wellknownRouter = require("./well-known");

router/share.js

@@ -1,12 +0,0 @@
-console.log("router/share INIT");
-var express = require("express");
-var router = new express.Router();
-const database = require("../services/database");
-
-router.route("/:id").get((req, res) => {
-    database.share.byId(req.params.id, (result) => {
-        res.json(result).status(200).end();
-    });
-});
-
-module.exports = router;

server.js

@@ -135,7 +135,6 @@ app.use("/api/search", router.searchRouter);
 app.use("/api/settings", router.settingsRouter);
 app.use("/api/status", router.statusRouter);
 app.use("/api/system", router.systemRouter);
-app.use("/api/shares", router.shareRouter);
 app.use("/api/tracks", router.trackRouter);
 app.use("/api/user", router.loginRouter);
 app.use("/api/user", router.userRouter);

services/database/share.js

@@ -2,43 +2,16 @@ const redis = require("../redis")
 
 const { ObjectId } = require('mongodb');
 const connector = require("./CONNECTOR");
-const database = require("./index");
 var dbo;
 connector.connect().then((ret) => {
   dbo = ret;
 });
 
 exports.byId = function (id, callback) {
-  let _id;
-  try {
-    _id = ObjectId(id);
-  } catch {
-    cb(callback);
-    return;
-  }
   dbo.collection("shares")
-    .findOne({ _id: _id })
+    .findOne({ _id: ObjectId(id) })
     .then((result) => {
-      if (result) {
+      callback(result);
-        switch (result.type) {
-          case "album":
-            database.albums.byId(result.object_id, undefined, (album) => {
-              result.object = album;
-              cb(callback, result);
-            });
-            break;
-          case "box":
-            database.boxes.byId(result.object_id, undefined, (box) => {
-              result.object = box;
-              cb(callback, result);
-            });
-            break;
-          default:
-            cb(callback, result);
-        }
-      } else {
-        cb(callback);
-      }
     });
 }
 
@@ -78,12 +51,10 @@ exports.delete = function (item, callback) {
   dbo.collection("shares")
     .deleteMany({ object_id: ObjectId(item.object_id) }, (err) => {
       if (err) throw err;
-      cb(callback);
+      if (callback) {
+        callback();
+      }
     });
-}
 
-function cb(callback, value) {
+
-  if (callback) {
-    callback(value);
-  }
 }