krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

limit rtc to parties

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-09-05 17:54:24 +02:00
parent 4b6af73a1b
commit 6792464fbf
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/client/js/services/pusherService.js
View File

@@ -58,8 +58,6 @@ angular.module('habitrpg')
api.socketId = api.pusher.connection.socket_id; api.socketId = api.pusher.connection.socket_id;
}); });
if (!partyId) return;
var partyChannelName = 'presence-group-' + partyId; var partyChannelName = 'presence-group-' + partyId;
var partyChannel = api.pusher.subscribe(partyChannelName); var partyChannel = api.pusher.subscribe(partyChannelName);
@@ -132,7 +130,7 @@ angular.module('habitrpg')
// Connect the user to Pusher and to the party's chat channel // Connect the user to Pusher and to the party's chat channel
partyId = user && $rootScope.user.party && $rootScope.user.party._id; partyId = user && $rootScope.user.party && $rootScope.user.party._id;
// if (!partyId) return; if (!partyId) return;
// See if another tab is already connected to Pusher // See if another tab is already connected to Pusher
if (!localStorage.getItem(tabIdKey)) { if (!localStorage.getItem(tabIdKey)) {

2
website/server/controllers/api-v3/auth.js
View File

@@ -327,7 +327,7 @@ api.pusherAuth = {
// Channel names are in the form of {presence|private}-{group|...}-{resourceId} // Channel names are in the form of {presence|private}-{group|...}-{resourceId}
let [channelType, resourceType, ...resourceId] = channelName.split('-'); let [channelType, resourceType, ...resourceId] = channelName.split('-');
if (['presence'].indexOf(channelType) === -1) { // presence is used only for parties, private for guilds too if (['presence'].indexOf(channelType) === -1) { // presence is used only for parties, private for guilds
throw new BadRequest('Invalid Pusher channel type.'); throw new BadRequest('Invalid Pusher channel type.');
} }