projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
activity_pub.ex
diff --git
a/lib/pleroma/web/activity_pub/activity_pub.ex
b/lib/pleroma/web/activity_pub/activity_pub.ex
index b2508de68a7092b6e6a680f8ac2252d7a30094ae..e9f0dcd3290bfb213c596c1cca2f4400610d2ace 100644
(file)
--- a/
lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/
lib/pleroma/web/activity_pub/activity_pub.ex
@@
-33,7
+33,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
"type" => "Like",
"actor" => ap_id,
"object" => id,
"type" => "Like",
"actor" => ap_id,
"object" => id,
- "to" => [User.ap_followers(user)]
+ "to" => [User.ap_followers(user)
, object.data["actor"]
]
}
{:ok, activity} = insert(data)
}
{:ok, activity} = insert(data)
@@
-133,6
+133,13
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
query
end
query
end
+ query = if opts["actor_id"] do
+ from activity in query,
+ where: fragment("? @> ?", activity.data, ^%{actor: opts["actor_id"]})
+ else
+ query
+ end
+
Repo.all(query)
|> Enum.reverse
end
Repo.all(query)
|> Enum.reverse
end
@@
-142,7
+149,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
"type" => "Announce",
"actor" => ap_id,
"object" => id,
"type" => "Announce",
"actor" => ap_id,
"object" => id,
- "to" => [User.ap_followers(user)]
+ "to" => [User.ap_followers(user)
, object.data["actor"]
]
}
{:ok, activity} = insert(data)
}
{:ok, activity} = insert(data)
@@
-167,7
+174,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
Repo.all(query)
end
Repo.all(query)
end
- def upload(
%Plug.Upload{} =
file) do
+ def upload(file) do
data = Upload.store(file)
Repo.insert(%Object{data: data})
end
data = Upload.store(file)
Repo.insert(%Object{data: data})
end