Commit 7c82b821 authored by lain's avatar lain
Browse files

Make emoji configurable in files.

parent 959e993c
firefox, /emoji/Firefox.gif
......@@ -93,7 +93,19 @@ def parse_mentions(text) do
{finmoji, "/finmoji/128px/#{finmoji}-128.png"}
end)
@emoji @finmoji_with_filenames
@emoji_from_file (with {:ok, file} <- File.read("config/emoji.txt") do
file
|> String.trim
|> String.split("\n")
|> Enum.map(fn(line) ->
[name, file] = String.split(line, ", ")
{name, file}
end)
else
_ -> []
end)
@emoji @finmoji_with_filenames ++ @emoji_from_file
def emojify(text, additional \\ nil) do
all_emoji = if additional do
......
......@@ -11,7 +11,7 @@ defmodule Pleroma.Web.Endpoint do
at: "/media", from: "uploads", gzip: false
plug Plug.Static,
at: "/", from: :pleroma,
only: ~w(index.html static finmoji)
only: ~w(index.html static finmoji emoji)
# Code reloading can be explicitly enabled under the
# :code_reloader configuration of your endpoint.
......
......@@ -240,6 +240,13 @@ def get("https://social.sakamoto.gq/.well-known/webfinger?resource=https://socia
}}
end
def get("https://pleroma.soykaf.com/.well-known/webfinger?resource=https://pleroma.soykaf.com/users/shp", [Accept: "application/xrd+xml"], []) do
{:ok, %Response{
status_code: 200,
body: File.read!("test/fixtures/httpoison_mock/shp@pleroma.soykaf.com.webfigner")
}}
end
def get("https://squeet.me/xrd/?uri=lain@squeet.me", [Accept: "application/xrd+xml"], []) do
{:ok, %Response{
status_code: 200,
......@@ -259,7 +266,13 @@ def get("https://social.sakamoto.gq/objects/0ccc1a2c-66b0-4305-b23a-7f7f2b040056
status_code: 200,
body: File.read!("test/fixtures/httpoison_mock/sakamoto.atom")
}}
end
def get("https://pleroma.soykaf.com/users/shp/feed.atom", _, _) do
{:ok, %Response{
status_code: 200,
body: File.read!("test/fixtures/httpoison_mock/shp@pleroma.soykaf.com.feed")
}}
end
def get("http://social.heldscal.la/.well-known/host-meta", [], [follow_redirect: true]) do
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment