From dff910dda667201bcf1887d52996ee6026818ace Mon Sep 17 00:00:00 2001
From: Peter Bhat Harkins <peter@push.cx>
Date: Fri, 4 Mar 2022 07:57:27 -0600
Subject: [PATCH] bump commonmarker; rubocop

---
 .rubocop.yml          | 2 ++
 Gemfile               | 2 +-
 Gemfile.lock          | 4 ++--
 app/models/message.rb | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 454a43e5..c02b16a1 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -215,6 +215,8 @@ Style/MethodDefParentheses:
   Enabled: false
 Style/MultilineBlockChain:
   Enabled: false
+Style/MultilineMemoization:
+  Enabled: false
 Style/MultilineTernaryOperator:
   Enabled: false
 Style/NegatedIf:
diff --git a/Gemfile b/Gemfile
index d603b4ea..b214aaed 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,7 @@ gem "rqrcode"
 gem "pdf-reader"
 gem "nokogiri", ">= 1.13.2"
 gem "htmlentities"
-gem "commonmarker", "~> 0.14"
+gem "commonmarker", ">= 0.23.4"
 
 # perf
 gem 'flamegraph'
diff --git a/Gemfile.lock b/Gemfile.lock
index f687b328..0e235e75 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,7 +82,7 @@ GEM
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     chunky_png (1.4.0)
-    commonmarker (0.23.2)
+    commonmarker (0.23.4)
     concurrent-ruby (1.1.9)
     crack (0.4.5)
       rexml
@@ -293,7 +293,7 @@ DEPENDENCIES
   bcrypt (~> 3.1.2)
   byebug
   capybara
-  commonmarker (~> 0.14)
+  commonmarker (>= 0.23.4)
   database_cleaner
   exception_notification
   factory_bot_rails
diff --git a/app/models/message.rb b/app/models/message.rb
index 0630035b..cea714b8 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -23,13 +23,13 @@ class Message < ApplicationRecord
     end
   end
 
-  scope :inbox, -> (user) {
+  scope :inbox, ->(user) {
     where(
       recipient: user,
       deleted_by_recipient: false,
     ).preload(:author, :hat, :recipient).order('id asc')
   }
-  scope :outbox, -> (user) {
+  scope :outbox, ->(user) {
     where(
       author: user,
       deleted_by_author: false,