"Go to Root" respects user names in URL

The behavior of navigating to root should match what is displayed in the top banner.

3 files changed, 23 insertions, 12 deletions

diff --git a/src/gmutil.c b/src/gmutil.c
index 32bf356f..b4cf86aa 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -149,6 +149,21 @@ iRangecc urlHost_String(const iString *d) {
     return url.host;
 }
 
+iRangecc urlUser_String(const iString *d) {
+    iRegExp *userPats[2] = { new_RegExp("~([^/?]+)", 0),
+                             new_RegExp("/users/([^/?]+)", caseInsensitive_RegExpOption) };
+    iRegExpMatch m;
+    init_RegExpMatch(&m);
+    iRangecc found = iNullRange;
+    iForIndices(i, userPats) {
+        if (matchString_RegExp(userPats[i], d, &m)) {
+            found = capturedRange_RegExpMatch(&m, 1);
+        }
+        iRelease(userPats[i]);
+    }
+    return found;
+}
+
 static iBool isAbsolutePath_(iRangecc path) {
     return isAbsolute_Path(collect_String(urlDecode_String(collect_String(newRange_String(path)))));
 }
diff --git a/src/gmutil.h b/src/gmutil.h
index 26385c02..de8c1e65 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -103,6 +103,7 @@ void            init_Url                (iUrl *, const iString *text);
 
 iRangecc        urlScheme_String        (const iString *);
 iRangecc        urlHost_String          (const iString *);
+iRangecc        urlUser_String          (const iString *);
 const iString * absoluteUrl_String      (const iString *, const iString *urlMaybeRelative);
 iBool           isLikelyUrl_String      (const iString *);
 void            punyEncodeUrlHost_String(iString *);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 2e81838f..146b0de7 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1025,17 +1025,7 @@ static void updateTrust_DocumentWidget_(iDocumentWidget *d, const iGmResponse *r
 }
 
 static void parseUser_DocumentWidget_(iDocumentWidget *d) {
-    clear_String(d->titleUser);
-    iRegExp *userPats[2] = { new_RegExp("~([^/?]+)", 0),
-                             new_RegExp("/users/([^/?]+)", caseInsensitive_RegExpOption) };
-    iRegExpMatch m;
-    init_RegExpMatch(&m);
-    iForIndices(i, userPats) {
-        if (matchString_RegExp(userPats[i], d->mod.url, &m)) {
-            setRange_String(d->titleUser, capturedRange_RegExpMatch(&m, 1));
-        }
-        iRelease(userPats[i]);
-    }
+    setRange_String(d->titleUser, urlUser_String(d->mod.url));
 }
 
 static iBool updateFromHistory_DocumentWidget_(iDocumentWidget *d) {
@@ -1956,9 +1946,14 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     else if (equal_Command(cmd, "navigate.root") && document_App() == d) {
         iUrl parts;
         init_Url(&parts, d->mod.url);
+        const char *rootEnd = parts.path.start;
+        const iRangecc user = urlUser_String(d->mod.url);
+        if (!isEmpty_Range(&user)) {
+            rootEnd = user.end;
+        }
         postCommandf_App(
             "open url:%s/",
-            cstr_Rangecc((iRangecc){ constBegin_String(d->mod.url), parts.path.start }));
+            cstr_Rangecc((iRangecc){ constBegin_String(d->mod.url), rootEnd }));
         return iTrue;
     }
     else if (equalWidget_Command(cmd, w, "scroll.moved")) {