add timestamp

This commit is contained in:
FloatingGhost 2021-12-16 15:58:56 +00:00
parent 1745606ab5
commit 2152832780
3 changed files with 15 additions and 9 deletions

View file

@ -4,7 +4,7 @@ def id(obj), do: obj.id
def encode(hashtag) do
%{
hashtag: hashtag.name,
timestamp: hashtag.inserted_at
timestamp: hashtag.timestamp
}
end
end

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 @@ def maybe_put_into_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 @@ def put(%Activity{} = activity) 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,12 +108,6 @@ def bulk_post(data, :activities) 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 =
data
@ -120,7 +127,7 @@ def bulk_post(data, :users) do
)
end
def bulk_post([] = data, :hashtags) do
def bulk_post(data, :hashtags) when is_list(data) do
d =
data
|> Enum.map(fn d ->

View file

@ -61,7 +61,6 @@ def get_or_create_by_names(names) when is_list(names) do
{:ok, Repo.all(from(ht in Hashtag, where: ht.name in ^names))}
end)
|> Repo.transaction() do
Pleroma.Elasticsearch.maybe_bulk_post(hashtags, :hashtags)
{:ok, hashtags}
else
{:error, _name, value, _changes_so_far} -> {:error, value}