👾 Bunch of features for sending urls with labels (#6)

bot.ts

@@ -3,18 +3,23 @@ import {
   Bot,
   GrammyError,
   HttpError,
-} from 'https://deno.land/x/grammy@v1.20.3/mod.ts'
+} from 'https://deno.land/x/grammy@v1.21.1/mod.ts'
 import { createConversation } from 'https://deno.land/x/grammy_conversations@v1.2.0/conversation.ts'
 import { conversations } from 'https://deno.land/x/grammy_conversations@v1.2.0/mod.ts'
 import {
   askApiKey,
   saveBunchUrls,
+  setDefaultLabel,
   updateToken,
 } from './src/conversations.ts'
 import { cancelMenu } from './src/menus.ts'
 import { OmnivoreApi } from './src/omnivore/api.ts'
 import { MyContext, sessionHandler } from './src/sessionsHandler.ts'
 import { inlineQuery } from "./src/inlineQuery.ts";
+import { slashCommandsListener } from './src/slashCommands.ts'
+import { cancelMenuAndResetLabel } from "./src/menus.ts";
+import { getUrlAndLabels } from "./src/utils/getUrlAndLabels.ts";
+import { includeSourceChoiceMenu } from "./src/menus.ts";
 
 await load({ export: true })
 
@@ -30,26 +35,34 @@ bot.use(conversations())
 bot.use(createConversation(askApiKey))
 bot.use(createConversation(saveBunchUrls))
 bot.use(createConversation(updateToken))
+bot.use(createConversation(setDefaultLabel))
 
 // Menu
 bot.use(cancelMenu)
+bot.use(cancelMenuAndResetLabel)
+bot.use(includeSourceChoiceMenu)
 
 // inline query
 bot.use(inlineQuery)
 
+// slash commands handler
+bot.use(slashCommandsListener)
+
 // handlers
 bot.on('message:entities:url', async ctx => {
+  // retrieve stuff from session
   const token = ctx.session.apiToken
-
   const api = new OmnivoreApi(token)
 
-  await api.saveUrl(ctx.message.text || '')
+  const {url, labels} = getUrlAndLabels(ctx)
 
-  if (api.addedEntriesCount === 1) {
-    await ctx.reply('Successfully added link to Omnivore! 😸👍')
-  } else {
-    await ctx.reply('Failed to add the link. 😿')
-  }
+  await api.saveUrl(url, labels)
+
+  const feedback = api.addedEntriesCount === 1
+    ? 'Successfully added link to Omnivore! 😸👍'
+    : 'Failed to add the link. 😿'
+
+    await ctx.reply(feedback)
 })
 
 bot.command('start', async ctx => {

src/conversations.ts

@@ -53,7 +53,7 @@ export async function saveBunchUrls(
 
   const api = new OmnivoreApi(token)
 
-  await api.processUrls(urlsArray)
+  await api.processUrls({urls: urlsArray})
   await ctx.reply(
     `Successfully added ${api.addedEntriesCount} of ${urlsArray.length} links!\nFailed to add ${api.failedEntriesCount} links.`,
     {
@@ -75,3 +75,19 @@ export async function updateToken(
     reply_markup: mainKeyboardLayout,
   })
 }
+
+export async function setDefaultLabel(
+  conversation: MyConversation,
+  ctx: MyContext
+) {
+  const newCtx = await conversation.waitFor('msg:text')
+  const label = newCtx.message?.text
+
+  conversation.session.defaultLabel = label || ctx.session.defaultLabel
+
+  await ctx.reply(`You've Successfully set the label ${label} 🎉`, {
+    reply_markup: mainKeyboardLayout,
+  })
+}
+
+

src/inlineQuery.ts

@@ -1,4 +1,4 @@
-import { Composer } from 'https://deno.land/x/grammy@v1.20.3/mod.ts'
+import { Composer } from 'https://deno.land/x/grammy@v1.21.1/mod.ts'
 import { OmnivoreApi } from './omnivore/api.ts'
 import { MyContext } from './sessionsHandler.ts'
 

src/keyboards.ts

@@ -1,4 +1,4 @@
-import { Keyboard } from 'https://deno.land/x/grammy@v1.20.3/mod.ts'
+import { Keyboard } from 'https://deno.land/x/grammy@v1.21.1/mod.ts'
 
 export const mainKeyboardLayout = new Keyboard()
   .text('👾 Save a bunch of urls')

src/menus.ts

@@ -3,10 +3,39 @@ import { mainKeyboardLayout } from './keyboards.ts'
 import { MyContext } from './sessionsHandler.ts'
 
 // Cancel menu button
-export const cancelMenu = new Menu<MyContext>('Cancel')
-  .text('Cancel', ctx => {
+export const cancelMenu = new Menu<MyContext>('Cancel').text(
+  'Cancel',
+  ctx => {
     ctx.reply('canceled 👌', { reply_markup: mainKeyboardLayout })
     ctx.conversation.exit()
   }
-  )
-  .row()
+)
+
+// cancel + reset button for set_default_label command
+export const cancelMenuAndResetLabel = new Menu<MyContext>(
+  'CancelAndReset'
+)
+  .addRange(cancelMenu)
+  .text('Reset label', ctx => {
+    ctx.session.defaultLabel = ''
+
+    ctx.reply('🍃 from now on there is no default label for links')
+  })
+
+export const includeSourceChoiceMenu = new Menu<MyContext>(
+  'includeSourceChoiceMenu'
+)
+  .text('yes', ctx => {
+    ctx.session.includeSource = true
+
+    ctx.reply(`Now your links sended to me, will include the source where they came from 😸👍`, {
+      reply_markup: mainKeyboardLayout,
+    })
+  })
+  .text('no', ctx => {
+    ctx.session.includeSource = false
+
+    ctx.reply(`Your links won't include the source, and that's absolutely normal 😸👍`, {
+      reply_markup: mainKeyboardLayout,
+    })
+  })