Add consumable invites #5814
Merged
Add consumable invites #5814
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Gargron
added
moderation
|
Related to #977? |
Gargron
force-pushed
the
feature-invites
branch
from
72d0a35
to
bb8518e
Compare
nightpool
previously requested changes
Nov 25, 2017
app/models/user.rb
Outdated
| accepts_nested_attributes_for :account | ||
|
|
||
| has_many :applications, class_name: 'Doorkeeper::Application', as: :owner | ||
|
|
||
| validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale? | ||
| validates_with BlacklistedEmailValidator, if: :email_changed? | ||
| validates_with InviteCodeValidator |
There was a problem hiding this comment.
This should only validate when the record is being created, so records don't start erroring once the invite expires
app/models/invite.rb
Outdated
| # expires_at :datetime | ||
| # max_uses :integer | ||
| # uses :integer default(0), not null | ||
| # default_follow_account_ids :integer is an Array |
- Default follows not used, probably bad idea - InviteCodeValidator is redundant because RegistrationsController checks invite code validity
Gargron
force-pushed
the
feature-invites
branch
from
3b65663
to
aa62afe
Compare
- Admin UI that lists everyone's invites, always available - Admin setting min_invite_role to control who can invite people - Non-admin invite UI only visible if users are allowed to
Gargron
force-pushed
the
feature-invites
branch
from
4c1f42f
to
f0726b7
Compare
nightpool
reviewed
Nov 27, 2017
| def destroy | ||
| @invite = Invite.where(user: current_user).find(params[:id]) | ||
| authorize @invite, :destroy? | ||
| @invite.destroy! |
There was a problem hiding this comment.
instead of destroying the record, this should probably just set expires_at = Time.now or something so that it's still auditable.
otherwise we have the situation where someone makes 100 accounts and deletes the invites so they can't be traced back to them.
nightpool
reviewed
Nov 27, 2017
| '21600': 6 hours | ||
| '3600': 1 hour | ||
| '43200': 12 hours | ||
| '86400': 1 day |
There was a problem hiding this comment.
shouldn't this just be done with some sort of interval helper?
There was a problem hiding this comment.
No, we overwrote the rails strings to be super short for relative time. Unless you know a better way
nightpool
reviewed
Nov 27, 2017
|
|
||
| .fields-group | ||
| = f.input :max_uses, wrapper: :with_label, collection: [1, 5, 10, 25, 50, 100], label_method: lambda { |num| I18n.t('invites.max_uses', count: num) }, prompt: I18n.t('invites.max_uses_prompt') | ||
| = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day].map(&:to_i), label_method: lambda { |i| I18n.t("invites.expires_in.#{i}") }, prompt: I18n.t('invites.expires_in_prompt') |
There was a problem hiding this comment.
7 days is probably useful here. 6 hours is probably not super useful? Or keep 6 hours, but get rid of 1 hour because we already have 30 minutes.
ykzts
approved these changes
Nov 27, 2017
1 task
yi0713
added a commit
to yi0713/mastodon
that referenced
this pull request
Dec 2, 2017
ykzts
pushed a commit
that referenced
this pull request
Dec 5, 2017
* i18n: (zh-CN) Add missing translations for multiple PRs. Related PRs: #5838 #5762 #5835 #5837 #5832 #5823 #5814 #5757 * i18n: (zh-CN) Fix translation for #5823 / #5835 * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Change `发送者` to `作者` * i18n: (zh-CN) Add missing translations for #5862 * i18n: (zh-CN) Add missing translation for #5874 * i18n: (zh-CN) Improve translations for keyboard shortcuts
cobodo
pushed a commit
to cobodo/mastodon
that referenced
this pull request
Dec 6, 2017
* Add consumable invites * Add UI for generating invite codes * Add tests * Display max uses and expiration in invites table, delete invite * Remove unused column and redundant validator - Default follows not used, probably bad idea - InviteCodeValidator is redundant because RegistrationsController checks invite code validity * Add admin setting to disable invites * Add admin UI for invites, configurable role for invite creation - Admin UI that lists everyone's invites, always available - Admin setting min_invite_role to control who can invite people - Non-admin invite UI only visible if users are allowed to * Do not remove invites from database, expire them instantly
cobodo
pushed a commit
to cobodo/mastodon
that referenced
this pull request
Dec 6, 2017
…on#5849) * i18n: (zh-CN) Add missing translations for multiple PRs. Related PRs: mastodon#5838 mastodon#5762 mastodon#5835 mastodon#5837 mastodon#5832 mastodon#5823 mastodon#5814 mastodon#5757 * i18n: (zh-CN) Fix translation for mastodon#5823 / mastodon#5835 * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Change `发送者` to `作者` * i18n: (zh-CN) Add missing translations for mastodon#5862 * i18n: (zh-CN) Add missing translation for mastodon#5874 * i18n: (zh-CN) Improve translations for keyboard shortcuts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Normal user UI:
Admin UI:
Admin settings UI: