refactor(feeds): avoid to refer config in service

yoshinorin · Jan 18, 2024 · 5961728 · 5961728
1 parent 1a872ec
commit 5961728
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/__tests__/unit/services/feed.test.ts b/__tests__/unit/services/feed.test.ts
@@ -42,7 +42,7 @@ test('generate sitemap.xml', async () => {
     }
   ]
 
-  const result = await generateFeedsString('https://example.com', data);
+  const result = await generateFeedsString('https://example.com', 'yourSiteName', 'yourName', data);
   expect(result.replace(/\s/g,"")).toEqual(
     `<feed xmlns="http://www.w3.org/2005/Atom">
     <title>yourSiteName</title>

diff --git a/src/pages/feeds/index.xml.tsx b/src/pages/feeds/index.xml.tsx
@@ -3,6 +3,7 @@ import { getFeed } from '../../api/feed';
 import { generateFeedsString } from '../../services/feeds';
 import { url } from '../../../config';
 import { getRequestContext } from '../../utils/requestContext';
+import { siteName, mainAuthor } from '../../../config';
 
 const SitemapXml = () => null;
 
@@ -29,7 +30,7 @@ export async function getServerSideProps(ctx: any) {
     }
   }) as Array<Feed>;
 
-  const feedXmlString = await generateFeedsString(url, feeds);
+  const feedXmlString = await generateFeedsString(url, siteName, mainAuthor, feeds);
   ctx.res.setHeader("Content-Type", "text/xml");
   ctx.res.write(feedXmlString);
   ctx.res.end();

diff --git a/src/services/feeds.ts b/src/services/feeds.ts
@@ -1,10 +1,9 @@
 import { Feed } from '../models/feed';
 import { convertUnixTimeToISODateSrting } from '../utils/time';
-import { siteName, mainAuthor } from '../../config';
 
 const FEED_URL = '/feeds/index.xml';
 
-export async function generateFeedsString(url: string, feeds: Array<Feed>): Promise<string> {
+export async function generateFeedsString(url: string, siteName: string, mainAuthor: string, feeds: Array<Feed>): Promise<string> {
 
   const latest = feeds[0]