refactor: review update

Author: canerakdas

apps/site/components/withAvatarGroup.tsx

@@ -3,19 +3,14 @@
 import type { ComponentProps, FC } from 'react';
 
 import AvatarGroup from '@/components/Common/AvatarGroup';
-import { getAuthorWithId, getAuthorWithName } from '@/util/authorUtils';
+import type { AuthorProps } from '@/types';
+import { getAuthors } from '@/util/authorUtils';
 
 type WithAvatarGroupProps = Omit<
   ComponentProps<typeof AvatarGroup>,
   'avatars'
 > &
-  (
-    | { usernames: Array<string>; names?: never }
-    | { names: Array<string>; usernames?: never }
-  ) & {
-    clickable?: boolean;
-    container?: HTMLElement | null;
-  };
+  AuthorProps;
 
 const WithAvatarGroup: FC<WithAvatarGroupProps> = ({
   usernames,
@@ -24,11 +19,11 @@ const WithAvatarGroup: FC<WithAvatarGroupProps> = ({
   ...props
 }) => (
   <AvatarGroup
-    avatars={
-      usernames
-        ? getAuthorWithId(usernames, clickable)
-        : getAuthorWithName(names, clickable)
-    }
+    avatars={getAuthors({
+      usernames: usernames,
+      names: names,
+      clickable: clickable,
+    })}
     {...props}
   />
 );

apps/site/types/author.ts

@@ -0,0 +1,12 @@
+export interface AuthorProps {
+  names?: Array<string>;
+  usernames?: Array<string>;
+  clickable?: boolean;
+  container?: HTMLElement | null;
+}
+
+export interface Author {
+  id: string;
+  name: string;
+  website?: string;
+}

apps/site/types/config.ts

@@ -29,9 +29,3 @@ export interface SiteConfig {
   websiteBanners: Record<string, WebsiteBanner>;
   websiteBadges: Record<string, WebsiteBadge>;
 }
-
-export interface Author {
-  id: string;
-  name: string;
-  website?: string;
-}

apps/site/types/index.ts

@@ -11,3 +11,4 @@ export * from './server';
 export * from './github';
 export * from './calendar';
 export * from './search';
+export * from './author';

apps/site/util/authorUtils.ts

@@ -1,7 +1,7 @@
 import { authors } from '@/next.json.mjs';
-
-import { getGitHubAvatarUrl } from './gitHubUtils';
-import { getAcronymFromString } from './stringUtils';
+import type { AuthorProps } from '@/types';
+import { getGitHubAvatarUrl } from '@/util/gitHubUtils';
+import { getAcronymFromString } from '@/util/stringUtils';
 
 export const mapAuthorToCardAuthors = (author: string) => {
   // Clears text in parentheses
@@ -69,3 +69,11 @@ export const getAuthorWithName = (names: Array<string>, hasUrl: boolean) => {
 
   return names.map(mapNameToAuthor);
 };
+
+export const getAuthors = ({ usernames, names, clickable }: AuthorProps) => {
+  if (usernames) {
+    return getAuthorWithId(usernames, clickable ?? true);
+  }
+
+  return getAuthorWithName(names || [], clickable ?? true);
+};