From 932065fc9f55d6bdfb2275cb10009537d967fc01 Mon Sep 17 00:00:00 2001
From: Karl Dubost <karl+github@la-grange.net>
Date: Wed, 4 Feb 2015 16:57:19 +0900
Subject: [PATCH] #451 rewrite_links with parsing and formatting

---
 webcompat/helpers.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/webcompat/helpers.py b/webcompat/helpers.py
index 1b6e6b250..880ec2706 100644
--- a/webcompat/helpers.py
+++ b/webcompat/helpers.py
@@ -194,15 +194,15 @@ def rewrite_links(link_header):
     </api/issues?per_page=50&page=2>; rel="next",
     </api/issues?per_page=50&page=4>; rel="last" etc.
     '''
-    links = link_header.split(',')
-    new_links = []
-    for link in links:
-        api_path, endpoint_path = link.rsplit('/', 1)
-        if api_path.strip().startswith('<https://api.github.com/repositories'):
-            new_links.append(endpoint_path.replace('issues?', '</api/issues?'))
-        if api_path.strip().startswith('<https://api.github.com/search'):
-            new_links.append(endpoint_path.replace('issues?', '</api/issues/search?'))
-    return ', '.join(new_links)
+    header_link_data = parse_link_header(link_header)
+    for data in header_link_data:
+        uri = data['link']
+        api_path, endpoint_path = uri.rsplit('/', 1)
+        if api_path.strip().startswith('https://api.github.com/repositories'):
+            data['link'] = endpoint_path.replace('issues?', '/api/issues?')
+        if api_path.strip().startswith('https://api.github.com/search'):
+            data['link'] = endpoint_path.replace('issues?', '/api/issues/search?')
+    return format_link_header(header_link_data)
 
 
 def sanitize_link(link_header):