end
def fetch_activities_for_context(context, opts \\ %{}) do
- query = from activity in Activity,
- where: fragment("?->>'type' = ? and ?->>'context' = ?", activity.data, "Create", activity.data, ^context),
- order_by: [desc: :id]
+ public = ["https://www.w3.org/ns/activitystreams#Public"]
+ recipients = if opts["user"], do: [opts["user"].ap_id | opts["user"].following] ++ public, else: public
+
+ query = from activity in Activity
query = query
|> restrict_blocked(opts)
- |> restrict_recipients(["https://www.w3.org/ns/activitystreams#Public"], opts["user"])
+ |> restrict_recipients(recipients, opts["user"])
+
+ query = from activity in query,
+ where: fragment("?->>'type' = ? and ?->>'context' = ?", activity.data, "Create", activity.data, ^context),
+ order_by: [desc: :id]
Repo.all(query)
end
}
User.insert_or_update_user(user_data)
+ if user = User.get_by_ap_id(ap_id) do
+ User.info_changeset(user, user_data}
+ |> Repo.update
+ else
+ User.insert_or_update_user(user_data)
+ end
end
end
end
def publish(actor, activity) do
- {:ok, followers} = User.get_followers(actor)
+ followers = if actor.follower_address in activity.recipients do
+ {:ok, followers} = User.get_followers(actor)
+ followers
+ else
+ []
+ end
- remote_inboxes = Pleroma.Web.Salmon.remote_users(activity) ++ followers
+ remote_inboxes = (Pleroma.Web.Salmon.remote_users(activity) ++ followers)
|> Enum.filter(fn (user) -> User.ap_enabled?(user) end)
|> Enum.map(fn (%{info: %{"source_data" => data}}) ->
- (data["endpoints"] && data["endpoints"]["sharedInbox"]) ||data["inbox"]
+ (data["endpoints"] && data["endpoints"]["sharedInbox"]) || data["inbox"]
end)
|> Enum.uniq