-
- {username}
-
+
-
-
- 
-
-
- [[user:offline]]
-
-
-
- [[user:banned]]
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+ {username}
+
+
+
+
+
+ [[user:banned]]
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
+
+
+
+ {postcount}
+ [[user:posts]]
+
+
+
+ {followerCount}
+ [[user:followers]]
+
+
+ {followingCount}
+ [[user:following]]
+
-
-
- [[user:email]]
+
+
-
+ [[user:email]]
- {email}
+ {email}
[[user:hidden]]
-
- [[user:fullname]] - {fullname} -
+ {fullname} [[user:website]] - {websiteName} -
+ {websiteName} [[user:location]] - {location} -
+ {location} [[user:age]] - {age} -
+ {age} +
- [[user:joined]] - -
- - [[user:lastonline]] - -
[[user:profile_views]] - {profileviews} -
+ {profileviews} [[user:reputation]] - {reputation} -
- - [[user:posts]] - {postcount} -
+ {reputation} - [[user:followers]] - {followerCount} -
+ [[user:joined]] + - [[user:following]] - {followingCount} -
+ [[user:lastonline]] + -
+
[[user:signature]] -
+
+
- [[user:fullname]] - {fullname} -
+ {fullname} [[user:website]] - {websiteName} -
+ {websiteName} [[user:location]] - {location} -
+ {location} [[user:age]] - {age} -
+ {age} +
- [[user:joined]] - -
- - [[user:lastonline]] - -
[[user:profile_views]] - {profileviews} -
+ {profileviews} [[user:reputation]] - {reputation} -
- - [[user:posts]] - {postcount} -
+ {reputation} - [[user:followers]] - {followerCount} -
+ [[user:joined]] + - [[user:following]] - {followingCount} -
+ [[user:lastonline]] + -
+
[[user:signature]] -
+
{signature}
+
+
-
[[global:recentposts]]
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl index b511bf5917..3720df04cb 100644 --- a/public/templates/accountedit.tpl +++ b/public/templates/accountedit.tpl @@ -30,11 +30,8 @@
-
- {username}
- [[user:edit]]
-
+
+
diff --git a/public/templates/accountposts.tpl b/public/templates/accountposts.tpl
new file mode 100644
index 0000000000..e2196327e8
--- /dev/null
+++ b/public/templates/accountposts.tpl
@@ -0,0 +1,41 @@
+
+
diff --git a/public/templates/accountsettings.tpl b/public/templates/accountsettings.tpl
index f90b978973..377bd80e61 100644
--- a/public/templates/accountsettings.tpl
+++ b/public/templates/accountsettings.tpl
@@ -1,10 +1,7 @@
+
+
+
+
+ [[topic:favourites.has_no_favourites]]
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+ {posts.username}
+
+
+ {posts.content}
+ +
+
+
+ posted
+ in
+
+ {posts.categoryName}
+
+
+
+
+
+
-
-
- {username}
- [[user:settings]]
-
+
+
diff --git a/public/templates/config.json b/public/templates/config.json
index 5bdcd81c5e..11126c65a8 100644
--- a/public/templates/config.json
+++ b/public/templates/config.json
@@ -23,6 +23,7 @@
"^user.*followers": "followers",
"^user.*settings": "accountsettings",
"^user.*favourites": "favourites",
+ "^user.*posts": "accountposts",
"^user/.*": "account",
"^recent/.*": "recent",
diff --git a/public/templates/favourites.tpl b/public/templates/favourites.tpl
index 13fc48bc27..a0edf132ee 100644
--- a/public/templates/favourites.tpl
+++ b/public/templates/favourites.tpl
@@ -1,13 +1,10 @@
-
-
- {username}
- [[topic:favourites]]
-
+
+
- [[topic:favourites.has_no_favourites]]
+ [[topic:favourites.has_no_favourites]]
diff --git a/public/templates/followers.tpl b/public/templates/followers.tpl
index 7182280206..f56e92733b 100644
--- a/public/templates/followers.tpl
+++ b/public/templates/followers.tpl
@@ -1,10 +1,7 @@
-
-
- {username}
- [[user:followers]]
-
+
+
diff --git a/public/templates/following.tpl b/public/templates/following.tpl
index a2bf44c430..0f1e3b7acb 100644
--- a/public/templates/following.tpl
+++ b/public/templates/following.tpl
@@ -1,10 +1,7 @@
-
-
- {username}
- [[user:following]]
-
+
+
diff --git a/src/posts.js b/src/posts.js
index 1f32708c7a..dd24aeed5a 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -169,11 +169,30 @@ var db = require('./database'),
});
}, function(pids) {
if (!(pids && pids.length)) {
- return callback(null, []);
+ return callback(null, { posts: [], nextStart: 0});
}
- Posts.getPostSummaryByPids(pids, false, callback);
+ Posts.getPostSummaryByPids(pids, false, function(err, posts) {
+ if(err) {
+ return callback(err);
+ }
+
+ if(!posts || !posts.length) {
+ return callback(null, { posts: [], nextStart: 0});
+ }
+
+ db.sortedSetRevRank('uid:' + uid + ':posts', posts[posts.length - 1].pid, function(err, rank) {
+ if(err) {
+ return calllback(err);
+ }
+ var userPosts = {
+ posts: posts,
+ nextStart: parseInt(rank, 10) + 1
+ };
+ callback(null, userPosts);
+ });
+ });
});
});
}
diff --git a/src/routes/user.js b/src/routes/user.js
index ebcdd5d304..1a4dc674be 100644
--- a/src/routes/user.js
+++ b/src/routes/user.js
@@ -72,6 +72,7 @@ var fs = require('fs'),
createRoute('/:userslug/following', '/following', 'following');
createRoute('/:userslug/followers', '/followers', 'followers');
createRoute('/:userslug/favourites', '/favourites', 'favourites');
+ createRoute('/:userslug/posts', '/posts', 'accountposts');
app.get('/:userslug/edit', function (req, res) {
@@ -363,6 +364,42 @@ var fs = require('fs'),
});
});
+ app.get('/api/user/:userslug/posts', function (req, res, next) {
+ var callerUID = req.user ? req.user.uid : '0';
+
+ user.getUidByUserslug(req.params.userslug, function (err, uid) {
+ if (!uid) {
+ res.json(404, {
+ error: 'User not found!'
+ });
+ return;
+ }
+
+ user.getUserFields(uid, ['username', 'userslug'], function (err, userData) {
+ if (err) {
+ return next(err);
+ }
+
+ if (userData) {
+ posts.getPostsByUid(callerUID, uid, 0, 19, function (err, userPosts) {
+ if (err) {
+ return next(err);
+ }
+ userData.uid = uid;
+ userData.posts = userPosts.posts;
+ userData.nextStart = userPosts.nextStart;
+
+ res.json(userData);
+ });
+ } else {
+ res.json(404, {
+ error: 'User not found!'
+ });
+ }
+ });
+ });
+ });
+
app.get('/api/user/:userslug', function (req, res, next) {
var callerUID = req.user ? req.user.uid : '0';
@@ -375,13 +412,13 @@ var fs = require('fs'),
user.isFollowing(callerUID, userData.theirid, function (isFollowing) {
- posts.getPostsByUid(callerUID, userData.theirid, 0, 9, function (err, posts) {
+ posts.getPostsByUid(callerUID, userData.theirid, 0, 9, function (err, userPosts) {
if(err) {
return next(err);
}
- userData.posts = posts.filter(function (p) {
+ userData.posts = userPosts.posts.filter(function (p) {
return p && parseInt(p.deleted, 10) !== 1;
});
diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js
index de61541d73..250cca3589 100644
--- a/src/socket.io/posts.js
+++ b/src/socket.io/posts.js
@@ -258,4 +258,15 @@ SocketPosts.loadMoreFavourites = function(socket, data, callback) {
posts.getFavourites(socket.uid, start, end, callback);
};
+SocketPosts.loadMoreUserPosts = function(socket, data, callback) {
+ if(!data || !data.after || !data.uid) {
+ return callback(new Error('invalid data'));
+ }
+
+ var start = parseInt(data.after, 10),
+ end = start + 9;
+
+ posts.getPostsByUid(socket.uid, data.uid, start, end, callback);
+};
+
module.exports = SocketPosts;
\ No newline at end of file