Merge branch 'main' into pdfs-uploading

.github/workflows/lint.yml

@@ -0,0 +1,22 @@
+name: Deno lint
+
+on: [push, pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Setup repo
+        uses: actions/checkout@v3
+
+      - name: Setup Deno
+        uses: denoland/setup-deno@v1
+        with:
+          deno-version: v1.x
+
+      - name: Run linter
+        run: deno lint

.github/workflows/tests.yml

@@ -0,0 +1,22 @@
+name: Deno tests
+
+on: [push, pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Setup repo
+        uses: actions/checkout@v3
+
+      - name: Setup Deno
+        uses: denoland/setup-deno@v1
+        with:
+          deno-version: v1.x
+
+      - name: Run tests
+        run: deno test -A

bot.ts

@@ -3,19 +3,24 @@ 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/[email protected]/conversation.ts'
 import { conversations } from 'https://deno.land/x/[email protected]/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 { fileListener } from "./src/files.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 })
 
@@ -31,29 +36,37 @@ 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)
 
 // file handling
 bot.use(fileListener)
 
+// 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,
+    })
+  })

src/omnivore/api.ts

@@ -10,6 +10,8 @@ import {
 } from './graphql.ts'
 import { InlineQueryResultBuilder } from 'https://deno.land/x/[email protected]/mod.ts'
 import { File } from "https://deno.land/x/[email protected]/message.ts";
+import { InlineQueryResultBuilder } from 'https://deno.land/x/[email protected]/mod.ts'
+import { Label, ProcessUrlsParams } from "../types.ts";
 
 interface OmnivoreApiInterface {
   apiToken: string
@@ -29,12 +31,13 @@ export class OmnivoreApi implements OmnivoreApiInterface {
     this.apiToken = apiToken
   }
 
-  async saveUrl(url: string) {
+  async saveUrl(url: string, labels: Label[]) {
     const variables = {
       input: {
         clientRequestId: globalThis.crypto.randomUUID(),
         source: 'api',
         url,
+        labels
       },
     }
 
@@ -70,13 +73,18 @@ export class OmnivoreApi implements OmnivoreApiInterface {
     }
   }
 
-  async processUrls(urls: string[], startIndex = 0) {
+  async processUrls({ urls, additionalLabels, startIndex = 0 }: ProcessUrlsParams) {
     const batchSize = 50
     const remainingUrls = urls.slice(startIndex)
 
     for (let i = 0; i <= batchSize && i < remainingUrls.length; i++) {
-      const url = remainingUrls[i]
-      await this.saveUrl(url)
+      const url = remainingUrls[i].url
+      const urlLabels = remainingUrls[i].labels
+
+      // add additional labels to each url
+      additionalLabels?.map((label) => urlLabels.push(label))
+
+      await this.saveUrl(url, urlLabels)
     }
 
     const nextIndex = startIndex + batchSize + 1
@@ -85,7 +93,7 @@ export class OmnivoreApi implements OmnivoreApiInterface {
       await new Promise(resolve =>
         setTimeout(resolve, OmnivoreApi.delayBetweenRequests)
       )
-      await this.processUrls(urls, nextIndex)
+      await this.processUrls({urls, startIndex: nextIndex})
     }
   }
 

src/sessionsHandler.ts

@@ -2,7 +2,7 @@ import {
   Context,
   session,
   SessionFlavor,
-} from 'https://deno.land/x/grammy@v1.20.3/mod.ts'
+} from 'https://deno.land/x/grammy@v1.21.1/mod.ts'
 import { createClient } from 'https://esm.sh/@supabase/[email protected]'
 import { supabaseAdapter } from 'https://deno.land/x/[email protected]/supabase/src/mod.ts'
 import { load } from 'https://deno.land/[email protected]/dotenv/mod.ts'
@@ -22,6 +22,8 @@ const storage = supabaseAdapter({
 
 interface SessionData {
   apiToken: string
+  defaultLabel: string
+  includeSource: boolean
 }
 
 export type MyContext = Context &
@@ -31,6 +33,8 @@ export type MyContext = Context &
 function initial(): SessionData {
   return {
     apiToken: '',
+    defaultLabel: '',
+    includeSource: false
   }
 }
 

src/slashCommands.ts

@@ -0,0 +1,23 @@
+import { Composer } from 'https://deno.land/x/[email protected]/mod.ts'
+import { MyContext } from './sessionsHandler.ts'
+import { cancelMenuAndResetLabel, includeSourceChoiceMenu } from "./menus.ts";
+
+export const slashCommandsListener = new Composer<MyContext>()
+
+slashCommandsListener.hears('/set_default_label', async ctx => {
+  ctx.reply(
+    'Send the label you want to be added for all of the links you send me',
+    {
+      reply_markup: cancelMenuAndResetLabel,
+    }
+  )
+
+  await ctx.conversation.enter('setDefaultLabel')
+})
+
+slashCommandsListener.hears('/set_include_source', ctx => {
+  ctx.reply(
+    'Do you want to include label from what channel or contact you\'ve saved the article?', {
+      reply_markup: includeSourceChoiceMenu
+    })
+})