merge

lib/mix/tasks/pleroma/activity.ex

@@ -4,7 +4,6 @@
 
 defmodule Mix.Tasks.Pleroma.Activity do
   alias Pleroma.Activity
-  alias Pleroma.Activity.Search
   alias Pleroma.User
   alias Pleroma.Web.CommonAPI
   alias Pleroma.Pagination

lib/pleroma/elasticsearch/store.ex

@@ -46,20 +46,25 @@ defmodule Pleroma.Elasticsearch do
   end
 
   def put(%Activity{} = activity) do
-    {:ok, _} = Elastix.Document.index(
+    {:ok, _} =
+      Elastix.Document.index(
         url(),
         "activities",
         "activity",
         DocumentMappings.Activity.id(activity),
         DocumentMappings.Activity.encode(activity)
       )
-    {:ok, _} = bulk_post(
+
-        activity.object.hashtags, :hashtags
+    {:ok, _} =
+      bulk_post(
+        activity.object.hashtags,
+        :hashtags
       )
   end
 
   def put(%User{} = user) do
-    {:ok, _ } = Elastix.Document.index(
+    {:ok, _} =
+      Elastix.Document.index(
         url(),
         "users",
         "user",
@@ -87,7 +92,8 @@ defmodule Pleroma.Elasticsearch do
       end)
       |> List.flatten()
 
-    {:ok, %{body: %{"errors" => false}}} = Elastix.Bulk.post(
+    {:ok, %{body: %{"errors" => false}}} =
+      Elastix.Bulk.post(
         url(),
         d,
         index: "activities",

lib/pleroma/search/elasticsearch/hashtag_parser.ex

@@ -3,7 +3,7 @@ defmodule Pleroma.Search.Elasticsearch.Parsers.Hashtag do
     %{
       term: %{
         hashtag: %{
-          value: String.downcase(term),
+          value: String.downcase(term)
         }
       }
     }