bookmarking of torrents

Author: tdjsnelling

api/src/controllers/torrent.js

@@ -307,6 +307,32 @@ export const fetchTorrent = (tracker) => async (req, res, next) => {
         },
       },
       { $unwind: { path: "$uploadedBy", preserveNullAndEmptyArrays: true } },
+      {
+        $lookup: {
+          from: "users",
+          as: "fetchedBy",
+          let: { torrentId: "$_id" },
+          pipeline: [
+            { $match: { $expr: { $eq: ["$_id", req.userId] } } },
+            {
+              $project: {
+                bookmarks: 1,
+              },
+            },
+            {
+              $addFields: {
+                bookmarked: { $in: ["$$torrentId", "$bookmarks"] },
+              },
+            },
+            {
+              $project: {
+                bookmarked: 1,
+              },
+            },
+          ],
+        },
+      },
+      { $unwind: { path: "$fetchedBy", preserveNullAndEmptyArrays: true } },
       {
         $lookup: {
           from: "comments",
@@ -428,6 +454,7 @@ export const getTorrentsPage = async ({
   category,
   source,
   tag,
+  uploadedBy,
   userId,
   tracker,
 }) => {
@@ -485,11 +512,11 @@ export const getTorrentsPage = async ({
           },
         ]
       : []),
-    ...(userId
+    ...(uploadedBy
       ? [
           {
             $match: {
-              uploadedBy: userId,
+              uploadedBy,
             },
           },
         ]
@@ -525,6 +552,32 @@ export const getTorrentsPage = async ({
         preserveNullAndEmptyArrays: true,
       },
     },
+    {
+      $lookup: {
+        from: "users",
+        as: "fetchedBy",
+        let: { torrentId: "$_id" },
+        pipeline: [
+          { $match: { $expr: { $eq: ["$_id", userId] } } },
+          {
+            $project: {
+              bookmarks: 1,
+            },
+          },
+          {
+            $addFields: {
+              bookmarked: { $in: ["$$torrentId", "$bookmarks"] },
+            },
+          },
+          {
+            $project: {
+              bookmarked: 1,
+            },
+          },
+        ],
+      },
+    },
+    { $unwind: { path: "$fetchedBy", preserveNullAndEmptyArrays: true } },
   ]);
 
   const [count] = await Torrent.aggregate([
@@ -592,7 +645,11 @@ export const listLatest = (tracker) => async (req, res, next) => {
   count = parseInt(count) || 25;
   count = Math.min(count, 100);
   try {
-    const { torrents } = await getTorrentsPage({ limit: count, tracker });
+    const { torrents } = await getTorrentsPage({
+      limit: count,
+      userId: req.userId,
+      tracker,
+    });
     res.json(torrents);
   } catch (e) {
     next(e);
@@ -608,6 +665,7 @@ export const searchTorrents = (tracker) => async (req, res, next) => {
       category,
       source,
       tag,
+      userId: req.userId,
       tracker,
     });
     res.json(torrents);
@@ -734,3 +792,29 @@ export const toggleFreeleech = async (req, res, next) => {
     next(e);
   }
 };
+
+export const toggleBookmark = async (req, res, next) => {
+  const { infoHash } = req.params;
+  try {
+    const torrent = await Torrent.findOne({ infoHash }).lean();
+
+    if (!torrent) {
+      res.status(404).send("Torrent could not be found");
+      return;
+    }
+
+    const user = await User.findOne({ _id: req.userId }).lean();
+
+    const isBookmarked = (await user.bookmarks?.length)
+      ? user.bookmarks.map((b) => b.toString()).includes(torrent._id.toString())
+      : false;
+
+    await User.findOneAndUpdate(
+      { _id: req.userId },
+      { [isBookmarked ? "$pull" : "$addToSet"]: { bookmarks: torrent._id } }
+    );
+    res.sendStatus(200);
+  } catch (e) {
+    next(e);
+  }
+};

api/src/controllers/user.js

@@ -683,7 +683,11 @@ export const fetchUser = (tracker) => async (req, res, next) => {
     const { ratio } = await getUserRatio(user._id);
     user.ratio = ratio;
 
-    const { torrents } = await getTorrentsPage({ userId: user._id, tracker });
+    const { torrents } = await getTorrentsPage({
+      uploadedBy: user._id,
+      userId: req.userId,
+      tracker,
+    });
     user.torrents = torrents;
 
     res.json(user);

api/src/routes/torrent.js

@@ -10,6 +10,7 @@ import {
   toggleFreeleech,
   uploadTorrent,
   editTorrent,
+  toggleBookmark,
 } from "../controllers/torrent";
 import { createReport } from "../controllers/moderation";
 
@@ -25,6 +26,7 @@ export default (tracker) => {
   router.post("/unvote/:infoHash/:vote", removeVote);
   router.post("/report/:infoHash", createReport);
   router.post("/toggle-freeleech/:infoHash", toggleFreeleech);
+  router.post("/bookmark/:infoHash", toggleBookmark);
   router.get("/latest", listLatest(tracker));
   router.get("/search", searchTorrents(tracker));
   return router;

api/src/schema/user.js

@@ -19,6 +19,7 @@ const User = new mongoose.Schema({
     qr: String,
     backup: [String],
   },
+  bookmarks: [mongoose.Schema.ObjectId],
 });
 
 export default mongoose.model("user", User);

client/components/TorrentList.js

@@ -11,6 +11,7 @@ import { ChevronsLeft } from "@styled-icons/boxicons-solid/ChevronsLeft";
 import { ChevronLeft } from "@styled-icons/boxicons-solid/ChevronLeft";
 import { ChevronsRight } from "@styled-icons/boxicons-solid/ChevronsRight";
 import { ChevronRight } from "@styled-icons/boxicons-solid/ChevronRight";
+import { Bookmark } from "@styled-icons/boxicons-solid/Bookmark";
 import List from "./List";
 import Text from "./Text";
 import Box from "./Box";
@@ -52,6 +53,9 @@ const TorrentList = ({ torrents = [], categories, total }) => {
             cell: ({ value, row }) => (
               <Text title={value}>
                 {value}
+                {row.fetchedBy?.bookmarked && (
+                  <Box as={Bookmark} size={16} color="primary" ml={2} />
+                )}
                 {(row.freeleech || SQ_SITE_WIDE_FREELEECH === true) && (
                   <Text as="span" fontSize={0} color="primary" ml={3}>
                     FL!

client/pages/torrent/[infoHash].js

@@ -13,6 +13,8 @@ import { File } from "@styled-icons/boxicons-regular/File";
 import { Folder } from "@styled-icons/boxicons-regular/Folder";
 import { Like } from "@styled-icons/boxicons-regular/Like";
 import { Dislike } from "@styled-icons/boxicons-regular/Dislike";
+import { Bookmark as BookmarkEmpty } from "@styled-icons/boxicons-regular/Bookmark";
+import { Bookmark } from "@styled-icons/boxicons-solid/Bookmark";
 import { withAuthServerSideProps } from "../../utils/withAuth";
 import SEO from "../../components/SEO";
 import Box from "../../components/Box";
@@ -124,6 +126,7 @@ const Torrent = ({ token, torrent = {}, userId, userRole, uid }) => {
   const [comments, setComments] = useState(torrent.comments);
   const [isFreeleech, setIsFreeleech] = useState(torrent.freeleech);
   const [hasGroup, setHasGroup] = useState(!!torrent.group);
+  const [bookmarked, setBookmarked] = useState(torrent.fetchedBy.bookmarked);
 
   const { addNotification } = useContext(NotificationContext);
   const { setLoading } = useContext(LoadingContext);
@@ -410,6 +413,39 @@ const Torrent = ({ token, torrent = {}, userId, userRole, uid }) => {
     setLoading(false);
   };
 
+  const handleBookmark = async () => {
+    setLoading(true);
+
+    try {
+      const bookmarkRes = await fetch(
+        `${SQ_API_URL}/torrent/bookmark/${torrent.infoHash}`,
+        {
+          method: "POST",
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        }
+      );
+
+      if (bookmarkRes.status !== 200) {
+        const reason = await bookmarkRes.text();
+        throw new Error(reason);
+      }
+
+      addNotification(
+        "success",
+        `Torrent ${bookmarked ? "removed from" : "added to"} bookmarks`
+      );
+
+      setBookmarked((b) => !b);
+    } catch (e) {
+      addNotification("error", `Could not bookmark torrent: ${e.message}`);
+      console.error(e);
+    }
+
+    setLoading(false);
+  };
+
   const category = Object.keys(SQ_TORRENT_CATEGORIES).find(
     (c) => slugify(c, { lower: true }) === torrent.type
   );
@@ -441,6 +477,9 @@ const Torrent = ({ token, torrent = {}, userId, userRole, uid }) => {
           )}
         </Text>
         <Box display="flex" alignItems="center" ml={3}>
+          <Button onClick={handleBookmark} variant="secondary" px="10px" mr={3}>
+            {bookmarked ? <Bookmark size={18} /> : <BookmarkEmpty size={18} />}
+          </Button>
           {(userRole === "admin" || userId === torrent.uploadedBy._id) && (
             <>
               <Button