user bookmarks list page

Author: tdjsnelling

api/src/controllers/torrent.js

@@ -450,6 +450,7 @@ export const deleteTorrent = async (req, res, next) => {
 export const getTorrentsPage = async ({
   skip = 0,
   limit = 25,
+  ids,
   query,
   category,
   source,
@@ -473,6 +474,13 @@ export const getTorrentsPage = async ({
         tags: 1,
       },
     },
+    ...(Array.isArray(ids)
+      ? [
+          {
+            $match: { $expr: { $in: ["$_id", ids] } },
+          },
+        ]
+      : []),
     ...(query
       ? [
           {
@@ -581,6 +589,13 @@ export const getTorrentsPage = async ({
   ]);
 
   const [count] = await Torrent.aggregate([
+    ...(Array.isArray(ids)
+      ? [
+          {
+            $match: { expr: { $in: ["$_id", ids] } },
+          },
+        ]
+      : []),
     ...(query
       ? [
           {
@@ -636,7 +651,7 @@ export const getTorrentsPage = async ({
 
   return {
     torrents: await embellishTorrentsWithTrackerScrape(tracker, torrents),
-    ...count,
+    total: count?.total ?? torrents.length,
   };
 };
 

api/src/controllers/user.js

@@ -9,6 +9,7 @@ import Progress from "../schema/progress";
 import { getTorrentsPage } from "./torrent";
 import { getUserRatio } from "../utils/ratio";
 import { BYTES_GB } from "../tracker/announce";
+import Torrent from "../schema/torrent";
 
 export const sendVerificationEmail = async (mail, address, token) => {
   await mail.sendMail({
@@ -1044,3 +1045,17 @@ export const deleteAccount = async (req, res, next) => {
     res.status(400).send("Request must include password");
   }
 };
+
+export const getUserBookmarks = (tracker) => async (req, res, next) => {
+  try {
+    const user = await User.findOne({ _id: req.userId }).lean();
+    const bookmarks = await getTorrentsPage({
+      ids: user.bookmarks,
+      userId: req.userId,
+      tracker,
+    });
+    res.json(bookmarks);
+  } catch (e) {
+    next(e);
+  }
+};

api/src/index.js

@@ -164,7 +164,7 @@ validateConfig(config).then(() => {
   // everything from here on requires user auth
   app.use(auth);
 
-  app.use("/account", accountRoutes(mail));
+  app.use("/account", accountRoutes(tracker, mail));
   app.use("/user", userRoutes(tracker));
   app.use("/torrent", torrentRoutes(tracker));
   app.use("/announcements", announcementRoutes());

api/src/routes/account.js

@@ -11,11 +11,12 @@ import {
   enableTotp,
   disableTotp,
   deleteAccount,
+  getUserBookmarks,
 } from "../controllers/user";
 
 const router = express.Router();
 
-export default (mail) => {
+export default (tracker, mail) => {
   router.get("/invites", fetchInvites);
   router.post("/generate-invite", generateInvite(mail));
   router.post("/change-password", changePassword(mail));
@@ -27,5 +28,6 @@ export default (mail) => {
   router.post("/totp/enable", enableTotp);
   router.post("/totp/disable", disableTotp);
   router.post("/delete", deleteAccount);
+  router.get("/bookmarks", getUserBookmarks(tracker));
   return router;
 };

client/components/Navigation.js

@@ -14,6 +14,7 @@ import { MessageAdd } from "@styled-icons/boxicons-regular/MessageAdd";
 import { News } from "@styled-icons/boxicons-regular/News";
 import { BookOpen } from "@styled-icons/boxicons-regular/BookOpen";
 import { Rss } from "@styled-icons/boxicons-regular/Rss";
+import { Bookmark } from "@styled-icons/boxicons-regular/Bookmark";
 import { User } from "@styled-icons/boxicons-regular/User";
 import { Error } from "@styled-icons/boxicons-regular/Error";
 import { TrendingUp } from "@styled-icons/boxicons-regular/TrendingUp";
@@ -196,6 +197,12 @@ const Navigation = ({ isMobile, menuIsOpen, setMenuIsOpen }) => {
                   <Rss size={24} />
                 </NavLink>
               </Link>
+              <Link href="/bookmarks" passHref>
+                <NavLink>
+                  <Text>Bookmarks</Text>
+                  <Bookmark size={24} />
+                </NavLink>
+              </Link>
               <Link href={`/user/${username}`} passHref>
                 <NavLink highlights={["/account"]}>
                   <Text>{username}</Text>

client/pages/bookmarks.js

@@ -0,0 +1,62 @@
+import React from "react";
+import getConfig from "next/config";
+import { useRouter } from "next/router";
+import qs from "qs";
+import { withAuthServerSideProps } from "../utils/withAuth";
+import SEO from "../components/SEO";
+import Text from "../components/Text";
+import TorrentList from "../components/TorrentList";
+
+const Bookmarks = ({ results }) => {
+  const {
+    publicRuntimeConfig: { SQ_TORRENT_CATEGORIES },
+  } = getConfig();
+
+  return (
+    <>
+      <SEO title="Your bookmarks" />
+      <Text as="h1" mb={5}>
+        Your bookmarks
+      </Text>
+      {results.torrents.length ? (
+        <TorrentList
+          torrents={results.torrents}
+          categories={SQ_TORRENT_CATEGORIES}
+          total={results.total}
+        />
+      ) : (
+        <Text color="grey">You do not have any bookmarks.</Text>
+      )}
+    </>
+  );
+};
+
+export const getServerSideProps = withAuthServerSideProps(
+  async ({ token, fetchHeaders }) => {
+    if (!token) return { props: {} };
+
+    const {
+      publicRuntimeConfig: { SQ_API_URL },
+    } = getConfig();
+
+    try {
+      const bookmarksRes = await fetch(`${SQ_API_URL}/account/bookmarks`, {
+        headers: fetchHeaders,
+      });
+      if (
+        bookmarksRes.status === 403 &&
+        (await bookmarksRes.text()) === "User is banned"
+      ) {
+        throw "banned";
+      } else {
+        const results = await bookmarksRes.json();
+        return { props: { results } };
+      }
+    } catch (e) {
+      if (e === "banned") throw "banned";
+      return { props: { results: { torrents: [] } } };
+    }
+  }
+);
+
+export default Bookmarks;