Merge branch 'fix/emoji-picker' into 'develop'

set visible_in_picker to true in custom_emojis

Closes #177 and mastofe#16

See merge request pleroma/pleroma!188

diff --combined lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 9d4e3d80625dc51a9374b4d08dfdce51c5c9e94d,3dd9aeb5797987814beaadc0ffc129ce707896b9..4252ac2fe2f0bce288bfb181901c2b1086277c6e
--- 1/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
--- 2/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@@ -10,8 -10,6 +10,8 @@@ defmodule Pleroma.Web.MastodonAPI.Masto
    import Ecto.Query
    require Logger
  
 +  action_fallback(:errors)
 +
    def create_app(conn, params) do
      with cs <- App.register_changeset(%App{}, params) |> IO.inspect(),
           {:ok, app} <- Repo.insert(cs) |> IO.inspect() do
@@@ -136,6 -134,7 +136,7 @@@
        %{
          "shortcode" => shortcode,
          "static_url" => url,
+         "visible_in_picker" => true,
          "url" => url
        }
      end)
@@@ -329,27 -328,27 +330,27 @@@
    end
  
    def reblog_status(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id}) do
 -    with {:ok, announce, _activity} = CommonAPI.repeat(ap_id_or_id, user) do
 +    with {:ok, announce, _activity} <- CommonAPI.repeat(ap_id_or_id, user) do
        render(conn, StatusView, "status.json", %{activity: announce, for: user, as: :activity})
      end
    end
  
    def unreblog_status(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id}) do
 -    with {:ok, _, _, %{data: %{"id" => id}}} = CommonAPI.unrepeat(ap_id_or_id, user),
 +    with {:ok, _, _, %{data: %{"id" => id}}} <- CommonAPI.unrepeat(ap_id_or_id, user),
           %Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id) do
        render(conn, StatusView, "status.json", %{activity: activity, for: user, as: :activity})
      end
    end
  
    def fav_status(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id}) do
 -    with {:ok, _fav, %{data: %{"id" => id}}} = CommonAPI.favorite(ap_id_or_id, user),
 +    with {:ok, _fav, %{data: %{"id" => id}}} <- CommonAPI.favorite(ap_id_or_id, user),
           %Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id) do
        render(conn, StatusView, "status.json", %{activity: activity, for: user, as: :activity})
      end
    end
  
    def unfav_status(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id}) do
 -    with {:ok, _, _, %{data: %{"id" => id}}} = CommonAPI.unfavorite(ap_id_or_id, user),
 +    with {:ok, _, _, %{data: %{"id" => id}}} <- CommonAPI.unfavorite(ap_id_or_id, user),
           %Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id) do
        render(conn, StatusView, "status.json", %{activity: activity, for: user, as: :activity})
      end
@@@ -921,10 -920,4 +922,10 @@@
          nil
      end
    end
 +
 +  def errors(conn, _) do
 +    conn
 +    |> put_status(500)
 +    |> json("Something went wrong")
 +  end
  end