projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/twittercards' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
transmogrifier.ex
diff --git
a/lib/pleroma/web/activity_pub/transmogrifier.ex
b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 26b2dd575432b29b0868e8f295650af2e74367a3..41d89a02b145d6594c7f60558ad643ff9e61beaf 100644
(file)
--- a/
lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/
lib/pleroma/web/activity_pub/transmogrifier.ex
@@
-406,7
+406,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier do
if not User.locked?(followed) do
ActivityPub.accept(%{
to: [follower.ap_id],
if not User.locked?(followed) do
ActivityPub.accept(%{
to: [follower.ap_id],
- actor: followed
.ap_id
,
+ actor: followed,
object: data,
local: true
})
object: data,
local: true
})
@@
-432,7
+432,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier do
ActivityPub.accept(%{
to: follow_activity.data["to"],
type: "Accept",
ActivityPub.accept(%{
to: follow_activity.data["to"],
type: "Accept",
- actor: followed
.ap_id
,
+ actor: followed,
object: follow_activity.data["id"],
local: false
}) do
object: follow_activity.data["id"],
local: false
}) do
@@
-458,7
+458,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier do
ActivityPub.reject(%{
to: follow_activity.data["to"],
type: "Reject",
ActivityPub.reject(%{
to: follow_activity.data["to"],
type: "Reject",
- actor: followed
.ap_id
,
+ actor: followed,
object: follow_activity.data["id"],
local: false
}) do
object: follow_activity.data["id"],
local: false
}) do