diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-03-25 09:24:08 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-03-25 09:24:08 +0000 |
| commit | b028b0f97d4b6310b1402b3b876aa8f8b286bc4d (patch) | |
| tree | eb2bbd4a455eb6cccf9fb2d7398d6aa094783c9f /lib | |
| parent | bc14c98de115d8695d3436d1f093f4c161ceb3b2 (diff) | |
| parent | 26b0c802c3eece72928d0425826af9fe728a5173 (diff) | |
| download | pleroma-b028b0f97d4b6310b1402b3b876aa8f8b286bc4d.tar.gz | |
Merge branch 'bugfix/missing-announces' into 'develop'
fix up missing announcements with preloads
See merge request pleroma/pleroma!972
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/activity.ex | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex index 26190df2f..3dfabe9f3 100644 --- a/lib/pleroma/activity.ex +++ b/lib/pleroma/activity.ex @@ -41,8 +41,8 @@ defmodule Pleroma.Activity do # # ``` # |> join(:inner, [activity], o in Object, - # on: fragment("(?->>'id') = COALESCE((? -> 'object'::text) ->> 'id'::text)", - # o.data, activity.data)) + # on: fragment("(?->>'id') = COALESCE((?)->'object'->> 'id', (?)->>'object')", + # o.data, activity.data, activity.data)) # |> preload([activity, object], [object: object]) # ``` # @@ -61,8 +61,9 @@ defmodule Pleroma.Activity do o in Object, on: fragment( - "(?->>'id') = COALESCE((? -> 'object'::text) ->> 'id'::text)", + "(?->>'id') = COALESCE(?->'object'->>'id', ?->>'object')", o.data, + activity.data, activity.data ) ) @@ -86,8 +87,9 @@ defmodule Pleroma.Activity do left_join: o in Object, on: fragment( - "(?->>'id') = COALESCE((? -> 'object'::text) ->> 'id'::text)", + "(?->>'id') = COALESCE(?->'object'->>'id', ?->>'object')", o.data, + activity.data, activity.data ), preload: [object: o] @@ -105,8 +107,9 @@ defmodule Pleroma.Activity do inner_join: o in Object, on: fragment( - "(?->>'id') = COALESCE((? -> 'object'::text) ->> 'id'::text)", + "(?->>'id') = COALESCE(?->'object'->>'id', ?->>'object')", o.data, + activity.data, activity.data ), preload: [object: o] @@ -182,8 +185,9 @@ defmodule Pleroma.Activity do inner_join: o in Object, on: fragment( - "(?->>'id') = COALESCE((? -> 'object'::text) ->> 'id'::text)", + "(?->>'id') = COALESCE(?->'object'->>'id', ?->>'object')", o.data, + activity.data, activity.data ), preload: [object: o] |