Merge remote-tracking branch 'origin/develop' into instance-markup-info

Signed-off-by: Nicole Mikołajczyk <git@mkljczk.pl>

lib/pleroma/web/api_spec.ex

@@ -97,7 +97,7 @@ defmodule Pleroma.Web.ApiSpec do
               "Frontend management",
               "Instance configuration",
               "Instance documents",
-              "Instance rule managment",
+              "Instance rule management",
               "Invites",
               "MediaProxy cache",
               "OAuth application management",

lib/pleroma/web/api_spec/operations/admin/rule_operation.ex

@@ -16,7 +16,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.RuleOperation do
 
   def index_operation do
     %Operation{
-      tags: ["Instance rule managment"],
+      tags: ["Instance rule management"],
       summary: "Retrieve list of instance rules",
       operationId: "AdminAPI.RuleController.index",
       security: [%{"oAuth" => ["admin:read"]}],
@@ -33,7 +33,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.RuleOperation do
 
   def create_operation do
     %Operation{
-      tags: ["Instance rule managment"],
+      tags: ["Instance rule management"],
       summary: "Create new rule",
       operationId: "AdminAPI.RuleController.create",
       security: [%{"oAuth" => ["admin:write"]}],
@@ -49,7 +49,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.RuleOperation do
 
   def update_operation do
     %Operation{
-      tags: ["Instance rule managment"],
+      tags: ["Instance rule management"],
       summary: "Modify existing rule",
       operationId: "AdminAPI.RuleController.update",
       security: [%{"oAuth" => ["admin:write"]}],
@@ -65,7 +65,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.RuleOperation do
 
   def delete_operation do
     %Operation{
-      tags: ["Instance rule managment"],
+      tags: ["Instance rule management"],
       summary: "Delete rule",
       operationId: "AdminAPI.RuleController.delete",
       parameters: [Operation.parameter(:id, :path, :string, "Rule ID")],

lib/pleroma/web/api_spec/operations/instance_operation.ex

@@ -52,7 +52,7 @@ defmodule Pleroma.Web.ApiSpec.InstanceOperation do
       summary: "Retrieve list of instance rules",
       operationId: "InstanceController.rules",
       responses: %{
-        200 => Operation.response("Array of domains", "application/json", array_of_rules())
+        200 => Operation.response("Array of rules", "application/json", array_of_rules())
       }
     }
   end

lib/pleroma/web/mastodon_api/views/instance_view.ex

@@ -261,6 +261,21 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
   end
 
   defp pleroma_configuration(instance) do
+    base_urls = %{}
+
+    base_urls =
+      if Config.get([:media_proxy, :enabled]) do
+        Map.put(base_urls, :media_proxy, Config.get([:media_proxy, :base_url]))
+      else
+        base_urls
+      end
+
+    base_urls =
+      case Config.get([Pleroma.Upload, :base_url]) do
+        nil -> base_urls
+        url -> Map.put(base_urls, :upload, url)
+      end
+
     %{
       metadata: %{
         account_activation_required: Keyword.get(instance, :account_activation_required),
@@ -271,6 +286,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
         birthday_required: Config.get([:instance, :birthday_required]),
         birthday_min_age: Config.get([:instance, :birthday_min_age]),
         translation: supported_languages(),
+        base_urls: base_urls,
         markup: markup()
       },
       stats: %{mau: Pleroma.User.active_user_count()},