Merge branch 'master' of github.com:RocketChat/Rocket.Chat

client/routes/roomRoute.coffee

@@ -15,6 +15,7 @@ FlowRouter.route '/room/:_id',
 
 				if not ChatRoom.find(params._id).count()
 					FlowRouter.go 'home'
+					return
 
 				mainNode = document.querySelector('.main-content')
 				if mainNode?

client/views/app/room.coffee

@@ -288,6 +288,9 @@ Template.room.helpers
 		if @lastLogin
 			return moment(@lastLogin).format('LLL')
 
+	canJoin: ->
+		return !! ChatRoom.findOne { _id: @_id, t: 'c' }
+
 
 Template.room.events
 

client/views/app/room.html

@@ -78,10 +78,12 @@
 						</div>
 					</form>
 				{{else}}
+					{{#if canJoin}}
 					<div>
 						{{{_ "you_are_in_preview_mode_of" room_name=roomName}}}
 						<button class="button join"><span><i class="icon-login"></i> {{_ "join"}}</span></button>
 					</div>
+					{{/if}}
 				{{/if}}
 			</footer>
 		</section>

server/methods/loadHistory.coffee

@@ -3,6 +3,9 @@ Meteor.methods
 		fromId = Meteor.userId()
 		# console.log '[methods] loadHistory -> '.green, 'fromId:', fromId, 'rid:', rid, 'end:', end, 'limit:', limit, 'skip:', skip
 
+		unless Meteor.call 'canAccessRoom', rid, fromId
+			return false
+
 		query =
 			rid: rid
 			ts: