feat: remove syncing website post data using a JF2 Feed

getindiekit · Jan 28, 2021 · 6f39349 · 6f39349
1 parent 069eac4
commit 6f39349
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 83 deletions.
diff --git a/indiekit.config.js b/indiekit.config.js
@@ -32,7 +32,6 @@ const twitter = new TwitterSyndicator({
 indiekit.set('application.mongodbUrl', process.env.MONGODB_URL);
 
 // Publication settings
-indiekit.set('publication.jf2Feed', process.env.PUBLICATION_JF2);
 indiekit.set('publication.me', process.env.PUBLICATION_URL);
 indiekit.set('publication.preset', jekyll);
 indiekit.set('publication.store', github);

diff --git a/packages/endpoint-syndicate/index.js b/packages/endpoint-syndicate/index.js
@@ -6,7 +6,6 @@ import {syndicateController} from './lib/controllers/syndicate.js';
 export const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const defaults = {
-  jf2Feed: false,
   mountpath: '/syndicate'
 };
 

diff --git a/packages/endpoint-syndicate/lib/utils.js b/packages/endpoint-syndicate/lib/utils.js
@@ -22,48 +22,14 @@ export const getMicropubEndpoint = (publication, request) => {
  * @returns {object} Post data for given url else recently published post
  */
 export const getPostData = async (publication, url) => {
-  const {posts, jf2Feed} = publication;
+  const {posts} = publication;
   let postData = {};
 
   if (url) {
     // Get item in database which matching URL
     postData = await posts.findOne({
       'properties.url': url
     });
-  } else if (jf2Feed) {
-    // Fetch JF2 Feed and return first child
-    try {
-      const {body} = await got(jf2Feed, {responseType: 'json'});
-      const {children} = body;
-
-      if (children.length > 0) {
-        const properties = children[0];
-        properties['mp-slug'] = path.basename(properties.url);
-
-        // Check if feed item already exists in database
-        const storedPostData = await posts.findOne({
-          'properties.url': properties.url
-        });
-
-        // Create new post data object
-        postData.date = new Date();
-        postData.lastAction = 'import';
-        postData.properties = properties;
-
-        // Update existing or insert new post data
-        await (storedPostData ?
-          posts.updateOne(postData, {checkKeys: false}) :
-          posts.insertOne(postData, {checkKeys: false})
-        );
-      } else {
-        throw new Error('JF2 Feed does not contain any posts');
-      }
-    } catch (error) {
-      const errorMessage = error.response ?
-        error.response.body.message :
-        error.message;
-      throw new Error(errorMessage);
-    }
   } else {
     // Get items in database and return first item
     const items = await posts.find().toArray();

diff --git a/packages/endpoint-syndicate/tests/integration.js b/packages/endpoint-syndicate/tests/integration.js
@@ -35,7 +35,7 @@ test.beforeEach(async t => {
     .set('Accept', 'application/json');
 });
 
-test.skip('Syndicates a URL', async t => {
+test('Syndicates a URL', async t => {
   const authScope = nock('https://tokens.indieauth.com')
     .get('/token')
     .reply(200, {
@@ -54,7 +54,7 @@ test.skip('Syndicates a URL', async t => {
   storeScope.done();
 });
 
-test.skip('Throws error syndicating a URL', async t => {
+test('Throws error syndicating a URL', async t => {
   const authScope = nock('https://tokens.indieauth.com')
     .get('/token')
     .reply(200, {

diff --git a/packages/endpoint-syndicate/tests/lib/utils.js b/packages/endpoint-syndicate/tests/lib/utils.js
@@ -31,49 +31,6 @@ test('Gets post for given URL from database', async t => {
   t.is(result.properties['mp-syndicate-to'], 'https://social.example/');
 });
 
-test('Adds post data from JF2 Feed', async t => {
-  const scope = nock('https://website.example')
-    .get('/feed.jf2')
-    .reply(200, getFixture('jf2/feed.jf2'));
-  const publication = {
-    jf2Feed: 'https://website.example/feed.jf2',
-    posts: {
-      findOne: async () => false,
-      insertOne: async () => {}
-    }
-  };
-  const result = await getPostData(publication);
-  t.is(result.properties.name, 'Second item in feed');
-  scope.done();
-});
-
-test('Updates post data from JF2 Feed to database', async t => {
-  const scope = nock('https://website.example')
-    .get('/feed.jf2')
-    .reply(200, getFixture('jf2/feed.jf2'));
-  const {publication} = t.context;
-  publication.jf2Feed = 'https://website.example/feed.jf2';
-  const result = await getPostData(publication);
-  t.is(result.properties.name, 'Second item in feed');
-  scope.done();
-});
-
-test('Throws error if no posts in JF2 Feed', async t => {
-  const scope = nock('https://website.example')
-    .get('/feed.jf2')
-    .reply(200, getFixture('jf2/feed-empty.jf2'));
-  const publication = {
-    jf2Feed: 'https://website.example/feed.jf2',
-    posts: {
-      findOne: async () => false,
-      insertOne: async () => {}
-    }
-  };
-  const error = await t.throwsAsync(getPostData(publication));
-  t.is(error.message, 'JF2 Feed does not contain any posts');
-  scope.done();
-});
-
 test('Gets post data from database', async t => {
   const result = await getPostData(t.context.publication);
   t.is(result.properties['mp-syndicate-to'], 'https://social.example/');

diff --git a/packages/indiekit/config/defaults.js b/packages/indiekit/config/defaults.js
@@ -47,7 +47,6 @@ const application = {
 const publication = {
   categories: [],
   locale: 'en',
-  jf2Feed: false,
   me: null,
   postTemplate: null,
   postTypes: [],