From e343c0c9c42968316c93ebb52a570ccd5778acb0 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 2 Jul 2017 15:01:59 +0200
Subject: [PATCH] Add way to update most recent notification id.
---
lib/pleroma/user.ex | 6 ++++++
lib/pleroma/web/router.ex | 2 ++
.../web/twitter_api/twitter_api_controller.ex | 16 +++++++++++++++-
.../twitter_api_controller_test.exs | 18 ++++++++++++++++++
4 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 23e650ce5..a30c8daed 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -46,6 +46,12 @@ def follow_changeset(struct, params \\ %{}) do
|> validate_required([:following])
end
+ def info_changeset(struct, params \\ %{}) do
+ struct
+ |> cast(params, [:info])
+ |> validate_required([:info])
+ end
+
def user_info(%User{} = user) do
note_count_query = from a in Object,
where: fragment("? @> ?", a.data, ^%{actor: user.ap_id, type: "Note"}),
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 5a0f3b63f..d92ee29ba 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -49,6 +49,8 @@ def user_fetcher(username) do
get "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials
post "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials
+ post "/account/most_recent_notification", TwitterAPI.Controller, :update_most_recent_notification
+
get "/statuses/home_timeline", TwitterAPI.Controller, :friends_timeline
get "/statuses/friends_timeline", TwitterAPI.Controller, :friends_timeline
get "/statuses/mentions", TwitterAPI.Controller, :mentions_timeline
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 407a7931a..2b29b6ccf 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
@@ -196,6 +196,20 @@ def external_profile(%{assigns: %{user: current_user}} = conn, %{"profileurl" =>
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
+
defp bad_request_reply(conn, error_message) do
json = error_json(conn, error_message)
json_reply(conn, 400, json)
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index 4450bd5e5..0281ea55b 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -24,6 +24,24 @@ test "with credentials", %{conn: conn, user: user} do
end
end
+ describe "POST /api/account/most_recent_notification" do
+ setup [:valid_user]
+ test "without valid credentials", %{conn: conn} do
+ conn = post conn, "/api/account/most_recent_notification.json"
+ assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
+ end
+
+ test "with credentials", %{conn: conn, user: user} do
+ conn = conn
+ |> with_credentials(user.nickname, "test")
+ |> post("/api/account/most_recent_notification.json", %{id: "200"})
+
+ assert json_response(conn, 200)
+ user = User.get_by_nickname(user.nickname)
+ assert user.info["most_recent_notification"] == 200
+ end
+ end
+
describe "POST /statuses/update.json" do
setup [:valid_user]
test "without valid credentials", %{conn: conn} do
--
GitLab