fixup! [ATAK] Enforce character limit on issue text.

Use unicode ellipsis char to save chars.
mysociety · Sep 6, 2023 · 0e583ef · 0e583ef
1 parent c8e9551
commit 0e583ef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/perllib/Open311/Endpoint/Integration/ATAK.pm b/perllib/Open311/Endpoint/Integration/ATAK.pm
@@ -120,14 +120,14 @@ sub _format_issue_text {
     # +2 for the not yet used format directive for detail (%s).
     my $max_detail_chars = $char_limit - length($issue_text) + 2;
 
-    # We need at least 3 characters of leeway so we can use an ellipsis to indicate
+    # We need at least 1 character leeway so we can use an ellipsis to indicate
     # the detail was truncated.
-    if ($max_detail_chars < 3 && length($detail) > $max_detail_chars) {
+    if ($max_detail_chars < 1 && length($detail) > $max_detail_chars) {
         die "Issue text is too large, even if we were to truncate the detail before inserting: " . $issue_text;
     }
 
     if (length($detail) > $max_detail_chars) {
-        $detail = substr($detail, 0, $max_detail_chars - 3) . "...";
+        $detail = substr($detail, 0, $max_detail_chars - 1) . "\x{2026}";
     }
 
     return sprintf($issue_text, $detail);

diff --git a/t/open311/endpoint/brent.t b/t/open311/endpoint/brent.t
@@ -945,23 +945,23 @@ subtest "GET ATAK service request updates OK" => sub {
 subtest "ATAK issue text formatting" => sub {
 
     dies_ok { $atak_endpoint->_format_issue_text(
-        120, 'category', 'location name', 'url', 'title', 'detail'
+        118, 'category', 'location name', 'url', 'title', 'detail'
     ) }, "formatting issue text fails when inputs are too big";
 
     my $issue_text =  $atak_endpoint->_format_issue_text(
-        121, 'category', 'location name', 'url', 'title', 'detail'
+        119, 'category', 'location name', 'url', 'title', 'detail'
     );
     is $issue_text, "Category: category\nLocation: location name\n\nlocation of problem: title\n\n" .
-        "detail: ...\n\nurl: url\n\nSubmitted via FixMyStreet\n";
+        "detail: \x{2026}\n\nurl: url\n\nSubmitted via FixMyStreet\n";
 
-    my $issue_text =  $atak_endpoint->_format_issue_text(
-        122, 'category', 'location name', 'url', 'title', 'detail'
+    $issue_text =  $atak_endpoint->_format_issue_text(
+        120, 'category', 'location name', 'url', 'title', 'detail'
     );
     is $issue_text, "Category: category\nLocation: location name\n\nlocation of problem: title\n\n" .
-        "detail: d...\n\nurl: url\n\nSubmitted via FixMyStreet\n";
+        "detail: d\x{2026}\n\nurl: url\n\nSubmitted via FixMyStreet\n";
 
-    my $issue_text =  $atak_endpoint->_format_issue_text(
-        127, 'category', 'location name', 'url', 'title', 'detail'
+    $issue_text =  $atak_endpoint->_format_issue_text(
+        124, 'category', 'location name', 'url', 'title', 'detail'
     );
     is $issue_text, "Category: category\nLocation: location name\n\nlocation of problem: title\n\n" .
         "detail: detail\n\nurl: url\n\nSubmitted via FixMyStreet\n";