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
/
web
/
activity_pub
/
utils.ex
diff --git
a/lib/pleroma/web/activity_pub/utils.ex
b/lib/pleroma/web/activity_pub/utils.ex
index ea1c3a04a37c401143e6e26c9e1f470e361701bd..0b5f496e35c4d0f8bc7943fc3c4ca8823dbaa676 100644
(file)
--- a/
lib/pleroma/web/activity_pub/utils.ex
+++ b/
lib/pleroma/web/activity_pub/utils.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.Web.ActivityPub.Utils do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.Utils do
@@
-12,7
+12,6
@@
defmodule Pleroma.Web.ActivityPub.Utils do
alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.User
- alias Pleroma.Web
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.Web.AdminAPI.AccountView
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.Web.AdminAPI.AccountView
@@
-107,7
+106,7
@@
defmodule Pleroma.Web.ActivityPub.Utils do
%{
"@context" => [
"https://www.w3.org/ns/activitystreams",
%{
"@context" => [
"https://www.w3.org/ns/activitystreams",
- "#{
Web.base_
url()}/schemas/litepub-0.1.jsonld",
+ "#{
Endpoint.
url()}/schemas/litepub-0.1.jsonld",
%{
"@language" => "und"
}
%{
"@language" => "und"
}
@@
-132,7
+131,7
@@
defmodule Pleroma.Web.ActivityPub.Utils do
end
def generate_id(type) do
end
def generate_id(type) do
- "#{
Web.base_
url()}/#{type}/#{UUID.generate()}"
+ "#{
Endpoint.
url()}/#{type}/#{UUID.generate()}"
end
def get_notified_from_object(%{"type" => type} = object) when type in @supported_object_types do
end
def get_notified_from_object(%{"type" => type} = object) when type in @supported_object_types do