cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace lookup_friend with lookup_user in FollowsController

Browse source
This commit is contained in:
Anton Khorev 2025-01-18 19:35:30 +03:00
parent 2074e9dce2
commit 82fb1bf798
2 changed files with 12 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/controllers/follows_controller.rb
View file

@ -10,25 +10,25 @@ class FollowsController < ApplicationController
authorize_resource authorize_resource
before_action :check_database_writable before_action :check_database_writable
before_action :lookup_friend before_action :lookup_user
def show def show
@already_follows = current_user.follows?(@friend) @already_follows = current_user.follows?(@user)
end end
def create def create
follow = Follow.new follow = Follow.new
follow.follower = current_user follow.follower = current_user
follow.following = @friend follow.following = @user
if current_user.follows?(@friend) if current_user.follows?(@user)
flash[:warning] = t ".already_followed", :name => @friend.display_name flash[:warning] = t ".already_followed", :name => @user.display_name
elsif current_user.follows.where(:created_at => Time.now.utc - 1.hour..).count >= current_user.max_follows_per_hour elsif current_user.follows.where(:created_at => Time.now.utc - 1.hour..).count >= current_user.max_follows_per_hour
flash[:error] = t ".limit_exceeded" flash[:error] = t ".limit_exceeded"
elsif follow.save elsif follow.save
flash[:notice] = t ".success", :name => @friend.display_name flash[:notice] = t ".success", :name => @user.display_name
UserMailer.follow_notification(follow).deliver_later UserMailer.follow_notification(follow).deliver_later
else else
follow.add_error(t(".failed", :name => @friend.display_name)) follow.add_error(t(".failed", :name => @user.display_name))
end end
referer = safe_referer(params[:referer]) if params[:referer] referer = safe_referer(params[:referer]) if params[:referer]
@ -37,25 +37,15 @@ class FollowsController < ApplicationController
end end
def destroy def destroy
if current_user.follows?(@friend) if current_user.follows?(@user)
Follow.where(:follower => current_user, :following => @friend).delete_all Follow.where(:follower => current_user, :following => @user).delete_all
flash[:notice] = t ".success", :name => @friend.display_name flash[:notice] = t ".success", :name => @user.display_name
else else
flash[:error] = t ".not_followed", :name => @friend.display_name flash[:error] = t ".not_followed", :name => @user.display_name
end end
referer = safe_referer(params[:referer]) if params[:referer] referer = safe_referer(params[:referer]) if params[:referer]
redirect_to referer || user_path redirect_to referer || user_path
end end
private
##
# ensure that there is a "friend" instance variable
def lookup_friend
@friend = User.active.find_by!(:display_name => params[:display_name])
rescue ActiveRecord::RecordNotFound
render_unknown_user params[:display_name]
end
end end

2
app/views/follows/show.html.erb
View file

@ -1,5 +1,5 @@
<% content_for :heading do %> <% content_for :heading do %>
<h1><%= t(@already_follows ? ".unfollow.heading" : ".follow.heading", :user => @friend.display_name) %></h1> <h1><%= t(@already_follows ? ".unfollow.heading" : ".follow.heading", :user => @user.display_name) %></h1>
<% end %> <% end %>
<%= bootstrap_form_tag :method => (@already_follows ? :delete : :post) do |f| %> <%= bootstrap_form_tag :method => (@already_follows ? :delete : :post) do |f| %>