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
fe7804e4
Commit
fe7804e4
authored
Oct 19, 2017
by
eal
Browse files
Add an API endpoint for emoji.
parent
38f3908c
Changes
3
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/formatter.ex
View file @
fe7804e4
...
...
@@ -122,4 +122,9 @@ def emojify(text, additional \\ nil) do
def
get_emoji
(
text
)
do
Enum
.
filter
(
@emoji
,
fn
({
emoji
,
_
})
->
String
.
contains?
(
text
,
":
#{
emoji
}
:"
)
end
)
end
def
get_custom_emoji
()
do
@emoji
|>
Enum
.
into
%{}
end
end
lib/pleroma/web/router.ex
View file @
fe7804e4
...
...
@@ -33,14 +33,15 @@ def user_fetcher(username) do
plug
:accepts
,
[
"html"
,
"json"
]
end
pipeline
:p
assword_reset
do
plug
:accepts
,
[
"html"
]
pipeline
:p
leroma_api
do
plug
:accepts
,
[
"html"
,
"json"
]
end
scope
"/api/pleroma"
,
Pleroma
.
Web
.
TwitterAPI
do
pipe_through
:p
assword_reset
pipe_through
:p
leroma_api
get
"/password_reset/:token"
,
UtilController
,
:show_password_reset
post
"/password_reset"
,
UtilController
,
:password_reset
get
"/emoji"
,
UtilController
,
:emoji
end
scope
"/oauth"
,
Pleroma
.
Web
.
OAuth
do
...
...
lib/pleroma/web/twitter_api/controllers/util_controller.ex
View file @
fe7804e4
defmodule
Pleroma
.
Web
.
TwitterAPI
.
UtilController
do
use
Pleroma
.
Web
,
:controller
alias
Pleroma
.
Web
alias
Pleroma
.
Formatter
alias
Pleroma
.
{
Repo
,
PasswordResetToken
,
User
}
...
...
@@ -68,4 +69,8 @@ def version(conn, _params) do
_
->
json
(
conn
,
version
)
end
end
def
emoji
(
conn
,
_params
)
do
json
conn
,
Formatter
.
get_custom_emoji
()
end
end
Write
Preview
Supports
Markdown
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