projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/wrong-date-format' into 'develop'
[akkoma]
/
lib
/
pleroma
/
emoji.ex
diff --git
a/lib/pleroma/emoji.ex
b/lib/pleroma/emoji.ex
index 523dea65299370e6f56e51717a5aa49a7be226a3..f3f08cd9dcf15f119a50c25c227289e39a1fc499 100644
(file)
--- a/
lib/pleroma/emoji.ex
+++ b/
lib/pleroma/emoji.ex
@@
-1,3
+1,7
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Emoji do
@moduledoc """
The emojis are loaded from:
defmodule Pleroma.Emoji do
@moduledoc """
The emojis are loaded from:
@@
-13,13
+17,13
@@
defmodule Pleroma.Emoji do
@ets_options [:ordered_set, :protected, :named_table, {:read_concurrency, true}]
@doc false
@ets_options [:ordered_set, :protected, :named_table, {:read_concurrency, true}]
@doc false
- def start_link
()
do
+ def start_link do
GenServer.start_link(__MODULE__, [], name: __MODULE__)
end
@doc "Reloads the emojis from disk."
@spec reload() :: :ok
GenServer.start_link(__MODULE__, [], name: __MODULE__)
end
@doc "Reloads the emojis from disk."
@spec reload() :: :ok
- def reload
()
do
+ def reload do
GenServer.call(__MODULE__, :reload)
end
GenServer.call(__MODULE__, :reload)
end
@@
-34,7
+38,7
@@
defmodule Pleroma.Emoji do
@doc "Returns all the emojos!!"
@spec get_all() :: [{String.t(), String.t()}, ...]
@doc "Returns all the emojos!!"
@spec get_all() :: [{String.t(), String.t()}, ...]
- def get_all
()
do
+ def get_all do
:ets.tab2list(@ets)
end
:ets.tab2list(@ets)
end
@@
-68,7
+72,7
@@
defmodule Pleroma.Emoji do
{:ok, state}
end
{:ok, state}
end
- defp load
()
do
+ defp load do
emojis =
(load_finmoji(Keyword.get(Application.get_env(:pleroma, :instance), :finmoji_enabled)) ++
load_from_file("config/emoji.txt") ++
emojis =
(load_finmoji(Keyword.get(Application.get_env(:pleroma, :instance), :finmoji_enabled)) ++
load_from_file("config/emoji.txt") ++
@@
-165,7
+169,7
@@
defmodule Pleroma.Emoji do
defp load_from_file_stream(stream) do
stream
defp load_from_file_stream(stream) do
stream
- |> Stream.map(&String.
strip
/1)
+ |> Stream.map(&String.
trim
/1)
|> Stream.map(fn line ->
case String.split(line, ~r/,\s*/) do
[name, file] -> {name, file}
|> Stream.map(fn line ->
case String.split(line, ~r/,\s*/) do
[name, file] -> {name, file}