projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f469a86
)
WelcomeMessage: Get rid of Ecto reference.
author
lain
<lain@soykaf.club>
Sat, 16 Feb 2019 16:24:48 +0000
(17:24 +0100)
committer
lain
<lain@soykaf.club>
Sat, 16 Feb 2019 16:24:48 +0000
(17:24 +0100)
lib/pleroma/user/welcome_message.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/user/welcome_message.ex
b/lib/pleroma/user/welcome_message.ex
index 6a0ec084f3081bfa19a5792fd437ec2bc72ac35c..8018ac22f967662cd7900b69e5e985c04f4f7212 100644
(file)
--- a/
lib/pleroma/user/welcome_message.ex
+++ b/
lib/pleroma/user/welcome_message.ex
@@
-1,7
+1,6
@@
defmodule Pleroma.User.WelcomeMessage do
alias Pleroma.User
alias Pleroma.Web.CommonAPI
defmodule Pleroma.User.WelcomeMessage do
alias Pleroma.User
alias Pleroma.Web.CommonAPI
- import Ecto.Query
def post_welcome_message_to_user(user) do
with %User{} = sender_user <- welcome_user(),
def post_welcome_message_to_user(user) do
with %User{} = sender_user <- welcome_user(),
@@
-16,14
+15,12
@@
defmodule Pleroma.User.WelcomeMessage do
end
defp welcome_user() do
end
defp welcome_user() do
- if nickname = Pleroma.Config.get([:instance, :welcome_user_nickname]) do
- from(u in User,
- where: u.local == true,
- where: u.nickname == ^nickname
- )
- |> Pleroma.Repo.one()
+ with nickname when is_binary(nickname) <-
+ Pleroma.Config.get([:instance, :welcome_user_nickname]),
+ %User{local: true} = user <- User.get_cached_by_nickname(nickname) do
+ user
else
else
- nil
+
_ ->
nil
end
end
end
end