X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser%2Fwelcome_message.ex;h=f8f52028595b7128a864bc611b90454920782bb1;hb=8f9ee694ed47709231ffc852d2e82a06468cba06;hp=6a0ec084f3081bfa19a5792fd437ec2bc72ac35c;hpb=d812a347ca936dba764eb223fde029d83ca3fba0;p=akkoma

diff --git a/lib/pleroma/user/welcome_message.ex b/lib/pleroma/user/welcome_message.ex
index 6a0ec084f..f8f520285 100644
--- a/lib/pleroma/user/welcome_message.ex
+++ b/lib/pleroma/user/welcome_message.ex
@@ -1,33 +1,34 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 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(),
          message when is_binary(message) <- welcome_message() do
       CommonAPI.post(sender_user, %{
-        "visibility" => "direct",
-        "status" => "@#{user.nickname}\n#{message}"
+        visibility: "direct",
+        status: "@#{user.nickname}\n#{message}"
       })
     else
       _ -> {:ok, nil}
     end
   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()
+  defp welcome_user do
+    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
-      nil
+      _ -> nil
     end
   end
 
-  defp welcome_message() do
+  defp welcome_message do
     Pleroma.Config.get([:instance, :welcome_message])
   end
 end