projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/disable-account
[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 25f498fcb22de11d79d121b501bf1897d64339b1..887f878c440ed2a6e6550017596c3f3764d1db12 100644
(file)
--- a/
lib/pleroma/web/common_api/utils.ex
+++ b/
lib/pleroma/web/common_api/utils.ex
@@
-226,7
+226,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
}
if in_reply_to do
}
if in_reply_to do
- in_reply_to_object = Object.normalize(in_reply_to
.data["object"]
)
+ in_reply_to_object = Object.normalize(in_reply_to)
object
|> Map.put("inReplyTo", in_reply_to_object.data["id"])
object
|> Map.put("inReplyTo", in_reply_to_object.data["id"])
@@
-284,7
+284,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 <- User.get_by_id(user.id),
+ with %User{local: true} = db_user <- User.get_
cached_
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