in dev, allow dev FE

[akkoma] / lib / pleroma / user_invite_token.ex

diff --git a/lib/pleroma/user_invite_token.ex b/lib/pleroma/user_invite_token.ex
index f08309485ff0150f173e09ab781b1fab95540b79..4cff1c515f3d6781e39f5eae197be34635862d5d 100644 (file)
--- a/lib/pleroma/user_invite_token.ex
+++ b/lib/pleroma/user_invite_token.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.UserInviteToken do
@@ -10,23 +10,24 @@ defmodule Pleroma.UserInviteToken do
   alias Pleroma.Repo
   alias Pleroma.UserInviteToken
 
+  @type t :: %__MODULE__{}
   @type token :: String.t()
 
   schema "user_invite_tokens" do
     field(:token, :string)
     field(:used, :boolean, default: false)
     field(:max_use, :integer)
-    field(:expire_at, :date)
+    field(:expires_at, :date)
     field(:uses, :integer, default: 0)
     field(:invite_type, :string)
 
     timestamps()
   end
 
-  @spec create_invite(map()) :: UserInviteToken.t()
+  @spec create_invite(map()) :: {:ok, UserInviteToken.t()}
   def create_invite(params \\ %{}) do
     %UserInviteToken{}
-    |> cast(params, ~w(max_use expire_at)a)
+    |> cast(params, [:max_use, :expires_at])
     |> add_token()
     |> assign_type()
     |> Repo.insert()
@@ -37,11 +38,11 @@ defmodule Pleroma.UserInviteToken do
     put_change(changeset, :token, token)
   end
 
-  defp assign_type(%{changes: %{max_use: _max_use, expire_at: _expire_at}} = changeset) do
+  defp assign_type(%{changes: %{max_use: _max_use, expires_at: _expires_at}} = changeset) do
     put_change(changeset, :invite_type, "reusable_date_limited")
   end
 
-  defp assign_type(%{changes: %{expire_at: _expire_at}} = changeset) do
+  defp assign_type(%{changes: %{expires_at: _expires_at}} = changeset) do
     put_change(changeset, :invite_type, "date_limited")
   end
 
@@ -73,7 +74,7 @@ defmodule Pleroma.UserInviteToken do
 
   @spec find_by_token(token()) :: {:ok, UserInviteToken.t()} | nil
   def find_by_token(token) do
-    with invite <- Repo.get_by(UserInviteToken, token: token) do
+    with %UserInviteToken{} = invite <- Repo.get_by(UserInviteToken, token: token) do
       {:ok, invite}
     end
   end
@@ -95,9 +96,8 @@ defmodule Pleroma.UserInviteToken do
     not_overdue_date?(invite) and invite.uses < invite.max_use and not invite.used
   end
 
-  defp not_overdue_date?(%{expire_at: expire_at} = invite) do
-    Date.compare(Date.utc_today(), expire_at) in [:lt, :eq] ||
-      (update_invite!(invite, %{used: true}) && false)
+  defp not_overdue_date?(%{expires_at: expires_at}) do
+    Date.compare(Date.utc_today(), expires_at) in [:lt, :eq]
   end
 
   @spec update_usage!(UserInviteToken.t()) :: nil | UserInviteToken.t() | no_return()