[#1364] Resolved merge conflicts with `develop`. Refactoring.

This commit is contained in:
Ivan Tashkinov 2020-04-13 13:24:31 +03:00
parent f00ff20768
commit 99b0bc1989
2 changed files with 33 additions and 15 deletions

View File

@ -10,11 +10,12 @@ defmodule Pleroma.FollowingRelationship do
alias Ecto.Changeset alias Ecto.Changeset
alias FlakeId.Ecto.CompatType alias FlakeId.Ecto.CompatType
alias Pleroma.FollowingRelationship.State
alias Pleroma.Repo alias Pleroma.Repo
alias Pleroma.User alias Pleroma.User
schema "following_relationships" do schema "following_relationships" do
field(:state, Pleroma.FollowingRelationship.State, default: :follow_pending) field(:state, State, default: :follow_pending)
belongs_to(:follower, User, type: CompatType) belongs_to(:follower, User, type: CompatType)
belongs_to(:following, User, type: CompatType) belongs_to(:following, User, type: CompatType)
@ -22,6 +23,11 @@ defmodule Pleroma.FollowingRelationship do
timestamps() timestamps()
end end
@doc "Returns underlying integer code for state atom"
def state_int_code(state_atom), do: State.__enum_map__() |> Keyword.fetch!(state_atom)
def accept_state_code, do: state_int_code(:follow_accept)
def changeset(%__MODULE__{} = following_relationship, attrs) do def changeset(%__MODULE__{} = following_relationship, attrs) do
following_relationship following_relationship
|> cast(attrs, [:state]) |> cast(attrs, [:state])
@ -86,7 +92,7 @@ def followers_query(%User{} = user) do
__MODULE__ __MODULE__
|> join(:inner, [r], u in User, on: r.follower_id == u.id) |> join(:inner, [r], u in User, on: r.follower_id == u.id)
|> where([r], r.following_id == ^user.id) |> where([r], r.following_id == ^user.id)
|> where([r], r.state == "accept") |> where([r], r.state == ^:follow_accept)
end end
def followers_ap_ids(%User{} = user, from_ap_ids \\ nil) do def followers_ap_ids(%User{} = user, from_ap_ids \\ nil) do
@ -198,6 +204,30 @@ def find(following_relationships, follower, following) do
end) end)
end end
@doc """
For a query with joined activity,
keeps rows where activity's actor is followed by user -or- is NOT domain-blocked by user.
"""
def keep_following_or_not_domain_blocked(query, user) do
where(
query,
[_, activity],
fragment(
# "(actor's domain NOT in domain_blocks) OR (actor IS in followed AP IDs)"
"""
NOT (substring(? from '.*://([^/]*)') = ANY(?)) OR
? = ANY(SELECT ap_id FROM users AS u INNER JOIN following_relationships AS fr
ON u.id = fr.following_id WHERE fr.follower_id = ? AND fr.state = ?)
""",
activity.actor,
^user.domain_blocks,
activity.actor,
^User.binary_id(user.id),
^accept_state_code()
)
)
end
defp validate_not_self_relationship(%Changeset{} = changeset) do defp validate_not_self_relationship(%Changeset{} = changeset) do
changeset changeset
|> validate_follower_id_following_id_inequality() |> validate_follower_id_following_id_inequality()

View File

@ -88,19 +88,7 @@ defp exclude_blocked(query, user, opts) do
query query
|> where([n, a], a.actor not in ^blocked_ap_ids) |> where([n, a], a.actor not in ^blocked_ap_ids)
|> where( |> FollowingRelationship.keep_following_or_not_domain_blocked(user)
[n, a],
fragment(
# "NOT (actor's domain in domain_blocks) OR (actor is in followed AP IDs)"
"NOT (substring(? from '.*://([^/]*)') = ANY(?)) OR \
? = ANY(SELECT ap_id FROM users AS u INNER JOIN following_relationships AS fr \
ON u.id = fr.following_id WHERE fr.follower_id = ? AND fr.state = 'accept')",
a.actor,
^user.domain_blocks,
a.actor,
^User.binary_id(user.id)
)
)
end end
defp exclude_notification_muted(query, _, %{@include_muted_option => true}) do defp exclude_notification_muted(query, _, %{@include_muted_option => true}) do