diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-06-09 13:55:32 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-06-09 13:55:32 +0300 |
| commit | 3ecfe2a6d4874cc6f7873c3d8c76f25d6b83829a (patch) | |
| tree | 50fe70940473a5cd40093c1c53650135e24ab651 /lib | |
| parent | bf391569cf83c3dec75fe1a6870ae0b9f228400b (diff) | |
| parent | b9544d565d42cd0705f6f583b328d1034ae8ae97 (diff) | |
| download | pleroma-3ecfe2a6d4874cc6f7873c3d8c76f25d6b83829a.tar.gz | |
Merge branch 'develop' into feature/releases
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/emoji.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/transmogrifier.ex | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex index de7fcc1ce..b77b26f7f 100644 --- a/lib/pleroma/emoji.ex +++ b/lib/pleroma/emoji.ex @@ -98,7 +98,9 @@ defmodule Pleroma.Emoji do Logger.error("Could not access the custom emoji directory #{emoji_dir_path}: #{e}") {:ok, results} -> - grouped = Enum.group_by(results, &File.dir?/1) + grouped = + Enum.group_by(results, fn file -> File.dir?(Path.join(emoji_dir_path, file)) end) + packs = grouped[true] || [] files = grouped[false] || [] diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index ff031a16e..3bb8b40b5 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -339,7 +339,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do def fix_type(%{"inReplyTo" => reply_id} = object) when is_binary(reply_id) do reply = Object.normalize(reply_id) - if reply.data["type"] == "Question" and object["name"] do + if reply && (reply.data["type"] == "Question" and object["name"]) do Map.put(object, "type", "Answer") else object |