AkkomaGang/akkoma
AkkomaGang/akkoma
13
63
Fork 84
Code Issues 164 Pull requests 17 Packages Projects 2 Releases 14 Wiki Activity

Use update_and_set cache.

Browse source
This commit is contained in:
lain 2018-02-25 16:34:24 +01:00
parent e3629af4da
commit dfaddeb765
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/web/activity_pub/transmogrifier.ex
View file

@ -128,9 +128,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
actor actor
|> User.upgrade_changeset(update_data) |> User.upgrade_changeset(update_data)
|> Repo.update |> User.update_and_set_cache()
User.invalidate_cache(actor)
ActivityPub.update(%{local: false, to: data["to"] || [], cc: data["cc"] || [], object: object, actor: actor_id}) ActivityPub.update(%{local: false, to: data["to"] || [], cc: data["cc"] || [], object: object, actor: actor_id})
else else
e -> e ->

10
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View file

@ -207,7 +207,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
def update_avatar(%{assigns: %{user: user}} = conn, params) do def update_avatar(%{assigns: %{user: user}} = conn, params) do
{:ok, object} = ActivityPub.upload(params) {:ok, object} = ActivityPub.upload(params)
change = Changeset.change(user, %{avatar: object.data}) change = Changeset.change(user, %{avatar: object.data})
{:ok, user} = Repo.update(change) {:ok, user} = User.update_and_set_cache(change)
render(conn, UserView, "show.json", %{user: user, for: user}) render(conn, UserView, "show.json", %{user: user, for: user})
end end
@ -216,7 +216,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
with {:ok, object} <- ActivityPub.upload(%{"img" => params["banner"]}), with {:ok, object} <- ActivityPub.upload(%{"img" => params["banner"]}),
new_info <- Map.put(user.info, "banner", object.data), new_info <- Map.put(user.info, "banner", object.data),
change <- User.info_changeset(user, %{info: new_info}), change <- User.info_changeset(user, %{info: new_info}),
{:ok, _user} <- Repo.update(change) do {:ok, _user} <- User.update_and_set_cache(change) do
%{"url" => [ %{ "href" => href } | _ ]} = object.data %{"url" => [ %{ "href" => href } | _ ]} = object.data
response = %{ url: href } |> Poison.encode! response = %{ url: href } |> Poison.encode!
conn conn
@ -228,7 +228,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
with {:ok, object} <- ActivityPub.upload(params), with {:ok, object} <- ActivityPub.upload(params),
new_info <- Map.put(user.info, "background", object.data), new_info <- Map.put(user.info, "background", object.data),
change <- User.info_changeset(user, %{info: new_info}), change <- User.info_changeset(user, %{info: new_info}),
{:ok, _user} <- Repo.update(change) do {:ok, _user} <- User.update_and_set_cache(change) do
%{"url" => [ %{ "href" => href } | _ ]} = object.data %{"url" => [ %{ "href" => href } | _ ]} = object.data
response = %{ url: href } |> Poison.encode! response = %{ url: href } |> Poison.encode!
conn conn
@ -255,7 +255,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
mrn <- max(id, user.info["most_recent_notification"] || 0), mrn <- max(id, user.info["most_recent_notification"] || 0),
updated_info <- Map.put(info, "most_recent_notification", mrn), updated_info <- Map.put(info, "most_recent_notification", mrn),
changeset <- User.info_changeset(user, %{info: updated_info}), changeset <- User.info_changeset(user, %{info: updated_info}),
{:ok, _user} <- Repo.update(changeset) do {:ok, _user} <- User.update_and_set_cache(changeset) do
conn conn
|> json_reply(200, Poison.encode!(mrn)) |> json_reply(200, Poison.encode!(mrn))
else else
@ -305,7 +305,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
end end
with changeset <- User.update_changeset(user, params), with changeset <- User.update_changeset(user, params),
{:ok, user} <- Repo.update(changeset) do {:ok, user} <- User.update_and_set_cache(changeset) do
render(conn, UserView, "user.json", %{user: user, for: user}) render(conn, UserView, "user.json", %{user: user, for: user})
else else
error -> error ->

5
lib/pleroma/web/web_finger/web_finger.ex
View file

@ -60,9 +60,8 @@ defmodule Pleroma.Web.WebFinger do
else else
{:ok, pem} = Salmon.generate_rsa_pem {:ok, pem} = Salmon.generate_rsa_pem
info = Map.put(info, "keys", pem) info = Map.put(info, "keys", pem)
res = Repo.update(Ecto.Changeset.change(user, info: info)) Ecto.Changeset.change(user, info: info)
User.invalidate_cache(user) |> User.update_and_set_cache()
res
end end
end end