moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only return posts in TwAPI conversations.

This commit is contained in:
Roger Braun 2017-06-30 16:41:09 +02:00
parent d4de38e8ff
commit 201804b836
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -77,7 +77,7 @@ def unfollow(follower, followed, local \\ true) do
def fetch_activities_for_context(context) do def fetch_activities_for_context(context) do
query = from activity in Activity, query = from activity in Activity,
where: fragment("? @> ?", activity.data, ^%{ context: context }), where: fragment("? @> ?", activity.data, ^%{ type: "Create", context: context }),
order_by: [desc: :inserted_at] order_by: [desc: :inserted_at]
Repo.all(query) Repo.all(query)
end end

7
test/web/activity_pub/activity_pub_test.exs
View File

@ -69,9 +69,10 @@ test "retrieve the activities for certain recipients" do
describe "fetch activities in context" do describe "fetch activities in context" do
test "retrieves activities that have a given context" do test "retrieves activities that have a given context" do
{:ok, activity} = ActivityBuilder.insert(%{"context" => "2hu"}) {:ok, activity} = ActivityBuilder.insert(%{"type" => "Create", "context" => "2hu"})
{:ok, activity_two} = ActivityBuilder.insert(%{"context" => "2hu"}) {:ok, activity_two} = ActivityBuilder.insert(%{"type" => "Create", "context" => "2hu"})
{:ok, _activity_three} = ActivityBuilder.insert(%{"context" => "3hu"}) {:ok, _activity_three} = ActivityBuilder.insert(%{"type" => "Create", "context" => "3hu"})
{:ok, _activity_four} = ActivityBuilder.insert(%{"type" => "Announce", "context" => "2hu"})
activities = ActivityPub.fetch_activities_for_context("2hu") activities = ActivityPub.fetch_activities_for_context("2hu")

6
test/web/twitter_api/twitter_api_controller_test.exs
View File

@ -85,9 +85,9 @@ test "returns one status", %{conn: conn} do
describe "GET /statusnet/conversation/:id.json" do describe "GET /statusnet/conversation/:id.json" do
test "returns the statuses in the conversation", %{conn: conn} do test "returns the statuses in the conversation", %{conn: conn} do
{:ok, _user} = UserBuilder.insert {:ok, _user} = UserBuilder.insert
{:ok, _activity} = ActivityBuilder.insert(%{"context" => "2hu"}) {:ok, _activity} = ActivityBuilder.insert(%{"type" => "Create", "context" => "2hu"})
{:ok, _activity_two} = ActivityBuilder.insert(%{"context" => "2hu"}) {:ok, _activity_two} = ActivityBuilder.insert(%{"type" => "Create", "context" => "2hu"})
{:ok, _activity_three} = ActivityBuilder.insert(%{"context" => "3hu"}) {:ok, _activity_three} = ActivityBuilder.insert(%{"type" => "Create", "context" => "3hu"})
{:ok, object} = Object.context_mapping("2hu") |> Repo.insert {:ok, object} = Object.context_mapping("2hu") |> Repo.insert
conn = conn conn = conn

6
test/web/twitter_api/twitter_api_test.exs
View File

@ -218,9 +218,9 @@ test "Unfollow another user using screen_name" do
test "fetch statuses in a context using the conversation id" do test "fetch statuses in a context using the conversation id" do
{:ok, user} = UserBuilder.insert() {:ok, user} = UserBuilder.insert()
{:ok, activity} = ActivityBuilder.insert(%{"context" => "2hu"}) {:ok, activity} = ActivityBuilder.insert(%{"type" => "Create", "context" => "2hu"})
{:ok, activity_two} = ActivityBuilder.insert(%{"context" => "2hu"}) {:ok, activity_two} = ActivityBuilder.insert(%{"type" => "Create", "context" => "2hu"})
{:ok, _activity_three} = ActivityBuilder.insert(%{"context" => "3hu"}) {:ok, _activity_three} = ActivityBuilder.insert(%{"type" => "Create", "context" => "3hu"})
{:ok, object} = Object.context_mapping("2hu") |> Repo.insert {:ok, object} = Object.context_mapping("2hu") |> Repo.insert