Browse Source

Make activity announceable by its author.

object-id-column
KokaKiwi Thibaut Girka 5 years ago
parent
commit
1f0be71ea4
2 changed files with 5 additions and 1 deletions
  1. +1
    -1
      lib/pleroma/web/activity_pub/activity_pub.ex
  2. +4
    -0
      lib/pleroma/web/activity_pub/visibility.ex

+ 1
- 1
lib/pleroma/web/activity_pub/activity_pub.ex View File

@@ -346,7 +346,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
local \\ true,
public \\ true
) do
with true <- is_public?(object),
with true <- is_announceable?(object, user),
announce_data <- make_announce_data(user, object, activity_id, public),
{:ok, activity} <- insert(announce_data, local),
{:ok, object} <- add_announce_to_object(activity, object),


+ 4
- 0
lib/pleroma/web/activity_pub/visibility.ex View File

@@ -27,6 +27,10 @@ defmodule Pleroma.Web.ActivityPub.Visibility do
end
end

def is_announceable?(activity, user) do
is_public?(activity) || activity.data["actor"] == user.ap_id
end

def is_direct?(%Activity{data: %{"directMessage" => true}}), do: true
def is_direct?(%Object{data: %{"directMessage" => true}}), do: true



Loading…
Cancel
Save