links [nfc]: Move getLinkType's isNarrowLink out to caller

Author: chrisbobbe

src/utils/__tests__/internalLinks-test.js

@@ -117,11 +117,7 @@ describe('isNarrowLink', () => {
 });
 
 describe('getLinkType', () => {
-  test('links to a different domain are of "non-narrow" type', () => {
-    expect(getLinkType(new URL('https://google.com/some-path'), realm)).toBe('non-narrow');
-  });
-
-  test('only in-app link containing "stream" is a stream link', () => {
+  test('only link containing "stream" is a stream link', () => {
     expect(getLinkType(new URL('/#narrow/pm-with/1,2-group', realm), realm)).toBe('pm');
     expect(getLinkType(new URL('/#narrow/stream/jest', realm), realm)).toBe('stream');
     expect(getLinkType(new URL('/#narrow/stream/stream/', realm), realm)).toBe('stream');
@@ -154,7 +150,7 @@ describe('getLinkType', () => {
     );
   });
 
-  test('only in-app link containing "pm-with" is a group link', () => {
+  test('only link containing "pm-with" is a group link', () => {
     expect(getLinkType(new URL('/#narrow/stream/jest/topic/test', realm), realm)).toBe('topic');
     expect(getLinkType(new URL('/#narrow/pm-with/1,2-group', realm), realm)).toBe('pm');
     expect(getLinkType(new URL('/#narrow/pm-with/1,2-group/near/1', realm), realm)).toBe('pm');
@@ -163,7 +159,7 @@ describe('getLinkType', () => {
     ).toBe('pm');
   });
 
-  test('only in-app link containing "is" is a special link', () => {
+  test('only link containing "is" is a special link', () => {
     expect(getLinkType(new URL('/#narrow/stream/jest/topic/test', realm), realm)).toBe('topic');
     expect(getLinkType(new URL('/#narrow/is/private', realm), realm)).toBe('special');
     expect(getLinkType(new URL('/#narrow/is/starred', realm), realm)).toBe('special');

src/utils/internalLinks.js

@@ -48,19 +48,18 @@ export const isNarrowLink = (url: URL, realm: URL): boolean =>
   && url.search === ''
   && /^#narrow\//i.test(url.hash);
 
-type LinkType = 'non-narrow' | 'home' | 'pm' | 'topic' | 'stream' | 'special';
+type LinkType = 'home' | 'pm' | 'topic' | 'stream' | 'special';
 
 /**
  * PRIVATE -- exported only for tests.
+ *
+ * The passed `url` must appear to be a link to a Zulip narrow on the given
+ * `realm`. In particular, `isNarrowLink(url, realm)` must be true.
  */
 // TODO: Work out what this does, write a jsdoc for its interface, and
 // reimplement using URL object (not just for the realm)
 export const getLinkType = (url: URL, realm: URL): LinkType => {
-  if (!isNarrowLink(url, realm)) {
-    return 'non-narrow';
-  }
-
-  // isNarrowLink(…) is true, by early return above, so this call is OK.
+  // isNarrowLink(…) is true, by jsdoc, so this call is OK.
   const hashSegments = getHashSegmentsFromNarrowLink(url, realm);
 
   if (
@@ -163,12 +162,12 @@ export const getNarrowFromLink = (
   streamsByName: Map<string, Stream>,
   ownUserId: UserId,
 ): Narrow | null => {
-  const type = getLinkType(url, realm);
-
-  if (type === 'non-narrow') {
+  if (!isNarrowLink(url, realm)) {
     return null;
   }
 
+  const type = getLinkType(url, realm);
+
   // isNarrowLink(…) is true, by early return above, so this call is OK.
   const hashSegments = getHashSegmentsFromNarrowLink(url, realm);