5 files changed, 14 insertions, 16 deletions
diff --git a/app/controllers/api/salmon_controller.rb b/app/controllers/api/salmon_controller.rb
index 329b258a4..8bd653d7d 100644
--- a/app/controllers/api/salmon_controller.rb
+++ b/app/controllers/api/salmon_controller.rb
@@ -3,7 +3,7 @@ class Api::SalmonController < ApiController
   respond_to :txt
 
   def update
-    ProcessInteractionService.new.(request.body.read, @account)
+    ProcessInteractionService.new.call(request.body.read, @account)
     head 201
   end
 
diff --git a/app/controllers/api/subscriptions_controller.rb b/app/controllers/api/subscriptions_controller.rb
index c8fa60260..c5190b136 100644
--- a/app/controllers/api/subscriptions_controller.rb
+++ b/app/controllers/api/subscriptions_controller.rb
@@ -4,7 +4,7 @@ class Api::SubscriptionsController < ApiController
 
   def show
     if @account.subscription(api_subscription_url(@account.id)).valid?(params['hub.topic'])
-      @account.update(subscription_expires_at: Time.now + ((params['hub.lease_seconds'] || 86400).to_i).seconds)
+      @account.update(subscription_expires_at: Time.now.utc + (params['hub.lease_seconds'] || 86_400).to_i.seconds)
       render plain: HTMLEntities.new.encode(params['hub.challenge']), status: 200
     else
       head 404
@@ -15,7 +15,7 @@ class Api::SubscriptionsController < ApiController
     body = request.body.read
 
     if @account.subscription(api_subscription_url(@account.id)).verify(body, request.headers['HTTP_X_HUB_SIGNATURE'])
-      ProcessFeedService.new.(body, @account)
+      ProcessFeedService.new.call(body, @account)
       head 201
     else
       head 202
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 23f48782f..50e6df80e 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -19,19 +19,19 @@ class Api::V1::AccountsController < ApiController
   end
 
   def follow
-    @follow = FollowService.new.(current_user.account, @account.acct)
+    @follow = FollowService.new.call(current_user.account, @account.acct)
     set_relationship
     render action: :relationship
   end
 
   def unfollow
-    @unfollow = UnfollowService.new.(current_user.account, @account)
+    @unfollow = UnfollowService.new.call(current_user.account, @account)
     set_relationship
     render action: :relationship
   end
 
   def relationships
-    ids = params[:id].is_a?(Enumerable) ? params[:id].map { |id| id.to_i } : [params[:id].to_i]
+    ids = params[:id].is_a?(Enumerable) ? params[:id].map(&:to_i) : [params[:id].to_i]
     @accounts    = Account.find(ids)
     @following   = Account.following_map(ids, current_user.account_id)
     @followed_by = Account.followed_by_map(ids, current_user.account_id)
diff --git a/app/controllers/api/v1/follows_controller.rb b/app/controllers/api/v1/follows_controller.rb
index de006f671..f688f2e72 100644
--- a/app/controllers/api/v1/follows_controller.rb
+++ b/app/controllers/api/v1/follows_controller.rb
@@ -3,11 +3,9 @@ class Api::V1::FollowsController < ApiController
   respond_to    :json
 
   def create
-    if params[:uri].blank?
-      raise ActiveRecord::RecordNotFound
-    end
+    raise ActiveRecord::RecordNotFound if params[:uri].blank?
 
-    @account = FollowService.new.(current_user.account, params[:uri]).try(:target_account)
+    @account = FollowService.new.call(current_user.account, params[:uri]).try(:target_account)
     render action: :show
   end
 end
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 4196852f2..14b86b2a2 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -13,34 +13,34 @@ class Api::V1::StatusesController < ApiController
   end
 
   def create
-    @status = PostStatusService.new.(current_user.account, params[:status], params[:in_reply_to_id].blank? ? nil : Status.find(params[:in_reply_to_id]), params[:media_ids])
+    @status = PostStatusService.new.call(current_user.account, params[:status], params[:in_reply_to_id].blank? ? nil : Status.find(params[:in_reply_to_id]), params[:media_ids])
     render action: :show
   end
 
   def destroy
     @status = Status.where(account_id: current_user.account).find(params[:id])
-    RemoveStatusService.new.(@status)
+    RemoveStatusService.new.call(@status)
     render_empty
   end
 
   def reblog
-    @status = ReblogService.new.(current_user.account, Status.find(params[:id])).reload
+    @status = ReblogService.new.call(current_user.account, Status.find(params[:id])).reload
     render action: :show
   end
 
   def unreblog
-    RemoveStatusService.new.(Status.where(account_id: current_user.account, reblog_of_id: params[:id]).first!)
+    RemoveStatusService.new.call(Status.where(account_id: current_user.account, reblog_of_id: params[:id]).first!)
     @status = Status.find(params[:id])
     render action: :show
   end
 
   def favourite
-    @status = FavouriteService.new.(current_user.account, Status.find(params[:id])).status.reload
+    @status = FavouriteService.new.call(current_user.account, Status.find(params[:id])).status.reload
     render action: :show
   end
 
   def unfavourite
-    @status = UnfavouriteService.new.(current_user.account, Status.find(params[:id])).status.reload
+    @status = UnfavouriteService.new.call(current_user.account, Status.find(params[:id])).status.reload
     render action: :show
   end