From: lambda <pleromagit@rogerbraun.net>
Date: Sun, 8 Apr 2018 06:02:11 +0000 (+0000)
Subject: Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=9998b4519da0a732d2a91ca067f4f849a0d37be6;hp=-c;p=akkoma

Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'

mastodon api emulation improvements for tootstream

Closes #101

See merge request pleroma/pleroma!100
---

9998b4519da0a732d2a91ca067f4f849a0d37be6
diff --combined lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 97a618186,f1cb6ec9d..b00f1e15c
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@@ -102,13 -102,14 +102,14 @@@ defmodule Pleroma.Web.MastodonAPI.Masto
    end
  
    @instance Application.get_env(:pleroma, :instance)
+   @mastodon_api_level "2.3.3"
  
    def masto_instance(conn, _params) do
      response = %{
        uri: Web.base_url(),
        title: Keyword.get(@instance, :name),
        description: "A Pleroma instance, an alternative fediverse server",
-       version: Keyword.get(@instance, :version),
+       version: "#{@mastodon_api_level} (compatible; #{Keyword.get(@instance, :version)})",
        email: Keyword.get(@instance, :email),
        urls: %{
          streaming_api: String.replace(Web.base_url(), ["http", "https"], "wss")
@@@ -604,7 -605,7 +605,7 @@@
                "video\/mp4"
              ]
            },
 -          settings: %{
 +          settings: Map.get(user.info, "settings") || %{
              onboarded: true,
              home: %{
                shows: %{
@@@ -649,18 -650,6 +650,18 @@@
      end
    end
  
 +  def put_settings(%{assigns: %{user: user}} = conn, %{"data" => settings} = _params) do
 +    with new_info <- Map.put(user.info, "settings", settings),
 +         change <- User.info_changeset(user, %{info: new_info}),
 +         {:ok, _user} <- User.update_and_set_cache(change) do
 +      conn
 +      |> json(%{})
 +    else e ->
 +        conn
 +        |> json(%{error: inspect(e)})
 +    end
 +  end
 +
    def login(conn, _) do
      conn
      |> render(MastodonView, "login.html", %{error: false})
diff --combined lib/pleroma/web/router.ex
index a33d03fc9,f24007784..8ee27e63c
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -100,6 -100,7 +100,7 @@@ defmodule Pleroma.Web.Router d
      get("/domain_blocks", MastodonAPIController, :empty_array)
      get("/follow_requests", MastodonAPIController, :empty_array)
      get("/mutes", MastodonAPIController, :empty_array)
+     get("/lists", MastodonAPIController, :empty_array)
  
      get("/timelines/home", MastodonAPIController, :home_timeline)
  
@@@ -120,12 -121,6 +121,12 @@@
      post("/media", MastodonAPIController, :upload)
    end
  
 +  scope "/api/web", Pleroma.Web.MastodonAPI do
 +    pipe_through(:authenticated_api)
 +
 +    put("/settings", MastodonAPIController, :put_settings)
 +  end
 +
    scope "/api/v1", Pleroma.Web.MastodonAPI do
      pipe_through(:api)
      get("/instance", MastodonAPIController, :masto_instance)