mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-15 03:15:32 +00:00
5bb8563f6c
Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.
58 lines
1,003 B
Ruby
58 lines
1,003 B
Ruby
# frozen_string_literal: true
|
|
|
|
class InvitesController < ApplicationController
|
|
include Authorization
|
|
|
|
layout 'admin'
|
|
|
|
before_action :authenticate_user!
|
|
before_action :set_pack
|
|
before_action :set_body_classes
|
|
|
|
def index
|
|
authorize :invite, :create?
|
|
|
|
@invites = invites
|
|
@invite = Invite.new
|
|
end
|
|
|
|
def create
|
|
authorize :invite, :create?
|
|
|
|
@invite = Invite.new(resource_params)
|
|
@invite.user = current_user
|
|
|
|
if @invite.save
|
|
redirect_to invites_path
|
|
else
|
|
@invites = invites
|
|
render :index
|
|
end
|
|
end
|
|
|
|
def destroy
|
|
@invite = invites.find(params[:id])
|
|
authorize @invite, :destroy?
|
|
@invite.expire!
|
|
redirect_to invites_path
|
|
end
|
|
|
|
private
|
|
|
|
def set_pack
|
|
use_pack 'settings'
|
|
end
|
|
|
|
def invites
|
|
Invite.where(user: current_user).order(id: :desc)
|
|
end
|
|
|
|
def resource_params
|
|
params.require(:invite).permit(:max_uses, :expires_in, :autofollow)
|
|
end
|
|
|
|
def set_body_classes
|
|
@body_classes = 'admin'
|
|
end
|
|
end
|