projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Deprecate Pleroma.Web.base_url/0
[akkoma]
/
lib
/
pleroma
/
object.ex
diff --git
a/lib/pleroma/object.ex
b/lib/pleroma/object.ex
index 546c4ea01693bc4fb4f0d461b22de60622a3f5b2..f0e15f0f70f1f0952264cbd9e0a3018b2d5dff5e 100644
(file)
--- a/
lib/pleroma/object.ex
+++ b/
lib/pleroma/object.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Object do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Object do
@@
-23,6
+23,8
@@
defmodule Pleroma.Object do
@derive {Jason.Encoder, only: [:data]}
@derive {Jason.Encoder, only: [:data]}
+ @cachex Pleroma.Config.get([:cachex, :provider], Cachex)
+
schema "objects" do
field(:data, :map)
schema "objects" do
field(:data, :map)
@@
-106,39
+108,42
@@
defmodule Pleroma.Object do
Logger.debug("Backtrace: #{inspect(Process.info(:erlang.self(), :current_stacktrace))}")
end
Logger.debug("Backtrace: #{inspect(Process.info(:erlang.self(), :current_stacktrace))}")
end
- def normalize(_,
fetch_remote \\ true, options \\ [
])
+ def normalize(_,
options \\ [fetch: false
])
# If we pass an Activity to Object.normalize(), we can try to use the preloaded object.
# Use this whenever possible, especially when walking graphs in an O(N) loop!
# If we pass an Activity to Object.normalize(), we can try to use the preloaded object.
# Use this whenever possible, especially when walking graphs in an O(N) loop!
- def normalize(%Object{} = object, _
, _
), do: object
- def normalize(%Activity{object: %Object{} = object}, _
, _
), do: object
+ def normalize(%Object{} = object, _), do: object
+ def normalize(%Activity{object: %Object{} = object}, _), do: object
# A hack for fake activities
# A hack for fake activities
- def normalize(%Activity{data: %{"object" => %{"fake" => true} = data}}, _
, _
) do
+ def normalize(%Activity{data: %{"object" => %{"fake" => true} = data}}, _) do
%Object{id: "pleroma:fake_object_id", data: data}
end
# No preloaded object
%Object{id: "pleroma:fake_object_id", data: data}
end
# No preloaded object
- def normalize(%Activity{data: %{"object" => %{"id" => ap_id}}},
fetch_remote, _
) do
+ def normalize(%Activity{data: %{"object" => %{"id" => ap_id}}},
options
) do
warn_on_no_object_preloaded(ap_id)
warn_on_no_object_preloaded(ap_id)
- normalize(ap_id,
fetch_remote
)
+ normalize(ap_id,
options
)
end
# No preloaded object
end
# No preloaded object
- def normalize(%Activity{data: %{"object" => ap_id}},
fetch_remote, _
) do
+ def normalize(%Activity{data: %{"object" => ap_id}},
options
) do
warn_on_no_object_preloaded(ap_id)
warn_on_no_object_preloaded(ap_id)
- normalize(ap_id,
fetch_remote
)
+ normalize(ap_id,
options
)
end
# Old way, try fetching the object through cache.
end
# Old way, try fetching the object through cache.
- def normalize(%{"id" => ap_id}, fetch_remote, _), do: normalize(ap_id, fetch_remote)
- def normalize(ap_id, false, _) when is_binary(ap_id), do: get_cached_by_ap_id(ap_id)
+ def normalize(%{"id" => ap_id}, options), do: normalize(ap_id, options)
- def normalize(ap_id, true, options) when is_binary(ap_id) do
- Fetcher.fetch_object_from_id!(ap_id, options)
+ def normalize(ap_id, options) when is_binary(ap_id) do
+ if Keyword.get(options, :fetch) do
+ Fetcher.fetch_object_from_id!(ap_id, options)
+ else
+ get_cached_by_ap_id(ap_id)
+ end
end
end
- def normalize(_, _
, _
), do: nil
+ def normalize(_, _), do: nil
# Owned objects can only be accessed by their owner
def authorize_access(%Object{data: %{"actor" => actor}}, %User{ap_id: ap_id}) do
# Owned objects can only be accessed by their owner
def authorize_access(%Object{data: %{"actor" => actor}}, %User{ap_id: ap_id}) do
@@
-156,9
+161,9
@@
defmodule Pleroma.Object do
def get_cached_by_ap_id(ap_id) do
key = "object:#{ap_id}"
def get_cached_by_ap_id(ap_id) do
key = "object:#{ap_id}"
- with {:ok, nil} <-
C
achex.get(:object_cache, key),
+ with {:ok, nil} <-
@c
achex.get(:object_cache, key),
object when not is_nil(object) <- get_by_ap_id(ap_id),
object when not is_nil(object) <- get_by_ap_id(ap_id),
- {:ok, true} <-
C
achex.put(:object_cache, key, object) do
+ {:ok, true} <-
@c
achex.put(:object_cache, key, object) do
object
else
{:ok, object} -> object
object
else
{:ok, object} -> object
@@
-216,13
+221,13
@@
defmodule Pleroma.Object do
end
def invalid_object_cache(%Object{data: %{"id" => id}}) do
end
def invalid_object_cache(%Object{data: %{"id" => id}}) do
- with {:ok, true} <-
C
achex.del(:object_cache, "object:#{id}") do
-
C
achex.del(:web_resp_cache, URI.parse(id).path)
+ with {:ok, true} <-
@c
achex.del(:object_cache, "object:#{id}") do
+
@c
achex.del(:web_resp_cache, URI.parse(id).path)
end
end
def set_cache(%Object{data: %{"id" => ap_id}} = object) do
end
end
def set_cache(%Object{data: %{"id" => ap_id}} = object) do
-
C
achex.put(:object_cache, "object:#{ap_id}", object)
+
@c
achex.put(:object_cache, "object:#{ap_id}", object)
{:ok, object}
end
{:ok, object}
end
@@
-255,6
+260,10
@@
defmodule Pleroma.Object do
end
end
end
end
+ defp poll_is_multiple?(%Object{data: %{"anyOf" => [_ | _]}}), do: true
+
+ defp poll_is_multiple?(_), do: false
+
def decrease_replies_count(ap_id) do
Object
|> where([o], fragment("?->>'id' = ?::text", o.data, ^to_string(ap_id)))
def decrease_replies_count(ap_id) do
Object
|> where([o], fragment("?->>'id' = ?::text", o.data, ^to_string(ap_id)))
@@
-279,12
+288,12
@@
defmodule Pleroma.Object do
end
def increase_vote_count(ap_id, name, actor) do
end
def increase_vote_count(ap_id, name, actor) do
- with %Object{} = object <- Object.normalize(ap_id),
+ with %Object{} = object <- Object.normalize(ap_id
, fetch: false
),
"Question" <- object.data["type"] do
"Question" <- object.data["type"] do
- multiple = Map.has_key?(object.data, "anyOf")
+ key = if poll_is_multiple?(object), do: "anyOf", else: "oneOf"
options =
options =
- (object.data["anyOf"] || object.data["oneOf"] || [])
+ object.data[key]
|> Enum.map(fn
%{"name" => ^name} = option ->
Kernel.update_in(option["replies"]["totalItems"], &(&1 + 1))
|> Enum.map(fn
%{"name" => ^name} = option ->
Kernel.update_in(option["replies"]["totalItems"], &(&1 + 1))
@@
-296,11
+305,8
@@
defmodule Pleroma.Object do
voters = [actor | object.data["voters"] || []] |> Enum.uniq()
data =
voters = [actor | object.data["voters"] || []] |> Enum.uniq()
data =
- if multiple do
- Map.put(object.data, "anyOf", options)
- else
- Map.put(object.data, "oneOf", options)
- end
+ object.data
+ |> Map.put(key, options)
|> Map.put("voters", voters)
object
|> Map.put("voters", voters)
object
@@
-319,11
+325,11
@@
defmodule Pleroma.Object do
end
def local?(%Object{data: %{"id" => id}}) do
end
def local?(%Object{data: %{"id" => id}}) do
- String.starts_with?(id, Pleroma.Web.
base_
url() <> "/")
+ String.starts_with?(id, Pleroma.Web.
Endpoint.
url() <> "/")
end
def replies(object, opts \\ []) do
end
def replies(object, opts \\ []) do
- object = Object.normalize(object)
+ object = Object.normalize(object
, fetch: false
)
query =
Object
query =
Object