Img sharing

src/bot.ts

@@ -189,7 +189,10 @@ function createInitialSessionData (): BotSessionData {
         imgSize: config.openAi.dalle.sessionDefault.imgSize,
         isEnabled: config.openAi.dalle.isEnabled,
         imgRequestQueue: [],
-        isProcessingQueue: false
+        isProcessingQueue: false,
+        imageGenerated: [],
+        isInscriptionLotteryEnabled: config.openAi.dalle.isInscriptionLotteryEnabled,
+        imgInquiried: []
       },
       chatGpt: {
         model: config.openAi.chatGpt.model,
@@ -402,7 +405,6 @@ const onMessage = async (ctx: OnMessageContext): Promise<void> => {
       }
       for (const config of Object.values(PayableBots)) {
         const bot = config.bot
-
         if (!bot.isSupportedEvent(ctx)) {
           continue
         }
@@ -428,7 +430,9 @@ const onMessage = async (ctx: OnMessageContext): Promise<void> => {
       }
       // Any message interacts with ChatGPT (only for private chats or /ask on enabled on group chats)
       if (ctx.update.message.chat && (ctx.chat.type === 'private' || ctx.session.openAi.chatGpt.isFreePromptChatGroups)) {
-        await openAiBot.onEvent(ctx)
+        await openAiBot.onEvent(ctx, (e) => {
+          logger.error(e)
+        })
         return
       }
       if (ctx.update.message.chat) {
@@ -460,6 +464,13 @@ const onCallback = async (ctx: OnCallBackQueryData): Promise<void> => {
       await sdImagesBot.onEvent(ctx, (e) => {
         logger.info(e, '// TODO refund payment')
       })
+      return
+    }
+
+    if (openAiBot.isSupportedEvent(ctx)) {
+      await openAiBot.onEvent(ctx, (e) => {
+        logger.error(e)
+      })
     }
   } catch (ex: any) {
     Sentry.captureException(ex)

src/config.ts

@@ -44,6 +44,7 @@ export default {
   openAi: {
     dalle: {
       isEnabled: Boolean(parseInt(process.env.IMAGE_GEN_ENABLED ?? '1')),
+      isInscriptionLotteryEnabled: false,
       telegramFileUrl: 'https://api.telegram.org/file/bot',
       completions: {
         temperature:
@@ -125,6 +126,8 @@ export default {
     holderAddress:
       process.env.PAYMENT_HOLDER_ADDRESS ??
       '0x9EE59D58606997AAFd2F6Ba46EC64402829f9b6C',
+    inscriptionDestinationAddress: '0x3abf101D3C31Aec5489C78E8efc86CaA3DF7B053',
+    minUserOneAmount: parseInt('1'), // always hold 1 ONE on user hot wallet balance to pay fees
     whitelist: (process.env.PAYMENT_WHITELIST ?? '')
       .split(',')
       .map((item) => item.toString().toLowerCase()),

src/modules/1country/utils/index.ts

@@ -35,7 +35,7 @@ export const getCommandNamePrompt = (
   supportedCommands: any
 ): { commandName: string, prompt: string } => {
   const hasCommand = ctx.hasCommand(
-    Object.values(supportedCommands).map((command: any) => command.name)
+    Object.values(supportedCommands).map((command: any) => command)
   )
   const commandName = hasCommand
     ? ctx.message?.text?.split(' ')[0].slice(1)

src/modules/llms/helpers.ts

@@ -20,8 +20,8 @@ export enum SupportedCommands {
 }
 
 export const MAX_TRIES = 3
-const LLAMA_PREFIX_LIST = ['*']
-const BARD_PREFIX_LIST = ['b.', 'B.']
+const LLAMA_PREFIX_LIST = ['* ']
+const BARD_PREFIX_LIST = ['b. ', 'B. ']
 
 export const isMentioned = (
   ctx: OnMessageContext | OnCallBackQueryData

src/modules/open-ai/helpers.ts

@@ -27,9 +27,9 @@ export enum SupportedCommands {
 
 export const MAX_TRIES = 3
 
-export const DALLE_PREFIX_LIST = ['i. ', ',', 'image ', 'd.', 'img ']
-export const CHAT_GPT_PREFIX_LIST = ['a.', '.']
-export const NEW_PREFIX_LIST = ['n.', '..']
+export const DALLE_PREFIX_LIST = ['i. ', ', ', 'd. ']
+export const CHAT_GPT_PREFIX_LIST = ['a. ', '. ']
+export const NEW_PREFIX_LIST = ['n. ', '.. ']
 
 export const isMentioned = (
   ctx: OnMessageContext | OnCallBackQueryData