projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging develop into feature/770-add-emoji-tags
[akkoma]
/
lib
/
pleroma
/
web
/
common_api
/
utils.ex
diff --git
a/lib/pleroma/web/common_api/utils.ex
b/lib/pleroma/web/common_api/utils.ex
index f596f703b5f3bae9bc8de8894372760407da4d1b..aafeb7248ff138172ffe4acfdaa654411269d787 100644
(file)
--- a/
lib/pleroma/web/common_api/utils.ex
+++ b/
lib/pleroma/web/common_api/utils.ex
@@
-31,7
+31,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
def get_replied_to_activity(""), do: nil
def get_replied_to_activity(id) when not is_nil(id) do
def get_replied_to_activity(""), do: nil
def get_replied_to_activity(id) when not is_nil(id) do
-
Repo.get(Activity,
id)
+
Activity.get_by_id(
id)
end
def get_replied_to_activity(_), do: nil
end
def get_replied_to_activity(_), do: nil
@@
-275,7
+275,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
end
def confirm_current_password(user, password) do
end
def confirm_current_password(user, password) do
- with %User{local: true} = db_user <-
Repo.get(User,
user.id),
+ with %User{local: true} = db_user <-
User.get_by_id(
user.id),
true <- Pbkdf2.checkpw(password, db_user.password_hash) do
{:ok, db_user}
else
true <- Pbkdf2.checkpw(password, db_user.password_hash) do
{:ok, db_user}
else
@@
-285,7
+285,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
def emoji_from_profile(%{info: _info} = user) do
(Formatter.get_emoji(user.bio) ++ Formatter.get_emoji(user.name))
def emoji_from_profile(%{info: _info} = user) do
(Formatter.get_emoji(user.bio) ++ Formatter.get_emoji(user.name))
- |> Enum.map(fn {shortcode, url} ->
+ |> Enum.map(fn {shortcode, url
, _
} ->
%{
"type" => "Emoji",
"icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}#{url}"},
%{
"type" => "Emoji",
"icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}#{url}"},