Merge branch 'pull/5261'

app/controllers/changesets_controller.rb

@@ -55,7 +55,7 @@ class ChangesetsController < ApplicationController
       elsif @params[:bbox]
         changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params))
       elsif @params[:friends] && current_user
-        changesets = changesets.where(:user => current_user.friends.identifiable)
+        changesets = changesets.where(:user => current_user.followings.identifiable)
       elsif @params[:nearby] && current_user
         changesets = changesets.where(:user => current_user.nearby)
       end

app/controllers/diary_entries_controller.rb

@@ -28,8 +28,8 @@ class DiaryEntriesController < ApplicationController
       end
     elsif params[:friends]
       if current_user
-        @title = t ".title_friends"
-        entries = DiaryEntry.where(:user => current_user.friends)
+        @title = t ".title_followed"
+        entries = DiaryEntry.where(:user => current_user.followings)
       else
         require_user
         return

app/controllers/follows_controller.rb

@@ -0,0 +1,61 @@
+class FollowsController < ApplicationController
+  include UserMethods
+
+  layout "site"
+
+  before_action :authorize_web
+  before_action :set_locale
+  before_action :check_database_readable
+
+  authorize_resource
+
+  before_action :check_database_writable
+  before_action :lookup_friend
+
+  def show
+    @already_follows = current_user.friends_with?(@friend)
+  end
+
+  def create
+    follow = Follow.new
+    follow.follower = current_user
+    follow.following = @friend
+    if current_user.friends_with?(@friend)
+      flash[:warning] = t ".already_followed", :name => @friend.display_name
+    elsif current_user.follows.where(:created_at => Time.now.utc - 1.hour..).count >= current_user.max_friends_per_hour
+      flash[:error] = t ".limit_exceeded"
+    elsif follow.save
+      flash[:notice] = t ".success", :name => @friend.display_name
+      UserMailer.friendship_notification(follow).deliver_later
+    else
+      follow.add_error(t(".failed", :name => @friend.display_name))
+    end
+
+    referer = safe_referer(params[:referer]) if params[:referer]
+
+    redirect_to referer || user_path
+  end
+
+  def destroy
+    if current_user.friends_with?(@friend)
+      Follow.where(:follower => current_user, :following => @friend).delete_all
+      flash[:notice] = t ".success", :name => @friend.display_name
+    else
+      flash[:error] = t ".not_followed", :name => @friend.display_name
+    end
+
+    referer = safe_referer(params[:referer]) if params[:referer]
+
+    redirect_to referer || user_path
+  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

app/controllers/friendships_controller.rb

@@ -1,61 +0,0 @@
-class FriendshipsController < ApplicationController
-  include UserMethods
-
-  layout "site"
-
-  before_action :authorize_web
-  before_action :set_locale
-  before_action :check_database_readable
-
-  authorize_resource
-
-  before_action :check_database_writable, :only => [:make_friend, :remove_friend]
-  before_action :lookup_friend, :only => [:make_friend, :remove_friend]
-
-  def make_friend
-    if request.post?
-      friendship = Friendship.new
-      friendship.befriender = current_user
-      friendship.befriendee = @friend
-      if current_user.friends_with?(@friend)
-        flash[:warning] = t ".already_a_friend", :name => @friend.display_name
-      elsif current_user.friendships.where(:created_at => Time.now.utc - 1.hour..).count >= current_user.max_friends_per_hour
-        flash[:error] = t ".limit_exceeded"
-      elsif friendship.save
-        flash[:notice] = t ".success", :name => @friend.display_name
-        UserMailer.friendship_notification(friendship).deliver_later
-      else
-        friendship.add_error(t(".failed", :name => @friend.display_name))
-      end
-
-      referer = safe_referer(params[:referer]) if params[:referer]
-
-      redirect_to referer || user_path
-    end
-  end
-
-  def remove_friend
-    if request.post?
-      if current_user.friends_with?(@friend)
-        Friendship.where(:befriender => current_user, :befriendee => @friend).delete_all
-        flash[:notice] = t ".success", :name => @friend.display_name
-      else
-        flash[:error] = t ".not_a_friend", :name => @friend.display_name
-      end
-
-      referer = safe_referer(params[:referer]) if params[:referer]
-
-      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