diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-06-03 22:30:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-03 22:30:38 +0200 |
commit | db5baf3d1a93cbf6961f721205cff0beaf71bffd (patch) | |
tree | a052f6043b22122a84eb1219f0ffba3ba8870a6a /app/controllers | |
parent | 02dffa8edd097014578774aed30249ed08d2f3a4 (diff) | |
parent | 1ac5427ddceb166764b63ba92421f04a0f6fde38 (diff) |
Merge pull request #1547 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/activitypub/outboxes_controller.rb | 6 | ||||
-rw-r--r-- | app/controllers/api/v1/emails/confirmations_controller.rb | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb index 111285036..4a52560ac 100644 --- a/app/controllers/activitypub/outboxes_controller.rb +++ b/app/controllers/activitypub/outboxes_controller.rb @@ -29,7 +29,7 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController ) else ActivityPub::CollectionPresenter.new( - id: account_outbox_url(@account), + id: outbox_url, type: :ordered, size: @account.statuses_count, first: outbox_url(page: true), @@ -47,11 +47,11 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController end def next_page - account_outbox_url(@account, page: true, max_id: @statuses.last.id) if @statuses.size == LIMIT + outbox_url(page: true, max_id: @statuses.last.id) if @statuses.size == LIMIT end def prev_page - account_outbox_url(@account, page: true, min_id: @statuses.first.id) unless @statuses.empty? + outbox_url(page: true, min_id: @statuses.first.id) unless @statuses.empty? end def set_statuses diff --git a/app/controllers/api/v1/emails/confirmations_controller.rb b/app/controllers/api/v1/emails/confirmations_controller.rb index 4a7aa9c32..f1d9954d0 100644 --- a/app/controllers/api/v1/emails/confirmations_controller.rb +++ b/app/controllers/api/v1/emails/confirmations_controller.rb @@ -3,12 +3,11 @@ class Api::V1::Emails::ConfirmationsController < Api::BaseController before_action :doorkeeper_authorize! before_action :require_user_owned_by_application! + before_action :require_user_not_confirmed! def create - if !current_user.confirmed? && current_user.unconfirmed_email.present? - current_user.update!(email: params[:email]) if params.key?(:email) - current_user.resend_confirmation_instructions - end + current_user.update!(email: params[:email]) if params.key?(:email) + current_user.resend_confirmation_instructions render_empty end @@ -18,4 +17,8 @@ class Api::V1::Emails::ConfirmationsController < Api::BaseController def require_user_owned_by_application! render json: { error: 'This method is only available to the application the user originally signed-up with' }, status: :forbidden unless current_user && current_user.created_by_application_id == doorkeeper_token.application_id end + + def require_user_not_confirmed! + render json: { error: 'This method is only available while the e-mail is awaiting confirmation' }, status: :forbidden if current_user.confirmed? || current_user.unconfirmed_email.blank? + end end |