Skip to content

Commit 6918bf9

Browse files
committed
Rubocop fixes
1 parent c264807 commit 6918bf9

File tree

4 files changed

+16
-2
lines changed

4 files changed

+16
-2
lines changed

app/controllers/better_together/conversations_controller.rb

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def create
3030
end
3131

3232
def show # rubocop:todo Metrics/MethodLength
33-
@messages = @conversation.messages.with_all_rich_text.includes(sender: [ :string_translations ]).order(:created_at)
33+
@messages = @conversation.messages.with_all_rich_text.includes(sender: [:string_translations]).order(:created_at)
3434
@message = @conversation.messages.build
3535

3636
respond_to do |format|
@@ -67,7 +67,12 @@ def set_conversation
6767
end
6868

6969
def set_conversations
70-
@conversations = helpers.current_person.conversations.includes(messages: [:sender], participants: [:string_translations, :contact_detail, { profile_image_attachment: :blob }]).order(updated_at: :desc).distinct(:id)
70+
@conversations = helpers.current_person.conversations.includes(messages: [:sender],
71+
participants: [
72+
:string_translations,
73+
:contact_detail,
74+
{ profile_image_attachment: :blob }
75+
]).order(updated_at: :desc).distinct(:id)
7176
end
7277

7378
def platform_manager_ids

db/migrate/20241025144852_remove_messages_content_column_null.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# frozen_string_literal: true
2+
3+
# Allows message content to be null in preparation to migrate to encrypted message contents
14
class RemoveMessagesContentColumnNull < ActiveRecord::Migration[7.1]
25
def change
36
change_column_null :better_together_messages, :content, true

db/migrate/20241025145238_remove_action_text_rich_texts_locale_column_null.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# frozen_string_literal: true
2+
3+
# Allows rich texts to have a null locale in the context of encrypted message contents
14
class RemoveActionTextRichTextsLocaleColumnNull < ActiveRecord::Migration[7.1]
25
def change
36
change_column_null :action_text_rich_texts, :locale, true

db/migrate/20241025150018_migrate_unencrypted_message_content_and_drop_column.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# frozen_string_literal: true
2+
3+
# Runs rake task to migrate existing message contents to encrypted message contents as encrypted rich texts
14
class MigrateUnencryptedMessageContentAndDropColumn < ActiveRecord::Migration[7.1]
25
def change
36
reversible do |dir|

0 commit comments

Comments
 (0)