Merge branch 'master' into dms

functions/handlers/post.js

@@ -1,6 +1,8 @@
 /* eslint-disable prefer-arrow-callback */
 /* eslint-disable promise/always-return */
 const admin = require('firebase-admin');
+const { db } = require('../util/admin');
+
 
 exports.putPost = (req, res) => {
     const newPost = {
@@ -12,7 +14,8 @@ exports.putPost = (req, res) => {
         createdAt: new Date().toISOString(),
         likeCount: 0,
         commentCount: 0,
-        microBlogTopics: req.body.microBlogTopics
+        microBlogTopics: req.body.microBlogTopics,
+        quoteBody: null
     };
 
     admin.firestore().collection('posts').add(newPost)
@@ -30,6 +33,7 @@ exports.putPost = (req, res) => {
 
 exports.getallPostsforUser = (req, res) => {
     var post_query = admin.firestore().collection("posts").where("userHandle", "==", req.user.handle);
+
     post_query.get()
     .then(function(myPosts) {
         let posts = [];
@@ -39,11 +43,11 @@ exports.getallPostsforUser = (req, res) => {
         return res.status(200).json(posts);
     })
     .then(function() {
-    res.status(200).send("Successfully retrieved all user's posts from database.");
-    return;
+    return res.status(200).json("Successfully retrieved all user's posts from database.");
+    
     })
     .catch(function(err) {
-    res.status(500).send("Failed to retrieve user's posts from database.", err);
+    return res.status(500).json("Failed to retrieve user's posts from database.", err);
     });
 };
 
@@ -58,14 +62,236 @@ exports.getallPosts = (req, res) => {
         return res.status(200).json(posts);
     })
     .then(function() {
-    res.status(200).send("Successfully retrieved every post from database.");
-    return;
+    return res.status(200).json("Successfully retrieved every post from database.");
     })
     .catch(function(err) {
-    res.status(500).send("Failed to retrieve posts from database.", err);
+    return res.status(500).json("Failed to retrieve posts from database.", err);
     });
 };
 
+exports.quoteWithPost = (req, res) => {
+
+    let quoteData;
+    const quoteDoc = admin.firestore().collection('quote').
+    where('userHandle', '==', req.user.handle).
+    where('postId', '==', req.params.postId).limit(1);
+
+    const postDoc = db.doc(`/posts/${req.params.postId}`);
+
+    postDoc.get()
+    .then((doc) => {
+        if(doc.exists) {
+            quoteData = doc.data();
+            return quoteDoc.get();
+        }
+        else
+        {
+            return res.status(404).json({error: 'Post not found'});
+        }
+    })
+    .then((data) => {
+        if(data.empty) {
+            return admin.firestore().collection('quote').add({
+                quoteId : req.params.postId,
+                userHandle : req.user.handle,
+                quoteBody : req.body.quoteBody
+            })
+            .then(() => {
+                const post = {
+                   body: quoteData.body,
+                   userHandle : req.user.handle,
+                   quoteBody: req.body.quoteBody,
+                   createdAt : new Date().toISOString(),
+                   userImage: req.body.userImage,
+                   likeCount: 0,
+                   commentCount: 0,
+                   userID: req.user.uid,
+                   microBlogTitle: quoteData.microBlogTitle,
+                   microBlogTopics: quoteData.microBlogTopics,
+                   quoteId: req.params.postId
+                }
+               return admin.firestore().collection('posts').add(post)
+               .then((doc) => {
+                doc.update({postId: doc.id})
+                const resPost = post;
+                resPost.postId = doc.id;
+                return res.status(200).json(resPost);
+               })
+            })
+        }
+        else {
+            return res.status(400).json({ error: 'Post has already been quoted.' });
+          }
+    })
+    .catch((err) => {
+        return res.status(500).json({error: err});
+
+    })
+
+}
+
+exports.quoteWithoutPost = (req, res) => {
+    let quoteData;
+    const quoteDoc = admin.firestore().collection('quote').
+    where('userHandle', '==', req.user.handle).
+    where('postId', '==', req.params.postId).limit(1);
+
+    const postDoc = db.doc(`/posts/${req.params.postId}`);
+
+    postDoc.get()
+    .then((doc) => {
+        if(doc.exists) {
+            quoteData = doc.data();
+            return quoteDoc.get();
+        }
+        else
+        {
+            return res.status(404).json({error: 'Post not found'});
+        }
+    })
+    .then((data) => {
+        if(data.empty) {
+            return admin.firestore().collection('quote').add({
+                quoteId : req.params.postId,
+                userHandle : req.user.handle,
+                quoteBody: null
+            })
+            .then(() => {
+                const post = {
+                userHandle : req.user.handle,
+                body: quoteData.body,
+                quoteBody: null,
+                createdAt : new Date().toISOString(),
+                likeCount: 0,
+                commentCount: 0,
+                userID: req.user.uid,
+                userImage: req.body.userImage,
+                microBlogTitle: quoteData.microBlogTitle,
+                microBlogTopics: quoteData.microBlogTopics,
+                quoteId: req.params.postId
+                }
+               return admin.firestore().collection('posts').add(post)
+               .then((doc) => {
+                doc.update({postId: doc.id})
+                const resPost = post;
+                resPost.postId = doc.id;
+                return res.status(200).json(resPost);
+               })
+                
+
+               
+            })
+        }
+        else {
+        return res.status(400).json({ error: 'Post has already been quoted.' });
+      }
+    })
+    .catch((err) => {
+        return res.status(500).json({error: 'Something is wrong'});
+
+    })
+
+}
+
+exports.checkforLikePost = (req, res) => {
+    const likedPostDoc = admin.firestore().collection('likes').where('userHandle', '==', req.user.handle)
+    .where('postId', '==', req.params.postId).limit(1);
+    let result;
+
+    likedPostDoc.get()
+    .then((data) => {
+        if (data.empty) {
+            result = false;
+            return res.status(200).json(result);
+        }
+        else
+        {
+            result = true;
+            return res.status(200).json(result);
+        }
+    })
+}
+
+exports.likePost = (req, res) => {
+    let postData;
+    const likeDoc = admin.firestore().collection('likes').where('userHandle', '==', req.user.handle)
+    .where('postId', '==', req.params.postId).limit(1);
+
+    const postDoc = db.doc(`/posts/${req.params.postId}`);
+
+    postDoc.get()
+    .then((doc) => {
+        if(doc.exists) {
+            postData = doc.data();
+            return likeDoc.get();
+        }
+        else
+        {
+            return res.status(404).json({error: 'Post not found'});
+        }
+    })
+    .then((data) => {
+        if (data.empty) {
+            return admin.firestore().collection('likes').add({
+                postId : req.params.postId,
+                userHandle: req.user.handle
+
+            })
+            .then(() => {
+                postData.likeCount++;
+                return postDoc.update({likeCount : postData.likeCount})
+            })
+            .then(() => {
+                return res.status(200).json(postData);
+            })
+        }
+    })
+    .catch((err) => {
+        return res.status(500).json({error: 'Something is wrong'});
+    })
+
+}
+
+
+exports.unlikePost = (req, res) => {
+
+    let postData;
+    const likeDoc = admin.firestore().collection('likes').where('userHandle', '==', req.user.handle)
+    .where('postId', '==', req.params.postId).limit(1);
+
+    const postDoc = db.doc(`/posts/${req.params.postId}`);
+
+    postDoc.get()
+    .then((doc) => {
+        if(doc.exists) {
+            postData = doc.data();
+            return likeDoc.get();
+        }
+        else
+        {
+            return res.status(404).json({error: 'Post not found'});
+        }
+    })
+    .then((data) => {
+            return db
+              .doc(`/likes/${data.docs[0].id}`)
+              .delete()
+              .then(() => {
+                postData.likeCount--;
+                return postDoc.update({ likeCount: postData.likeCount });
+              })
+              .then(() => {
+                res.status(200).json(postData);
+              });
+          
+    })
+    .catch((err) => {
+        console.error(err);
+        return res.status(500).json({error: 'Something is wrong'});
+    })
+
+}
+
 exports.getFilteredPosts = (req, res) => {
     admin.firestore().collection('posts').where('userHandle', '==', 'new user').where('microBlogTopics', '==')
 };

functions/handlers/topic.js

@@ -1,20 +1,28 @@
 const { admin, db } = require("../util/admin");
 exports.putTopic = (req, res) => {
-  const newTopic = {
-    topic: req.body.topic
-  };
-
-  admin
-    .firestore()
-    .collection("topics")
-    .add(newTopic)
+  let new_following = [];
+  let userRef = db.doc(`/users/${req.userData.handle}`);
+  userRef
+    .get()
     .then(doc => {
-      const resTopic = newTopic;
-      return res.status(200).json(resTopic);
+      new_following = doc.data().followedTopics;
+      new_following.push(req.body.following);
+
+      // add stuff
+      userRef
+        .set({ followedTopics: new_following }, { merge: true })
+        .then(doc => {
+          return res
+            .status(201)
+            .json({ message: `Following ${req.body.following}` });
+        })
+        .catch(err => {
+          return res.status(500).json({ err });
+        });
+      return res.status(200).json({ message: "OK" });
     })
     .catch(err => {
-      console.error(err);
-      return res.status(500).json({ error: "something is wrong" });
+      return res.status(500).json({ err });
     });
 };
 
@@ -40,21 +48,46 @@ exports.getAllTopics = (req, res) => {
 };
 
 exports.deleteTopic = (req, res) => {
-  const topic = db.doc(`/topics/${req.params.topicId}`);
-  topic
+  let new_following = [];
+  let userRef = db.doc(`/users/${req.userData.handle}`);
+  userRef
     .get()
     .then(doc => {
-      if (!doc.exists) {
-        return res.status(404).json({ error: "Topic not found" });
-      } else {
-        return topic.delete();
-      }
-    })
-    .then(() => {
-      return res.json({ message: "Topic successfully deleted!" });
+      new_following = doc.data().followedTopics;
+      // remove username from array
+      new_following.forEach(function(follower, index) {
+        if (follower === `${req.body.unfollow}`) {
+          new_following.splice(index, 1);
+        }
+      });
+
+      // update database
+      userRef
+        .set({ followedTopics: new_following }, { merge: true })
+        .then(doc => {
+          return res
+            .status(202)
+            .json({ message: `Successfully unfollow ${req.body.unfollow}` });
+        })
+        .catch(err => {
+          return res.status(500).json({ err });
+        });
+      return res.status(200).json({ message: "ok" });
     })
     .catch(err => {
-      console.error(err);
-      return res.status(500).json({ error: "Failed to delete topic." });
+      return res.status(500).json({ err });
+    });
+};
+
+exports.getUserTopics = (req, res) => {
+  let data = [];
+  db.doc(`/users/${req.body.handle}`)
+    .get()
+    .then(doc => {
+      data = doc.data().followedTopics;
+      return res.status(200).json({ data });
+    })
+    .catch(err => {
+      return res.status(500).json({ err });
     });
 };

functions/handlers/users.js

@@ -203,10 +203,10 @@ exports.deleteUser = (req, res) => {
   // Get the profile image filename
   // `https://firebasestorage.googleapis.com/v0/b/${config.storageBucket}/o/${imageFileName}?alt=media`
   let imageFileName;
-  req.userData.imageUrl ? 
-  imageFileName = req.userData.imageUrl.split('/o/')[1].split('?alt=')[0] : 
-  imageFileName = 'no-img.png'
-  
+  req.userData.imageUrl
+    ? (imageFileName = req.userData.imageUrl.split("/o/")[1].split("?alt=")[0])
+    : (imageFileName = "no-img.png");
+
   const userId = req.userData.userId;
   let errors = {};
 
@@ -223,56 +223,58 @@ exports.deleteUser = (req, res) => {
   let auth = admin.auth().deleteUser(userId);
 
   // Deletes database data
-  let data = db.collection("users").doc(`${req.user.handle}`).delete();
+  let data = db
+    .collection("users")
+    .doc(`${req.user.handle}`)
+    .delete();
 
   // Deletes any custom profile image
   let image;
-  if (imageFileName !== 'no-img.png') {
-    image = admin.storage().bucket().file(imageFileName).delete()
+  if (imageFileName !== "no-img.png") {
+    image = admin
+      .storage()
+      .bucket()
+      .file(imageFileName)
+      .delete();
   } else {
     image = Promise.resolve();
   }
 
   // Deletes all users posts
-  let posts = db.collection("posts")
+  let posts = db
+    .collection("posts")
     .where("userHandle", "==", req.user.handle)
     .get()
-    .then((query) => {
-      query.forEach((snap) => {
+    .then(query => {
+      query.forEach(snap => {
         snap.ref.delete();
       });
       return;
-    })
+    });
 
   let promises = [
-    auth
-      .then(thenFunction('auth'))
-      .catch((err) => catchFunction('auth', err)), 
-    data
-      .then(thenFunction('data'))
-      .catch((err) => catchFunction('data', err)),
-    image
-      .then(thenFunction('image'))
-      .catch((err) => catchFunction('image', err)),
-    posts
-      .then(thenFunction('posts'))
-      .catch((err) => catchFunction('image', err))
+    auth.then(thenFunction("auth")).catch(err => catchFunction("auth", err)),
+    data.then(thenFunction("data")).catch(err => catchFunction("data", err)),
+    image.then(thenFunction("image")).catch(err => catchFunction("image", err)),
+    posts.then(thenFunction("posts")).catch(err => catchFunction("image", err))
   ];
 
-
   // Wait for all promises to resolve
   let waitPromise = Promise.all(promises);
 
-  waitPromise.then(() => {
-    if (Object.keys(errors) > 0) {
-      return res.status(500).json(errors);
-    } else {
-      return res.status(200).json({message: `All data for ${req.userData.handle} has been deleted.`});
-    }
-  })
-  .catch((err) => {
-    return res.status(500).json({error: err});
-  })
+  waitPromise
+    .then(() => {
+      if (Object.keys(errors) > 0) {
+        return res.status(500).json(errors);
+      } else {
+        return res.status(200).json({
+          message: `All data for ${req.userData.handle} has been deleted.`
+        });
+      }
+    })
+    .catch(err => {
+      return res.status(500).json({ error: err });
+    });
 };
 
 // Returns all data in the database for the user who is currently signed in
@@ -353,55 +355,67 @@ exports.getAuthenticatedUser = (req, res) => {
 // Must be run by the Admin user
 exports.verifyUser = (req, res) => {
   if (req.userData.handle !== "Admin") {
-    return res.status(403).json({error: "This must be done as Admin"});
+    return res.status(403).json({ error: "This must be done as Admin" });
   }
 
   db.doc(`/users/${req.body.user}`)
     .get()
-    .then((doc) => {
+    .then(doc => {
       if (doc.exists) {
         let verifiedUser = doc.data();
         verifiedUser.verified = true;
-        return db.doc(`/users/${req.body.user}`).set(verifiedUser, {merge: true});
+        return db
+          .doc(`/users/${req.body.user}`)
+          .set(verifiedUser, { merge: true });
       } else {
-        return res.status(400).json({error: `User ${req.body.user} was not found`});
+        return res
+          .status(400)
+          .json({ error: `User ${req.body.user} was not found` });
       }
     })
     .then(() => {
-      return res.status(201).json({message: `${req.body.user} is now verified`});
+      return res
+        .status(201)
+        .json({ message: `${req.body.user} is now verified` });
     })
-    .catch((err) => {
+    .catch(err => {
       console.error(err);
-      return res.status(500).json({error: err.code});
+      return res.status(500).json({ error: err.code });
     });
-}
+};
 
 // Unverifies the user sent to the request
 // Must be run by admin
 exports.unverifyUser = (req, res) => {
   if (req.userData.handle !== "Admin") {
-    return res.status(403).json({error: "This must be done as Admin"});
+    return res.status(403).json({ error: "This must be done as Admin" });
   }
 
   db.doc(`/users/${req.body.user}`)
     .get()
-    .then((doc) => {
+    .then(doc => {
       if (doc.exists) {
         let unverifiedUser = doc.data();
         unverifiedUser.verified = false;
-        return db.doc(`/users/${req.body.user}`).set(unverifiedUser, {merge: true});
+        return db
+          .doc(`/users/${req.body.user}`)
+          .set(unverifiedUser, { merge: true });
       } else {
-        return res.status(400).json({error: `User ${req.body.user} was not found`});
+        return res
+          .status(400)
+          .json({ error: `User ${req.body.user} was not found` });
       }
     })
     .then(() => {
-      return res.status(201).json({message: `${req.body.user} is no longer verified`});
+      return res
+        .status(201)
+        .json({ message: `${req.body.user} is no longer verified` });
     })
-    .catch((err) => {
+    .catch(err => {
       console.error(err);
-      return res.status(500).json({error: err.code});
+      return res.status(500).json({ error: err.code });
     });
-}
+};
 
 // Returns all the DMs that the user is currently participating in
 exports.getDirectMessages = (req, res) => {
@@ -931,19 +945,80 @@ exports.checkDirectMessagesEnabled = (req, res) => {
 }
 
 exports.getUserHandles = (req, res) => {
-  admin
-    .firestore()
-    .collection("users")
+  db.doc(`/users/${req.body.userHandle}`)
     .get()
-    .then(data => {
-      let users = [];
-      data.forEach(function(doc) {
-        users.push(doc.data().handle);
-      });
-      return res.status(200).json(users);
+    .then(doc => {
+      if (doc.exists) {
+        let userHandle = doc.data().handle;
+        return res.status(200).json(userHandle);
+      } else {
+        return res.status(404).json({ error: "user not found" });
+      }
     })
     .catch(err => {
       console.error(err);
       return res.status(500).json({ error: "Failed to get all user handles." });
     });
 };
+
+exports.addSubscription = (req, res) => {
+  let new_following = [];
+  let userRef = db.doc(`/users/${req.userData.handle}`);
+  userRef.get().then(doc => {
+    new_following = doc.data().following;
+    new_following.push(req.body.following);
+
+    // add stuff
+    userRef
+      .set({ following: new_following }, { merge: true })
+      .then(doc => {
+        return res
+          .status(201)
+          .json({ message: `Following ${req.body.following}` });
+      })
+      .catch(err => {
+        return res.status(500).json({ err });
+      });
+    return res.status(200).json({ message: "ok" });
+  });
+};
+
+exports.getSubs = (req, res) => {
+  let data = [];
+  db.doc(`/users/${req.userData.handle}`)
+    .get()
+    .then(doc => {
+      data = doc.data().following;
+      return res.status(200).json({ data });
+    })
+    .catch(err => {
+      return res.status(500).json({ err });
+    });
+};
+
+exports.removeSub = (req, res) => {
+  let new_following = [];
+  let userRef = db.doc(`/users/${req.userData.handle}`);
+  userRef.get().then(doc => {
+    new_following = doc.data().following;
+    // remove username from array
+    new_following.forEach(function(follower, index) {
+      if (follower === `${req.body.unfollow}`) {
+        new_following.splice(index, 1);
+      }
+    });
+
+    // update database
+    userRef
+      .set({ following: new_following }, { merge: true })
+      .then(doc => {
+        return res
+          .status(202)
+          .json({ message: `Successfully unfollow ${req.body.unfollow}` });
+      })
+      .catch(err => {
+        return res.status(500).json({ err });
+      });
+    return res.status(200).json({ message: "ok" });
+  });
+};

functions/index.js

@@ -24,7 +24,10 @@ const {
   updateProfileInfo,
   verifyUser,
   unverifyUser,
-  getUserHandles
+  getUserHandles,
+  addSubscription,
+  getSubs,
+  removeSub
 } = require("./handlers/users");
 
 // Adds a user to the database and registers them in firebase with
@@ -56,6 +59,8 @@ app.post("/dms/toggle", fbAuth, toggleDirectMessages);
 
 app.get("/getUser", fbAuth, getUserDetails);
 
+app.post("/getUserDetails", fbAuth, getUserDetails);
+
 // Returns all profile data of the currently logged in user
 app.get("/getProfileInfo", fbAuth, getProfileInfo);
 
@@ -74,13 +79,22 @@ app.post("/verifyUser", fbAuth, verifyUser);
 app.post("/unverifyUser", fbAuth, unverifyUser);
 
 // get user handles with search phase
-app.get("/getUserHandles", fbAuth, getUserHandles);
+app.post("/getUserHandles", fbAuth, getUserHandles);
+
+// get user's subscription
+app.get("/getSubs", fbAuth, getSubs);
+
+// add user to another user's "following" data field
+app.post("/addSubscription", fbAuth, addSubscription);
+
+// remove one subscription
+app.post("/removeSub", fbAuth, removeSub);
 
 
 /*------------------------------------------------------------------*
  *  handlers/post.js                                                *
  *------------------------------------------------------------------*/
-const { getallPostsforUser, getallPosts, putPost } = require("./handlers/post");
+const { getallPostsforUser, getallPosts, putPost, likePost, unlikePost, quoteWithPost, quoteWithoutPost, checkforLikePost} = require("./handlers/post");
 
 app.get("/getallPostsforUser", fbAuth, getallPostsforUser);
 
@@ -89,11 +103,23 @@ app.get("/getallPosts", getallPosts);
 // Adds one post to the database
 app.post("/putPost", fbAuth, putPost);
 
+app.get("/like/:postId", fbAuth, likePost);
+app.get("/unlike/:postId", fbAuth, unlikePost);
+app.get("/checkforLikePost/:postId", fbAuth, checkforLikePost);
+
+app.post("/quoteWithPost/:postId", fbAuth, quoteWithPost);
+app.post("/quoteWithoutPost/:postId", fbAuth, quoteWithoutPost);
+
 
 /*------------------------------------------------------------------*
  *  handlers/topic.js                                                *
  *------------------------------------------------------------------*/
-const { putTopic, getAllTopics, deleteTopic } = require("./handlers/topic");
+const {
+  putTopic,
+  getAllTopics,
+  deleteTopic,
+  getUserTopics
+} = require("./handlers/topic");
 
 // add topic to database
 app.post("/putTopic", fbAuth, putTopic);
@@ -102,6 +128,9 @@ app.post("/putTopic", fbAuth, putTopic);
 app.get("/getAllTopics", fbAuth, getAllTopics);
 
 // delete a specific topic
-app.delete("/deleteTopic/:topicId", fbAuth, deleteTopic);
+app.post("/deleteTopic", fbAuth, deleteTopic);
+
+// get topic for this user
+app.post("/getUserTopics", fbAuth, getUserTopics);
 
 exports.api = functions.https.onRequest(app);