FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

inbox: refactor a bit further so the cyber dog shuts up

This commit is contained in:
Georg Gadinger 2023-01-19 16:21:21 +01:00
parent 6c90f2f0dd
commit c4724b8c62
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/controllers/inbox_controller.rb
View File

@ -3,24 +3,17 @@
class InboxController < ApplicationController class InboxController < ApplicationController
before_action :authenticate_user! before_action :authenticate_user!
before_action :find_author, only: %i[show]
def show def show
@inbox = current_user.cursored_inbox(last_id: params[:last_id]).then(&method(:filter_author_chain)) find_author
@inbox_last_id = @inbox.map(&:id).min find_inbox_entries
@more_data_available = !current_user.cursored_inbox(last_id: @inbox_last_id, size: 1).then(&method(:filter_author_chain)).count.zero?
@inbox_count = current_user.inboxes.then(&method(:filter_author_chain)).count
if @author_user && @inbox_count.zero? if @author_user && @inbox_count.zero?
flash[:info] = t(".author.info", author: @author) # rubocop disabled because of a false positive
flash[:info] = t(".author.info", author: @author) # rubocop:disable Rails/ActionControllerFlashBeforeRender
redirect_to inbox_path(last_id: params[:last_id]) redirect_to inbox_path(last_id: params[:last_id])
end end
@delete_id = if @author_user && @inbox_count.positive? @delete_id = find_delete_id
"ib-delete-all-author"
else
"ib-delete-all"
end
@disabled = true if @inbox.empty? @disabled = true if @inbox.empty?
respond_to do |format| respond_to do |format|
@ -28,7 +21,8 @@ class InboxController < ApplicationController
format.turbo_stream do format.turbo_stream do
render "show", layout: false, status: :see_other render "show", layout: false, status: :see_other
@inbox.update_all(new: false) # rubocop disabled as just flipping a flag doesn't need to have validations to be run
@inbox.update_all(new: false) # rubocop:disable Rails/SkipsModelValidations
end end
end end
end end
@ -63,6 +57,19 @@ class InboxController < ApplicationController
flash.now[:error] = t(".author.error", author: @author) unless @author_user flash.now[:error] = t(".author.error", author: @author) unless @author_user
end end
def find_inbox_entries
@inbox = current_user.cursored_inbox(last_id: params[:last_id]).then(&method(:filter_author_chain))
@inbox_last_id = @inbox.map(&:id).min
@more_data_available = current_user.cursored_inbox(last_id: @inbox_last_id, size: 1).then(&method(:filter_author_chain)).count.positive?
@inbox_count = current_user.inboxes.then(&method(:filter_author_chain)).count
end
def find_delete_id
return "ib-delete-all-author" if @author_user && @inbox_count.positive?
"ib-delete-all"
end
def filter_author_chain(query) def filter_author_chain(query)
return query unless @author_user return query unless @author_user