following....

Author: James Ayres

src/containers/App/App.js

@@ -3,7 +3,7 @@ import { BrowserRouter as Router, Route } from 'react-router-dom';
 import sortBy from 'lodash.sortby';
 import urlEnv from '../../utils/urlEnv';
 import profileContents from '../../utils/profileContents';
-import { queryFollowers } from '../../utils/following';
+import { queryFollowers, followURLCheck } from '../../utils/following';
 
 import ContentViewContainer from '../ContentViewContainer';
 import Settings from '../Settings';
@@ -15,7 +15,7 @@ class App extends Component {
     this.state = {
       loading: true,
       contentSelectionOpen: false,
-      correctBrowser: false,
+      correctBrowser: true,
       isOwner: false,
       posts: [],
       theirPosts: [],
@@ -26,17 +26,16 @@ class App extends Component {
   }
 
   async componentDidMount() {
-    console.log('hmmm');
     try {
       const archive = await new global.DatArchive(urlEnv());
       const archiveInfo = await archive.getInfo();
-      const results = await this.refreshPosts(archive);
+      const allPosts = await this.getAllPosts(archive);
       const theirresults = await this.refreshTheirPosts(archive);
       const userData = await this.getUserInfo(archive);
 
       this.setState({
         correctBrowser: true,
-        posts: results,
+        posts: allPosts,
         theirPosts: theirresults,
         loading: false,
         ...(archiveInfo.isOwner && { isOwner: true }),
@@ -83,7 +82,32 @@ class App extends Component {
     }
   };
 
-  refreshPosts = async archive => {
+  /*
+  * This method takes an archive and
+  * returns all of their posts. 
+  * It does not setState.
+  */
+  getAllPosts = async archive => {
+    const posts = await archive.readdir('/posts');
+    if (posts.length === 0) {
+      this.setState({
+        posts: []
+      });
+    } else {
+      const promises = posts.map(async post => {
+        const postResponse = await archive.readFile(`/posts/${post}`);
+        return JSON.parse(postResponse);
+      });
+      const results = await Promise.all(promises);
+      return results;
+    }
+  };
+
+  /*
+  * Exact same as the above function, but
+  * also sets state.
+  */
+  getAllPostsSaved = async archive => {
     const posts = await archive.readdir('/posts');
     if (posts.length === 0) {
       this.setState({
@@ -120,7 +144,7 @@ class App extends Component {
   deletePost = async postId => {
     const archive = await new global.DatArchive(urlEnv());
     await archive.unlink(`/posts/${postId}.json`);
-    this.refreshPosts(archive);
+    this.getAllPostsSaved(archive);
   };
 
   deletePostSingle = async postId => {
@@ -140,9 +164,12 @@ class App extends Component {
       3a. return true or false message if valid dat URL
     ---*/
     const followerData = {
-      name: 'frogs',
+      name: '',
       url: followerFieldVal
     };
+    if (followerData.url === '') {
+      return null;
+    }
     // 4. write to following array in profile.json
     this.setState(
       {
@@ -154,18 +181,16 @@ class App extends Component {
         }
       },
       () => this.changeUserData(this.state.userData)
-      // () => console.log('update', this.state.userData)
     );
+    document.querySelector('#add-follower-input').value = '';
   };
 
   updateUserData = e => {
     e.preventDefault();
-    console.log('userdata', this.state.userData);
     this.changeUserData(this.state.userData);
   };
 
   userDataChange = (e, str) => {
-    console.log('frogs');
     this.setState({
       userData: {
         ...this.state.userData,
@@ -206,7 +231,7 @@ class App extends Component {
                     : this.state.posts
                 )}
                 isOwner={this.state.isOwner}
-                getPosts={this.refreshPosts}
+                getPosts={this.getAllPostsSaved}
                 togglePostDisplayFn={this.togglePostDisplay}
                 correctBrowser={this.state.correctBrowser}
                 deletePost={this.deletePost}
@@ -224,7 +249,7 @@ class App extends Component {
                 contentSelectionOpen={this.state.contentSelectionOpen}
                 toggleContentSelection={this.toggleContentSelection}
                 togglePostDisplayFn={this.togglePostDisplay}
-                getPosts={this.refreshPosts}
+                getPosts={this.getAllPostsSaved}
                 isOwner={this.state.isOwner}
                 correctBrowser={this.state.correctBrowser}
                 deletePost={this.deletePostSingle}

src/utils/fileContents.js

@@ -5,14 +5,15 @@ const fileContents = (
   postIdStr,
   postType,
   postAuthor
-) => `{
-  "postId": "${postIdStr}",
-  "titleContent": "${postTitle}",
-  "textContent": ${postText},
-  "imageSource": "${postImage}",
-  "createdAt": ${Date.now()},
-  "postType": "${postType}",
-  "postAuthor": "${postAuthor}"
-}`;
+) =>
+  JSON.stringify({
+    postId: postIdStr,
+    titleContent: postTitle,
+    textContent: postText,
+    imageSource: postImage,
+    createdAt: Date.now(),
+    postType: postType,
+    postAuthor: postAuthor
+  });
 
 export default fileContents;

src/utils/following.js

@@ -7,7 +7,6 @@ export const queryFollowers = async () => {
   const userData = await archive.readFile(`profile.json`);
   const followingArray = JSON.parse(userData).follows;
   // 2. map following users
-  console.log('followingArray', followingArray);
   if (followingArray.length > 0) {
     followingArray.map(async follow => {
       await queryFollowerPosts(follow);
@@ -35,3 +34,19 @@ const queryFollowerPosts = async follow => {
 const writePost = async (post, postId) => {
   await archive.writeFile(`/theirposts/${postId}.json`, post);
 };
+
+export const followURLCheck = async value => {
+  if (
+    value.startsWith('dat://') &&
+    (value.length === 70 || value.length === 71)
+  ) {
+    return value;
+  } else if (
+    !value.startsWith('dat://') &&
+    (value.length === 65 || value.length === 66)
+  ) {
+    return 'dat://' + value;
+  } else {
+    return '';
+  }
+};