stricter restrictions on creating anonymous notes

Author: deevroman

app/assets/javascripts/index/new_note.js

@@ -149,7 +149,7 @@ OSM.NewNote = function (map) {
       createNote(location, text, (feature) => {
         if (typeof OSM.user === "undefined") {
           const anonymousNotesCount = Number(OSM.cookies.get("_osm_anonymous_notes_count")) || 0;
-          OSM.cookies.set("_osm_anonymous_notes_count", anonymousNotesCount + 1, { expires: 30 });
+          OSM.cookies.set("_osm_anonymous_notes_count", anonymousNotesCount + 1, { expires: 14 });
         }
         content.find("textarea").val("");
         addCreatedNoteMarker(feature);

app/views/notes/new.html.erb

@@ -1,22 +1,25 @@
 <% set_title(t(".title")) %>
 
 <%= render "sidebar_header", :title => t(".title") %>
-
+<% soft_anonymous_notes_limit_reached = !current_user && @anonymous_notes_count >= 5
+   hard_anonymous_notes_limit_reached = !current_user && @anonymous_notes_count >= 10
+   warn_class = hard_anonymous_notes_limit_reached ? "alert-danger" : "alert-warning" %>
 <div class="note">
   <p class="alert alert-info"><%= t(".intro") %></p>
   <% if !current_user %>
-    <div class="alert alert-warning pb-0">
+    <div class="alert <%= warn_class %> pb-0">
       <p><%= t ".anonymous_warning_html",
                :log_in => link_to(t(".anonymous_warning_log_in"), login_path(:referer => new_note_path)),
                :sign_up => link_to(t(".anonymous_warning_sign_up"), new_user_path) %></p>
-    <% if @anonymous_notes_count >= 10 %>
+    <% if soft_anonymous_notes_limit_reached %>
       <p><%= t ".counter_warning_html",
                :x_anonymous_notes => t(".x_anonymous_notes", :count => @anonymous_notes_count),
                :contribute_by_yourself => link_to(t(".counter_warning_guide_link.text"), t(".counter_warning_guide_link.url")),
                :community_can_help => link_to(t(".counter_warning_forum_link.text"), t(".counter_warning_forum_link.url")) %></p>
     <% end %>
     </div>
   <% end %>
+  <% if !hard_anonymous_notes_limit_reached %>
   <p class="alert alert-warning" id="new-note-zoom-warning" hidden><%= t "javascripts.site.createnote_disabled_tooltip" %></p>
   <form action="#">
     <input type="hidden" name="lon" autocomplete="off">
@@ -28,4 +31,5 @@
       <%= submit_tag t(".add"), :name => "add", :disabled => 1, :class => "btn btn-primary" %>
     </div>
   </form>
+  <% end %>
 </div>

test/system/create_note_test.rb

@@ -100,30 +100,38 @@ def teardown
     end
   end
 
-  test "encouragement to contribute appears after 10 created notes and disappears after login" do
-    check_encouragement_while_creating_notes(10)
+  test "encouragement to contribute appears after 5 created notes and disappears after login" do
+    check_encouragement_while_creating_notes(5)
 
     sign_in_as(create(:user))
 
     check_no_encouragement_while_logging_out
   end
 
-  test "encouragement to contribute appears after 10 created notes and disappears after email signup" do
-    check_encouragement_while_creating_notes(10)
+  test "encouragement to contribute appears after 5 created notes and disappears after email signup" do
+    check_encouragement_while_creating_notes(5)
 
     sign_up_with_email
 
     check_no_encouragement_while_logging_out
   end
 
-  test "encouragement to contribute appears after 10 created notes and disappears after google signup" do
-    check_encouragement_while_creating_notes(10)
+  test "encouragement to contribute appears after 5 created notes and disappears after google signup" do
+    check_encouragement_while_creating_notes(5)
 
     sign_up_with_google
 
     check_no_encouragement_while_logging_out
   end
 
+  test "strict encouragement to contribute appears after 10 created notes and disappears after login" do
+    check_strict_encouragement_while_creating_notes(5, 10)
+
+    sign_in_as(create(:user))
+
+    check_no_encouragement_while_logging_out
+  end
+
   private
 
   def check_encouragement_while_creating_notes(encouragement_threshold)
@@ -147,6 +155,32 @@ def check_encouragement_while_creating_notes(encouragement_threshold)
     end
   end
 
+  def check_strict_encouragement_while_creating_notes(encouragement_threshold, strict_encouragement_threshold)
+    strict_encouragement_threshold.times do |n|
+      visit new_note_path(:anchor => "map=16/0/#{0.001 * n}")
+
+      within_sidebar do
+        if n < encouragement_threshold
+          assert_no_content(/already posted at least \d+ anonymous note/)
+        else
+          assert_content(/already posted at least \d+ anonymous note/)
+        end
+
+        fill_in "text", :with => "new note ##{n + 1}"
+        click_on "Add Note"
+
+        assert_content "new note ##{n + 1}"
+      end
+    end
+
+    visit new_note_path(:anchor => "map=16/0/#{0.001 * strict_encouragement_threshold}")
+
+    within_sidebar do
+      assert_content(/already posted at least #{strict_encouragement_threshold} anonymous note/)
+      assert_no_button "Add Note"
+    end
+  end
+
   def check_no_encouragement_while_logging_out
     visit new_note_path(:anchor => "map=16/0/0")