added user post tuple

functions/handlers/topic.js

@@ -26,6 +26,41 @@ exports.putTopic = (req, res) => {
     });
 };
 
+exports.putNewTopic = (req, res) => {
+  let new_following = [];
+  let userRef = db.doc(`/users/${req.userData.handle}`);
+  userRef
+    .get()
+    .then(doc => {
+      let topics = [];
+      new_following = doc.data().following;
+      // new_following.push(req.body.following);
+      new_following.forEach(follow => {
+        if (follow.handle === req.body.handle) {
+          // topics = follow.topics;
+          follow.topics.push(req.body.topic);
+        }
+      });
+      // return res.status(201).json({ new_following });
+
+      // add stuff
+      userRef
+        .set({ following: new_following }, { merge: true })
+        .then(doc => {
+          return res
+            .status(201)
+            .json({ message: `Following ${req.body.topic}` });
+        })
+        .catch(err => {
+          return res.status(500).json({ err });
+        });
+      return res.status(200).json({ message: "OK" });
+    })
+    .catch(err => {
+      return res.status(500).json({ err });
+    });
+};
+
 exports.getAllTopics = (req, res) => {
   admin
     .firestore()

functions/handlers/users.js

@@ -226,7 +226,7 @@ exports.deleteUser = (req, res) => {
       const deleteUsername = req.userData.handle;
       db.doc(`/users/${deleteUsername}`)
         .get()
-      .then((deleteUserDocSnap) => {
+        .then(deleteUserDocSnap => {
           const dms = deleteUserDocSnap.data().dms;
           const dmRecipients = deleteUserDocSnap.data().dmRecipients;
 
@@ -239,25 +239,32 @@ exports.deleteUser = (req, res) => {
           let otherUsersPromises = [];
 
           // Resolve if they don't have a dmRecipients list
-        if (dmRecipients === undefined || dmRecipients === null || dmRecipients.length === 0) {
+          if (
+            dmRecipients === undefined ||
+            dmRecipients === null ||
+            dmRecipients.length === 0
+          ) {
             resolve();
             return;
           }
-        dmRecipients.forEach((dmRecipient) => {
+          dmRecipients.forEach(dmRecipient => {
             otherUsersPromises.push(
               // Get each users data
-            db.doc(`/users/${dmRecipient}`).get()
+              db
-              .then((otherUserDocSnap) => {
+                .doc(`/users/${dmRecipient}`)
+                .get()
+                .then(otherUserDocSnap => {
                   // Get the index of deleteUsername so that we can remove the dangling
                   // reference to the DM document
-                let otherUserDMRecipients = otherUserDocSnap.data().dmRecipients;
+                  let otherUserDMRecipients = otherUserDocSnap.data()
+                    .dmRecipients;
                   let otherUserDMs = otherUserDocSnap.data().dms;
                   let index = -1;
                   otherUserDMRecipients.forEach((dmRecip, i) => {
                     if (dmRecip === deleteUsername) {
                       index = i;
                     }
-                })
+                  });
 
                   if (index !== -1) {
                     // Remove deleteUsername from their dmRecipients list
@@ -272,28 +279,29 @@ exports.deleteUser = (req, res) => {
                       dms: otherUserDMs
                     });
                   }
-                
-              })
-          )
                 })
+            );
+          });
 
           // Wait for the removal of DM data stored on other users to be deleted
           Promise.all(otherUsersPromises)
             .then(() => {
               // Iterate through DM references and delete them from the dm collection
               let dmRefsPromises = [];
-            dms.forEach((dmRef) => {
+              dms.forEach(dmRef => {
                 // Create a delete queue
                 let batch = db.batch();
                 dmRefsPromises.push(
                   // Add the messages to the delete queue
-                db.collection(`/dm/${dmRef.id}/messages`).listDocuments()
+                  db
-                  .then((docs) => {
+                    .collection(`/dm/${dmRef.id}/messages`)
-                    console.log("second")
+                    .listDocuments()
+                    .then(docs => {
+                      console.log("second");
                       console.log(docs);
-                    docs.map((doc) => {
+                      docs.map(doc => {
                         batch.delete(doc);
-                    })
+                      });
 
                       // Add the doc that the DM is stored in to the delete queue
                       batch.delete(dmRef);
@@ -301,8 +309,8 @@ exports.deleteUser = (req, res) => {
                       // Commit the writes
                       return batch.commit();
                     })
-              )
+                );
-            })
+              });
 
               return Promise.all(dmRefsPromises);
             })
@@ -310,18 +318,17 @@ exports.deleteUser = (req, res) => {
               resolve();
               return;
             })
-          .catch((err) => {
+            .catch(err => {
               console.log("error " + err);
               reject(err);
               return;
+            });
         })
-      })
+        .catch(err => {
-      .catch((err) => {
           console.log(err);
           return res.status(500).json({ error: err });
-      })
+        });
-
+    });
-    })
   }
 
   // Deletes user from authentication
@@ -334,18 +341,18 @@ exports.deleteUser = (req, res) => {
         return db
           .collection("users")
           .doc(`${req.user.handle}`)
-          .delete()
+          .delete();
       })
       .then(() => {
         resolve();
         return;
       })
-      .catch((err) => {
+      .catch(err => {
         console.log(err);
         reject(err);
         return;
-      })
+      });
-  })
+  });
 
   // Deletes any custom profile image
   let image;
@@ -454,15 +461,16 @@ exports.getUserDetails = (req, res) => {
 
 exports.getAllHandles = (req, res) => {
   var user_query = admin.firestore().collection("users");
-  user_query.get()
+  user_query
-  .then((allUsers) => {
+    .get()
+    .then(allUsers => {
       let users = [];
-      allUsers.forEach((user) => {
+      allUsers.forEach(user => {
         users.push(user.data().handle);
       });
       return res.status(200).json(users);
     })
-  .catch((err) => {
+    .catch(err => {
       return res.status(500).json({
         message: "Failed to retrieve posts from database.",
         error: err
@@ -577,7 +585,7 @@ exports.getDirectMessages = (req, res) => {
   // Returns all the messages in a dm documentSnapshot
   function getMessages(dm) {
     let promise = new Promise((resolve, reject) => {
-      let messagesCollection = dm.collection('messages');
+      let messagesCollection = dm.collection("messages");
 
       // If the messagesCollection is missing, that mean that there aren't any messages
       if (messagesCollection === null || messagesCollection === undefined) {
@@ -588,90 +596,96 @@ exports.getDirectMessages = (req, res) => {
       let promises = [];
 
       // Get all of the messages in the DM
-      messagesCollection.get()
+      messagesCollection.get().then(dmQuerySnap => {
-        .then((dmQuerySnap) => {
+        dmQuerySnap.forEach(dmQueryDocSnap => {
-          dmQuerySnap.forEach((dmQueryDocSnap) => {
           promises.push(
-              dmQueryDocSnap.ref.get()
+            dmQueryDocSnap.ref.get().then(messageData => {
-                .then((messageData) => {
               msgs.push(messageData.data());
               return;
             })
-            )
+          );
-          })
+        });
 
         let waitPromise = Promise.all(promises);
         waitPromise.then(() => {
           // Sort the messages in reverse order by date
           // Newest should be at the bottom, because that's how they will be displayed on the front-end
           msgs.sort((a, b) => {
-              return (b.createdAt > a.createdAt) ? -1 : ((b.createdAt < a.createdAt) ? 1 : 0);
+            return b.createdAt > a.createdAt
-            })
+              ? -1
+              : b.createdAt < a.createdAt
+              ? 1
+              : 0;
+          });
           resolve(msgs);
         });
-        })
+      });
     });
     return promise;
   }
 
-
   const dms = req.userData.dms;
 
   // Return null if this user has no DMs
-  if (dms === undefined || dms === null || dms.length === 0) return res.status(200).json({data: null});
+  if (dms === undefined || dms === null || dms.length === 0)
+    return res.status(200).json({ data: null });
 
   let dmsData = [];
   let dmPromises = [];
 
-  dms.forEach((dm) => {
+  dms.forEach(dm => {
     let dmData = {};
     // Make a new promise for each DM document
-    dmPromises.push(new Promise((resolve, reject) => {
+    dmPromises.push(
-      dm  // DM document reference
+      new Promise((resolve, reject) => {
-      .get()
+        dm.get() // DM document reference
-      .then((doc) => {
+          .then(doc => {
             let docData = doc.data();
 
             // Recipient is the person you are messaging
-        docData.authors[0] === req.userData.handle ?
+            docData.authors[0] === req.userData.handle
-          dmData.recipient = docData.authors[1] :
+              ? (dmData.recipient = docData.authors[1])
-          dmData.recipient = docData.authors[0]
+              : (dmData.recipient = docData.authors[0]);
 
             // Save the createdAt time
             dmData.createdAt = docData.createdAt;
 
             // Get all the messages from this dm document
-        getMessages(dm)
+            getMessages(dm).then(msgs => {
-          .then((msgs) => {
               dmData.messages = msgs;
-            dmData.recentMessage = msgs.length !== 0 ? msgs[msgs.length - 1].message : null;
+              dmData.recentMessage =
-            dmData.recentMessageTimestamp = msgs.length !== 0 ? msgs[msgs.length - 1].createdAt : null;
+                msgs.length !== 0 ? msgs[msgs.length - 1].message : null;
+              dmData.recentMessageTimestamp =
+                msgs.length !== 0 ? msgs[msgs.length - 1].createdAt : null;
               dmData.dmId = doc.id;
               resolve(dmData);
+            });
           })
-        
+          .catch(err => {
-        
-      
-      }).catch((err) => {
             console.err(err);
-        return res.status(400).json({error: {
+            return res.status(400).json({
-          message: "An error occurred when reading the DM document reference",
+              error: {
+                message:
+                  "An error occurred when reading the DM document reference",
                 error: err
-        }});
+              }
-      })
+            });
-    }).then((dmData) => {
+          });
+      }).then(dmData => {
         dmsData.push(dmData);
       })
-    )
+    );
-    
+  });
-  })
 
   // Wait for all DM document promises to resolve before returning data
   dmWaitPromise = Promise.all(dmPromises)
     .then(() => {
       // Sort the DMs so that the ones with the newest messages are at the top
       dmsData.sort((a, b) => {
-        if (a.recentMessageTimestamp === null && b.recentMessageTimestamp === null) {
+        if (
+          a.recentMessageTimestamp === null &&
+          b.recentMessageTimestamp === null
+        ) {
           if (b.createdAt < a.createdAt) {
             return -1;
           } else if (b.createdAt > a.createdAt) {
@@ -691,15 +705,17 @@ exports.getDirectMessages = (req, res) => {
           return 0;
         }
       });
-      return res.status(200).json({data: dmsData})
+      return res.status(200).json({ data: dmsData });
     })
-    .catch((err) => {
+    .catch(err => {
-      return res.status(500).json({error:{
+      return res.status(500).json({
+        error: {
           message: "An error occurred while sorting",
           error: err
-      }});
-    });
         }
+      });
+    });
+};
 
 // Toggles direct messages on or off depending on the requese
 /* Request Parameters
@@ -708,34 +724,40 @@ exports.getDirectMessages = (req, res) => {
 exports.toggleDirectMessages = (req, res) => {
   const enable = req.body.enable;
   const user = req.userData.handle;
-  db.doc(`/users/${user}`).update({dmEnabled: enable})
+  db.doc(`/users/${user}`)
+    .update({ dmEnabled: enable })
     .then(() => {
       return res.status(201).json({ message: "Success" });
     })
-    .catch((err) => {
+    .catch(err => {
       return res.status(500).json({ error: err });
-    })
+    });
-}
+};
 
 // Returns a promise that resolves if user has DMs enabled
 // and rejects if there is an error or DMs are disabled
-isDirectMessageEnabled = (username) => {
+isDirectMessageEnabled = username => {
   return new Promise((resolve, reject) => {
     let result = {};
     result.code = null;
     result.message = null;
     if (username === null || username === undefined || username === "") {
       result.code = 400;
-      result.message = "No user was sent in the request. The request should have a non-empty 'user' key.";
+      result.message =
+        "No user was sent in the request. The request should have a non-empty 'user' key.";
       reject(result);
     }
 
     db.doc(`/users/${username}`)
       .get()
-      .then((doc) => {
+      .then(doc => {
         if (doc.exists) {
           // console.log(doc.data())
-          if (doc.data().dmEnabled === true || doc.data().dmEnabled === null || doc.data().dmEnabled === undefined) {
+          if (
+            doc.data().dmEnabled === true ||
+            doc.data().dmEnabled === null ||
+            doc.data().dmEnabled === undefined
+          ) {
             // Assume DMs are enabled if they don't have a dmEnabled key
             resolve(result);
           } else {
@@ -750,42 +772,46 @@ isDirectMessageEnabled = (username) => {
           reject(result);
         }
       })
-      .catch((err) => {
+      .catch(err => {
-        console.log("HI")
+        console.log("HI");
         console.error(err);
         result.code = 500;
         result.message = err;
         reject(result);
-      })
       });
-}
+  });
+};
 
 // Returns a promise that resolves if the data in the DM is valid and
 // rejects if there are any error. Errors are returned in the promise
-verifyDirectMessageIntegrity = (dmRef) => {
+verifyDirectMessageIntegrity = dmRef => {
   return new Promise((resolve, reject) => {
     resolve("Not implemented yet");
-  })
+  });
-}
+};
-
 
 // Checks if there are any DM channels open with userB on userA's side
 oneWayCheck = (userA, userB) => {
   return new Promise((resolve, reject) => {
-
     db.doc(`/users/${userA}`)
       .get()
-      .then((userASnapshot) => {
+      .then(userASnapshot => {
         const dmList = userASnapshot.data().dms;
         const dmRecipients = userASnapshot.data().dmRecipients;
 
-        if (dmList === null || dmList === undefined || dmRecipients === null || dmRecipients === undefined) {
+        if (
+          dmList === null ||
+          dmList === undefined ||
+          dmRecipients === null ||
+          dmRecipients === undefined
+        ) {
           // They don't have any DMs yet
           console.log("No DMs array");
-          userASnapshot.ref.set({dms:[], dmRecipients:[]}, {merge: true})
+          userASnapshot.ref
+            .set({ dms: [], dmRecipients: [] }, { merge: true })
             .then(() => {
               resolve();
-            })
+            });
         } else if (dmList.length === 0) {
           // Their DMs are empty
           console.log("DMs array is empty");
@@ -810,17 +836,16 @@ oneWayCheck = (userA, userB) => {
           //   )
           // })
 
-          dmRecipients.forEach((dmRecipient) => {
+          dmRecipients.forEach(dmRecipient => {
             if (dmRecipient === userB) {
               console.log(`You already have a DM with ${userB}`);
               reject(new Error(`You already have a DM with ${userB}`));
               return;
             }
-          })
+          });
 
           resolve();
 
-
           // Promise.all(forEachPromises)
           //   .then((dmDocs) => {
           //     // Check if any of the DMs have for userA have userA and userB as the authors.
@@ -866,15 +891,10 @@ oneWayCheck = (userA, userB) => {
           //       }
           //     })
           //   })
-
-
-
         }
-    })
+      });
-  })
+  });
-  
+};
-}
-
 
 // Returns a promise that resolves if there is not already a DM channel
 // between the creator and recipient usernames. It rejects if one already
@@ -885,36 +905,39 @@ checkNoDirectMessageExists = (creator, recipient) => {
     let recipientPromise = oneWayCheck(recipient, creator);
     let temp_array = [];
     temp_array.push(creatorPromise);
-    temp_array.push(recipientPromise)
+    temp_array.push(recipientPromise);
 
     Promise.all(temp_array)
       .then(() => {
         resolve();
       })
-        .catch((err) => {
+      .catch(err => {
         reject(err);
-        })
+      });
-    })
+  });
-}
+};
 
 addDirectMessageToUser = (username, recipient, dmRef) => {
   return new Promise((resolve, reject) => {
-    db.doc(`/users/${username}`).get()
+    db.doc(`/users/${username}`)
-      .then((docSnap) => {
+      .get()
+      .then(docSnap => {
         let dmList = docSnap.data().dms;
         let dmRecipients = docSnap.data().dmRecipients;
         dmList.push(dmRef);
         dmRecipients.push(recipient);
-        return db.doc(`/users/${username}`).update({dms: dmList, dmRecipients});
+        return db
+          .doc(`/users/${username}`)
+          .update({ dms: dmList, dmRecipients });
       })
       .then(() => {
         resolve();
       })
-      .catch((err) => {
+      .catch(err => {
         reject(err);
-      })
+      });
-  })
+  });
-}
+};
 
 // Sends a DM from the caller to the requested DM document
 /* Request Parameters
@@ -932,21 +955,26 @@ exports.sendDirectMessage = (req, res) => {
     createdAt: new Date().toISOString(),
     message,
     messageId: null
-  }
+  };
 
-  db.doc(`/users/${creator}`).get()
+  db.doc(`/users/${creator}`)
-    .then((userDoc) => {
+    .get()
+    .then(userDoc => {
       let dmList = userDoc.data().dms;
 
       // Return if the creator doesn't have any DMs.
       // This means they have not created a DM's channel yet
-      if (dmList === null || dmList === undefined) return res.status(400).json({error: `There is no DM channel between ${creator} and ${recipient}. Use /api/dms/new.`})
+      if (dmList === null || dmList === undefined)
+        return res.status(400).json({
+          error: `There is no DM channel between ${creator} and ${recipient}. Use /api/dms/new.`
+        });
       let dmRefPromises = [];
-      dmList.forEach((dmRef) => {
+      dmList.forEach(dmRef => {
         dmRefPromises.push(
           new Promise((resolve, reject) => {
-            dmRef.get()
+            dmRef
-              .then((dmDoc) => {
+              .get()
+              .then(dmDoc => {
                 let authors = dmDoc.data().authors;
                 if (
                   (authors[0] === creator && authors[1] === recipient) ||
@@ -957,41 +985,45 @@ exports.sendDirectMessage = (req, res) => {
                   resolve({ correct: false, dmRef });
                 }
               })
-              .catch((err) => {
+              .catch(err => {
                 reject(err);
+              });
           })
-          })
+        );
-        )
+      });
-      })
 
       return Promise.all(dmRefPromises);
     })
-    .then((results) => {
+    .then(results => {
       let correctDMRef = null;
-      results.forEach((result) => {
+      results.forEach(result => {
         if (result.correct) {
           correctDMRef = result.dmRef;
         }
-      })
+      });
 
       if (correctDMRef === null) {
-        console.log(`There is no DM channel between ${creator} and ${recipient}. Use /api/dms/new.`);
+        console.log(
-        return res.status(400).json({error: `There is no DM channel between ${creator} and ${recipient}. Use /api/dms/new.`});
+          `There is no DM channel between ${creator} and ${recipient}. Use /api/dms/new.`
+        );
+        return res.status(400).json({
+          error: `There is no DM channel between ${creator} and ${recipient}. Use /api/dms/new.`
+        });
       }
 
       return db.collection(`/dm/${correctDMRef.id}/messages`).add(newMessage);
     })
-    .then((newMsgRef) => {
+    .then(newMsgRef => {
       return newMsgRef.update({ messageId: newMsgRef.id }, { merge: true });
     })
     .then(() => {
       return res.status(200).json({ message: "OK" });
     })
-    .catch((err) => {
+    .catch(err => {
       console.log(err);
       return res.status(500).json({ error: err });
-    })
+    });
-}
+};
 
 // Creates a DM between the caller and the user in the request
 /* Request Parameters
@@ -1002,7 +1034,8 @@ exports.createDirectMessage = (req, res) => {
   const recipient = req.body.user;
 
   // Check if they are DMing themselves
-  if (creator === recipient) return res.status(400).json({error: "You can't DM yourself"});
+  if (creator === recipient)
+    return res.status(400).json({ error: "You can't DM yourself" });
 
   // Check if this user has DMs enabled
   let creatorEnabled = isDirectMessageEnabled(creator);
@@ -1011,45 +1044,52 @@ exports.createDirectMessage = (req, res) => {
   let recipientEnabled = isDirectMessageEnabled(recipient);
 
   // Make sure that they don't already have a DM channel
-  let noDMExists = checkNoDirectMessageExists(creator, recipient)
+  let noDMExists = checkNoDirectMessageExists(creator, recipient);
 
-
+  let dataValidations = [creatorEnabled, recipientEnabled, noDMExists];
-  let dataValidations = [
-    creatorEnabled,
-    recipientEnabled,
-    noDMExists
-  ]
 
   Promise.all(dataValidations)
     .then(() => {
       // Create a new DM document
-      return db.collection("dm").add({})
+      return db.collection("dm").add({});
     })
-    .then((dmDocRef) => {
+    .then(dmDocRef => {
       // Fill it with some data.
       // Note that there isn't a messages collection by default.
       let dmData = {
         dmId: dmDocRef.id,
         authors: [creator, recipient],
         createdAt: new Date().toISOString()
-      }
+      };
 
       // Update DM document
       let dmDocPromise = dmDocRef.set(dmData);
 
       // Add the DM reference to the creator
-      let updateCreatorPromise = addDirectMessageToUser(creator, recipient, dmDocRef);
+      let updateCreatorPromise = addDirectMessageToUser(
+        creator,
+        recipient,
+        dmDocRef
+      );
 
       // Add the DM reference to the recipient
-      let updateRecipientPromise = addDirectMessageToUser(recipient, creator, dmDocRef);
+      let updateRecipientPromise = addDirectMessageToUser(
+        recipient,
+        creator,
+        dmDocRef
+      );
 
       // Wait for all promises
-      return Promise.all([dmDocPromise, updateCreatorPromise, updateRecipientPromise]);
+      return Promise.all([
+        dmDocPromise,
+        updateCreatorPromise,
+        updateRecipientPromise
+      ]);
     })
     .then(() => {
       return res.status(201).json({ message: "Success!" });
     })
-    .catch((err) => {
+    .catch(err => {
       console.log(err);
 
       if (err.code && err.message && err.code > 0) {
@@ -1059,8 +1099,8 @@ exports.createDirectMessage = (req, res) => {
         // Generic or firebase error
         return res.status(500).json({ error: err });
       }
-    })
+    });
-}
+};
 
 // Checks if the requested user has DMs enable or not
 /* Request Parameters
@@ -1071,7 +1111,7 @@ exports.checkDirectMessagesEnabled = (req, res) => {
     .then(() => {
       return res.status(200).json({ enabled: true });
     })
-    .catch((result) => {
+    .catch(result => {
       console.log(result);
       if (result.code === 200) {
         // DMs are disabled
@@ -1080,8 +1120,8 @@ exports.checkDirectMessagesEnabled = (req, res) => {
         // Some other error occured
         return res.status(result.code).json({ err: result.message });
       }
-    })
+    });
-}
+};
 
 exports.getUserHandles = (req, res) => {
   db.doc(`/users/${req.body.userHandle}`)
@@ -1105,7 +1145,9 @@ exports.addSubscription = (req, res) => {
   let userRef = db.doc(`/users/${req.userData.handle}`);
   userRef.get().then(doc => {
     new_following = doc.data().following;
-    new_following.push(req.body.following);
+    new_following
+      ? new_following.push(req.body.following)
+      : (new_following = req.body.following);
 
     // add stuff
     userRef
@@ -1118,7 +1160,7 @@ exports.addSubscription = (req, res) => {
       .catch(err => {
         return res.status(500).json({ err });
       });
-    return res.status(200).json({ message: "ok" });
+    // return res.status(200).json({ message: "ok" });
   });
 };
 
@@ -1146,25 +1188,32 @@ exports.uploadProfileImage = (req, res) => {
 
   let imageFileName;
   let imageToBeUploaded = {};
-  let oldImageFileName = req.userData.imageUrl ? req.userData.imageUrl.split("/o/")[1].split("?alt")[0] : null;
+  let oldImageFileName = req.userData.imageUrl
+    ? req.userData.imageUrl.split("/o/")[1].split("?alt")[0]
+    : null;
   // console.log(`old file: ${oldImageFileName}`);
 
   busboy.on("file", (fieldname, file, filename, encoding, mimetype) => {
-    if (mimetype !== 'image/jpeg' && mimetype !== 'image/png') {
+    if (mimetype !== "image/jpeg" && mimetype !== "image/png") {
       return res.status(400).json({ error: "Wrong filetype submitted" });
     }
     // console.log(fieldname);
     // console.log(filename);
     // console.log(mimetype);
     const imageExtension = filename.split(".")[filename.split(".").length - 1]; // Get the image file extension
-    imageFileName = `${Math.round(Math.random() * 100000000000)}.${imageExtension}`;  // Get a random filename
+    imageFileName = `${Math.round(
+      Math.random() * 100000000000
+    )}.${imageExtension}`; // Get a random filename
     const filepath = path.join(os.tmpdir(), imageFileName);
     imageToBeUploaded = { filepath, mimetype };
     file.pipe(fs.createWriteStream(filepath));
   });
   busboy.on("finish", () => {
     // Save the file to the storage bucket
-    admin.storage().bucket(config.storageBucket).upload(imageToBeUploaded.filepath, {
+    admin
+      .storage()
+      .bucket(config.storageBucket)
+      .upload(imageToBeUploaded.filepath, {
         resumable: false,
         metadata: {
           metadata: {
@@ -1180,24 +1229,33 @@ exports.uploadProfileImage = (req, res) => {
       .then(() => {
         // Delete their old image if they have one
         if (oldImageFileName !== null && oldImageFileName !== "no-img.png") {
-        admin.storage().bucket(config.storageBucket).file(oldImageFileName).delete()
+          admin
+            .storage()
+            .bucket(config.storageBucket)
+            .file(oldImageFileName)
+            .delete()
             .then(() => {
-            return res.status(201).json({ message: "Image uploaded successfully1"});
+              return res
+                .status(201)
+                .json({ message: "Image uploaded successfully1" });
             })
-          .catch((err) => {
+            .catch(err => {
               console.log(err);
-            return res.status(201).json({ message: "Image uploaded successfully2"});
+              return res
-          })
+                .status(201)
+                .json({ message: "Image uploaded successfully2" });
+            });
           // return res.status(201).json({ message: "Image uploaded successfully"});
         } else {
-        return res.status(201).json({ message: "Image uploaded successfully3"});
+          return res
+            .status(201)
+            .json({ message: "Image uploaded successfully3" });
         }
-
       })
-    .catch((err) => {
+      .catch(err => {
         console.error(err);
-      return res.status(500).json({ error: err.code})
+        return res.status(500).json({ error: err.code });
-    })
+      });
   });
   busboy.end(req.rawBody);
 
@@ -1253,7 +1311,7 @@ exports.uploadProfileImage = (req, res) => {
   //     });
   // });
   //   busboy.end(req.rawBody);
-}
+};
 
 exports.removeSub = (req, res) => {
   let new_following = [];

functions/index.js

@@ -144,7 +144,8 @@ const {
   putTopic,
   getAllTopics,
   deleteTopic,
-  getUserTopics
+  getUserTopics,
+  putNewTopic
 } = require("./handlers/topic");
 
 // add topic to database
@@ -159,4 +160,6 @@ app.post("/deleteTopic", fbAuth, deleteTopic);
 // get topic for this user
 app.post("/getUserTopics", fbAuth, getUserTopics);
 
+app.post("/putNewTopic", fbAuth, putNewTopic);
+
 exports.api = functions.https.onRequest(app);

twistter-frontend/src/pages/Home.js

@@ -168,7 +168,7 @@ class Home extends Component {
             <p></p>
           )
         ) : (
-          <p>Loading</p>
+          <p></p>
         )
       )
     ) : (

twistter-frontend/src/pages/otherUser.js

@@ -77,7 +77,8 @@ class user extends Component {
       user: null,
       following: null,
       posts: null,
-      myTopics: null
+      myTopics: null,
+      followingList: null
     };
   }
 
@@ -113,6 +114,24 @@ class user extends Component {
     }
   };
 
+  handleAdd = newTopic => {
+    axios
+      .post("/putNewTopic", {
+        handle: this.state.profile,
+        topic: newTopic
+      })
+      .then(() => {
+        let temp = this.state.myTopics;
+        temp.push(newTopic);
+        this.setState({
+          myTopics: temp
+        });
+      })
+      .catch(err => {
+        console.err(err);
+      });
+  };
+
   componentDidMount() {
     axios
       .post("/getUserDetails", {
@@ -129,11 +148,19 @@ class user extends Component {
     axios
       .get("/user")
       .then(res => {
+        // console.log(res.data.credentials.following);
+        let list = [];
+        let fol = false;
+        res.data.credentials.following.forEach(follow => {
+          console.log(follow);
+          if (this.state.profile === follow.handle) {
+            fol = true;
+            list = follow.topics;
+          }
+        });
         this.setState({
-          following: res.data.credentials.following.includes(
+          following: fol,
-            this.state.profile
+          myTopics: list
-          ),
-          myTopics: res.data.credentials.followedTopics
         });
       })
       .catch(err => console.log(err));
@@ -154,7 +181,7 @@ class user extends Component {
       .get("/getAlert")
       .then(res => {
         let temp = this.state.posts;
-        console.log(res.data);
+        // console.log(res.data);
         res.data.forEach(element => {
           element ? temp.push(element) : console.err;
         });
@@ -194,8 +221,8 @@ class user extends Component {
       <p>loading username...</p>
     );
 
-    console.log(this.state.topics);
+    // console.log(this.state.topics);
-    console.log(this.state.myTopics);
+    // console.log(this.state.myTopics);
     let topicsMarkup = this.state.topics ? (
       this.state.topics.map(
         topic =>
@@ -212,6 +239,8 @@ class user extends Component {
                 label={topic}
                 key={{ topic }.topic.id}
                 color="secondary"
+                clickable
+                onClick={key => this.handleAdd(topic)}
               />
             )
           ) : (
@@ -228,7 +257,7 @@ class user extends Component {
     ) : (
       <img src={noImage} height="150" width="150" />
     );
-    console.log(this.state.posts);
+    //(this.state.posts);
     let postMarkup = this.state.posts ? (
       this.state.posts.map(post => (
         <Card className={classes.card}>