4 files changed, 29 insertions, 10 deletions
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex
index a79b0dca9..e35a94c84 100644
--- a/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@ -17,6 +17,7 @@ defmodule Pleroma.Web.Endpoint do
     plug Phoenix.CodeReloader
   end
 
+  plug TrailingFormatPlug
   plug Plug.RequestId
   plug Plug.Logger
 
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index e7d0b9437..d9a3968a7 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -21,17 +21,18 @@ defmodule Pleroma.Web.Router do
 
   scope "/api", Pleroma.Web do
     pipe_through :api
-    get "/statuses/public_timeline.json", TwitterAPI.Controller, :public_timeline
-    get "/statuses/public_and_external_timeline.json", TwitterAPI.Controller, :public_timeline
+    get "/statuses/public_timeline", TwitterAPI.Controller, :public_timeline
+    get "/statuses/public_and_external_timeline", TwitterAPI.Controller, :public_timeline
+    get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status
   end
 
   scope "/api", Pleroma.Web do
     pipe_through :authenticated_api
 
-    post "/account/verify_credentials.json", TwitterAPI.Controller, :verify_credentials
-    post "/statuses/update.json", TwitterAPI.Controller, :status_update
-    get "/statuses/friends_timeline.json", TwitterAPI.Controller, :friends_timeline
-    post "/friendships/create.json", TwitterAPI.Controller, :follow
-    post "/friendships/destroy.json", TwitterAPI.Controller, :unfollow
+    post "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials
+    post "/statuses/update", TwitterAPI.Controller, :status_update
+    get "/statuses/friends_timeline", TwitterAPI.Controller, :friends_timeline
+    post "/friendships/create", TwitterAPI.Controller, :follow
+    post "/friendships/destroy", TwitterAPI.Controller, :unfollow
   end
 end
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index b98283248..f777ba848 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -69,9 +69,19 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
 
   defp activities_to_statuses(activities, opts) do
     Enum.map(activities, fn(activity) ->
-      actor = get_in(activity.data, ["actor"])
-      user = Repo.get_by!(User, ap_id: actor)
-      ActivityRepresenter.to_map(activity, Map.merge(opts, %{user: user}))
+      activity_to_status(activity, opts)
     end)
   end
+
+  defp activity_to_status(activity, opts) do
+    actor = get_in(activity.data, ["actor"])
+    user = Repo.get_by!(User, ap_id: actor)
+    ActivityRepresenter.to_map(activity, Map.merge(opts, %{user: user}))
+  end
+
+  def fetch_status(user, id) do
+    with %Activity{} = activity <- Repo.get(Activity, id) do
+      activity_to_status(activity, %{for: user})
+    end
+  end
 end
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 42485933b..2a49b6270 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -50,6 +50,13 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     |> json_reply(200, response)
   end
 
+  def fetch_status(%{assigns: %{user: user}} = conn, %{ "id" => id }) do
+    response = TwitterAPI.fetch_status(user, id) |> Poison.encode!
+
+    conn
+    |> json_reply(200, response)
+  end
+
   defp json_reply(conn, status, json) do
     conn
     |> put_resp_content_type("application/json")