fix path bug, fix config bug

This commit is contained in:
Moon Man 2020-03-24 02:33:27 +00:00
parent 6611ca31b6
commit 1736384612
1 changed files with 4 additions and 3 deletions

View File

@ -36,7 +36,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy do
new_files = new_files =
for {emojo_shortcode, emojo_url} <- foreign_emoji, for {emojo_shortcode, emojo_url} <- foreign_emoji,
!has_emojo(installed_emoji, emojo_shortcode) do !has_emojo(installed_emoji, emojo_shortcode) do
Logger.debug("HANDLING EMOJO") Logger.debug("HANDLING EMOJO #{emojo_shortcode} #{emojo_url}")
cond do cond do
!String.match?(emojo_shortcode, ~r/^[[:word:]]+$/) -> !String.match?(emojo_shortcode, ~r/^[[:word:]]+$/) ->
@ -47,13 +47,14 @@ defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy do
remote_emojo = HTTPoison.get!(emojo_url) remote_emojo = HTTPoison.get!(emojo_url)
if remote_emojo.status_code == 200 do if remote_emojo.status_code == 200 do
emoji_dir_path = Path.join(Config.get!([:instance, :static_dir]), "emoji/stolen") Logger.debug("got remote emoji")
emoji_dir_path = Path.join(Pleroma.Config.get!([:instance, :static_dir]), "emoji/stolen")
emojo_uri = URI.parse(emojo_url) emojo_uri = URI.parse(emojo_url)
extension = Path.extname(Path.basename(emojo_uri.path)) extension = Path.extname(Path.basename(emojo_uri.path))
filename = emojo_shortcode <> extension filename = emojo_shortcode <> extension
new_file = Path.join([emoji_dir_path, "priv/static/emoji/stolen", filename]) new_file = Path.join([emoji_dir_path, filename])
{:ok, file} = File.open(new_file, [:write]) {:ok, file} = File.open(new_file, [:write])
IO.binwrite(file, remote_emojo.body) IO.binwrite(file, remote_emojo.body)