bump

Author: Takazudo

functions/tweet-to-trello/package-lock.json

@@ -13,6 +13,7 @@
     "front-matter": "^3.1.0",
     "node-fetch": "^2.3.0",
     "node-html-parser": "^1.2.12",
+    "nodemailer": "^6.4.6",
     "sendmail": "^1.6.1",
     "tall": "^3.0.0"
   }

functions/tweet-to-trello/package.json

@@ -7,7 +7,8 @@ const {
   isValidSecret,
   createDataFromBodyText,
   createDataFromJSON,
-  notifyFailure
+  notifyFailure,
+  unshortenUrl
 } = require('./utils')
 
 const raiseError = message => {
@@ -48,14 +49,27 @@ exports.handler = async (event, context) => {
     }
   }
 
+  // == expand url ==
+
+  let expandedUrl
+
+  try {
+    expandedUrl = unshortenUrl(urlSource)
+  } catch (error) {
+    raiseError('ERR: tall failed. Anyway keep going.')
+    expandedUrl = urlSource
+  }
+
+  // == fetch formatted page text ==
+
   let formattedPageText
 
   try {
     // fetch target page's html as text
     const html = await fetchHtml(urlSource)
     formattedPageText = createFormattedTextFromHtml(html)
   } catch (err) {
-    raiseError('ERR: fetching page failed')
+    raiseError(`ERR: fetching page failed. ${urlSource}`)
     console.log(err)
     // something wrong
     return {
@@ -76,7 +90,7 @@ exports.handler = async (event, context) => {
 
     // something wrong
     if (!response.ok) {
-      raiseError('ERR: trello api says response.ok is false')
+      raiseError(`ERR: trello api says response.ok is false ${urlSource}`)
       // NOT res.status >= 200 && res.status < 300
       const data = await response.json()
       console.log(data)
@@ -97,7 +111,7 @@ exports.handler = async (event, context) => {
     }
   } catch (err) {
     // something wrong
-    raiseError('ERR: request failed on creating card')
+    raiseError(`ERR: request failed on creating card ${urlSource}`)
     console.log(err.message)
     console.log(err)
     return {

functions/tweet-to-trello/tweet-to-trello.js

@@ -4,6 +4,8 @@ const { URLSearchParams } = require('url')
 const fetch = require('node-fetch')
 const parseHtml = require('node-html-parser').parse
 const frontMatter = require('front-matter')
+const tall = require('tall').tall
+const nodemailer = require('nodemailer');
 
 const {
   TRELLO_API_KEY: key,
@@ -13,6 +15,15 @@ const {
   TWEET_TO_TRELLO_SECRET: correctAppSecret
 } = process.env
 
+module.exports.unshortenUrl = async url => {
+  try {
+  const unshortenUrl = await tall(url)
+  console.log('Tall url', unshortenUrl)
+  } catch(error) {
+  console.log('GOT ERROR!', error)
+  }
+}
+
 module.exports.isValidSecret = appSecret => {
   if (appSecret !== correctAppSecret) return false
   return true
@@ -21,9 +32,9 @@ module.exports.isValidSecret = appSecret => {
 module.exports.createDataFromJSON = bodyContent => {
   const parsed = JSON.parse(bodyContent)
   return {
-    tweetText: null,
-    urlSource: parsed.url,
-    appSecret: parsed.secret
+  tweetText: null,
+  urlSource: parsed.url,
+  appSecret: parsed.secret
   }
 }
 
@@ -37,9 +48,9 @@ ${a[1]}
 ${a[2]}`
   const data = frontMatter(str)
   return {
-    tweetText: data.body,
-    urlSource: data.attributes.url,
-    appSecret: data.attributes.secret
+  tweetText: data.body,
+  urlSource: data.attributes.url,
+  appSecret: data.attributes.secret
   }
 }
 
@@ -58,57 +69,68 @@ module.exports.createParams = ({ desc, urlSource, fromTweet, fromIos }) => {
 module.exports.fetchHtml = async url => {
   const response = await fetch(url)
   if (!response.ok) {
-    return false
+  return false
   }
   const data = await response.text()
   return data
 }
 
 module.exports.createFormattedTextFromHtml = html => {
   const options = {
-    script: false,
-    style: false,
-    pre: true,
-    comment: false
+  script: false,
+  style: false,
+  pre: true,
+  comment: false
   }
   // parsed should be a formatted DOM element that node-html-parser generates
   const parsed = parseHtml(html, options)
   // we don't need many line breaks
   return parsed.text
-    .replace(/\n\s+/g, '\n')
-    .replace(/\n\n\n+/g, '\n\n')
+  .replace(/\n\s+/g, '\n')
+  .replace(/\n\n\n+/g, '\n\n')
 }
 
 module.exports.combineText = (tweetText, pageText) => {
   let text
   if (tweetText) {
-    text = `${tweetText}\n\n---\n\n${pageText}`
+  text = `${tweetText}\n\n---\n\n${pageText}`
   } else {
-    text = pageText
+  text = pageText
   }
   return text.slice(0, 16384)
 }
 
 module.exports.createTrelloCard = async params => {
   const response = await fetch('https://api.trello.com/1/cards', {
-    method: 'post',
-    headers: { Accept: 'application/json' },
-    body: params
+  method: 'post',
+  headers: { Accept: 'application/json' },
+  body: params
   })
   return response
 }
 
 module.exports.notifyFailure = message => {
-  const descriptor = {
-    from: `"TRBKM" <${process.env.CONTACT_EMAIL}>`,
-    to: process.env.CONTACT_EMAIL,
+  const transporter = nodemailer.createTransport({
+    host: 'smtp.gmail.com',
+    port: 465,
+    secure: true,
+    auth: {
+      user: process.env.GMAIL_SENDER_ADDRESS ,
+      pass: process.env.GMAIL_SENDER_PASSWORD,
+    }
+  });
+
+  transporter.sendMail({
+    from: `"TRBKM" <${process.env.GMAIL_SENDER_ADDRESS}>`,
+    to: process.env.ERROR_REPORT_TO,
     subject: `[TRBKM] Failed ${message}`,
     text: message
-  }
-  sendMail(descriptor, e => {
-    if (e) {
+  }, function(error, info) {
+  	if (error) {
       console.log('ERR: mail sent falled')
-    } else {
+      console.log(error)
+  	} else {
+      console.log('mail sent seems ok')
     }
-  })
+  });
 }

functions/tweet-to-trello/utils.js

@@ -13,6 +13,7 @@
     "front-matter": "^3.1.0",
     "node-fetch": "^2.3.0",
     "node-html-parser": "^1.2.12",
+    "nodemailer": "^6.4.6",
     "sendmail": "^1.6.1",
     "tall": "^3.0.0"
   }