hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Merge branch 'features/hashtag-column' into 'develop'"

Browse source 
This reverts merge request !2824
This commit is contained in:
Haelwenn 2020-12-28 12:02:16 +00:00
commit 3966add048
24 changed files with 70 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

37
test/pleroma/web/activity_pub/transmogrifier_test.exs
View file

@ -204,37 +204,30 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
{:ok, activity} = CommonAPI.post(user, %{status: "#2hu :firefox:"})
{:ok, %{"object" => modified_object}} = Transmogrifier.prepare_outgoing(activity.data)
{:ok, modified} = Transmogrifier.prepare_outgoing(activity.data)
assert [
%{"name" => "#2hu", "type" => "Hashtag"},
%{"name" => ":firefox:", "type" => "Emoji"}
] = modified_object["tag"]
assert length(modified["object"]["tag"]) == 2
refute Map.has_key?(modified_object, "hashtags")
refute Map.has_key?(modified_object, "emoji")
refute Map.has_key?(modified_object, "like_count")
refute Map.has_key?(modified_object, "announcements")
refute Map.has_key?(modified_object, "announcement_count")
refute Map.has_key?(modified_object, "context_id")
assert is_nil(modified["object"]["emoji"])
assert is_nil(modified["object"]["like_count"])
assert is_nil(modified["object"]["announcements"])
assert is_nil(modified["object"]["announcement_count"])
assert is_nil(modified["object"]["context_id"])
end
test "it strips internal fields of article" do
activity = insert(:article_activity)
{:ok, %{"object" => modified_object}} = Transmogrifier.prepare_outgoing(activity.data)
{:ok, modified} = Transmogrifier.prepare_outgoing(activity.data)
assert [
%{"name" => "#2hu", "type" => "Hashtag"},
%{"name" => ":2hu:", "type" => "Emoji"}
] = modified_object["tag"]
assert length(modified["object"]["tag"]) == 2
refute Map.has_key?(modified_object, "hashtags")
refute Map.has_key?(modified_object, "emoji")
refute Map.has_key?(modified_object, "like_count")
refute Map.has_key?(modified_object, "announcements")
refute Map.has_key?(modified_object, "announcement_count")
refute Map.has_key?(modified_object, "context_id")
assert is_nil(modified["object"]["emoji"])
assert is_nil(modified["object"]["like_count"])
assert is_nil(modified["object"]["announcements"])
assert is_nil(modified["object"]["announcement_count"])
assert is_nil(modified["object"]["context_id"])
assert is_nil(modified["object"]["likes"])
end
test "the directMessage flag is present" do