X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api_controller.ex;h=a3c98a245e423bc572c3567691d601243e9f4e22;hb=1f1caab138120cf3e08e9d9311570f2c646003d0;hp=3eb4f5d63b40ae018955f02557466ee4db9db91d;hpb=dfaddeb765cdc7b5253663d7173aca52371e48bd;p=akkoma

diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 3eb4f5d63..a3c98a245 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -1,6 +1,6 @@
 defmodule Pleroma.Web.TwitterAPI.Controller do
   use Pleroma.Web, :controller
-  alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView}
+  alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView, ActivityView}
   alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
   alias Pleroma.Web.CommonAPI
   alias Pleroma.{Repo, Activity, User}
@@ -44,7 +44,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
 
   def public_and_external_timeline(%{assigns: %{user: user}} = conn, params) do
     statuses = TwitterAPI.fetch_public_and_external_statuses(user, params)
-    {:ok, json} = Poison.encode(statuses)
+    {:ok, json} = Jason.encode(statuses)
 
     conn
     |> json_reply(200, json)
@@ -52,7 +52,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
 
   def public_timeline(%{assigns: %{user: user}} = conn, params) do
     statuses = TwitterAPI.fetch_public_statuses(user, params)
-    {:ok, json} = Poison.encode(statuses)
+    {:ok, json} = Jason.encode(statuses)
 
     conn
     |> json_reply(200, json)
@@ -60,7 +60,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
 
   def friends_timeline(%{assigns: %{user: user}} = conn, params) do
     statuses = TwitterAPI.fetch_friend_statuses(user, params)
-    {:ok, json} = Poison.encode(statuses)
+    {:ok, json} = Jason.encode(statuses)
 
     conn
     |> json_reply(200, json)
@@ -85,7 +85,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
         params = Map.merge(params, %{"actor_id" => target_user.ap_id, "whole_db" => true})
         statuses  = TwitterAPI.fetch_user_statuses(user, params)
         conn
-        |> json_reply(200, statuses |> Poison.encode!)
+        |> json_reply(200, statuses |> Jason.encode!)
       {:error, msg} ->
         bad_request_reply(conn, msg)
     end
@@ -93,7 +93,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
 
   def mentions_timeline(%{assigns: %{user: user}} = conn, params) do
     statuses = TwitterAPI.fetch_mentions(user, params)
-    {:ok, json} = Poison.encode(statuses)
+    {:ok, json} = Jason.encode(statuses)
 
     conn
     |> json_reply(200, json)
@@ -140,15 +140,15 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   end
 
   def fetch_status(%{assigns: %{user: user}} = conn, %{"id" => id}) do
-    response = Poison.encode!(TwitterAPI.fetch_status(user, id))
-
-    conn
-    |> json_reply(200, response)
+    with %Activity{} = activity <- Repo.get(Activity, id),
+         true <- ActivityPub.visible_for_user?(activity, user) do
+      render conn, ActivityView, "activity.json", %{activity: activity, for: user}
+    end
   end
 
   def fetch_conversation(%{assigns: %{user: user}} = conn, %{"id" => id}) do
     id = String.to_integer(id)
-    response = Poison.encode!(TwitterAPI.fetch_conversation(user, id))
+    response = Jason.encode!(TwitterAPI.fetch_conversation(user, id))
 
     conn
     |> json_reply(200, response)
@@ -200,7 +200,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     else
       {:error, errors} ->
       conn
-      |> json_reply(400, Poison.encode!(errors))
+      |> json_reply(400, Jason.encode!(errors))
     end
   end
 
@@ -208,6 +208,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     {:ok, object} = ActivityPub.upload(params)
     change = Changeset.change(user, %{avatar: object.data})
     {:ok, user} = User.update_and_set_cache(change)
+    CommonAPI.update(user)
 
     render(conn, UserView, "show.json", %{user: user, for: user})
   end
@@ -216,9 +217,10 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     with {:ok, object} <- ActivityPub.upload(%{"img" => params["banner"]}),
          new_info <- Map.put(user.info, "banner", object.data),
          change <- User.info_changeset(user, %{info: new_info}),
-         {:ok, _user} <- User.update_and_set_cache(change) do
+         {:ok, user} <- User.update_and_set_cache(change) do
+      CommonAPI.update(user)
       %{"url" => [ %{ "href" => href } | _ ]} = object.data
-      response = %{ url: href } |> Poison.encode!
+      response = %{ url: href } |> Jason.encode!
       conn
       |> json_reply(200, response)
     end
@@ -230,7 +232,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
          change <- User.info_changeset(user, %{info: new_info}),
          {:ok, _user} <- User.update_and_set_cache(change) do
       %{"url" => [ %{ "href" => href } | _ ]} = object.data
-      response = %{ url: href } |> Poison.encode!
+      response = %{ url: href } |> Jason.encode!
       conn
       |> json_reply(200, response)
     end
@@ -238,7 +240,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
 
   def external_profile(%{assigns: %{user: current_user}} = conn, %{"profileurl" => uri}) do
     with {:ok, user_map} <- TwitterAPI.get_external_profile(current_user, uri),
-         response <- Poison.encode!(user_map) do
+         response <- Jason.encode!(user_map) do
       conn
       |> json_reply(200, response)
     else
@@ -257,7 +259,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
          changeset <- User.info_changeset(user, %{info: updated_info}),
          {:ok, _user} <- User.update_and_set_cache(changeset) do
       conn
-      |> json_reply(200, Poison.encode!(mrn))
+      |> json_reply(200, Jason.encode!(mrn))
     else
       _e -> bad_request_reply(conn, "Can't update.")
     end
@@ -285,7 +287,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     with {:ok, friends} <- User.get_friends(user) do
       ids = friends
       |> Enum.map(fn x -> x.id end)
-      |> Poison.encode!
+      |> Jason.encode!
 
       json(conn, ids)
     else
@@ -294,7 +296,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   end
 
   def empty_array(conn, _params) do
-    json(conn, Poison.encode!([]))
+    json(conn, Jason.encode!([]))
   end
 
   def update_profile(%{assigns: %{user: user}} = conn, params) do
@@ -306,6 +308,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
 
     with changeset <- User.update_changeset(user, params),
          {:ok, user} <- User.update_and_set_cache(changeset) do
+      CommonAPI.update(user)
       render(conn, UserView, "user.json", %{user: user, for: user})
     else
       error ->
@@ -336,6 +339,6 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   end
 
   defp error_json(conn, error_message) do
-    %{"error" => error_message, "request" => conn.request_path} |> Poison.encode!
+    %{"error" => error_message, "request" => conn.request_path} |> Jason.encode!
   end
 end