Merge remote-tracking branch 'origin/feature/elasticsearch' into develop

This commit is contained in:
FloatingGhost 2021-12-16 16:13:41 +00:00
commit 415d9dd6f6
3 changed files with 21 additions and 12 deletions

View file

@ -4,19 +4,13 @@
defmodule Mix.Tasks.Pleroma.Activity do
alias Pleroma.Activity
alias Pleroma.Activity.Search
alias Pleroma.User
alias Pleroma.Web.CommonAPI
alias Pleroma.Pagination
require Logger
import Mix.Pleroma
import Ecto.Query
@shortdoc "A collection of activity debug tasks"
@moduledoc """
A collection of activity related tasks
mix pleroma.activity get <id>
"""
def run(["get", id | _rest]) do
start_pleroma()

View file

@ -1,6 +1,13 @@
defmodule Pleroma.Elasticsearch.DocumentMappings.Hashtag do
def id(obj), do: obj.id
def encode(%{timestamp: _} = hashtag) do
%{
hashtag: hashtag.name,
timestamp: hashtag.timestamp
}
end
def encode(hashtag) do
%{
hashtag: hashtag.name,

View file

@ -1,6 +1,7 @@
defmodule Pleroma.Elasticsearch do
alias Pleroma.Activity
alias Pleroma.User
alias Pleroma.Object
alias Pleroma.Elasticsearch.DocumentMappings
alias Pleroma.Config
require Logger
@ -45,6 +46,12 @@ defmodule Pleroma.Elasticsearch do
{:ok, :skipped}
end
def maybe_bulk_post(data, type) do
if enabled?() do
bulk_post(data, type)
end
end
def put(%Activity{} = activity) do
{:ok, _} =
Elastix.Document.index(
@ -54,6 +61,12 @@ defmodule Pleroma.Elasticsearch do
DocumentMappings.Activity.id(activity),
DocumentMappings.Activity.encode(activity)
)
activity
|> Map.get(:object)
|> Object.hashtags()
|> Enum.map(fn x -> %{id: x, name: x, timestamp: DateTime.to_iso8601(DateTime.utc_now())} end)
|> bulk_post(:hashtags)
end
def put(%User{} = user) do
@ -95,11 +108,6 @@ defmodule Pleroma.Elasticsearch do
)
end
def maybe_bulk_post(data, type) do
if enabled?() do
bulk_post(data, type)
end
end
def bulk_post(data, :users) do
d =
@ -121,7 +129,7 @@ defmodule Pleroma.Elasticsearch do
)
end
def bulk_post([] = data, :hashtags) do
def bulk_post(data, :hashtags) when is_list(data) do
d =
data
|> Enum.map(fn d ->