X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api_controller.ex;h=9b1c74a3f085eae6defb09a3a1593ffb186a45cc;hb=25c733f4022f171a69cff9badfa8d625a3ad5b6b;hp=56b2f7cfa170f76f79d787d6931152d73b28c0b2;hpb=08e53df91e1b52a36d557668d16afecc2eaa0a74;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 56b2f7cfa..9b1c74a3f 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -2,7 +2,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   use Pleroma.Web, :controller
   alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView}
   alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
-  alias Pleroma.{Repo, Activity}
+  alias Pleroma.{Repo, Activity, User}
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Ecto.Changeset
 
@@ -128,8 +128,17 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     |> json_reply(200, response)
   end
 
+  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)
 
@@ -138,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)
 
@@ -147,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,6 +196,36 @@ 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
+
+  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
+
   defp bad_request_reply(conn, error_message) do
     json = error_json(conn, error_message)
     json_reply(conn, 400, json)