projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add follow_requests_outstanding_since?/3 to Pleroma.Activity
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
builder.ex
diff --git
a/lib/pleroma/web/activity_pub/builder.ex
b/lib/pleroma/web/activity_pub/builder.ex
index 298aff6b7aac17ac04b16417000137bf12d6e1d5..f56bfc600ecce9b24c061b1485a21e376368bc41 100644
(file)
--- a/
lib/pleroma/web/activity_pub/builder.ex
+++ b/
lib/pleroma/web/activity_pub/builder.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.Builder do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.Builder do
@@
-80,7
+80,7
@@
defmodule Pleroma.Web.ActivityPub.Builder do
@spec delete(User.t(), String.t()) :: {:ok, map(), keyword()}
def delete(actor, object_id) do
@spec delete(User.t(), String.t()) :: {:ok, map(), keyword()}
def delete(actor, object_id) do
- object = Object.normalize(object_id, false)
+ object = Object.normalize(object_id, f
etch: f
alse)
user = !object && User.get_cached_by_ap_id(object_id)
user = !object && User.get_cached_by_ap_id(object_id)
@@
-222,6
+222,9
@@
defmodule Pleroma.Web.ActivityPub.Builder do
actor.ap_id == Relay.ap_id() ->
[actor.follower_address]
actor.ap_id == Relay.ap_id() ->
[actor.follower_address]
+ public? and Visibility.is_local_public?(object) ->
+ [actor.follower_address, object.data["actor"], Pleroma.Constants.as_local_public()]
+
public? ->
[actor.follower_address, object.data["actor"], Pleroma.Constants.as_public()]
public? ->
[actor.follower_address, object.data["actor"], Pleroma.Constants.as_public()]