Merge pull request #8 from kikiklang/random

Random

Author: kikiklang

cli.js

@@ -28,6 +28,10 @@ const cli = meow(help, {
     clear: {
       type: 'boolean',
       alias: 'c'
+    },
+    random: {
+      type: 'boolean',
+      alias: 'r'
     }
   }
 })

index.js

@@ -16,6 +16,10 @@ const wikipediaCLI = flags => {
     return wiclipedia.clearHistory()
   }
 
+  if (flags.random) {
+    return wiclipedia.displayRandomArticlesList()
+  }
+
   return wiclipedia.launchProgram()
 }
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wiclipedia",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "wikipedia articles summaries in your terminal",
   "repository": "kikiklang/wiclipedia",
   "homepage": "https://github.com/kikiklang/wiclipedia",

package.json

@@ -7,7 +7,7 @@ const fetch = require('node-fetch')
 const ora = require('ora')
 const wtf = require('wtf_wikipedia')
 
-const getSuggestedTopic = async (userInput, lang) => {
+exports.getSuggestedTopic = async (userInput, lang) => {
   const domain = `https://${lang}.wikipedia.org`
   const path = '/w/api.php'
   const action = 'query'
@@ -27,12 +27,37 @@ const getSuggestedTopic = async (userInput, lang) => {
 
     return result
   } catch (error) {
-    console.log('sorry, there is a problem with that request')
+    console.log('sorry, there is a problem with that request', error)
     process.exit(1)
   }
 }
 
-const getArticle = async (userPick, lang) => {
+exports.getRandomSuggestions = async lang => {
+  const domain = `https://${lang}.wikipedia.org`
+  const path = '/w/api.php'
+  const action = 'query'
+  const format = 'json'
+  const list = 'random'
+  const rnlimit = 10
+  const rnnamespace = 0
+  const endpoint = `${domain}${path}?action=${action}&format=${format}&list=${list}&rnlimit=${rnlimit}&rnnamespace=${rnnamespace}`
+
+  try {
+    const spinner = ora('waiting for the response...').start()
+    const response = await fetch(endpoint)
+    const data = await response.json()
+    const result = Object.values(data.query.random)
+
+    spinner.stop()
+
+    return result
+  } catch (error) {
+    console.log('sorry, there is a problem with that request', error)
+    process.exit(1)
+  }
+}
+
+exports.getArticle = async (userPick, lang) => {
   try {
     const spinner = ora('waiting for the article...').start()
     const doc = await wtf.fetch(userPick, lang)
@@ -46,11 +71,8 @@ const getArticle = async (userPick, lang) => {
 
     return result
   } catch (error) {
-    console.log('sorry, there is a problem with that request')
+    console.log('sorry, there is a problem with that request', error)
     process.exit(1)
   }
 }
 
-exports.getSuggestedTopic = getSuggestedTopic
-exports.getArticle = getArticle
-

src/fetch-data.js

@@ -10,9 +10,11 @@ module.exports = `
       --lang, -l          set language for wikipedia articles (english by default)
       --previous, -p      display and use previous searches
       --clear, -c         clear search history
+      --random, -r        suggest random articles
 
     Examples
       $ wicli
       $ wicli --lang
       $ wicli --previous
+      $ wicli --random
 `

src/help.js

@@ -44,3 +44,11 @@ exports.historyInteractive = {
   symbol: '>',
   menu: []
 }
+
+exports.randomInteractive = {
+  type: 'interactive',
+  query: bold().blue(' - here is a list of 10 random topics...'),
+  handle: 'userPick',
+  symbol: '>',
+  menu: []
+}

src/prompt.js

@@ -19,17 +19,25 @@ const options = require('./boxen-options')
  * Check specifically if the user decided to quit the program or wanted to make another search
  * @param  {String} input The picked choice after prompt
  */
-function _checkUserAnswers(input) {
+function _checkUserAnswers(input, lang) {
   if (input.userPick.includes('(Try another search)')) {
     process.stdout.write('\u001Bc') // Clear the console
     header.logAppName()
     prompt.topicInteractive.menu = []
     return _search()
   }
 
+  if (input.userPick.includes('(Try another random)')) {
+    process.stdout.write('\u001Bc') // Clear the console
+    prompt.randomInteractive.menu = []
+    return displayRandomArticlesList()
+  }
+
   if (input.userPick.includes('(Quit)')) {
     process.exit(1)
   }
+
+  config.storeSearches(input.userPick, lang)
 }
 
 /**
@@ -41,7 +49,9 @@ function _fillInteractiveTopicsName(topics, promptName) {
   topics.forEach(item => {
     prompt[promptName].menu.push(item.title)
   })
-  prompt[promptName].menu.push(yellow('(Try another search)'))
+  promptName === 'randomInteractive' ?
+    prompt[promptName].menu.push(yellow('(Try another random)')) :
+    prompt[promptName].menu.push(yellow('(Try another search)'))
   prompt[promptName].menu.push(red('(Quit)'))
 }
 
@@ -117,17 +127,16 @@ async function _askForATopic() {
  */
 async function _refineTopics() {
   const input = await qoa.interactive(prompt.topicInteractive)
-  await _checkUserAnswers(input)
   const lang = await config.checkLang()
+  await _checkUserAnswers(input, lang)
   const response = await fetch.getArticle(input.userPick, lang)
 
-  config.storeSearches(input.userPick, lang)
   _displayArticle(response)
   prompt.topicInteractive.menu = []
 }
 
 /**
- * Just calling other functions
+ * Just calling other functions ¯\_(ツ)_/¯
  */
 async function _search() {
   await _askForATopic()
@@ -199,3 +208,21 @@ exports.displayPreviousSearches = async () => {
   _displayArticle(response)
   prompt.historyInteractive.menu = []
 }
+
+/**
+ * Allow the user to display a list of random articles
+ * Pick one of them, trigger an api call and display the response
+ */
+const displayRandomArticlesList = async () => {
+  await header.logAppName()
+  const lang = await config.checkLang()
+  const suggestedTopics = await fetch.getRandomSuggestions(lang)
+  _fillInteractiveTopicsName(suggestedTopics, 'randomInteractive')
+  const input = await qoa.interactive(prompt.randomInteractive)
+  await _checkUserAnswers(input, lang)
+  const response = await fetch.getArticle(input.userPick, lang)
+  _displayArticle(response)
+  prompt.historyInteractive.menu = []
+}
+
+exports.displayRandomArticlesList = displayRandomArticlesList