From 571917cfbd65143cdb04f2cceed1dd9a513bed84 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Mon, 24 Aug 2015 13:39:38 -0300 Subject: [PATCH] Force lowercase in the name of new rooms --- client/views/app/sideNav/createChannelFlex.coffee | 2 +- client/views/app/sideNav/privateGroupsFlex.coffee | 2 +- server/methods/createChannel.coffee | 2 +- server/methods/createPrivateGroup.coffee | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/views/app/sideNav/createChannelFlex.coffee b/client/views/app/sideNav/createChannelFlex.coffee index 6f3bf5a44057..c5b20475bce3 100644 --- a/client/views/app/sideNav/createChannelFlex.coffee +++ b/client/views/app/sideNav/createChannelFlex.coffee @@ -77,7 +77,7 @@ Template.createChannelFlex.events 'click .save-channel': (e, instance) -> err = SideNav.validate() - name = instance.find('#channel-name').value + name = instance.find('#channel-name').value.toLowerCase().trim() instance.roomName.set name if not err Meteor.call 'createChannel', name, instance.selectedUsers.get(), (err, result) -> diff --git a/client/views/app/sideNav/privateGroupsFlex.coffee b/client/views/app/sideNav/privateGroupsFlex.coffee index ba7f6a8712a5..e38e00d07759 100644 --- a/client/views/app/sideNav/privateGroupsFlex.coffee +++ b/client/views/app/sideNav/privateGroupsFlex.coffee @@ -73,7 +73,7 @@ Template.privateGroupsFlex.events 'click .save-pvt-group': (e, instance) -> err = SideNav.validate() - name = instance.find('#pvt-group-name').value + name = instance.find('#pvt-group-name').value.toLowerCase().trim() instance.groupName.set name if not err Meteor.call 'createPrivateGroup', name, instance.selectedUsers.get(), (err, result) -> diff --git a/server/methods/createChannel.coffee b/server/methods/createChannel.coffee index 8b80d937b9e1..ffb890bd2df8 100644 --- a/server/methods/createChannel.coffee +++ b/server/methods/createChannel.coffee @@ -3,7 +3,7 @@ Meteor.methods if not Meteor.userId() throw new Meteor.Error 'invalid-user', "[methods] createChannel -> Invalid user" - if not /^[0-9a-z-_]+$/i.test name + if not /^[0-9a-z-_]+$/.test name throw new Meteor.Error 'name-invalid' console.log '[methods] createChannel -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments diff --git a/server/methods/createPrivateGroup.coffee b/server/methods/createPrivateGroup.coffee index 40d252a649d2..1b93ebfb6655 100644 --- a/server/methods/createPrivateGroup.coffee +++ b/server/methods/createPrivateGroup.coffee @@ -5,7 +5,7 @@ Meteor.methods console.log '[methods] createPrivateGroup -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments - if not /^[0-9a-z-_]+$/i.test name + if not /^[0-9a-z-_]+$/.test name throw new Meteor.Error 'name-invalid' now = new Date()