Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature...

[akkoma] / lib / pleroma / user.ex

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index e959fe67738bdc33f2d38238c4495d07a1f9e70d..e9196ae0391b8b254008d1414b567e2da2265c38 100644 (file)
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -250,6 +250,13 @@ defmodule Pleroma.User do
     Repo.get_by(User, nickname: nickname)
   end
 
+  def get_by_nickname_or_email(nickname_or_email) do
+    case user = Repo.get_by(User, nickname: nickname_or_email) do
+      %User{} -> user
+      nil -> Repo.get_by(User, email: nickname_or_email)
+    end
+  end
+
   def get_cached_user_info(user) do
     key = "user_info:#{user.id}"
     Cachex.get!(:user_cache, key, fallback: fn _ -> user_info(user) end)
@@ -315,6 +322,16 @@ defmodule Pleroma.User do
     update_and_set_cache(cs)
   end
 
+  def decrease_note_count(%User{} = user) do
+    note_count = user.info["note_count"] || 0
+    note_count = if note_count <= 0, do: 0, else: note_count - 1
+    new_info = Map.put(user.info, "note_count", note_count)
+
+    cs = info_changeset(user, %{info: new_info})
+
+    update_and_set_cache(cs)
+  end
+
   def update_note_count(%User{} = user) do
     note_count_query =
       from(