X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api_controller.ex;h=848ec218ff82c145b632a1b05b33d3d52aabcaf9;hb=c7be7a94544ef2dda687feea4d5c19ac06fc1d0e;hp=6154d5ad76b220ed1ca40b922bd19c9224389a0d;hpb=d009a79df55c15d247b58a7d8877ef0031959371;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 6154d5ad7..848ec218f 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -3,17 +3,18 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView}
   alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
   alias Pleroma.Web.CommonAPI
-  alias Pleroma.{Repo, Activity, User, Object}
+  alias Pleroma.{Repo, Activity, User}
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Ecto.Changeset
 
   require Logger
 
   def verify_credentials(%{assigns: %{user: user}} = conn, _params) do
-    render(conn, UserView, "show.json", %{user: user})
+    token = Phoenix.Token.sign(conn, "user socket", user.id)
+    render(conn, UserView, "show.json", %{user: user, token: token})
   end
 
-  def status_update(%{assigns: %{user: user}} = conn, %{"status" => status_text} = status_data) do
+  def status_update(%{assigns: %{user: user}} = conn, %{"status" => _} = status_data) do
     with media_ids <- extract_media_ids(status_data),
          {:ok, activity} <- TwitterAPI.create_status(user, Map.put(status_data, "media_ids",  media_ids)) do
       conn
@@ -65,10 +66,23 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     |> json_reply(200, json)
   end
 
+  def show_user(conn, params) do
+    with {:ok, shown} <- TwitterAPI.get_user(params) do
+      if user = conn.assigns.user do
+        render conn, UserView, "show.json", %{user: shown, for: user}
+      else
+        render conn, UserView, "show.json", %{user: shown}
+      end
+    else
+      {:error, msg} ->
+        bad_request_reply(conn, msg)
+    end
+  end
+
   def user_timeline(%{assigns: %{user: user}} = conn, params) do
     case TwitterAPI.get_user(user, params) do
       {:ok, target_user} ->
-        params = Map.merge(params, %{"actor_id" => target_user.ap_id})
+        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!)
@@ -93,6 +107,22 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     end
   end
 
+  def block(%{assigns: %{user: user}} = conn, params) do
+    case TwitterAPI.block(user, params) do
+      {:ok, user, blocked} ->
+        render conn, UserView, "show.json", %{user: blocked, for: user}
+      {:error, msg} -> forbidden_json_reply(conn, msg)
+    end
+  end
+
+  def unblock(%{assigns: %{user: user}} = conn, params) do
+    case TwitterAPI.unblock(user, params) do
+      {:ok, user, blocked} ->
+        render conn, UserView, "show.json", %{user: blocked, for: user}
+      {:error, msg} -> forbidden_json_reply(conn, msg)
+    end
+  end
+
   def delete_post(%{assigns: %{user: user}} = conn, %{"id" => id}) do
     with {:ok, delete} <- CommonAPI.delete(id, user) do
       json = ActivityRepresenter.to_json(delete, %{user: user, for: user})
@@ -177,7 +207,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   def update_avatar(%{assigns: %{user: user}} = conn, params) do
     {:ok, object} = ActivityPub.upload(params)
     change = Changeset.change(user, %{avatar: object.data})
-    {:ok, user} = Repo.update(change)
+    {:ok, user} = User.update_and_set_cache(change)
+    CommonAPI.update(user)
 
     render(conn, UserView, "show.json", %{user: user, for: user})
   end
@@ -186,8 +217,9 @@ 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} <- Repo.update(change) do
-      %{"url" => [ %{ "href" => href } | t ]} = object.data
+         {:ok, user} <- User.update_and_set_cache(change) do
+      CommonAPI.update(user)
+      %{"url" => [ %{ "href" => href } | _ ]} = object.data
       response = %{ url: href } |> Poison.encode!
       conn
       |> json_reply(200, response)
@@ -198,8 +230,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     with {:ok, object} <- ActivityPub.upload(params),
          new_info <- Map.put(user.info, "background", object.data),
          change <- User.info_changeset(user, %{info: new_info}),
-         {:ok, user} <- Repo.update(change) do
-      %{"url" => [ %{ "href" => href } | t ]} = object.data
+         {:ok, _user} <- User.update_and_set_cache(change) do
+      %{"url" => [ %{ "href" => href } | _ ]} = object.data
       response = %{ url: href } |> Poison.encode!
       conn
       |> json_reply(200, response)
@@ -225,7 +257,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
          mrn <- max(id, user.info["most_recent_notification"] || 0),
          updated_info <- Map.put(info, "most_recent_notification", mrn),
          changeset <- User.info_changeset(user, %{info: updated_info}),
-         {:ok, user} <- Repo.update(changeset) do
+         {:ok, _user} <- User.update_and_set_cache(changeset) do
       conn
       |> json_reply(200, Poison.encode!(mrn))
     else
@@ -233,22 +265,40 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     end
   end
 
-  def followers(%{assigns: %{user: user}} = conn, _params) do
-    with {:ok, followers} <- User.get_followers(user) do
+  def followers(conn, params) do
+    with {:ok, user} <- TwitterAPI.get_user(conn.assigns.user, params),
+         {:ok, followers} <- User.get_followers(user) do
       render(conn, UserView, "index.json", %{users: followers, for: user})
     else
       _e -> bad_request_reply(conn, "Can't get followers")
     end
   end
 
-  def friends(%{assigns: %{user: user}} = conn, _params) do
-    with {:ok, friends} <- User.get_friends(user) do
+  def friends(conn, params) do
+    with {:ok, user} <- TwitterAPI.get_user(conn.assigns.user, params),
+         {:ok, friends} <- User.get_friends(user) do
       render(conn, UserView, "index.json", %{users: friends, for: user})
     else
       _e -> bad_request_reply(conn, "Can't get friends")
     end
   end
 
+  def friends_ids(%{assigns: %{user: user}} = conn, _params) do
+    with {:ok, friends} <- User.get_friends(user) do
+      ids = friends
+      |> Enum.map(fn x -> x.id end)
+      |> Poison.encode!
+
+      json(conn, ids)
+    else
+      _e -> bad_request_reply(conn, "Can't get friends")
+    end
+  end
+
+  def empty_array(conn, _params) do
+    json(conn, Poison.encode!([]))
+  end
+
   def update_profile(%{assigns: %{user: user}} = conn, params) do
     params = if bio = params["description"] do
       Map.put(params, "bio", bio)
@@ -257,7 +307,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     end
 
     with changeset <- User.update_changeset(user, params),
-         {:ok, user} <- Repo.update(changeset) do
+         {:ok, user} <- User.update_and_set_cache(changeset) do
+      CommonAPI.update(user)
       render(conn, UserView, "user.json", %{user: user, for: user})
     else
       error ->
@@ -266,7 +317,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     end
   end
 
-  def search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
+  def search(%{assigns: %{user: user}} = conn, %{"q" => _query} = params) do
     conn
     |> json(TwitterAPI.search(user, params))
   end