From 4f9b7432dd4d323ac6cc4efceeae2efaffe62e7d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 27 Sep 2016 16:58:23 +0200
Subject: Fix #52 - Add API versioning (v1)

---
 app/controllers/api/accounts_controller.rb    | 52 --------------------------
 app/controllers/api/apps_controller.rb        | 13 -------
 app/controllers/api/follows_controller.rb     | 13 -------
 app/controllers/api/media_controller.rb       |  8 ----
 app/controllers/api/statuses_controller.rb    | 54 ---------------------------
 app/controllers/api/v1/accounts_controller.rb | 52 ++++++++++++++++++++++++++
 app/controllers/api/v1/apps_controller.rb     | 13 +++++++
 app/controllers/api/v1/follows_controller.rb  | 13 +++++++
 app/controllers/api/v1/media_controller.rb    |  8 ++++
 app/controllers/api/v1/statuses_controller.rb | 54 +++++++++++++++++++++++++++
 10 files changed, 140 insertions(+), 140 deletions(-)
 delete mode 100644 app/controllers/api/accounts_controller.rb
 delete mode 100644 app/controllers/api/apps_controller.rb
 delete mode 100644 app/controllers/api/follows_controller.rb
 delete mode 100644 app/controllers/api/media_controller.rb
 delete mode 100644 app/controllers/api/statuses_controller.rb
 create mode 100644 app/controllers/api/v1/accounts_controller.rb
 create mode 100644 app/controllers/api/v1/apps_controller.rb
 create mode 100644 app/controllers/api/v1/follows_controller.rb
 create mode 100644 app/controllers/api/v1/media_controller.rb
 create mode 100644 app/controllers/api/v1/statuses_controller.rb

(limited to 'app/controllers/api')

diff --git a/app/controllers/api/accounts_controller.rb b/app/controllers/api/accounts_controller.rb
deleted file mode 100644
index 490c28e75..000000000
--- a/app/controllers/api/accounts_controller.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-class Api::AccountsController < ApiController
-  before_action :doorkeeper_authorize!
-  before_action :set_account
-  respond_to    :json
-
-  def show
-  end
-
-  def following
-    @following = @account.following
-  end
-
-  def followers
-    @followers = @account.followers
-  end
-
-  def statuses
-    @statuses = @account.statuses.with_includes.with_counters.paginate_by_max_id(20, params[:max_id] || nil).to_a
-  end
-
-  def follow
-    @follow = FollowService.new.(current_user.account, @account.acct)
-    set_relationship
-    render action: :relationship
-  end
-
-  def unfollow
-    @unfollow = UnfollowService.new.(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]
-    @accounts    = Account.find(ids)
-    @following   = Account.following_map(ids, current_user.account_id)
-    @followed_by = Account.followed_by_map(ids, current_user.account_id)
-    @blocking    = {}
-  end
-
-  private
-
-  def set_account
-    @account = Account.find(params[:id])
-  end
-
-  def set_relationship
-    @following   = Account.following_map([@account.id], current_user.account_id)
-    @followed_by = Account.followed_by_map([@account.id], current_user.account_id)
-    @blocking    = {}
-  end
-end
diff --git a/app/controllers/api/apps_controller.rb b/app/controllers/api/apps_controller.rb
deleted file mode 100644
index 629cb2416..000000000
--- a/app/controllers/api/apps_controller.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Api::AppsController < ApplicationController
-  respond_to :json
-
-  def create
-    @app = Doorkeeper::Application.create!(app_params)
-  end
-
-  private
-
-  def app_params
-    params.permit(:name, :redirect_uri)
-  end
-end
diff --git a/app/controllers/api/follows_controller.rb b/app/controllers/api/follows_controller.rb
deleted file mode 100644
index dbd44cc54..000000000
--- a/app/controllers/api/follows_controller.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Api::FollowsController < ApiController
-  before_action :doorkeeper_authorize!
-  respond_to    :json
-
-  def create
-    if params[:uri].blank?
-      raise ActiveRecord::RecordNotFound
-    end
-
-    @account = FollowService.new.(current_user.account, params[:uri]).try(:target_account)
-    render action: :show
-  end
-end
diff --git a/app/controllers/api/media_controller.rb b/app/controllers/api/media_controller.rb
deleted file mode 100644
index d5a0a124a..000000000
--- a/app/controllers/api/media_controller.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class Api::MediaController < ApiController
-  before_action :doorkeeper_authorize!
-  respond_to    :json
-
-  def create
-    @media = MediaAttachment.create!(account: current_user.account, file: params[:file])
-  end
-end
diff --git a/app/controllers/api/statuses_controller.rb b/app/controllers/api/statuses_controller.rb
deleted file mode 100644
index 44fb40bae..000000000
--- a/app/controllers/api/statuses_controller.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-class Api::StatusesController < ApiController
-  before_action :doorkeeper_authorize!
-  respond_to    :json
-
-  def show
-    @status = Status.find(params[:id])
-  end
-
-  def context
-    @status      = Status.find(params[:id])
-    @ancestors   = @status.ancestors
-    @descendants = @status.descendants
-  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])
-    render action: :show
-  end
-
-  def destroy
-    @status = Status.where(account_id: current_user.account).find(params[:id])
-    RemoveStatusService.new.(@status)
-    render_empty
-  end
-
-  def reblog
-    @status = ReblogService.new.(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!)
-    @status = Status.find(params[:id])
-    render action: :show
-  end
-
-  def favourite
-    @status = FavouriteService.new.(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
-    render action: :show
-  end
-
-  def home
-    @statuses = Feed.new(:home, current_user.account).get(20, params[:max_id]).to_a
-  end
-
-  def mentions
-    @statuses = Feed.new(:mentions, current_user.account).get(20, params[:max_id]).to_a
-  end
-end
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
new file mode 100644
index 000000000..23f48782f
--- /dev/null
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -0,0 +1,52 @@
+class Api::V1::AccountsController < ApiController
+  before_action :doorkeeper_authorize!
+  before_action :set_account
+  respond_to    :json
+
+  def show
+  end
+
+  def following
+    @following = @account.following
+  end
+
+  def followers
+    @followers = @account.followers
+  end
+
+  def statuses
+    @statuses = @account.statuses.with_includes.with_counters.paginate_by_max_id(20, params[:max_id] || nil).to_a
+  end
+
+  def follow
+    @follow = FollowService.new.(current_user.account, @account.acct)
+    set_relationship
+    render action: :relationship
+  end
+
+  def unfollow
+    @unfollow = UnfollowService.new.(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]
+    @accounts    = Account.find(ids)
+    @following   = Account.following_map(ids, current_user.account_id)
+    @followed_by = Account.followed_by_map(ids, current_user.account_id)
+    @blocking    = {}
+  end
+
+  private
+
+  def set_account
+    @account = Account.find(params[:id])
+  end
+
+  def set_relationship
+    @following   = Account.following_map([@account.id], current_user.account_id)
+    @followed_by = Account.followed_by_map([@account.id], current_user.account_id)
+    @blocking    = {}
+  end
+end
diff --git a/app/controllers/api/v1/apps_controller.rb b/app/controllers/api/v1/apps_controller.rb
new file mode 100644
index 000000000..f7a5e0b0a
--- /dev/null
+++ b/app/controllers/api/v1/apps_controller.rb
@@ -0,0 +1,13 @@
+class Api::V1::AppsController < ApplicationController
+  respond_to :json
+
+  def create
+    @app = Doorkeeper::Application.create!(app_params)
+  end
+
+  private
+
+  def app_params
+    params.permit(:name, :redirect_uri)
+  end
+end
diff --git a/app/controllers/api/v1/follows_controller.rb b/app/controllers/api/v1/follows_controller.rb
new file mode 100644
index 000000000..de006f671
--- /dev/null
+++ b/app/controllers/api/v1/follows_controller.rb
@@ -0,0 +1,13 @@
+class Api::V1::FollowsController < ApiController
+  before_action :doorkeeper_authorize!
+  respond_to    :json
+
+  def create
+    if params[:uri].blank?
+      raise ActiveRecord::RecordNotFound
+    end
+
+    @account = FollowService.new.(current_user.account, params[:uri]).try(:target_account)
+    render action: :show
+  end
+end
diff --git a/app/controllers/api/v1/media_controller.rb b/app/controllers/api/v1/media_controller.rb
new file mode 100644
index 000000000..4896534ad
--- /dev/null
+++ b/app/controllers/api/v1/media_controller.rb
@@ -0,0 +1,8 @@
+class Api::V1::MediaController < ApiController
+  before_action :doorkeeper_authorize!
+  respond_to    :json
+
+  def create
+    @media = MediaAttachment.create!(account: current_user.account, file: params[:file])
+  end
+end
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
new file mode 100644
index 000000000..4196852f2
--- /dev/null
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -0,0 +1,54 @@
+class Api::V1::StatusesController < ApiController
+  before_action :doorkeeper_authorize!
+  respond_to    :json
+
+  def show
+    @status = Status.find(params[:id])
+  end
+
+  def context
+    @status      = Status.find(params[:id])
+    @ancestors   = @status.ancestors
+    @descendants = @status.descendants
+  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])
+    render action: :show
+  end
+
+  def destroy
+    @status = Status.where(account_id: current_user.account).find(params[:id])
+    RemoveStatusService.new.(@status)
+    render_empty
+  end
+
+  def reblog
+    @status = ReblogService.new.(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!)
+    @status = Status.find(params[:id])
+    render action: :show
+  end
+
+  def favourite
+    @status = FavouriteService.new.(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
+    render action: :show
+  end
+
+  def home
+    @statuses = Feed.new(:home, current_user.account).get(20, params[:max_id]).to_a
+  end
+
+  def mentions
+    @statuses = Feed.new(:mentions, current_user.account).get(20, params[:max_id]).to_a
+  end
+end
-- 
cgit