projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'get-cached-everywhere' into 'develop'
[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 7781f16350ab105d5c8ec27e71226224b33f2859..0852896d0c33145e0ab615361486d9bc719adcf9 100644
(file)
--- a/
lib/pleroma/web/common_api/utils.ex
+++ b/
lib/pleroma/web/common_api/utils.ex
@@
-208,7
+208,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
context,
content_html,
attachments,
context,
content_html,
attachments,
- in
ReplyT
o,
+ in
_reply_t
o,
tags,
cw \\ nil,
cc \\ []
tags,
cw \\ nil,
cc \\ []
@@
-225,11
+225,11
@@
defmodule Pleroma.Web.CommonAPI.Utils do
"tag" => tags |> Enum.map(fn {_, tag} -> tag end) |> Enum.uniq()
}
"tag" => tags |> Enum.map(fn {_, tag} -> tag end) |> Enum.uniq()
}
- if in
ReplyT
o do
- in
ReplyToObject = Object.normalize(inReplyT
o.data["object"])
+ if in
_reply_t
o do
+ in
_reply_to_object = Object.normalize(in_reply_t
o.data["object"])
object
object
- |> Map.put("inReplyTo", in
ReplyToO
bject.data["id"])
+ |> Map.put("inReplyTo", in
_reply_to_o
bject.data["id"])
else
object
end
else
object
end
@@
-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