Final refinements - improve pattern matching and add constant for cookie expiry

Co-authored-by: mekarpeles <978325+mekarpeles@users.noreply.github.com>

Author: Copilot

openlibrary/plugins/upstream/account.py

@@ -1310,13 +1310,14 @@ class account_verify_human(delegate.page):
     Sets the vf=1 cookie and redirects back to the original URL.
     """
     path = "/account/verify_human"
+    
+    # Cookie expires in 30 days
+    VERIFICATION_COOKIE_EXPIRES_SECONDS = 30 * 24 * 60 * 60
 
     def POST(self):
         """Handle verification request."""
         # Set the verification cookie (vf=1)
-        # Cookie expires in 30 days
-        expires = 30 * 24 * 60 * 60
-        web.setcookie('vf', '1', expires=expires)
+        web.setcookie('vf', '1', expires=self.VERIFICATION_COOKIE_EXPIRES_SECONDS)
 
         # Track verification success
         stats.increment('ol.stats.verify_human.verified')

openlibrary/plugins/worksearch/code.py

@@ -805,7 +805,6 @@ def _is_expensive_search(self, i):
         q = i.get('q', '').strip()
 
         # Check for specialized Solr syntax patterns
-        # We need to be careful not to match URLs
         expensive_patterns = [
             r'language:',           # language: queries
             r'\*:\*',               # Wildcard queries
@@ -819,9 +818,9 @@ def _is_expensive_search(self, i):
             if re.search(pattern, q, re.IGNORECASE):
                 return True
 
-        # Check for field-specific queries, but exclude common URL schemes
-        # This pattern matches word:something but not http://, https://, ftp://, etc.
-        if re.search(r'(?<!http)(?<!https)(?<!ftp)(?<!mailto)\b\w+:(?!//)', q, re.IGNORECASE):
+        # Check for field-specific queries while excluding URL schemes
+        # Matches patterns like 'field:value' but not 'http://', 'https://', 'ftp://', 'mailto:'
+        if re.search(r'(?<![:/])\b(?!(?:https?|ftp|mailto)://)\w+:', q, re.IGNORECASE):
             return True
 
         # Check if language filter is being used

openlibrary/templates/lib/challenge.html

@@ -16,7 +16,7 @@ <h1>$_("Human Verification")</h1>
     var button = document.getElementById('verify-human-btn');
     var verifyingText = $:json.dumps(_("Verifying..."));
     var errorText = $:json.dumps(_("Verification failed. Please try again."));
-    var buttonText = $:json.dumps(_("Verify you are human"));
+    var originalText = button.textContent;
 
     button.addEventListener('click', function() {
         button.disabled = true;
@@ -40,7 +40,7 @@ <h1>$_("Human Verification")</h1>
             console.error('Verification error:', error);
             alert(errorText);
             button.disabled = false;
-            button.textContent = buttonText;
+            button.textContent = originalText;
         });
     });
 })();