Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/controllers/messages_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def show(list_name:, list_seq:)
# If this is a turbo frame request, just render the message
return if turbo_frame_request?

render_threads yyyymm: @message.published_at.strftime('%Y%m')
render_threads yyyymm: @message.yyyymm
end

private
Expand Down Expand Up @@ -68,9 +68,9 @@ def render_threads(yyyymm: nil, q: nil)
if q
root_query.where!('body %> ?', q)
else
@yyyymms = Message.where(list_id: @list, parent_id: nil).order('yyyymm').pluck(Arel.sql "distinct to_char(published_at, 'YYYYMM') as yyyymm")
@yyyymms = Message.distinct.where(list_id: @list, parent_id: nil).order('yyyymm').pluck('yyyymm')
@yyyymm = yyyymm || @yyyymms.last
root_query.where!("to_char(published_at, 'YYYYMM') = ?", @yyyymm)
root_query.where!(yyyymm: @yyyymm)
end

messages = Message.with_recursive(parent_and_children: [root_query, Message.joins('inner join parent_and_children on messages.parent_id = parent_and_children.id')])
Expand All @@ -79,7 +79,7 @@ def render_threads(yyyymm: nil, q: nil)
@messages = compose_tree(messages)

if q
@yyyymms = @messages.map { it.published_at.strftime('%Y%m') }.uniq
@yyyymms = @messages.map { it.yyyymm }.uniq
@yyyymm = @yyyymms.last
end

Expand Down
Loading