Refactor GitHub repo URL parsing

Author: devnoname120

website/src/queries-init.js

@@ -166,15 +166,7 @@ function getQueryOrDefault(defaultVal) {
   if (!JQ_REPO_FIELD.val()) {
     JQ_REPO_FIELD.val(defaultVal);
   }
-
-  const val = JQ_REPO_FIELD.val();
-
-  const isShorthand = /^[\w\.-]+\/[\w\.-]+$/;
-  if (isShorthand.test(val)) {
-    return val; // we are dealing with "user/repo" input format
-  } else {
-    return new URL(val).pathname;
-  }
+  return JQ_REPO_FIELD.val();
 }
 
 function hideFilterContainer() {

website/src/queries-logic.js

@@ -462,32 +462,55 @@ function initial_request(user, repo) {
 }
 
 /** Extracts and sanitizes 'user' and 'repo' values from potential inputs. */
-function initiate_search() {
+function parse_query(queryString) {
+  const shorthand = /^(?<user>[\w.-]+)\/(?<repo>[\w.-]+)$/;
+  const shorthandMatch = shorthand.exec(queryString);
+
+  if (shorthandMatch) { // we are dealing with "user/repo" input format
+    const {user, repo} = shorthandMatch.groups;
+    return {user, repo};
+  }
+
+  let pathname;
+  try {
+    pathname = new URL(queryString).pathname;
+  } catch {
+    return null;
+  }
+
+  const values = pathname.split('/').filter(s => s.length > 0);
+  if (values.length < 2)
+    return null;
 
+  const [user, repo] = values;
+  return {user, repo};
+}
+
+
+function initiate_search() {
   /* Checking if search is allowed. */
   if (searchNotAllowed())
     return; // abort
 
   clear_old_data();
 
   let queryString = getQueryOrDefault("payne911/PieMenu");
-  let queryValues = queryString.split('/').filter(s => s.length > 0);
+  const queryValues = parse_query(queryString);
 
-  let len = queryValues.length;
-  if (len < 2) {
+  if (!queryValues) {
     setMsg('Please enter a valid query: it should contain two strings separated by a "/", or the full URL to a GitHub repo');
     ga_faultyQuery(queryString);
     return; // abort
   }
 
+  const {user, repo} = queryValues;
+
   setUpOctokitWithLatestToken();
 
   setQueryFieldsAsLoading();
   hideFilterContainer();
   setMsg(UF_MSG_SCANNING);
 
-  const user = queryValues[0];
-  const repo = queryValues[1];
   if (history.replaceState) {
     history.replaceState({}, document.title, `?repo=${user}/${repo}`); // replace current URL param
   }