Fixing bad merge

app/models/tipline_message.rb

@@ -16,16 +16,6 @@ def save_ignoring_duplicate!
     end
   end
 
-  private
-
-  def verify_user_rate_limit
-    rate_limit = CheckConfig.get('tipline_user_max_messages_per_day', 1500, :integer)
-    # Block tipline user when they have sent more than X messages in 24 hours
-    if self.state == 'received' && TiplineMessage.where(uid: self.uid, created_at: Time.now.ago(1.day)..Time.now, state: 'received').count > rate_limit
-      Bot::Smooch.block_user(self.uid)
-    end
-  end
-
   def media_url
     payload = begin JSON.parse(self.payload).to_h rescue self.payload.to_h end
     media_url = nil
@@ -41,6 +31,16 @@ def media_url
     media_url || payload['mediaUrl']
   end
 
+  private
+
+  def verify_user_rate_limit
+    rate_limit = CheckConfig.get('tipline_user_max_messages_per_day', 1500, :integer)
+    # Block tipline user when they have sent more than X messages in 24 hours
+    if self.state == 'received' && TiplineMessage.where(uid: self.uid, created_at: Time.now.ago(1.day)..Time.now, state: 'received').count > rate_limit
+      Bot::Smooch.block_user(self.uid)
+    end
+  end
+
   class << self
     def from_smooch_payload(msg, payload, event = nil, language = nil)
       msg = msg.with_indifferent_access