ソースを参照

Add shortUrl to link response for backward compatibility

poeti8 6 年 前
コミット
f7b8e8f674
2 ファイル変更11 行追加3 行削除
  1. 3 1
      server/controllers/linkController.ts
  2. 8 2
      server/db/link.ts

+ 3 - 1
server/controllers/linkController.ts

@@ -82,12 +82,14 @@ export const shortener: Handler = async (req, res) => {
     // the existent URL without creating one
     if (queries[3]) {
       const { domain_id: d, user_id: u, ...link } = queries[3];
+      const shortLink = generateShortLink(link.address, req.user.domain);
       const data = {
         ...link,
         id: link.address,
         password: !!link.password,
         reuse: true,
-        shortLink: generateShortLink(link.address, req.user.domain)
+        shortLink,
+        shortUrl: shortLink,
       };
       return res.json(data);
     }

+ 8 - 2
server/db/link.ts

@@ -42,7 +42,8 @@ export const createShortLink = async (data: CreateLink, user: UserJoined) => {
     ...link,
     password: !!data.password,
     reuse: !!data.reuse,
-    shortLink: generateShortLink(data.address, domain)
+    shortLink: generateShortLink(data.address, domain),
+    shortUrl: generateShortLink(data.address, domain)
   };
 };
 
@@ -207,11 +208,14 @@ export const getLinks = async (
     "domains.id"
   );
 
+
+
   const links = matchedLinks.map(link => ({
     ...link,
     id: link.address,
     password: !!link.password,
-    shortLink: generateShortLink(link.address, link.domain)
+    shortLink: generateShortLink(link.address, link.domain),
+    shortUrl: generateShortLink(link.address, link.domain)
   }));
 
   return links;
@@ -299,6 +303,7 @@ interface IGetStatsResponse {
   lastMonth: StatsResult;
   lastWeek: StatsResult;
   shortLink: string;
+  shortUrl: string;
   target: string;
   total: number;
   updatedAt: string;
@@ -448,6 +453,7 @@ export const getStats = async (link: Link, domain: Domain) => {
       views: stats.lastWeek.views
     },
     shortLink: generateShortLink(link.address, domain.address),
+    shortUrl: generateShortLink(link.address, domain.address),
     target: link.target,
     total: link.visit_count,
     updatedAt: new Date().toISOString()