From: Tom Hughes <tom@compton.nu>
Date: Tue, 28 Jan 2025 18:30:19 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5568'
X-Git-Tag: live~170
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b17f2540949637d928908f6669946731660810c6?hp=f01cbc68c286b947d7b4e9971a518b26051a3ef2

Merge remote-tracking branch 'upstream/pull/5568'
---

diff --git a/app/models/note.rb b/app/models/note.rb
index 17b57c0fa..376516e9b 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -99,16 +99,6 @@ class Note < ApplicationRecord
     comments.first.author
   end
 
-  # Return the note's author ID, derived from the first comment
-  def author_id
-    comments.first.author_id
-  end
-
-  # Return the note's author IP address, derived from the first comment
-  def author_ip
-    comments.first.author_ip
-  end
-
   private
 
   # Fill in default values for new notes
diff --git a/test/models/note_test.rb b/test/models/note_test.rb
index ba87911e3..8b0439ac2 100644
--- a/test/models/note_test.rb
+++ b/test/models/note_test.rb
@@ -65,23 +65,6 @@ class NoteTest < ActiveSupport::TestCase
     assert_equal user, comment.note.author
   end
 
-  def test_author_id
-    comment = create(:note_comment)
-    assert_nil comment.note.author_id
-
-    user = create(:user)
-    comment = create(:note_comment, :author => user)
-    assert_equal user.id, comment.note.author_id
-  end
-
-  def test_author_ip
-    comment = create(:note_comment)
-    assert_nil comment.note.author_ip
-
-    comment = create(:note_comment, :author_ip => IPAddr.new("192.168.1.1"))
-    assert_equal IPAddr.new("192.168.1.1"), comment.note.author_ip
-  end
-
   # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05
   def test_lat_lon_format
     note = build(:note, :latitude => 0.00004 * GeoRecord::SCALE, :longitude => 0.00008 * GeoRecord::SCALE)