diff --git a/lib/boards-api.js b/lib/boards-api.js index f331172..68a68c0 100644 --- a/lib/boards-api.js +++ b/lib/boards-api.js @@ -254,14 +254,16 @@ BoardsAPI.prototype.getBoardSettings = function(userID,board){ } BoardsAPI.prototype.getPostsInBoard = function(adminID,board){ - var downloadPost = hash => { + var downloadPost = (hash,op) => { this.ipfs.cat(hash,(err2,r) => { if(err2){ this.ee.emit('error',err2) console.log('Could not download post',hash,'of',board+'@'+adminID) } else { // It already returns a JSON? - this.ee.emit('post in '+board+'@'+adminID,r,hash) + var post = r + if(op) post.op = op // Inject op + this.ee.emit('post in '+board+'@'+adminID,post,hash) } }) } @@ -297,7 +299,7 @@ BoardsAPI.prototype.getPostsInBoard = function(adminID,board){ this.getUserPostListInBoard(adminID,board,(err,res) => { if(err){ console.log(err) - } else res.forEach(item => downloadPost(item.hash)) + } else res.forEach(item => downloadPost(item.hash,adminID)) }) return this.ee } diff --git a/package.json b/package.json index bf197e7..f2f5432 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "gulp-util": "~3.0.7", "history": "~1.13.1", "ipfs-api": "~2.7.6", + "lodash.sortedindex": "~3.1.1", "moment": "~2.10.6", "react": "~0.14.2", "react-dom": "~0.14.2", diff --git a/webapp/app.jsx b/webapp/app.jsx index ac962f0..5bd90f8 100644 --- a/webapp/app.jsx +++ b/webapp/app.jsx @@ -7,6 +7,8 @@ var Redirect = require('react-router').Redirect var Link = require('react-router').Link var MarkdownLib = require('react-markdown') +var moment = require('moment') +var sortedIndex = require('lodash.sortedindex') var BoardsAPI = require('../lib/boards-api.js') var opt, s = localStorage.getItem('ipfs-boards-settings') @@ -75,14 +77,21 @@ var Navbar = React.createClass({ }) var Post = React.createClass({ + getDate: function(){ + if(this.props.post.date){ + return moment.unix(this.props.post.date).fromNow() + } else { + return 'Unknown Date' + } + }, render: function(){ return