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/mix/tasks/pleroma/search.ex

@@ -24,8 +24,8 @@ defmodule Mix.Tasks.Pleroma.Search do
   end
 
   def run(["import", "users" | _rest]) do
-    start_pleroma()  
+    start_pleroma()
-                     
+
     from(u in User, where: u.nickname not in ["internal.fetch", "relay"])
     |> get_all(:users)
   end

lib/pleroma/elasticsearch/store.ex

@@ -46,26 +46,31 @@ defmodule Pleroma.Elasticsearch do
   end
 
   def put(%Activity{} = activity) do
-    {:ok, _} = Elastix.Document.index(
+    {:ok, _} =
-      url(),
+      Elastix.Document.index(
-      "activities",
+        url(),
-      "activity",
+        "activities",
-      DocumentMappings.Activity.id(activity),
+        "activity",
-      DocumentMappings.Activity.encode(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, _} =
-      url(),
+      Elastix.Document.index(
-      "users",
+        url(),
-      "user",
+        "users",
-      DocumentMappings.User.id(user),
+        "user",
-      DocumentMappings.User.encode(user)
+        DocumentMappings.User.id(user),
-    )
+        DocumentMappings.User.encode(user)
+      )
   end
 
   def bulk_post(data, :activities) do
@@ -87,12 +92,13 @@ defmodule Pleroma.Elasticsearch do
       end)
       |> List.flatten()
 
-    {:ok, %{body: %{"errors" => false}}} = Elastix.Bulk.post(
+    {:ok, %{body: %{"errors" => false}}} =
-      url(),
+      Elastix.Bulk.post(
-      d,
+        url(),
-      index: "activities",
+        d,
-      type: "activity"
+        index: "activities",
-    )
+        type: "activity"
+      )
   end
 
   def bulk_post(data, :users) do

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)
         }
       }
     }

lib/pleroma/search/elasticsearch/user_paser.ex

@@ -25,7 +25,7 @@ defmodule Pleroma.Search.Elasticsearch.Parsers.User do
                 query: term,
                 operator: "AND"
               }
-            }  
+            }
           }
         ]
       }