From efa61c161085fd24f7e85ccf7f32ef823e335d7b Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 16 May 2019 13:14:48 -0500
Subject: [PATCH] Move to pleroma.database mix task

---
 lib/mix/tasks/pleroma/conversations.ex | 23 -----------------------
 lib/mix/tasks/pleroma/database.ex      | 11 +++++++++++
 2 files changed, 11 insertions(+), 23 deletions(-)
 delete mode 100644 lib/mix/tasks/pleroma/conversations.ex

diff --git a/lib/mix/tasks/pleroma/conversations.ex b/lib/mix/tasks/pleroma/conversations.ex
deleted file mode 100644
index b52b9921a..000000000
--- a/lib/mix/tasks/pleroma/conversations.ex
+++ /dev/null
@@ -1,23 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Mix.Tasks.Pleroma.Conversations do
-  use Mix.Task
-  alias Mix.Tasks.Pleroma.Common
-  alias Pleroma.Conversation
-
-  @shortdoc "Manages Pleroma conversations."
-  @moduledoc """
-  Manages Pleroma conversations.
-
-  ## Create a conversation for all existing DMs. Can be safely re-run.
-
-      mix pleroma.conversations bump_all
-
-  """
-  def run(["bump_all"]) do
-    Common.start_pleroma()
-    Conversation.bump_for_all_activities()
-  end
-end
diff --git a/lib/mix/tasks/pleroma/database.ex b/lib/mix/tasks/pleroma/database.ex
index ab9a3a7ff..42753a1a4 100644
--- a/lib/mix/tasks/pleroma/database.ex
+++ b/lib/mix/tasks/pleroma/database.ex
@@ -4,6 +4,7 @@
 
 defmodule Mix.Tasks.Pleroma.Database do
   alias Mix.Tasks.Pleroma.Common
+  alias Pleroma.Conversation
   require Logger
   use Mix.Task
 
@@ -19,6 +20,11 @@ defmodule Mix.Tasks.Pleroma.Database do
 
     Options:
     - `--vacuum` - run `VACUUM FULL` after the embedded objects are replaced with their references
+
+  ## Create a conversation for all existing DMs. Can be safely re-run.
+
+      mix pleroma.database bump_all_conversations
+
   """
   def run(["remove_embedded_objects" | args]) do
     {options, [], []} =
@@ -48,4 +54,9 @@ defmodule Mix.Tasks.Pleroma.Database do
       )
     end
   end
+
+  def run(["bump_all_conversations"]) do
+    Common.start_pleroma()
+    Conversation.bump_for_all_activities()
+  end
 end
-- 
2.45.2