fix content snippet extraction

diff --git a/src/server.ts b/src/server.ts
index 9f2279722ead176acec38351d502048a32e51f10..5b32531ae05facddf265b88ab7809a8922ae17bf 100644 (file)
--- a/src/server.ts
+++ b/src/server.ts
@@ -15,49 +15,72 @@ const db = knex({
 const parser = new Parser();
 const app = express();
 
+function contentExtractor(feed: FeedSchema, item): string {
+  let str = '';
+  switch(feed.title) {
+    case 'TechCrunch':
+      str = item.contentSnippet;
+      break;
+    case 'Ars Technica Features':
+      str = item.contentSnippet;
+      break;
+  }
+
+  return str;
+}
+
 async function queryFeeds() {
 
   const completeFeedList = await db.select<FeedSchema[]>('*').from('feeds').orderBy('created_at');
 
   const feedsToQuery = completeFeedList.filter(feed => {
     // only update every 5 minutes
-    return Date.now() > (feed.updated_at + 1000 * 60 * 5);
+    //return Date.now() > (feed.updated_at + 1000 * 60 * 5);
+    return true;
   });
 
   console.log(`Querying ${feedsToQuery.length} feeds`);
 
   for(let feed of feedsToQuery) {
     console.log(`Querying ${feed.title}(${feed.url})`);
-    const data = await parser.parseURL(feed.url);
-
-    const items: FeedEntrySchema<any>[] = data.items.map(item => {
-      return {
-        id: item.guid,
-        title: item.title,
-        link: item.link,
-        feed_id: feed.id,
-        pub_date: Math.floor(new Date(item.pubDate).getTime()/1000),
-        author: item.creator,
-        created_at: Math.floor(Date.now()/1000),
-        updated_at: Math.floor(Date.now()/1000),
-        meta: {
-          comment_link: item.comments
+    try {
+      const data = await parser.parseURL(feed.url);
+
+      const items: FeedEntrySchema<any>[] = data.items.map(item => {
+        return {
+          id: item.guid,
+          title: item.title,
+          link: item.link,
+          feed_id: feed.id,
+          pub_date: Math.floor(new Date(item.pubDate).getTime()/1000),
+          author: item.creator,
+          created_at: Math.floor(Date.now()/1000),
+          updated_at: Math.floor(Date.now()/1000),
+          meta: {
+            comment_link: item.comments,
+            snippet: contentExtractor(feed, item)
+          }
         }
+      });
+
+      for(let item of items) {
+        // inserting one at a time so that we can ignore duplicates for now
+        // eventually we'll need to do some kind of merge
+        await db('feed_entry').insert(item).onConflict().ignore();
       }
-    });
 
-    for(let item of items) {
-      // inserting one at a time so that we can ignore duplicates for now
-      // eventually we'll need to do some kind of merge
-      await db('feed_entry').insert(item).onConflict().ignore();
-    }
+      await db('feeds').update({
+        updated_at: new Date()
+      }).where({
+        id: feed.id
+      });
 
-    await db('feeds').update({
-      updated_at: new Date()
-    }).where({
-      id: feed.id
-    });
 
+    }
+    catch(e) {
+      console.log(e);
+      console.log('Continuing..');
+    }
   }
 
   setTimeout(queryFeeds, (Number(process.env.FEED_REFRESH_RATE) + 1) * 1000 * 60);
@@ -122,11 +145,11 @@ app.get('/river', async (req, res) => {
   });
 
   res.send(groups.map(group => {
-      return `<div class="item">
-        ${renderFeedItemHeader(group[0])}
-        ${group.map(renderFeedItem).join("\n")}
-      </div>`;
-    }).join("\n"));
+    return `<div class="item">
+${renderFeedItemHeader(group[0])}
+${group.map(renderFeedItem).join("\n")}
+</div>`;
+  }).join("\n"));
 });
 
 app.post('/feeds', async (req, res) => {

diff --git a/src/time.ts b/src/time.ts
index f5c33fb5c9481df5c86b151aabe83ae763d33c61..8bc4fc694cffac31ffaa5d2dd6f5ea9f093b38a9 100644 (file)
--- a/src/time.ts
+++ b/src/time.ts
@@ -26,7 +26,7 @@ export function fuzzyTime(timestamp: number): string {
   hour = minute * 60,
   day = hour * 24;
 
-  let fuzzy: string = '';
+  let fuzzy: string = formatDate(timestamp);
 
   if (delta < 30) {
     fuzzy = 'just then.';
@@ -40,8 +40,6 @@ export function fuzzyTime(timestamp: number): string {
     fuzzy = '1 hour ago.'
   } else if (delta < day) {
     fuzzy = Math.floor(delta / hour) + ' hours ago.';
-  } else if (delta < day * 2) {
-    fuzzy = formatDate(timestamp);
   }
 
   return fuzzy;

diff --git a/src/views.ts b/src/views.ts
index 9e695428d9b606823399063a8d8acecb68d396fe..8ca67d42bef5af7f3e458dc3629ee8b680a31c94 100644 (file)
--- a/src/views.ts
+++ b/src/views.ts
@@ -14,10 +14,13 @@ return `
 }
 
 export function renderFeedItem(entry: FeedWithEntrySchema): string {
+  const meta = JSON.parse(entry.meta);
+  const date = new Date(entry.pub_date * 1000);
   return `
   <div class="content">
-    <span title="${new Date(entry.pub_date * 1000)}">${fuzzyTime(new Date(entry.pub_date * 1000).getTime())}</span>
+    <span title="${date}">${fuzzyTime(date.getTime())}</span>
     <a href="${entry.link}">${entry.title}</a>
+    ${meta.snippet ? `<p>${meta.snippet}</p>` : ''}
   </div>
   `
 }