about summary refs log tree commit diff
path: root/lib/cli.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-03-28 15:12:33 +0100
committerGitHub <noreply@github.com>2019-03-28 15:12:33 +0100
commitbb316faffff7a76bc89f7e942233f0e14caf60f5 (patch)
tree260458c7ff43dd82fc02cc7e5ef0920dd8d2a25b /lib/cli.rb
parent0418bdd71f59b4d7e9f3498f2990c8b044f310e1 (diff)
parent050efbc12650feaac3e833c4dd740bf090e3dae1 (diff)
Merge pull request #970 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib/cli.rb')
-rw-r--r--lib/cli.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/cli.rb b/lib/cli.rb
index 59f0f3076..65a5ae696 100644
--- a/lib/cli.rb
+++ b/lib/cli.rb
@@ -5,6 +5,7 @@ require_relative 'mastodon/media_cli'
 require_relative 'mastodon/emoji_cli'
 require_relative 'mastodon/accounts_cli'
 require_relative 'mastodon/feeds_cli'
+require_relative 'mastodon/search_cli'
 require_relative 'mastodon/settings_cli'
 require_relative 'mastodon/statuses_cli'
 require_relative 'mastodon/domains_cli'
@@ -28,6 +29,9 @@ module Mastodon
     desc 'feeds SUBCOMMAND ...ARGS', 'Manage feeds'
     subcommand 'feeds', Mastodon::FeedsCLI
 
+    desc 'search SUBCOMMAND ...ARGS', 'Manage the search engine'
+    subcommand 'search', Mastodon::SearchCLI
+
     desc 'settings SUBCOMMAND ...ARGS', 'Manage dynamic settings'
     subcommand 'settings', Mastodon::SettingsCLI