aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
diff options
context:
space:
mode:
authorAlex S <alex.strizhakov@gmail.com>2019-04-08 16:01:28 +0700
committerAlex S <alex.strizhakov@gmail.com>2019-04-08 16:01:28 +0700
commit012bb5dcc9bfbf6f3ea210ec4e865f3adcea9dfd (patch)
tree7f76a7ca35e165352294542732d4d02cdea8bce2 /lib/pleroma
parent56c75aec123bc22bd0be94cef627beec324bff15 (diff)
downloadpleroma-012bb5dcc9bfbf6f3ea210ec4e865f3adcea9dfd.tar.gz
renaming expire_at -> expires_at
keyword style change
Diffstat (limited to 'lib/pleroma')
-rw-r--r--lib/pleroma/user_invite_token.ex12
-rw-r--r--lib/pleroma/web/admin_api/views/account_view.ex2
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/pleroma/user_invite_token.ex b/lib/pleroma/user_invite_token.ex
index f08309485..11f1dcb16 100644
--- a/lib/pleroma/user_invite_token.ex
+++ b/lib/pleroma/user_invite_token.ex
@@ -16,7 +16,7 @@ defmodule Pleroma.UserInviteToken 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)
@@ -26,7 +26,7 @@ defmodule Pleroma.UserInviteToken do
@spec create_invite(map()) :: 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 +37,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
@@ -95,8 +95,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] ||
+ defp not_overdue_date?(%{expires_at: expires_at} = invite) do
+ Date.compare(Date.utc_today(), expires_at) in [:lt, :eq] ||
(update_invite!(invite, %{used: true}) && false)
end
diff --git a/lib/pleroma/web/admin_api/views/account_view.ex b/lib/pleroma/web/admin_api/views/account_view.ex
index fd7917500..28bb667d8 100644
--- a/lib/pleroma/web/admin_api/views/account_view.ex
+++ b/lib/pleroma/web/admin_api/views/account_view.ex
@@ -32,7 +32,7 @@ defmodule Pleroma.Web.AdminAPI.AccountView do
"id" => invite.id,
"token" => invite.token,
"used" => invite.used,
- "expire_at" => invite.expire_at,
+ "expires_at" => invite.expires_at,
"uses" => invite.uses,
"max_use" => invite.max_use,
"invite_type" => invite.invite_type