X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api_controller.ex;h=5e0b9ea0aafe8463554cfd9f10e2dd1596d09f34;hb=4dc517a0bb979793c1c2590d38efe853c68eb80c;hp=b5b829ca0532d8fd539e303f853dc21fa358bdd6;hpb=2f0e13abe28045be1bd06da3b36f6cbaab44f5c2;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 b5b829ca0..5e0b9ea0a 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -1,21 +1,23 @@
 defmodule Pleroma.Web.TwitterAPI.Controller do
   use Pleroma.Web, :controller
-  alias Pleroma.Web.TwitterAPI.TwitterAPI
-  alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter}
-  alias Pleroma.{Repo, Activity}
+  alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView}
+  alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
+  alias Pleroma.Web.CommonAPI
+  alias Pleroma.{Repo, Activity, User, Object}
   alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Ecto.Changeset
 
-  def verify_credentials(%{assigns: %{user: user}} = conn, _params) do
-    response = user |> UserRepresenter.to_json(%{for: user})
+  require Logger
 
-    conn
-    |> json_reply(200, response)
+  def verify_credentials(%{assigns: %{user: user}} = conn, _params) do
+    render(conn, UserView, "show.json", %{user: user})
   end
 
   def status_update(%{assigns: %{user: user}} = conn, %{"status" => status_text} = status_data) do
-    if status_text |> String.trim |> String.length != 0 do
+    l = status_text |> String.trim |> String.length
+    if l > 0 && l < 5000 do
       media_ids = extract_media_ids(status_data)
-      {:ok, activity} = TwitterAPI.create_status(user, Map.put(status_data, "media_ids",  media_ids ))
+      {:ok, activity} = TwitterAPI.create_status(user, Map.put(status_data, "media_ids",  media_ids))
       conn
       |> json_reply(200, ActivityRepresenter.to_json(activity, %{user: user}))
     else
@@ -41,6 +43,14 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     end
   end
 
+  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)
+
+    conn
+    |> json_reply(200, json)
+  end
+
   def public_timeline(%{assigns: %{user: user}} = conn, params) do
     statuses = TwitterAPI.fetch_public_statuses(user, params)
     {:ok, json} = Poison.encode(statuses)
@@ -79,34 +89,38 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
 
   def follow(%{assigns: %{user: user}} = conn, params) do
     case TwitterAPI.follow(user, params) do
-      { :ok, user, followed, _activity } ->
-        response = followed |> UserRepresenter.to_json(%{for: user})
-        conn
-        |> json_reply(200, response)
-      { :error, msg } -> forbidden_json_reply(conn, msg)
+      {:ok, user, followed, _activity} ->
+        render(conn, UserView, "show.json", %{user: followed, 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})
+      conn
+      |> json_reply(200, json)
     end
   end
 
   def unfollow(%{assigns: %{user: user}} = conn, params) do
     case TwitterAPI.unfollow(user, params) do
-      { :ok, user, unfollowed, } ->
-        response = unfollowed |> UserRepresenter.to_json(%{for: user})
-        conn
-        |> json_reply(200, response)
-      { :error, msg } -> forbidden_json_reply(conn, msg)
+      {:ok, user, unfollowed} ->
+        render(conn, UserView, "show.json", %{user: unfollowed, for: user})
+      {:error, msg} -> forbidden_json_reply(conn, msg)
     end
   end
 
-  def fetch_status(%{assigns: %{user: user}} = conn, %{ "id" => id }) do
-    response = TwitterAPI.fetch_status(user, id) |> Poison.encode!
+  def fetch_status(%{assigns: %{user: user}} = conn, %{"id" => id}) do
+    response = Poison.encode!(TwitterAPI.fetch_status(user, id))
 
     conn
     |> json_reply(200, response)
   end
 
-  def fetch_conversation(%{assigns: %{user: user}} = conn, %{ "id" => id }) do
+  def fetch_conversation(%{assigns: %{user: user}} = conn, %{"id" => id}) do
     id = String.to_integer(id)
-    response = TwitterAPI.fetch_conversation(user, id) |> Poison.encode!
+    response = Poison.encode!(TwitterAPI.fetch_conversation(user, id))
 
     conn
     |> json_reply(200, response)
@@ -119,32 +133,23 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     |> send_resp(200, response)
   end
 
-  def help_test(conn, _params) do
-    conn |> json_reply(200, Poison.encode!("ok"))
-  end
-
   def upload_json(conn, %{"media" => media}) do
     response = TwitterAPI.upload(media, "json")
     conn
     |> json_reply(200, response)
   end
 
-  def config(conn, _params) do
-    response = %{
-      site: %{
-        name: Pleroma.Web.base_url,
-        server: Pleroma.Web.base_url,
-        textlimit: -1
-      }
-    }
-    |> Poison.encode!
-
-    conn
-    |> json_reply(200, response)
+  def get_by_id_or_ap_id(id) do
+    activity = Repo.get(Activity, id) || Activity.get_create_activity_by_object_ap_id(id)
+    if activity.data["type"] == "Create" do
+      activity
+    else
+      Activity.get_create_activity_by_object_ap_id(activity.data["object"])
+    end
   end
 
   def favorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
-    activity = Repo.get(Activity, id)
+    activity = get_by_id_or_ap_id(id)
     {:ok, status} = TwitterAPI.favorite(user, activity)
     response = Poison.encode!(status)
 
@@ -153,7 +158,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   end
 
   def unfavorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
-    activity = Repo.get(Activity, id)
+    activity = get_by_id_or_ap_id(id)
     {:ok, status} = TwitterAPI.unfavorite(user, activity)
     response = Poison.encode!(status)
 
@@ -162,7 +167,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   end
 
   def retweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do
-    activity = Repo.get(Activity, id)
+    activity = get_by_id_or_ap_id(id)
     if activity.data["actor"] == user.ap_id do
       bad_request_reply(conn, "You cannot repeat your own notice.")
     else
@@ -177,8 +182,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
 
   def register(conn, params) do
     with {:ok, user} <- TwitterAPI.register_user(params) do
-      conn
-      |> json_reply(200, Poison.encode!(user))
+
+      render(conn, UserView, "show.json", %{user: user})
     else
       {:error, errors} ->
       conn
@@ -188,14 +193,89 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
 
   def update_avatar(%{assigns: %{user: user}} = conn, params) do
     {:ok, object} = ActivityPub.upload(params)
-    change = Ecto.Changeset.change(user, %{avatar: object.data})
+    change = Changeset.change(user, %{avatar: object.data})
     {:ok, user} = Repo.update(change)
 
-    response = UserRepresenter.to_map(user, %{for: user})
-    |> Poison.encode!
+    render(conn, UserView, "show.json", %{user: user, for: user})
+  end
 
-    conn
-    |> json_reply(200, response)
+  def update_banner(%{assigns: %{user: user}} = conn, params) 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
+      response = %{ url: href } |> Poison.encode!
+      conn
+      |> json_reply(200, response)
+    end
+  end
+
+  def update_background(%{assigns: %{user: user}} = conn, params) 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
+      response = %{ url: href } |> Poison.encode!
+      conn
+      |> json_reply(200, response)
+    end
+  end
+
+  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
+      conn
+      |> json_reply(200, response)
+    end
+  end
+
+  def update_most_recent_notification(%{assigns: %{user: user}} = conn, %{"id" => id}) do
+    with id when is_number(id) <- String.to_integer(id),
+         info <- user.info,
+         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
+      conn
+      |> json_reply(200, Poison.encode!(mrn))
+    else
+      _e -> bad_request_reply(conn, "Can't update.")
+    end
+  end
+
+  def followers(%{assigns: %{user: user}} = conn, _params) do
+    with {: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
+      render(conn, UserView, "index.json", %{users: friends, for: user})
+    else
+      _e -> bad_request_reply(conn, "Can't get friends")
+    end
+  end
+
+  def update_profile(%{assigns: %{user: user}} = conn, params) do
+    params = if bio = params["description"] do
+      Map.put(params, "bio", bio)
+    else
+      params
+    end
+
+    with changeset <- User.update_changeset(user, params),
+         {:ok, user} <- Repo.update(changeset) do
+      render(conn, UserView, "user.json", %{user: user, for: user})
+    else
+      error ->
+        Logger.debug("Can't update user: #{inspect(error)}")
+        bad_request_reply(conn, "Can't update user")
+    end
   end
 
   defp bad_request_reply(conn, error_message) do