From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 28 Dec 2021 00:01:25 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f5c3d45120364681b3601baa36a0ce9fa22680d7;p=akkoma

Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
---

f5c3d45120364681b3601baa36a0ce9fa22680d7
diff --cc lib/pleroma/web/mastodon_api/controllers/app_controller.ex
index d2a35dce2,93e63ba03..079382b17
--- a/lib/pleroma/web/mastodon_api/controllers/app_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/app_controller.ex
@@@ -44,10 -31,8 +42,9 @@@ defmodule Pleroma.Web.MastodonAPI.AppCo
        params
        |> Map.take([:client_name, :redirect_uris, :website])
        |> Map.put(:scopes, scopes)
 +      |> Maps.put_if_present(:user_id, user_id)
  
      with cs <- App.register_changeset(%App{}, app_attrs),
-          false <- cs.changes[:client_name] == @local_mastodon_name,
           {:ok, app} <- Repo.insert(cs) do
        render(conn, "show.json", app: app)
      end