Fix workaround for Elasticsearch 7.x (mastodon#13828)

noellabo · web-flow · commit 1c434615b30a · 2020-05-23T05:48:14.000+02:00
diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb
@@ -29,3 +29,22 @@ def enabled?
 # Mastodon is run with hidden services enabled, because
 # ElasticSearch is *not* supposed to be accessed through a proxy
 Faraday.ignore_env_proxy = true
+
+# Elasticsearch 7.x workaround
+Elasticsearch::Transport::Client.prepend Module.new {
+  def search(arguments = {})
+    arguments[:rest_total_hits_as_int] = true
+    super arguments
+  end
+}
+Elasticsearch::API::Indices::IndicesClient.prepend Module.new {
+  def create(arguments = {})
+    arguments[:include_type_name] = true
+    super arguments
+  end
+
+  def put_mapping(arguments = {})
+    arguments[:include_type_name] = true
+    super arguments
+  end
+}
