projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hardening/disallow-ostatus-downgrade' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
ostatus
/
activity_representer.ex
diff --git
a/lib/pleroma/web/ostatus/activity_representer.ex
b/lib/pleroma/web/ostatus/activity_representer.ex
index 95037125dc94821ff4a61520b8fab30ed45d8f47..7603453011ec50c4622abc01ad1f9adf81d27ef0 100644
(file)
--- a/
lib/pleroma/web/ostatus/activity_representer.ex
+++ b/
lib/pleroma/web/ostatus/activity_representer.ex
@@
-9,6
+9,7
@@
defmodule Pleroma.Web.OStatus.ActivityRepresenter do
alias Pleroma.Web.OStatus.UserRepresenter
require Logger
alias Pleroma.Web.OStatus.UserRepresenter
require Logger
+ require Pleroma.Constants
defp get_href(id) do
with %Object{data: %{"external_url" => external_url}} <- Object.get_cached_by_ap_id(id) do
defp get_href(id) do
with %Object{data: %{"external_url" => external_url}} <- Object.get_cached_by_ap_id(id) do
@@
-34,7
+35,7
@@
defmodule Pleroma.Web.OStatus.ActivityRepresenter do
Enum.map(to, fn id ->
cond do
# Special handling for the AP/Ostatus public collections
Enum.map(to, fn id ->
cond do
# Special handling for the AP/Ostatus public collections
-
"https://www.w3.org/ns/activitystreams#Public"
== id ->
+
Pleroma.Constants.as_public()
== id ->
{:link,
[
rel: "mentioned",
{:link,
[
rel: "mentioned",