From 1901ffc4f511f4e25e1bb51d3bdb0a51c0545fe4 Mon Sep 17 00:00:00 2001 From: Andrei Prigorshnev Date: Tue, 20 Jul 2021 20:29:57 +0400 Subject: [PATCH] Rearrange the join method --- app/controllers/groups_controller.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index afaf2d5e08..866c6eb9a6 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -409,15 +409,14 @@ class GroupsController < ApplicationController end def join - group = Group.find(params[:id]) ensure_logged_in - - raise Discourse::InvalidAccess unless group.public_admission - unless current_user.staff? RateLimiter.new(current_user, "public_group_membership", 3, 1.minute).performed! end + group = Group.find(params[:id]) + raise Discourse::InvalidAccess unless group.public_admission + already_in_group = group.users.exists?(id: current_user.id) return if already_in_group