Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-05 13:06:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

changed the chat route to /chats/:roomid?

Browse Source
This commit is contained in:
barisusakli
2015-12-15 19:05:32 +02:00
parent 58d05f7c79
commit 5d1169e686
5 changed files with 63 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/controllers/accounts/chats.js
View File

@@ -1,13 +1,11 @@
'use strict';
var async = require('async'),
nconf = require('nconf'),
var async = require('async');
var messaging = require('../../messaging');
var meta = require('../../meta');
var helpers = require('../helpers');
user = require('../../user'),
messaging = require('../../messaging'),
meta = require('../../meta'),
helpers = require('../helpers'),
utils = require('../../../public/src/utils');
var chatsController = {};
@@ -16,35 +14,15 @@ chatsController.get = function(req, res, callback) {
return callback();
}
// In case a userNAME is passed in instead of a slug, the route should not 404
var slugified = utils.slugify(req.params.userslug);
if (req.params.userslug && req.params.userslug !== slugified) {
return helpers.redirect(res, '/chats/' + slugified);
}
async.parallel({
contacts: async.apply(user.getFollowing, req.user.uid, 0, 199),
recentChats: async.apply(messaging.getRecentChats, req.user.uid, 0, 19)
}, function(err, results) {
messaging.getRecentChats(req.user.uid, 0, 19, function(err, recentChats) {
if (err) {
return callback(err);
}
if (results.recentChats.users && results.recentChats.users.length) {
var contactUids = results.recentChats.users.map(function(chatObj) {
return parseInt(chatObj.uid, 10);
});
results.contacts = results.contacts.filter(function(contact) {
return contactUids.indexOf(parseInt(contact.uid, 10)) === -1;
});
}
if (!req.params.userslug) {
if (!req.params.roomid) {
return res.render('chats', {
chats: results.recentChats.users,
nextStart: results.recentChats.nextStart,
contacts: results.contacts,
rooms: recentChats.rooms,
nextStart: recentChats.nextStart,
allowed: true,
title: '[[pages:chats]]',
breadcrumbs: helpers.buildBreadcrumbs([{text: '[[pages:chats]]'}])
@@ -52,21 +30,23 @@ chatsController.get = function(req, res, callback) {
}
async.waterfall([
async.apply(user.getUidByUserslug, req.params.userslug),
function(toUid, next) {
if (!toUid || parseInt(toUid, 10) === parseInt(req.user.uid, 10)) {
function (next) {
messaging.isUserInRoom(req.uid, req.params.roomid, next);
},
function (inRoom, next) {
if (!inRoom) {
return callback();
}
async.parallel({
toUser: async.apply(user.getUserFields, toUid, ['uid', 'username']),
users: async.apply(messaging.getUsersInRoom, req.params.roomid, 0, -1),
messages: async.apply(messaging.getMessages, {
fromuid: req.user.uid,
touid: toUid,
uid: req.user.uid,
roomId: req.params.roomid,
since: 'recent',
isNew: false
}),
allowed: async.apply(messaging.canMessage, req.user.uid, toUid)
allowed: async.apply(messaging.canMessage, req.user.uid, req.params.roomid)
}, next);
}
], function(err, data) {
@@ -74,15 +54,20 @@ chatsController.get = function(req, res, callback) {
return callback(err);
}
var usernames = data.users.map(function(user) {
return user && user.username;
}).join(', ');
res.render('chats', {
chats: results.recentChats.users,
nextStart: results.recentChats.nextStart,
contacts: results.contacts,
meta: data.toUser,
roomId: req.params.roomid,
rooms: recentChats.rooms,
nextStart: recentChats.nextStart,
users: data.users,
usernames: usernames,
messages: data.messages,
allowed: data.allowed,
title: '[[pages:chat, ' + data.toUser.username + ']]',
breadcrumbs: helpers.buildBreadcrumbs([{text: '[[pages:chats]]', url: '/chats'}, {text: data.toUser.username}])
title: '[[pages:chat, ' + usernames + ']]',
breadcrumbs: helpers.buildBreadcrumbs([{text: '[[pages:chats]]', url: '/chats'}, {text: usernames}])
});
});
});