X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api_controller.ex;h=ea30306760857e9f8ac2b6cb3901cd3380b89ed6;hb=94a394e3a8949dde95e7e6cc65b46374dd9412a2;hp=4a1622cc80b540601520f1b32350941e492f6d36;hpb=36448d6483c7f53266052e72bd39b04558478410;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 4a1622cc8..ea3030676 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -1,16 +1,13 @@
 defmodule Pleroma.Web.TwitterAPI.Controller do
   use Pleroma.Web, :controller
-  alias Pleroma.Web.TwitterAPI.TwitterAPI
-  alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter}
-  alias Pleroma.{Web, Repo, Activity}
+  alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView}
+  alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
+  alias Pleroma.{Repo, Activity, User}
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Ecto.Changeset
 
   def verify_credentials(%{assigns: %{user: user}} = conn, _params) do
-    response = user |> UserRepresenter.to_json(%{for: user})
-
-    conn
-    |> json_reply(200, response)
+    render(conn, UserView, "show.json", %{user: user})
   end
 
   def status_update(%{assigns: %{user: user}} = conn, %{"status" => status_text} = status_data) do
@@ -90,9 +87,7 @@ 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)
+        render(conn, UserView, "show.json", %{user: followed, for: user})
       {:error, msg} -> forbidden_json_reply(conn, msg)
     end
   end
@@ -100,9 +95,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   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)
+        render(conn, UserView, "show.json", %{user: unfollowed, for: user})
       {:error, msg} -> forbidden_json_reply(conn, msg)
     end
   end
@@ -129,32 +122,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: Web.base_url,
-        server: 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)
 
@@ -163,7 +147,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)
 
@@ -172,7 +156,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
@@ -187,8 +171,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
@@ -201,10 +185,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     change = Changeset.change(user, %{avatar: object.data})
     {:ok, user} = Repo.update(change)
 
-    response = Poison.encode!(UserRepresenter.to_map(user, %{for: user}))
-
-    conn
-    |> json_reply(200, response)
+    render(conn, UserView, "show.json", %{user: user, for: user})
   end
 
   def external_profile(%{assigns: %{user: current_user}} = conn, %{"profileurl" => uri}) do
@@ -215,6 +196,28 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     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
+
   defp bad_request_reply(conn, error_message) do
     json = error_json(conn, error_message)
     json_reply(conn, 400, json)