Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
ab8b9aba
Commit
ab8b9aba
authored
Jan 31, 2018
by
eal
Browse files
Split emoji to default and custom.
parent
5e37aded
Pipeline
#566
passed with stage
in 2 minutes and 49 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
config/emoji.txt
→
config/emoji
_default
.txt
View file @
ab8b9aba
File moved
lib/pleroma/formatter.ex
View file @
ab8b9aba
...
...
@@ -104,13 +104,19 @@ def html_escape(text) do
{
finmoji
,
"/finmoji/128px/
#{
finmoji
}
-128.png"
}
end
)
@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
}
@emoji_from_file
(
with
{
:ok
,
default
}
<-
File
.
read
(
"config/emoji.txt"
)
do
custom
=
with
{
:ok
,
custom
}
<-
File
.
read
(
"config/custom_emoji.txt"
)
do
custom
else
_e
->
""
end
(
default
<>
"
\n
"
<>
custom
)
|>
String
.
trim
()
|>
String
.
split
(
~r/\n+/
)
|>
Enum
.
map
(
fn
(
line
)
->
[
name
,
file
]
=
String
.
split
(
line
,
~r/,\s*/
)
{
name
,
file
}
end
)
else
_
->
[]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment