projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'support/oauth_fetch_token' into 'develop'
[akkoma]
/
lib
/
pleroma
/
object.ex
diff --git
a/lib/pleroma/object.ex
b/lib/pleroma/object.ex
index 30ba7b57a88f615557ea38884a9f40835e223784..03a75dfbdbbcdcf00bbf9493b1c8cc9272868266 100644
(file)
--- a/
lib/pleroma/object.ex
+++ b/
lib/pleroma/object.ex
@@
-1,17
+1,17
@@
defmodule Pleroma.Object do
use Ecto.Schema
defmodule Pleroma.Object do
use Ecto.Schema
- alias Pleroma.{Repo, Object}
+ alias Pleroma.{Repo, Object
, Activity
}
import Ecto.{Query, Changeset}
schema "objects" do
import Ecto.{Query, Changeset}
schema "objects" do
- field
:data, :map
+ field
(:data, :map)
timestamps()
end
def create(data) do
Object.change(%Object{}, %{data: data})
timestamps()
end
def create(data) do
Object.change(%Object{}, %{data: data})
- |> Repo.insert
+ |> Repo.insert
()
end
def change(struct, params \\ %{}) do
end
def change(struct, params \\ %{}) do
@@
-22,18
+22,26
@@
defmodule Pleroma.Object do
end
def get_by_ap_id(nil), do: nil
end
def get_by_ap_id(nil), do: nil
+
def get_by_ap_id(ap_id) do
def get_by_ap_id(ap_id) do
- Repo.one(from object in Object,
- where: fragment("(?)->>'id' = ?", object.data, ^ap_id))
+ Repo.one(from(object in Object, where: fragment("(?)->>'id' = ?", object.data, ^ap_id)))
end
end
- def get_cached_by_ap_id(ap_id) do
- if Mix.env == :test do
+ def normalize(obj) when is_map(obj), do: Object.get_by_ap_id(obj["id"])
+ def normalize(ap_id) when is_binary(ap_id), do: Object.get_by_ap_id(ap_id)
+ def normalize(_), do: nil
+
+ if Mix.env() == :test do
+ def get_cached_by_ap_id(ap_id) do
get_by_ap_id(ap_id)
get_by_ap_id(ap_id)
- else
+ end
+ else
+ def get_cached_by_ap_id(ap_id) do
key = "object:#{ap_id}"
key = "object:#{ap_id}"
- Cachex.get!(:user_cache, key, fallback: fn(_) ->
+
+ Cachex.fetch!(:object_cache, key, fn _ ->
object = get_by_ap_id(ap_id)
object = get_by_ap_id(ap_id)
+
if object do
{:commit, object}
else
if object do
{:commit, object}
else
@@
-46,4
+54,12
@@
defmodule Pleroma.Object do
def context_mapping(context) do
Object.change(%Object{}, %{data: %{"id" => context}})
end
def context_mapping(context) do
Object.change(%Object{}, %{data: %{"id" => context}})
end
+
+ def delete(%Object{data: %{"id" => id}} = object) do
+ with Repo.delete(object),
+ Repo.delete_all(Activity.all_non_create_by_object_ap_id_q(id)),
+ {:ok, true} <- Cachex.del(:object_cache, "object:#{id}") do
+ {:ok, object}
+ end
+ end
end
end