logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 089d72d2e6bb1f3c3674162c5c9a7c4988241358
parent: a23df89b5d457ef56154069c132c75a590de810f
Author: rinpatch <rinpatch@sdf.org>
Date:   Thu, 28 May 2020 11:38:35 +0000

Merge branch 'chore/fix-spelling' into 'develop'

Fix minor spelling error

See merge request pleroma/pleroma!2598

Diffstat:

Mlib/pleroma/emoji/pack.ex2+-
Mlib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex2+-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pleroma/emoji/pack.ex b/lib/pleroma/emoji/pack.ex @@ -499,7 +499,7 @@ defmodule Pleroma.Emoji.Pack do if Base.decode16!(sha) == :crypto.hash(:sha256, archive) do {:ok, archive} else - {:error, :imvalid_checksum} + {:error, :invalid_checksum} end end end diff --git a/lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex b/lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex @@ -106,7 +106,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiPackController do |> put_status(:internal_server_error) |> json(%{error: "The requested instance does not support sharing emoji packs"}) - {:error, :imvalid_checksum} -> + {:error, :invalid_checksum} -> conn |> put_status(:internal_server_error) |> json(%{error: "SHA256 for the pack doesn't match the one sent by the server"})