This commit is contained in:
Baris Usakli
2013-05-15 13:57:13 -04:00
parent a4dfc604e7
commit 58aa0ee647
9 changed files with 169 additions and 41 deletions

View File

@@ -34,7 +34,8 @@ var user = require('./../user.js'),
});
app.get('/users/:username*', function(req, res) {
app.get('/users/:username', function(req, res) {
if(!req.params.username) {
res.send("User doesn't exist!");
return;
@@ -189,30 +190,33 @@ var user = require('./../user.js'),
if(req.user.uid == req.body.uid)
return res.redirect('/');
user.addFriend(req.user.uid, req.body.uid, function(err, data) {
if(err)
res.send({error:err});
else
res.send(data);
user.addFriend(req.user.uid, req.body.uid, function(data) {
res.send({data:data});
});
});
app.post('/users/removefriend', function(req, res){
if(!req.user)
return res.redirect('/403');
if(req.user.uid == req.body.uid)
return res.redirect('/');
user.removeFriend(req.user.uid, req.body.uid, function(data) {
res.send({data:data});
});
});
app.get('/users/:username/friends', function(req, res){
if(!req.user)
return res.redirect('/403');
user.get_uid_by_username(req.params.username, function(uid) {
user.getFriends(uid, function(data) {
res.send(JSON.stringify(data, null, 0));
});
});
res.send(templates['header'] + app.create_route('users/'+req.params.username+'/friends','friends') + templates['footer']);
});
function api_method(req, res) {
var callerUID = req.user?req.user.uid : 0;
if (!req.params.section && !req.params.username) {
@@ -225,6 +229,14 @@ var user = require('./../user.js'),
}
else if(String(req.params.section).toLowerCase() === 'friends') {
getUserDataByUserName(req.params.username, callerUID, function(userData) {
user.getFriends(userData.uid, function(friendsData){
userData.friends = friendsData;
userData.friendCount = friendsData.length;
res.send(JSON.stringify(userData));
});
});
}
else if (String(req.params.section).toLowerCase() === 'edit') {
getUserDataByUserName(req.params.username, callerUID, function(userData) {