mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 00:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Remove unknown activities from feed.

Browse source
This commit is contained in:
Roger Braun 2017-04-22 14:37:54 +02:00
parent c585f9e26c
commit 923584d046
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/ostatus/activity_representer.ex
View file

@ -22,4 +22,6 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
{:updated, h.(updated_at)} {:updated, h.(updated_at)}
] ++ attachments ] ++ attachments
end end
def to_simple_form(_,_), do: nil
end end

1
lib/pleroma/web/ostatus/feed_representer.ex
View file

@ -11,6 +11,7 @@ defmodule Pleroma.Web.OStatus.FeedRepresenter do
entries = Enum.map(activities, fn(activity) -> entries = Enum.map(activities, fn(activity) ->
{:entry, ActivityRepresenter.to_simple_form(activity, user)} {:entry, ActivityRepresenter.to_simple_form(activity, user)}
end) end)
|> Enum.filter(fn ({_, form}) -> form end)
[{ [{
:feed, [ :feed, [

1
lib/pleroma/web/websub/websub.ex
View file

@ -1,6 +1,5 @@
defmodule Pleroma.Web.Websub do defmodule Pleroma.Web.Websub do
alias Pleroma.Repo alias Pleroma.Repo
alias Pleroma.Websub
alias Pleroma.Web.Websub.WebsubServerSubscription alias Pleroma.Web.Websub.WebsubServerSubscription
alias Pleroma.Web.OStatus.FeedRepresenter alias Pleroma.Web.OStatus.FeedRepresenter
alias Pleroma.Web.OStatus alias Pleroma.Web.OStatus

7
test/web/ostatus/activity_representer_test.exs
View file

@ -2,7 +2,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
use Pleroma.DataCase use Pleroma.DataCase
alias Pleroma.Web.OStatus.ActivityRepresenter alias Pleroma.Web.OStatus.ActivityRepresenter
alias Pleroma.User alias Pleroma.{User, Activity}
import Pleroma.Factory import Pleroma.Factory
@ -32,6 +32,11 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
assert clean(res) == clean(expected) assert clean(res) == clean(expected)
end end
test "an unknown activity" do
tuple = ActivityRepresenter.to_simple_form(%Activity{}, nil)
assert is_nil(tuple)
end
defp clean(string) do defp clean(string) do
String.replace(string, ~r/\s/, "") String.replace(string, ~r/\s/, "")
end end