pleroma

commit: 2cf753c5022dd7178d882e36e25b3a40dc403eff
parent a853218701c662ce452757a05395c8c6002c5a3d
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Wed, 10 Feb 2021 00:52:59 +0000

Merge branch 'fix/no-version-api-pleroma-social' into 'develop'

Fix no version number on api.pleroma.social

See merge request pleroma/pleroma!3310
Diffstat:
M
lib/mix/tasks/pleroma/openapi_spec.ex
2
++
M
lib/pleroma/web/api_spec.ex
3
++-

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/mix/tasks/pleroma/openapi_spec.ex b/lib/mix/tasks/pleroma/openapi_spec.ex
@@ -1,5 +1,7 @@
 defmodule Mix.Tasks.Pleroma.OpenapiSpec do
   def run([path]) do
+    # Load Pleroma application to get version info
+    Application.load(:pleroma)
     spec = Pleroma.Web.ApiSpec.spec(server_specific: false) |> Jason.encode!()
     File.write(path, spec)
   end
diff --git a/lib/pleroma/web/api_spec.ex b/lib/pleroma/web/api_spec.ex
@@ -37,7 +37,8 @@ defmodule Pleroma.Web.ApiSpec do
 
         Please report such occurences on our [issue tracker](https://git.pleroma.social/pleroma/pleroma/-/issues). Feel free to submit API questions or proposals there too!
         """,
-        version: Application.spec(:pleroma, :vsn) |> to_string(),
+        # Strip environment from the version
+        version: Application.spec(:pleroma, :vsn) |> to_string() |> String.replace(~r/\+.*$/, ""),
         extensions: %{
           # Logo path should be picked so that the path exists both on Pleroma instances and on api.pleroma.social
           "x-logo": %{"url" => "/static/logo.svg", "altText" => "Pleroma logo"}