X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fmix%2Ftasks%2Fpleroma%2Femoji.ex;h=2b03a30095bbc7b7ccc6a83ea214cc0491581303;hb=fc2eb1fbd6a5b38a3cf72e557cce1029d6b7f16f;hp=2126588b1ae83b0a475a8639279d015d72c2444c;hpb=eff725c3af4537b2d993f85a236636cd5d5e17d0;p=akkoma
diff --git a/lib/mix/tasks/pleroma/emoji.ex b/lib/mix/tasks/pleroma/emoji.ex
index 2126588b1..2b03a3009 100644
--- a/lib/mix/tasks/pleroma/emoji.ex
+++ b/lib/mix/tasks/pleroma/emoji.ex
@@ -1,23 +1,21 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2018 Pleroma Authors
+# Copyright © 2017-2020 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Mix.Tasks.Pleroma.Emoji do
use Mix.Task
- @shortdoc "Manages Pleroma instance"
- @moduledoc """
- """
-
- @default_manifest "https://git.pleroma.social/vaartis/emoji-index/raw/master/index.json"
+ @shortdoc "Manages emoji packs"
+ @moduledoc File.read!("docs/administration/CLI_tasks/emoji.md")
def run(["ls-packs" | args]) do
+ Mix.Pleroma.start_pleroma()
Application.ensure_all_started(:hackney)
{options, [], []} = parse_global_opts(args)
manifest =
- fetch_manifest(if options[:manifest], do: options[:manifest], else: @default_manifest)
+ fetch_manifest(if options[:manifest], do: options[:manifest], else: default_manifest())
Enum.each(manifest, fn {name, info} ->
to_print = [
@@ -31,15 +29,19 @@ defmodule Mix.Tasks.Pleroma.Emoji do
for {param, value} <- to_print do
IO.puts(IO.ANSI.format([:bright, param, :normal, ": ", value]))
end
+
+ # A newline
+ IO.puts("")
end)
end
def run(["get-packs" | args]) do
+ Mix.Pleroma.start_pleroma()
Application.ensure_all_started(:hackney)
{options, pack_names, []} = parse_global_opts(args)
- manifest_url = if options[:manifest], do: options[:manifest], else: @default_manifest
+ manifest_url = if options[:manifest], do: options[:manifest], else: default_manifest()
manifest = fetch_manifest(manifest_url)
@@ -60,16 +62,17 @@ defmodule Mix.Tasks.Pleroma.Emoji do
])
)
- binary_archive = Tesla.get!(src_url).body
- archive_md5 = :crypto.hash(:md5, binary_archive) |> Base.encode16()
+ binary_archive = Tesla.get!(client(), src_url).body
+ archive_sha = :crypto.hash(:sha256, binary_archive) |> Base.encode16()
- md5_status_text = ["MD5 of ", :bright, pack_name, :normal, " source file is ", :bright]
- if archive_md5 == String.upcase(pack["src_md5"]) do
- IO.puts(IO.ANSI.format(md5_status_text ++ [:green, "OK"]))
+ sha_status_text = ["SHA256 of ", :bright, pack_name, :normal, " source file is ", :bright]
+
+ if archive_sha == String.upcase(pack["src_sha256"]) do
+ IO.puts(IO.ANSI.format(sha_status_text ++ [:green, "OK"]))
else
- IO.puts(IO.ANSI.format(md5_status_text ++ [:red, "BAD"]))
+ IO.puts(IO.ANSI.format(sha_status_text ++ [:red, "BAD"]))
- raise "Bad MD5 for #{pack_name}"
+ raise "Bad SHA256 for #{pack_name}"
end
# The url specified in files should be in the same directory
@@ -87,15 +90,12 @@ defmodule Mix.Tasks.Pleroma.Emoji do
])
)
- files = Tesla.get!(files_url).body |> Poison.decode!()
+ files = Tesla.get!(client(), files_url).body |> Jason.decode!()
IO.puts(IO.ANSI.format(["Unpacking ", :bright, pack_name]))
- static_path = Path.join(:code.priv_dir(:pleroma), "static")
-
pack_path =
Path.join([
- static_path,
Pleroma.Config.get!([:instance, :static_dir]),
"emoji",
pack_name
@@ -113,18 +113,21 @@ defmodule Mix.Tasks.Pleroma.Emoji do
file_list: files_to_unzip
)
- IO.puts(IO.ANSI.format(["Writing emoji.txt for ", :bright, pack_name]))
-
- emoji_txt_str =
- Enum.map(
- files,
- fn {shortcode, path} ->
- "#{shortcode}, /instance/static/emoji/#{pack_name}/#{path}"
- end
- )
- |> Enum.join("\n")
-
- File.write!(Path.join(pack_path, "emoji.txt"), emoji_txt_str)
+ IO.puts(IO.ANSI.format(["Writing pack.json for ", :bright, pack_name]))
+
+ pack_json = %{
+ pack: %{
+ "license" => pack["license"],
+ "homepage" => pack["homepage"],
+ "description" => pack["description"],
+ "fallback-src" => pack["src"],
+ "fallback-src-sha256" => pack["src_sha256"],
+ "share-files" => true
+ },
+ files: files
+ }
+
+ File.write!(Path.join(pack_path, "pack.json"), Jason.encode!(pack_json, pretty: true))
else
IO.puts(IO.ANSI.format([:bright, :red, "No pack named \"#{pack_name}\" found"]))
end
@@ -149,20 +152,26 @@ defmodule Mix.Tasks.Pleroma.Emoji do
default_exts = [".png", ".gif"]
default_exts_str = Enum.join(default_exts, " ")
+
exts =
- String.trim(IO.gets("Emoji file extensions (separated with spaces) [#{default_exts_str}]: "))
- exts = if String.length(exts) > 0 do
- String.split(exts, " ") |> Enum.filter(fn e -> (e |> String.trim() |> String.length()) > 0 end)
- else
- default_exts
- end
+ String.trim(
+ IO.gets("Emoji file extensions (separated with spaces) [#{default_exts_str}]: ")
+ )
+
+ exts =
+ if String.length(exts) > 0 do
+ String.split(exts, " ")
+ |> Enum.filter(fn e -> e |> String.trim() |> String.length() > 0 end)
+ else
+ default_exts
+ end
- IO.puts "Downloading the pack and generating MD5"
+ IO.puts("Downloading the pack and generating SHA256")
- binary_archive = Tesla.get!(src).body
- archive_md5 = :crypto.hash(:md5, binary_archive) |> Base.encode16()
+ binary_archive = Tesla.get!(client(), src).body
+ archive_sha = :crypto.hash(:sha256, binary_archive) |> Base.encode16()
- IO.puts "MD5 is #{archive_md5}"
+ IO.puts("SHA256 is #{archive_sha}")
pack_json = %{
name => %{
@@ -170,38 +179,31 @@ defmodule Mix.Tasks.Pleroma.Emoji do
homepage: homepage,
description: description,
src: src,
- src_md5: archive_md5,
+ src_sha256: archive_sha,
files: files_name
}
}
tmp_pack_dir = Path.join(System.tmp_dir!(), "emoji-pack-#{name}")
- {:ok, _} =
- :zip.unzip(
- binary_archive,
- cwd: tmp_pack_dir
- )
- emoji_map =
- find_all_emoji(tmp_pack_dir, exts) |>
- Enum.map(&Path.relative_to(&1, tmp_pack_dir)) |>
- Enum.map(fn f -> {f |> Path.basename() |> Path.rootname(), f} end) |>
- Enum.into(%{})
+ {:ok, _} = :zip.unzip(binary_archive, cwd: String.to_charlist(tmp_pack_dir))
- File.write!(files_name, Poison.encode!(emoji_map, pretty: true))
+ emoji_map = Pleroma.Emoji.Loader.make_shortcode_to_file_map(tmp_pack_dir, exts)
- IO.puts """
+ File.write!(files_name, Jason.encode!(emoji_map, pretty: true))
+
+ IO.puts("""
#{files_name} has been created and contains the list of all found emojis in the pack.
Please review the files in the remove those not needed.
- """
+ """)
if File.exists?("index.json") do
- existing_data = File.read!("index.json") |> Poison.decode!()
+ existing_data = File.read!("index.json") |> Jason.decode!()
File.write!(
"index.json",
- Poison.encode!(
+ Jason.encode!(
Map.merge(
existing_data,
pack_json
@@ -210,32 +212,22 @@ defmodule Mix.Tasks.Pleroma.Emoji do
)
)
- IO.puts "index.json file has been update with the #{name} pack"
+ IO.puts("index.json file has been update with the #{name} pack")
else
- File.write!("index.json", Poison.encode!(pack_json, pretty: true))
+ File.write!("index.json", Jason.encode!(pack_json, pretty: true))
- IO.puts "index.json has been created with the #{name} pack"
+ IO.puts("index.json has been created with the #{name} pack")
end
-
- end
-
- defp find_all_emoji(dir, exts) do
- Enum.reduce(
- File.ls!(dir),
- [],
- fn f, acc ->
- filepath = Path.join(dir, f)
- if File.dir?(filepath) do
- acc ++ find_all_emoji(filepath, exts)
- else
- acc ++ [filepath]
- end
- end
- ) |> Enum.filter(fn f -> Path.extname(f) in exts end)
end
defp fetch_manifest(from) do
- Tesla.get!(from).body |> Poison.decode!()
+ Jason.decode!(
+ if String.starts_with?(from, "http") do
+ Tesla.get!(client(), from).body
+ else
+ File.read!(from)
+ end
+ )
end
defp parse_global_opts(args) do
@@ -249,4 +241,14 @@ defmodule Mix.Tasks.Pleroma.Emoji do
]
)
end
+
+ defp client do
+ middleware = [
+ {Tesla.Middleware.FollowRedirects, [max_redirects: 3]}
+ ]
+
+ Tesla.client(middleware)
+ end
+
+ defp default_manifest, do: Pleroma.Config.get!([:emoji, :default_manifest])
end