短縮URLを出力できるように

TUS-OSK · Dec 8, 2018 · f9c4421 · f9c4421
1 parent 594d0d9
commit f9c4421
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/caputure.js b/caputure.js
@@ -23,10 +23,9 @@ const Webcam = NodeWebcam.create({
  */
 
 /**
- * @param {OAuth2Client} oAuth2Client
- * @returns {Promise<void>}
+ * @param {OAuth2Client}oAuth2Client
+ * @param {Object} album
  */
-
 module.exports.capture = (oAuth2Client, album) => {
     return new Promise((resolve, reject) => {
         Webcam.capture("", async (err, photo) => {
@@ -36,7 +35,7 @@ module.exports.capture = (oAuth2Client, album) => {
             const uploadToken = await photoapi.uploadPhoto(oAuth2Client, photo, Date().toLocaleString());
             const {mediaItem} = await photoapi.createAlbumMediaItem(oAuth2Client, album.id, uploadToken, "");
             const {baseUrl} = await photoapi.getMediaItem(oAuth2Client, mediaItem.id);
-            resolve(baseUrl);
+            resolve(photoapi.getShortURL(baseUrl));
         })
     })
 };
@@ -51,7 +50,7 @@ async function main() {
         album = await photoapi.createAlbum(oAuth2Client, albumTitle);
         await photoapi.shareAlbum(oAuth2Client, album.id);
     }
-    setInterval(() => module.exports.capture(oAuth2Client, album).then(slack.send), 3000);
+    setInterval(() => module.exports.capture(oAuth2Client, album).then(slack.send), 5000);
 }
 
 if (require.main === module) {

diff --git a/photoAPI.js b/photoAPI.js
@@ -243,6 +243,11 @@ module.exports.getMediaItem = async (oAuth2Client, mediaItemID) => {
     });
 };
 
+module.exports.getShortURL = async url => {
+    const ret = await rpap.get(`http://is.gd/create.php?format=simple&format=json&url=${url}`);
+    return JSON.parse(ret)["shorturl"];
+};
+
 async function main() {
     const oAuth2Client = await module.exports.getOAuthToken();