stream-chat-react-native-core 4.0.0-beta.2 → 4.0.0-beta.6

package/src/components/Message/MessageSimple/ReactionList.tsx

@@ -17,16 +17,7 @@ import { useTheme } from '../../../contexts/themeContext/ThemeContext';
 import { Unknown } from '../../../icons/Unknown';
 
 import type { IconProps } from '../../../icons/utils/base';
-import type {
-  DefaultAttachmentType,
-  DefaultChannelType,
-  DefaultCommandType,
-  DefaultEventType,
-  DefaultMessageType,
-  DefaultReactionType,
-  DefaultUserType,
-  UnknownType,
-} from '../../../types/types';
+import type { DefaultStreamChatGenerics } from '../../../types/types';
 import type { ReactionData } from '../../../utils/utils';
 
 const styles = StyleSheet.create({
@@ -69,15 +60,9 @@ const Icon: React.FC<
 };
 
 export type ReactionListPropsWithContext<
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 > = Pick<
-  MessageContextValue<At, Ch, Co, Ev, Me, Re, Us>,
+  MessageContextValue<StreamChatGenerics>,
   | 'alignment'
   | 'message'
   | 'onLongPress'
@@ -87,7 +72,7 @@ export type ReactionListPropsWithContext<
   | 'reactions'
   | 'showMessageOverlay'
 > &
-  Pick<MessagesContextValue<At, Ch, Co, Ev, Me, Re, Us>, 'targetedMessage'> & {
+  Pick<MessagesContextValue<StreamChatGenerics>, 'targetedMessage'> & {
     messageContentWidth: number;
     supportedReactions: ReactionData[];
     fill?: string;
@@ -98,15 +83,9 @@ export type ReactionListPropsWithContext<
   };
 
 const ReactionListWithContext = <
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 >(
-  props: ReactionListPropsWithContext<At, Ch, Co, Ev, Me, Re, Us>,
+  props: ReactionListPropsWithContext<StreamChatGenerics>,
 ) => {
   const {
     alignment,
@@ -198,34 +177,7 @@ const ReactionListWithContext = <
       : x2 - (reactionSize * reactions.length) / 2 - strokeSize;
 
   return (
-    <TouchableOpacity
-      disabled={preventPress}
-      onLongPress={(event) => {
-        if (onLongPress) {
-          onLongPress({
-            emitter: 'reactionList',
-            event,
-          });
-        }
-      }}
-      onPress={(event) => {
-        if (onPress) {
-          onPress({
-            defaultHandler: () => showMessageOverlay(true),
-            emitter: 'reactionList',
-            event,
-          });
-        }
-      }}
-      onPressIn={(event) => {
-        if (onPressIn) {
-          onPressIn({
-            defaultHandler: () => showMessageOverlay(true),
-            emitter: 'reactionList',
-            event,
-          });
-        }
-      }}
+    <View
       style={[
         styles.container,
         {
@@ -266,7 +218,34 @@ const ReactionListWithContext = <
               <Circle cx={x2} cy={y2} fill={alignmentLeft ? fill : white} r={radius * 2} />
             </Svg>
           </View>
-          <View
+          <TouchableOpacity
+            disabled={preventPress}
+            onLongPress={(event) => {
+              if (onLongPress) {
+                onLongPress({
+                  emitter: 'reactionList',
+                  event,
+                });
+              }
+            }}
+            onPress={(event) => {
+              if (onPress) {
+                onPress({
+                  defaultHandler: () => showMessageOverlay(true),
+                  emitter: 'reactionList',
+                  event,
+                });
+              }
+            }}
+            onPressIn={(event) => {
+              if (onPressIn) {
+                onPressIn({
+                  defaultHandler: () => showMessageOverlay(true),
+                  emitter: 'reactionList',
+                  event,
+                });
+              }
+            }}
             style={[
               styles.reactionBubble,
               {
@@ -290,24 +269,16 @@ const ReactionListWithContext = <
                 type={reaction.type}
               />
             ))}
-          </View>
+          </TouchableOpacity>
         </View>
       ) : null}
-    </TouchableOpacity>
+    </View>
   );
 };
 
-const areEqual = <
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
->(
-  prevProps: ReactionListPropsWithContext<At, Ch, Co, Ev, Me, Re, Us>,
-  nextProps: ReactionListPropsWithContext<At, Ch, Co, Ev, Me, Re, Us>,
+const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
+  prevProps: ReactionListPropsWithContext<StreamChatGenerics>,
+  nextProps: ReactionListPropsWithContext<StreamChatGenerics>,
 ) => {
   const {
     message: prevMessage,
@@ -351,29 +322,17 @@ const MemoizedReactionList = React.memo(
 ) as typeof ReactionListWithContext;
 
 export type ReactionListProps<
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
-> = Partial<Omit<ReactionListPropsWithContext<At, Ch, Co, Ev, Me, Re, Us>, 'messageContentWidth'>> &
-  Pick<ReactionListPropsWithContext<At, Ch, Co, Ev, Me, Re, Us>, 'messageContentWidth'>;
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
+> = Partial<Omit<ReactionListPropsWithContext<StreamChatGenerics>, 'messageContentWidth'>> &
+  Pick<ReactionListPropsWithContext<StreamChatGenerics>, 'messageContentWidth'>;
 
 /**
  * ReactionList - A high level component which implements all the logic required for a message reaction list
  */
 export const ReactionList = <
-  At extends UnknownType = DefaultAttachmentType,
-  Ch extends UnknownType = DefaultChannelType,
-  Co extends string = DefaultCommandType,
-  Ev extends UnknownType = DefaultEventType,
-  Me extends UnknownType = DefaultMessageType,
-  Re extends UnknownType = DefaultReactionType,
-  Us extends UnknownType = DefaultUserType,
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 >(
-  props: ReactionListProps<At, Ch, Co, Ev, Me, Re, Us>,
+  props: ReactionListProps<StreamChatGenerics>,
 ) => {
   const {
     alignment,
@@ -384,8 +343,8 @@ export const ReactionList = <
     preventPress,
     reactions,
     showMessageOverlay,
-  } = useMessageContext<At, Ch, Co, Ev, Me, Re, Us>();
-  const { supportedReactions, targetedMessage } = useMessagesContext<At, Ch, Co, Ev, Me, Re, Us>();
+  } = useMessageContext<StreamChatGenerics>();
+  const { supportedReactions, targetedMessage } = useMessagesContext<StreamChatGenerics>();
 
   return (
     <MemoizedReactionList

package/src/components/Message/MessageSimple/__tests__/Message.test.js

@@ -1,20 +1,20 @@
 import React from 'react';
-import { cleanup, fireEvent, render, waitFor } from '@testing-library/react-native';
-
-import { Message } from '../../Message';
 
-import { Chat } from '../../../Chat/Chat';
-import { Channel } from '../../../Channel/Channel';
-import { MessageInput } from '../../../MessageInput/MessageInput';
+import { cleanup, fireEvent, render, waitFor } from '@testing-library/react-native';
 
+import { OverlayProvider } from '../../../../contexts/overlayContext/OverlayProvider';
 import { getOrCreateChannelApi } from '../../../../mock-builders/api/getOrCreateChannel';
+
 import { useMockedApis } from '../../../../mock-builders/api/useMockedApis';
-import { generateChannel } from '../../../../mock-builders/generator/channel';
+import { generateChannelResponse } from '../../../../mock-builders/generator/channel';
 import { generateMember } from '../../../../mock-builders/generator/member';
 import { generateMessage } from '../../../../mock-builders/generator/message';
 import { generateUser } from '../../../../mock-builders/generator/user';
 import { getTestClientWithUser } from '../../../../mock-builders/mock';
-import { OverlayProvider } from '../../../../contexts/overlayContext/OverlayProvider';
+import { Channel } from '../../../Channel/Channel';
+import { Chat } from '../../../Chat/Chat';
+import { MessageInput } from '../../../MessageInput/MessageInput';
+import { Message } from '../../Message';
 
 describe('Message', () => {
   let channel;
@@ -26,7 +26,7 @@ describe('Message', () => {
 
   beforeEach(async () => {
     const members = [generateMember({ user })];
-    const mockedChannel = generateChannel({
+    const mockedChannel = generateChannelResponse({
       members,
       messages,
     });

package/src/components/Message/MessageSimple/__tests__/MessageAvatar.test.js

@@ -1,7 +1,6 @@
 import React from 'react';
-import { cleanup, render, waitFor } from '@testing-library/react-native';
 
-import { MessageAvatar } from '../MessageAvatar';
+import { cleanup, render, waitFor } from '@testing-library/react-native';
 
 import { ThemeProvider } from '../../../../contexts/themeContext/ThemeContext';
 import { defaultTheme } from '../../../../contexts/themeContext/utils/theme';
@@ -10,6 +9,7 @@ import {
   generateStaticMessage,
 } from '../../../../mock-builders/generator/message';
 import { generateStaticUser } from '../../../../mock-builders/generator/user';
+import { MessageAvatar } from '../MessageAvatar';
 
 afterEach(cleanup);
 

package/src/components/Message/MessageSimple/__tests__/MessageContent.test.js

@@ -1,23 +1,22 @@
 import React, { useEffect } from 'react';
 import { View } from 'react-native';
-import { cleanup, render, waitFor } from '@testing-library/react-native';
-
-import { Message } from '../../Message';
-import { MessageContent } from '../../MessageSimple/MessageContent';
 
-import { Chat } from '../../../Chat/Chat';
-import { Channel } from '../../../Channel/Channel';
+import { cleanup, render, waitFor } from '@testing-library/react-native';
 
 import { ChannelsStateProvider } from '../../../../contexts/channelsStateContext/ChannelsStateContext';
 
 import { getOrCreateChannelApi } from '../../../../mock-builders/api/getOrCreateChannel';
 import { useMockedApis } from '../../../../mock-builders/api/useMockedApis';
-import { generateChannel } from '../../../../mock-builders/generator/channel';
+import { generateChannelResponse } from '../../../../mock-builders/generator/channel';
 import { generateMember } from '../../../../mock-builders/generator/member';
 import { generateMessage } from '../../../../mock-builders/generator/message';
 import { generateReaction } from '../../../../mock-builders/generator/reaction';
 import { generateUser } from '../../../../mock-builders/generator/user';
 import { getTestClientWithUser } from '../../../../mock-builders/mock';
+import { Channel } from '../../../Channel/Channel';
+import { Chat } from '../../../Chat/Chat';
+import { Message } from '../../Message';
+import { MessageContent } from '../../MessageSimple/MessageContent';
 
 describe('MessageContent', () => {
   let channel;
@@ -29,7 +28,7 @@ describe('MessageContent', () => {
 
   beforeEach(async () => {
     const members = [generateMember({ user })];
-    const mockedChannel = generateChannel({
+    const mockedChannel = generateChannelResponse({
       members,
       messages,
     });
@@ -168,21 +167,6 @@ describe('MessageContent', () => {
     });
   });
 
-  it('renders the Gallery when image attachments exist', async () => {
-    const user = generateUser();
-    const message = generateMessage({
-      attachments: [{ image_url: 'https://i.imgur.com/SLx06PP.png', type: 'image' }],
-      user,
-    });
-
-    const { getByTestId } = renderMessage({ message });
-
-    await waitFor(() => {
-      expect(getByTestId('message-content-wrapper')).toBeTruthy();
-      expect(getByTestId('image-attachment-single')).toBeTruthy();
-    });
-  });
-
   it('renders the GalleryContainer when multiple image attachments exist', async () => {
     const user = generateUser();
     const message = generateMessage({
@@ -193,12 +177,11 @@ describe('MessageContent', () => {
       user,
     });
 
-    const { getByTestId, queryAllByTestId } = renderMessage({ message });
+    const { getByTestId } = renderMessage({ message });
 
     await waitFor(() => {
       expect(getByTestId('message-content-wrapper')).toBeTruthy();
-      expect(getByTestId('image-multiple-container')).toBeTruthy();
-      expect(queryAllByTestId('image-multiple')).toHaveLength(2);
+      expect(getByTestId('gallery-container')).toBeTruthy();
     });
   });
 

package/src/components/Message/MessageSimple/__tests__/MessagePinnedHeader.test.js

@@ -1,7 +1,6 @@
 import React from 'react';
-import { cleanup, render, waitFor } from '@testing-library/react-native';
 
-import { MessagePinnedHeader } from '../MessagePinnedHeader';
+import { cleanup, render, waitFor } from '@testing-library/react-native';
 
 import { ThemeProvider } from '../../../../contexts/themeContext/ThemeContext';
 import { defaultTheme } from '../../../../contexts/themeContext/utils/theme';
@@ -10,6 +9,7 @@ import {
   generateStaticMessage,
 } from '../../../../mock-builders/generator/message';
 import { generateStaticUser } from '../../../../mock-builders/generator/user';
+import { MessagePinnedHeader } from '../MessagePinnedHeader';
 
 afterEach(cleanup);
 

package/src/components/Message/MessageSimple/__tests__/MessageReplies.test.js

@@ -1,13 +1,13 @@
 import React from 'react';
-import { cleanup, fireEvent, render, waitFor } from '@testing-library/react-native';
 
-import { MessageReplies } from '../MessageReplies';
+import { cleanup, fireEvent, render, waitFor } from '@testing-library/react-native';
 
 import { ThemeProvider } from '../../../../contexts/themeContext/ThemeContext';
 import { defaultTheme } from '../../../../contexts/themeContext/utils/theme';
 import { TranslationProvider } from '../../../../contexts/translationContext/TranslationContext';
 import { generateMessage } from '../../../../mock-builders/generator/message';
 import { generateStaticUser, generateUser } from '../../../../mock-builders/generator/user';
+import { MessageReplies } from '../MessageReplies';
 import { MessageRepliesAvatars } from '../MessageRepliesAvatars';
 
 afterEach(cleanup);

package/src/components/Message/MessageSimple/__tests__/MessageStatus.test.js

@@ -1,14 +1,13 @@
 import React from 'react';
-import { cleanup, render, waitFor } from '@testing-library/react-native';
-
-import { MessageStatus } from '../MessageStatus';
 
-import { Chat } from '../../../Chat/Chat';
+import { cleanup, render, waitFor } from '@testing-library/react-native';
 
-import { Streami18n } from '../../../../utils/Streami18n';
 import { generateMessage } from '../../../../mock-builders/generator/message';
 import { generateStaticUser, generateUser } from '../../../../mock-builders/generator/user';
 import { getTestClientWithUser } from '../../../../mock-builders/mock';
+import { Streami18n } from '../../../../utils/Streami18n';
+import { Chat } from '../../../Chat/Chat';
+import { MessageStatus } from '../MessageStatus';
 
 let chatClient;
 let id;

package/src/components/Message/MessageSimple/__tests__/MessageTextContainer.test.js

@@ -1,8 +1,7 @@
 import React from 'react';
 import { Text } from 'react-native';
-import { cleanup, render, waitFor } from '@testing-library/react-native';
 
-import { MessageTextContainer } from '../MessageTextContainer';
+import { cleanup, render, waitFor } from '@testing-library/react-native';
 
 import { ThemeProvider } from '../../../../contexts/themeContext/ThemeContext';
 import { defaultTheme } from '../../../../contexts/themeContext/utils/theme';
@@ -11,6 +10,7 @@ import {
   generateStaticMessage,
 } from '../../../../mock-builders/generator/message';
 import { generateStaticUser } from '../../../../mock-builders/generator/user';
+import { MessageTextContainer } from '../MessageTextContainer';
 
 afterEach(cleanup);
 

package/src/components/Message/MessageSimple/__tests__/__snapshots__/MessageAvatar.test.js.snap

@@ -36,7 +36,7 @@ exports[`MessageAvatar should render message avatar 1`] = `
         onError={[Function]}
         source={
           Object {
-            "uri": "https://images-na.ssl-images-amazon.com/images/I/51t29lLkg8L._AC_SL1000_.jpg",
+            "uri": "https://i.imgur.com/ytIyojl.png",
           }
         }
         style={

package/src/components/Message/MessageSimple/utils/parseLinks.test.ts

@@ -0,0 +1,100 @@
+import { parseLinksFromText } from './parseLinks';
+
+describe('parseLinksFromText', () => {
+  it.each([
+    ['www.getstream.io', 'www.getstream.io'],
+    ['getstream.io', 'getstream.io'],
+    ['scrn://team-chat', 'team-chat'],
+    ['https://localhost', 'localhost'],
+    [
+      'https://localhost/with/path?and=query&multiple=params',
+      'localhost/with/path?and=query&multiple=params',
+    ],
+    ['https://localhost/with/path?and=query#fragment', 'localhost/with/path?and=query#fragment'],
+    ['reactnative.stream', 'reactnative.stream'],
+    [
+      'https://zh.wikipedia.org/wiki/挪威牛油危機',
+      'zh.wikipedia.org/wiki/%E6%8C%AA%E5%A8%81%E7%89%9B%E6%B2%B9%E5%8D%B1%E6%A9%9F',
+    ],
+    [
+      'https://getstream.io/chat/docs/react-native/?language=javascript',
+      'getstream.io/chat/docs/react-native/?language=javascript',
+    ],
+    ['127.0.0.1/local_(development)_server', '127.0.0.1/local_(development)_server'],
+    ['https://a.co:8999/ab.php?p=12', 'a.co:8999/ab.php?p=12'],
+  ])('Returns the encoded value of %p as %p', (link, expected) => {
+    const result = parseLinksFromText(link);
+
+    expect(result[0].encoded).toBe(expected);
+  });
+
+  it('parses fqdn', () => {
+    const input = `We have put the apim bol,
+temporarily so :sj: we can later put the monitors on my grasp
+on reality right now is
+https://www.contrived-example.com:8080/sub/page.php?p1=1🇳🇴&p2=2#fragment-identifier
+:)`;
+
+    const result = parseLinksFromText(input);
+
+    expect(result).toEqual([
+      {
+        encoded:
+          'www.contrived-example.com:8080/sub/page.php?p1=1%F0%9F%87%B3%F0%9F%87%B4&p2=2#fragment-identifier',
+        raw: 'https://www.contrived-example.com:8080/sub/page.php?p1=1🇳🇴&p2=2#fragment-identifier',
+        scheme: 'https://',
+      },
+    ]);
+  });
+
+  it.each([
+    ['support+rn@getstream.io'],
+    ['support.rn@getstream.io'],
+    ['support-rn@getstream.io'],
+    ['support_rn@getstream.io'],
+  ])('Can parse the email address %p', (email) => {
+    const result = parseLinksFromText(email);
+
+    expect(result[0].encoded).toBe(email);
+    expect(result[0].scheme).toBe('mailto:');
+  });
+
+  it("doesn't double the mailto prefix", () => {
+    const input = 'mailto:support@getstream.io';
+
+    const result = parseLinksFromText(input);
+
+    expect(result[0]).toEqual({
+      encoded: 'support@getstream.io',
+      raw: input,
+      scheme: 'mailto:',
+    });
+  });
+
+  it('Does not falsely parse LINKs from text content', () => {
+    const input = `#This string exists to test that we don't produce false positives
+
+Existing links:
+[already a parsed link](https://getstream.io/blog/react-native-how-to-build-bidirectional-infinite-scroll/)
+[even a bogus one]( should not match )
+
+## These should, however, be parsed:
+www.getstream.io
+getstream.io
+`;
+    const result = parseLinksFromText(input);
+
+    expect(result).toHaveLength(2);
+  });
+
+  it('Encodes incomplete emoji unicode', () => {
+    const input = 'https://getstream.io/�';
+    const result = parseLinksFromText(input);
+
+    expect(result[0]).toEqual({
+      encoded: 'getstream.io/%EF%BF%BD',
+      raw: 'https://getstream.io/�',
+      scheme: 'https://',
+    });
+  });
+});

package/src/components/Message/MessageSimple/utils/parseLinks.ts

@@ -0,0 +1,95 @@
+/**
+ * 📣 Note: Do not use named capture groups, as
+ *          it is not yet available in Hermes.
+ *
+ * These helpers indend to make it easier to skim read
+ * the patterns below, but note that some are optional,
+ * specified in the patterns these are added to.
+ * */
+const emailUserName = '[\\w+\\.~$_-]+';
+const schema = `(\\w{2,15}:\\/\\/)`;
+const domain = `((?:\\w+\\.\\w+)+(?:[^:\\/\\s]+))`;
+const port = `(:[0-9]{1,5})`;
+const path = `((?:\\/)?[^?#\\s]+)`;
+const queryString = `(\\?[^#\\s]+)`;
+const fragment = `(#[\\w_-]+)`;
+
+/**
+ * Match any email address, with and without `mailto:`
+ */
+const emailPattern = `(mailto:)?((?:${emailUserName})@(?:${domain}))`;
+
+/**
+ * Match any string starting with something that seems like it's a schema.
+ * */
+const schemePrefixedLinkPattern = `${schema}(\\S+)`;
+
+/**
+ * Match as much as possible of a fqdn, at least with a domain name formed as
+ * something.tld
+ */
+const fqdnLinkPattern = `${schema}?${domain}${port}?${path}?${queryString}?${fragment}?`;
+
+interface Link {
+  encoded: string;
+  raw: string;
+  scheme: string;
+}
+
+/**
+ * This is done separately because of the version of javascript run
+ * for expo
+ * */
+const removeMarkdownLinksFromText = (input: string) => input.replace(/\[[\w\s]+\]\(.*\)/g, '');
+
+export const parseLinksFromText = (input: string): Link[] => {
+  let matches;
+
+  const inputWithoutMarkdownLinks = removeMarkdownLinksFromText(input);
+
+  const results: Link[] = [];
+
+  const emailRegExp = new RegExp(emailPattern, 'gi');
+  while ((matches = emailRegExp.exec(input)) !== null) {
+    const [raw, scheme = 'mailto:', displayValue] = matches;
+    results.push({ encoded: encodeURI(displayValue), raw, scheme });
+  }
+
+  /**
+   * The two link patterns are checked with an "or" (`|`)
+   * to avoid overlapping matches being duplicated in the output.
+   * */
+  const linkRegex = new RegExp(`${fqdnLinkPattern}|${schemePrefixedLinkPattern}`, 'gi');
+  while ((matches = linkRegex.exec(inputWithoutMarkdownLinks)) !== null) {
+    const [
+      raw,
+      fqdnScheme = '',
+      fqdnDomainName = '',
+      fqdnPort = '',
+      fqdnPath = '',
+      fqdnQueryStraing = '',
+      fqdnFragment = '',
+      schemePrefixedScheme = '',
+      schemePrefixedPath = '',
+    ] = matches;
+
+    if (schemePrefixedScheme !== '') {
+      results.push({
+        encoded: encodeURI(schemePrefixedPath),
+        raw,
+        scheme: schemePrefixedScheme,
+      });
+      continue;
+    }
+
+    results.push({
+      encoded: encodeURI(
+        [fqdnDomainName, fqdnPort, fqdnPath, fqdnQueryStraing, fqdnFragment].join(''),
+      ),
+      raw,
+      scheme: fqdnScheme,
+    });
+  }
+
+  return results;
+};