Skip to content

Commit 6fd391f

Browse files
committed
List is a model now
1 parent adc2e0c commit 6fd391f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

app/controllers/messages_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def index
66
if (list_name = params[:list_name])
77
@list = List.find_by_name list_name
88

9-
messages = Message.with_recursive(parent_and_children: [Message.where(list_id: @list.id, parent_id: nil).order(:id).limit(100), Message.joins('inner join parent_and_children on messages.parent_id = parent_and_children.id')])
9+
messages = Message.with_recursive(parent_and_children: [Message.where(list_id: @list, parent_id: nil).order(:id).limit(100), Message.joins('inner join parent_and_children on messages.parent_id = parent_and_children.id')])
1010
.joins('inner join parent_and_children on parent_and_children.id = messages.id')
1111
@messages = compose_tree(messages)
1212
elsif (query = params[:q])
@@ -23,7 +23,7 @@ def index
2323
# GET /messages/ruby-dev/1
2424
def show
2525
@list = List.find_by_name(params[:list_name])
26-
@message = Message.find_by(list_id: @list.id, list_seq: params[:list_seq])
26+
@message = Message.find_by(list_id: @list, list_seq: params[:list_seq])
2727
end
2828

2929
private

app/models/message.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ def from_mail(mail, list, list_seq)
4848

4949
# mail.in_reply_to returns strange Array object in some cases (?), so let's use the raw value
5050
parent_message_id_header = extract_message_id_from_in_reply_to(mail.header[:in_reply_to]&.value)
51-
self.parent_id = Message.where(list_id: list.id, message_id_header: parent_message_id_header).pick(:id) if parent_message_id_header
51+
self.parent_id = Message.where(list_id: list, message_id_header: parent_message_id_header).pick(:id) if parent_message_id_header
5252
if !self.parent_id && (String === mail.references)
53-
self.parent_id = Message.where(list_id: list.id, message_id_header: mail.references).pick(:id)
53+
self.parent_id = Message.where(list_id: list, message_id_header: mail.references).pick(:id)
5454
end
5555
if !self.parent_id && (Array === mail.references)
5656
mail.references.compact.each do |ref|
57-
break if (self.parent_id = Message.where(list_id: list.id, message_id_header: ref).pick(:id))
57+
break if (self.parent_id = Message.where(list_id: list, message_id_header: ref).pick(:id))
5858
end
5959
end
6060

0 commit comments

Comments
 (0)