exception: handle duplicate keywords in YOURLS 1.9

Injabie3 · Injabie3 · commit bc44ecaf748b · 2022-07-16T00:51:34.000-07:00
- API returns HTTP 400 so we take a different code path.
diff --git a/yourls/data.py b/yourls/data.py
@@ -100,7 +100,7 @@ def __eq__(self, other):
             return NotImplemented
 
 
-def _handle_api_error_with_json(http_exc, jsondata, response):
+def _handle_api_error_with_json(http_exc, jsondata, response, request_data):
     """Handle YOURLS API errors.
 
     requests' raise_for_status doesn't show the user the YOURLS json response,
@@ -110,7 +110,11 @@ def _handle_api_error_with_json(http_exc, jsondata, response):
         code = jsondata['code']
         message = jsondata['message']
 
-        if code == 'error:noloop':
+        if code == 'error:keyword':
+            # In YOURLS 1.9 or later, we get HTTP 400, so we should handle duplicate
+            # keyword here.
+            raise YOURLSKeywordExistsError(message, keyword=request_data['keyword'])
+        elif code == 'error:noloop':
             raise YOURLSNoLoopError(message, response=response)
         elif code == 'error:nourl':
             raise YOURLSNoURLError(message, response=response)
@@ -142,7 +146,7 @@ def _validate_yourls_response(response, data):
         else:
             logger.debug('Received error {response} with JSON {json}',
                          response=response, json=jsondata)
-            _handle_api_error_with_json(http_exc, jsondata, response)
+            _handle_api_error_with_json(http_exc, jsondata, response, data)
 
         if reraise:
             six.reraise(*http_error_info)
