From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Thu, 16 Dec 2021 16:13:41 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/feature/elasticsearch' into develop
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=415d9dd6f6887af96d85cfb2c306b94bb8a1a42f;hp=-c;p=akkoma

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

415d9dd6f6887af96d85cfb2c306b94bb8a1a42f
diff --combined lib/pleroma/elasticsearch/store.ex
index aa5e2b104,5c9e15022..7f6ef37a9
--- a/lib/pleroma/elasticsearch/store.ex
+++ b/lib/pleroma/elasticsearch/store.ex
@@@ -1,6 -1,7 +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 +46,12 @@@
      {: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 +61,12 @@@
          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,16 -108,9 +108,11 @@@
        )
    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
 +      |> Enum.filter(fn x -> x.actor_type == "Person" end)
        |> Enum.map(fn d ->
          [
            %{index: %{_id: DocumentMappings.User.id(d)}},
@@@ -121,7 -127,7 +129,7 @@@
      )
    end
  
-   def bulk_post([] = data, :hashtags) do
+   def bulk_post(data, :hashtags) when is_list(data) do
      d =
        data
        |> Enum.map(fn d ->