diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-01-15 08:24:24 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-01-15 08:24:24 +0000 |
| commit | c29430b018d3ba34677d5f816f67e3b8d44ec685 (patch) | |
| tree | ead105dbc2363a018cdb669e2f82bf056c2e6c4f /lib | |
| parent | d3a4f5b7d7234efddc7fed608f6062b30e8a4c11 (diff) | |
| parent | 4ca65c6182e9a575de3f360a3dac2861ad4e9960 (diff) | |
| download | pleroma-c29430b018d3ba34677d5f816f67e3b8d44ec685.tar.gz pleroma-c29430b018d3ba34677d5f816f67e3b8d44ec685.zip | |
Merge branch 'mrf-steal-emoji-extname' into 'develop'
MRF.StealEmojiPolicy: Properly add fallback extension to filenames missing one
See merge request pleroma/pleroma!4029
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex b/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex index 28c2cf3b3..237dfefa5 100644 --- a/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex @@ -34,7 +34,9 @@ defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy do |> Path.basename() |> Path.extname() - file_path = Path.join(emoji_dir_path, shortcode <> (extension || ".png")) + extension = if extension == "", do: ".png", else: extension + + file_path = Path.join(emoji_dir_path, shortcode <> extension) case File.write(file_path, response.body) do :ok -> |