Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop

[akkoma] / lib / pleroma / elasticsearch / document_mappings / hashtag.ex

diff --git a/lib/pleroma/elasticsearch/document_mappings/hashtag.ex b/lib/pleroma/elasticsearch/document_mappings/hashtag.ex
index ddf91231c1eafa965655a55b7ae903a970b2a386..ce9a86c8d07edf4f61c044f98dff87b3a46675d7 100644 (file)
--- a/lib/pleroma/elasticsearch/document_mappings/hashtag.ex
+++ b/lib/pleroma/elasticsearch/document_mappings/hashtag.ex
@@ -1,10 +1,17 @@
 defmodule Pleroma.Elasticsearch.DocumentMappings.Hashtag do
   def id(obj), do: obj.id
 
-  def encode(hashtag) do
+  def encode(%{timestamp: _} = hashtag) do
     %{
       hashtag: hashtag.name,
       timestamp: hashtag.timestamp
     }
   end
+
+  def encode(hashtag) do
+    %{
+      hashtag: hashtag.name,
+      timestamp: hashtag.inserted_at
+    }
+  end
 end