From 51f87ba30cf20a1ca6bc19d2229913d8e1eecda5 Mon Sep 17 00:00:00 2001 From: Ilja Date: Sat, 2 Jul 2022 07:59:46 +0200 Subject: [PATCH] Change order of privilege tags to make more sense The tags were listed in different places They were listed in a rather randomly order I reordered them in a way I think makes more sense --- config/config.exs | 14 +++++++------- config/description.exs | 28 ++++++++++++++-------------- docs/configuration/cheatsheet.md | 14 +++++++------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/config/config.exs b/config/config.exs index 935d4fc98..eb56723fa 100644 --- a/config/config.exs +++ b/config/config.exs @@ -257,15 +257,15 @@ config :pleroma, :instance, password_reset_token_validity: 60 * 60 * 24, profile_directory: true, admin_privileges: [ - :users_delete, - :users_manage_credentials, - :messages_read, - :users_manage_tags, - :users_manage_activation_state, - :users_manage_invites, - :reports_manage_reports, :users_read, + :users_manage_invites, + :users_manage_activation_state, + :users_manage_tags, + :users_manage_credentials, + :users_delete, + :messages_read, :messages_delete, + :reports_manage_reports, :emoji_manage_emoji ], moderator_privileges: [], diff --git a/config/description.exs b/config/description.exs index e2ff91fb3..66ae53d42 100644 --- a/config/description.exs +++ b/config/description.exs @@ -964,15 +964,15 @@ config :pleroma, :config_description, [ key: :admin_privileges, type: {:list, :atom}, suggestions: [ - :users_delete, - :users_manage_credentials, - :messages_read, - :users_manage_tags, - :users_manage_activation_state, - :users_manage_invites, - :reports_manage_reports, :users_read, + :users_manage_invites, + :users_manage_activation_state, + :users_manage_tags, + :users_manage_credentials, + :users_delete, + :messages_read, :messages_delete, + :reports_manage_reports, :emoji_manage_emoji ], description: @@ -982,15 +982,15 @@ config :pleroma, :config_description, [ key: :moderator_privileges, type: {:list, :atom}, suggestions: [ - :users_delete, - :users_manage_credentials, - :messages_read, - :users_manage_tags, - :users_manage_activation_state, - :users_manage_invites, - :reports_manage_reports, :users_read, + :users_manage_invites, + :users_manage_activation_state, + :users_manage_tags, + :users_manage_credentials, + :users_delete, + :messages_read, :messages_delete, + :reports_manage_reports, :emoji_manage_emoji ], description: diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index c59c914f2..af82b6948 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -66,15 +66,15 @@ To add configuration to your config file, you can copy it from the base config. * `password_reset_token_validity`: The time after which reset tokens aren't accepted anymore, in seconds (default: one day). * `admin_privileges`: A list of privileges an admin has (e.g. delete messages, manage reports...) * Possible values are: - * `:users_delete` - * `:users_manage_credentials` - * `:messages_read` - * `:users_manage_tags` - * `:users_manage_activation_state` - * `:users_manage_invites` - * `:reports_manage_reports` * `:users_read` + * `:users_manage_invites` + * `:users_manage_activation_state` + * `:users_manage_tags` + * `:users_manage_credentials` + * `:users_delete` + * `:messages_read` * `:messages_delete` + * `:reports_manage_reports` * `:emoji_manage_emoji` * `moderator_privileges`: A list of privileges a moderator has (e.g. delete messages, manage reports...) * Possible values are the same as for `admin_privileges`