Browse Source

Add basic Avatar updating code.

tags/v0.9.9
Roger Braun 7 years ago
parent
commit
eb9358c8d6
4 changed files with 37 additions and 2 deletions
  1. +1
    -0
      lib/pleroma/web/router.ex
  2. +13
    -0
      lib/pleroma/web/twitter_api/twitter_api_controller.ex
  3. +5
    -2
      test/web/activity_pub/activity_pub_test.exs
  4. +18
    -0
      test/web/twitter_api/twitter_api_controller_test.exs

+ 1
- 0
lib/pleroma/web/router.ex View File

@@ -45,5 +45,6 @@ defmodule Pleroma.Web.Router do
post "/favorites/create", TwitterAPI.Controller, :favorite
post "/favorites/destroy/:id", TwitterAPI.Controller, :unfavorite
post "/statuses/retweet/:id", TwitterAPI.Controller, :retweet
post "/qvitter/update_avatar", TwitterAPI.Controller, :update_avatar
end
end

+ 13
- 0
lib/pleroma/web/twitter_api/twitter_api_controller.ex View File

@@ -3,6 +3,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
alias Pleroma.Web.TwitterAPI.TwitterAPI
alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter}
alias Pleroma.{Repo, Activity}
alias Pleroma.Web.ActivityPub.ActivityPub

def verify_credentials(%{assigns: %{user: user}} = conn, _params) do
response = user |> UserRepresenter.to_json(%{for: user})
@@ -142,6 +143,18 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
end
end

def update_avatar(%{assigns: %{user: user}} = conn, params) do
{:ok, object} = ActivityPub.upload(params)
change = Ecto.Changeset.change(user, %{avatar: object.data})
{:ok, user} = Repo.update(change)

response = UserRepresenter.to_map(user, %{for: user})
|> Poison.encode!

conn
|> json_reply(200, response)
end

defp json_reply(conn, status, json) do
conn
|> put_resp_content_type("application/json")


+ 5
- 2
test/web/activity_pub/activity_pub_test.exs
File diff suppressed because it is too large
View File


+ 18
- 0
test/web/twitter_api/twitter_api_controller_test.exs View File

@@ -157,6 +157,24 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
end
end

describe "POST /api/qvitter/update_avatar.json" do
setup [:valid_user]
test "without valid credentials", %{conn: conn} do
conn = post conn, "/api/qvitter/update_avatar.json"
assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
end

test "with credentials", %{conn: conn, user: current_user} do
conn = conn
|> with_credentials(current_user.nickname, "test")
|> post("/api/qvitter/update_avatar.json", %{img: Pleroma.Web.ActivityPub.ActivityPubTest.data_uri})

current_user = Repo.get(User, current_user.id)
assert is_map(current_user.avatar)
assert json_response(conn, 200) == UserRepresenter.to_map(current_user, %{for: current_user})
end
end

describe "POST /api/favorites/create/:id" do
setup [:valid_user]
test "without valid credentials", %{conn: conn} do


Loading…
Cancel
Save