From 60d8a595f0193547a971d5bae96bc0d294324a2c Mon Sep 17 00:00:00 2001 From: Joshua Arts Date: Tue, 26 Jun 2018 16:20:04 -0400 Subject: [PATCH] always join owners ad moderators --- app/controllers/rooms_controller.rb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb index e8da0d64..5319d41d 100644 --- a/app/controllers/rooms_controller.rb +++ b/app/controllers/rooms_controller.rb @@ -37,15 +37,20 @@ class RoomsController < ApplicationController def join opts = default_meeting_options - # Assign join name if passed. - if params[@room.invite_path] - @join_name = params[@room.invite_path][:join_name] - elsif !params[:join_name] - # Join name not passed. - return + unless @room.owned_by?(current_user) + # Assign join name if passed. + if params[@room.invite_path] + @join_name = params[@room.invite_path][:join_name] + elsif !params[:join_name] + # Join name not passed. + return + end end if @room.running? + # Determine if the user needs to join as a moderator. + opts[:user_is_moderator] = @room.owned_by?(current_user) + if current_user redirect_to @room.join_path(current_user.name, opts, current_user.uid) else