From c03ac3037461a879f85a2a075919f8bc925e5723 Mon Sep 17 00:00:00 2001 From: Kouhai Date: Wed, 5 Jul 2023 01:45:04 -0700 Subject: [PATCH] th: invite limit nonfixited bugs --- app/models/invite.rb | 4 ++-- app/views/invites/_form.html.haml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/invite.rb b/app/models/invite.rb index 52c09e4806..bc4f16dba2 100644 --- a/app/models/invite.rb +++ b/app/models/invite.rb @@ -21,8 +21,8 @@ class Invite < ApplicationRecord # FIXME: make this a rails cfg key or whatev? TH_USE_INVITE_QUOTA = !!ENV['TH_USE_INVITE_QUOTA'] - TH_INVITE_MAX_USES = ENV.fetch('TH_INVITE_MAX_USES', 25) - TH_ACTIVE_INVITE_SLOT_QUOTA = ENV.fetch('TH_ACTIVE_INVITE_SLOT_QUOTA', 40) + TH_INVITE_MAX_USES = ENV.fetch('TH_INVITE_MAX_USES', 25).to_i + TH_ACTIVE_INVITE_SLOT_QUOTA = ENV.fetch('TH_ACTIVE_INVITE_SLOT_QUOTA', 40).to_i belongs_to :user, inverse_of: :invites has_many :users, inverse_of: :invite diff --git a/app/views/invites/_form.html.haml b/app/views/invites/_form.html.haml index 31789feaf4..b736184fc6 100644 --- a/app/views/invites/_form.html.haml +++ b/app/views/invites/_form.html.haml @@ -3,9 +3,9 @@ .fields-row .fields-row__column.fields-row__column-6.fields-group - = f.input :max_uses, wrapper: :with_label, collection: [1, 5, 10, 25], label_method: lambda { |num| I18n.t('invites.max_uses', count: num) }, prompt: I18n.t('invites.max_uses_prompt'), include_blank: false, include_hidden: false # required: true + = f.input :max_uses, wrapper: :with_label, collection: [1, 5, 10, 25], label_method: lambda { |num| I18n.t('invites.max_uses', count: num) }, prompt: I18n.t('invites.max_uses_prompt'), include_blank: false, include_hidden: false .fields-row__column.fields-row__column-6.fields-group - = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week, 1.month].map(&:to_i), label_method: lambda { |i| I18n.t("invites.expires_in.#{i}") }, prompt: I18n.t('invites.expires_in_prompt'), include_blank: false, include_hidden: false, selected: 1 # required: true + = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week, 1.month].map(&:to_i), label_method: lambda { |i| I18n.t("invites.expires_in.#{i}") }, prompt: I18n.t('invites.expires_in_prompt'), include_blank: false, include_hidden: false .fields-group = f.input :autofollow, wrapper: :with_label