Record balance changes

.eslintrc.json

@@ -52,7 +52,7 @@
         "trailingComma": "all",
         "semi": false,
         "singleQuote": false,
-        "printWidth": 80,
+        "printWidth": 100,
         "tabWidth": 2,
         "useTabs": false,
         "bracketSpacing": true,

src/backend/analytics.ts

@@ -76,12 +76,7 @@ function aesEncrypt(
 }
 
 // Main function to process and send an event
-async function processEvent(
-  event: object,
-  publicKey: string,
-  apiGateway: string,
-  apiKey: string,
-) {
+async function processEvent(event: object, publicKey: string, apiGateway: string, apiKey: string) {
   try {
     // Generate AES key and IV
     const { key, iv } = generateAESKeyIV()
@@ -116,10 +111,7 @@ async function processEvent(
 
 const analyticsHandler = (fastify: any, _options: any, done: () => void) => {
   fastify.get("/config", async (_request: any, _reply: any) => {
-    return getEncryptionKeys(
-      config.TELEMETREE_PROJECT_ID,
-      config.TELEMETREE_API_KEY,
-    )
+    return getEncryptionKeys(config.TELEMETREE_PROJECT_ID, config.TELEMETREE_API_KEY)
   })
 
   fastify.post("/send", async (_request: any, _reply: any) => {

src/backend/auth-handler.ts

@@ -5,11 +5,7 @@ import { logger } from "#root/logger"
 import { validate } from "@tma.js/init-data-node"
 import { FastifyInstance } from "fastify"
 
-export const authHandler = (
-  fastify: FastifyInstance,
-  _options: unknown,
-  done: () => void,
-) => {
+export const authHandler = (fastify: FastifyInstance, _options: unknown, done: () => void) => {
   // eslint-disable-next-line no-unused-vars
   fastify.post("/:userId", async (request, _reply) => {
     const { userId } = request.params as any

src/backend/captcha.ts

@@ -28,15 +28,10 @@ const checkCaptcha = (fastify: any, _options: any, done: () => void) => {
       const user = await findUserById(userId)
       if (!user || !user.suspicionDices) return { result: false }
       if (user.suspicionDices === Number(data) + 1 + 100) {
-        logger.info(
-          `Solved captcha from ${user.id} with ${user.suspicionDices} suspicion dices`,
-        )
+        logger.info(`Solved captcha from ${user.id} with ${user.suspicionDices} suspicion dices`)
         user.suspicionDices = 0
         await user.save()
-        await _options.bot.api.sendMessage(
-          userId,
-          i18n.t(user.language, "dice.captcha_solved"),
-        )
+        await _options.bot.api.sendMessage(userId, i18n.t(user.language, "dice.captcha_solved"))
         return { result: true }
       }
     }

src/backend/nft-handler.ts

@@ -51,22 +51,15 @@ function toJSON(nft: DocumentType<CNFT>) {
   }
 }
 
-const nftHandler = (
-  fastify: FastifyInstance,
-  _options: any,
-  done: () => void,
-) => {
+const nftHandler = (fastify: FastifyInstance, _options: any, done: () => void) => {
   fastify.get("/collection.json", (_request: any, _reply: any) => {
     return {
       name: "Cube Worlds Citizens",
       description: "Cube Worlds Project Citizens",
       image: "https://cubeworlds.club/avatar.png",
       // external_url: null,
       // external_link: null,
-      social_links: [
-        "https://t.me/cube_worlds_bot",
-        "https://twitter.com/cube_worlds",
-      ],
+      social_links: ["https://t.me/cube_worlds_bot", "https://twitter.com/cube_worlds"],
       marketplace: "getgems.io",
       cover_image: "https://cubeworlds.club/background.png",
     }

src/bot/features/admin/parameters.ts

@@ -17,9 +17,7 @@ feature.command("description", logHandle("command-description"), async ctx => {
     await ctx.reply(`<code>/description ${ctx.dbuser.customDescription}</code>`)
     return
   }
-  await ctx.reply(
-    `<code>/description</code> ${oldCustomDescription ?? "about selected person"}`,
-  )
+  await ctx.reply(`<code>/description</code> ${oldCustomDescription ?? "about selected person"}`)
 })
 
 feature.command("positive", logHandle("command-positive"), async ctx => {
@@ -73,9 +71,7 @@ feature.command("scale", logHandle("command-scale"), async ctx => {
     await ctx.dbuser.save()
     return ctx.reply(`New scale: <code>/scale ${newScale}</code>`)
   }
-  return ctx.reply(
-    `Current scale: <code>/scale ${oldScale}</code>. Can be in range [0 .. 35]`,
-  )
+  return ctx.reply(`Current scale: <code>/scale ${oldScale}</code>. Can be in range [0 .. 35]`)
 })
 
 feature.command("steps", logHandle("command-steps"), async ctx => {
@@ -89,9 +85,7 @@ feature.command("steps", logHandle("command-steps"), async ctx => {
     await ctx.dbuser.save()
     return ctx.reply(`New steps: <code>/steps ${newSteps}</code>`)
   }
-  return ctx.reply(
-    `Current steps: <code>/steps ${oldSteps}</code>. Can be in range [ 10 .. 50 ]`,
-  )
+  return ctx.reply(`Current steps: <code>/steps ${oldSteps}</code>. Can be in range [ 10 .. 50 ]`)
 })
 
 feature.command("preset", logHandle("command-preset"), async ctx => {
@@ -115,8 +109,7 @@ Can be: ${presets.join(", ")}`,
 
 feature.command("sampler", logHandle("command-sampler"), async ctx => {
   const oldSampler = ctx.dbuser.sampler ?? SDSampler.K_DPMPP_2S_ANCESTRAL
-  const newSampler: SDSampler =
-    SDSampler[ctx.match.trim() as keyof typeof SDSampler]
+  const newSampler: SDSampler = SDSampler[ctx.match.trim() as keyof typeof SDSampler]
   if (newSampler) {
     ctx.dbuser.sampler = newSampler
     await ctx.dbuser.save()

src/bot/features/admin/queue.ts

@@ -2,11 +2,7 @@
 import { Composer, InputFile } from "grammy"
 import type { Context } from "#root/bot/context.js"
 import { logHandle } from "#root/bot/helpers/logging.js"
-import {
-  photoCaption,
-  queueMenu,
-  sendUserMetadata,
-} from "#root/bot/keyboards/queue-menu.js"
+import { photoCaption, queueMenu, sendUserMetadata } from "#root/bot/keyboards/queue-menu.js"
 import { isAdmin } from "#root/bot/filters/is-admin.js"
 import { config } from "#root/config.js"
 import { Address, toNano } from "@ton/core"
@@ -15,17 +11,8 @@ import { changeImageData } from "#root/bot/callback-data/image-selection.js"
 import { SelectImageButton, photoKeyboard } from "#root/bot/keyboards/photo.js"
 import { NftCollection } from "#root/bot/helpers/nft-collection.js"
 import { NFTMintParameters, NftItem } from "#root/bot/helpers/nft-item.js"
-import {
-  pinImageURLToIPFS,
-  pinJSONToIPFS,
-  unpin,
-  warmIPFSHash,
-} from "#root/bot/helpers/ipfs.js"
-import {
-  ClipGuidancePreset,
-  SDSampler,
-  generate,
-} from "#root/bot/helpers/generation.js"
+import { pinImageURLToIPFS, pinJSONToIPFS, unpin, warmIPFSHash } from "#root/bot/helpers/ipfs.js"
+import { ClipGuidancePreset, SDSampler, generate } from "#root/bot/helpers/generation.js"
 import { randomAttributes } from "#root/bot/helpers/attributes.js"
 import { countUsers, findUserById } from "#root/bot/models/user.js"
 import { ChatGPTAPI } from "chatgpt"
@@ -37,7 +24,7 @@ import {
   sendPreviewNFT,
   sendToGroupsNewNFT,
   // sendNewPlaces,
-} from "../../helpers/telegram"
+} from "#root/bot/helpers/telegram.js"
 
 const composer = new Composer<Context>()
 
@@ -78,8 +65,7 @@ feature.callbackQuery(
             },
           })
           const name = selectedUser.name ?? ""
-          const info =
-            ctx.dbuser.customDescription ?? selectedUser.description ?? ""
+          const info = ctx.dbuser.customDescription ?? selectedUser.description ?? ""
           const result = await api.sendMessage(
             `Write an inspiring text about a person named "${name}" who has decided to start a journey.
             You could also use additional information: "${info}", if it feels appropriate, and translate into English if not.
@@ -139,14 +125,10 @@ feature.callbackQuery(
 
         case SelectImageButton.Avatar: {
           const nextAvatarNumber =
-            ctx.dbuser.selectedUser === selectedUser.id
-              ? (ctx.dbuser.avatarNumber ?? -1) + 1
-              : 0
+            ctx.dbuser.selectedUser === selectedUser.id ? (ctx.dbuser.avatarNumber ?? -1) + 1 : 0
           ctx.dbuser.avatarNumber = nextAvatarNumber
           await ctx.dbuser.save()
-          sendUserMetadata(ctx, selectedUser).catch(error =>
-            ctx.reply((error as Error).message),
-          )
+          sendUserMetadata(ctx, selectedUser).catch(error => ctx.reply((error as Error).message))
           break
         }
 
@@ -185,11 +167,7 @@ feature.callbackQuery(
             attributes: randomAttributes(),
           }
           ctx.logger.info(json)
-          const ipfsJSONHash = await pinJSONToIPFS(
-            adminIndex(ctx.dbuser.id),
-            username,
-            json,
-          )
+          const ipfsJSONHash = await pinJSONToIPFS(adminIndex(ctx.dbuser.id), username, json)
           selectedUser.nftImage = ipfsImageHash
           selectedUser.nftJson = ipfsJSONHash
           await selectedUser.save()
@@ -222,8 +200,7 @@ feature.callbackQuery(
           selectedUser.mintedAt = new Date()
           await selectedUser.save()
 
-          const nextItemIndex =
-            await NftCollection.fetchNextItemIndexWithRetry()
+          const nextItemIndex = await NftCollection.fetchNextItemIndexWithRetry()
           const userAddress = Address.parse(selectedUser.wallet ?? "")
           const parameters: NFTMintParameters = {
             queryId: 0,
@@ -297,9 +274,7 @@ feature.callbackQuery(
     } catch (error) {
       ctx.logger.error(error)
       const { message } = error as Error
-      await (message
-        ? ctx.reply(`Error: ${message}`)
-        : ctx.reply(ctx.t("wrong")))
+      await (message ? ctx.reply(`Error: ${message}`) : ctx.reply(ctx.t("wrong")))
     }
     ctx.chatAction = null
   },

src/bot/features/admin/topup.ts

@@ -11,18 +11,13 @@ const composer = new Composer<Context>()
 
 const feature = composer.chatType("private").filter(isAdmin)
 
-feature.command(
-  "topup",
-  logHandle("command-topup"),
-  chatAction("upload_document"),
-  async ctx => {
-    const wallet = await openWallet(config.MNEMONICS!.split(" "))
-    const collectionAddress = Address.parse(config.COLLECTION_ADDRESS)
-    const seqno = await topUpBalance(wallet, collectionAddress, 10)
-    ctx.logger.info(`Collection ${collectionAddress} will be topUpped`)
-    await waitSeqno(seqno, wallet)
-    await ctx.reply(`Collection ${collectionAddress} topUpped!`)
-  },
-)
+feature.command("topup", logHandle("command-topup"), chatAction("upload_document"), async ctx => {
+  const wallet = await openWallet(config.MNEMONICS!.split(" "))
+  const collectionAddress = Address.parse(config.COLLECTION_ADDRESS)
+  const seqno = await topUpBalance(wallet, collectionAddress, 10)
+  ctx.logger.info(`Collection ${collectionAddress} will be topUpped`)
+  await waitSeqno(seqno, wallet)
+  await ctx.reply(`Collection ${collectionAddress} topUpped!`)
+})
 
 export { composer as topupFeature }

src/bot/features/admin/transaction.ts

@@ -3,6 +3,7 @@ import type { Context } from "#root/bot/context.js"
 import { logHandle } from "#root/bot/helpers/logging.js"
 import { isAdmin } from "#root/bot/filters/is-admin.js"
 import { fromNano } from "@ton/core"
+import { BalanceChangeType } from "#root/bot/models/balance"
 import { addPoints, findUserByName } from "../../models/user"
 import { findTransaction } from "../../models/transaction"
 import { tonToPoints } from "../../helpers/ton"
@@ -20,9 +21,7 @@ feature.command("transaction", logHandle("command-transaction"), async ctx => {
 
     const trx = await findTransaction(numberLt, hash)
     if (!trx) {
-      return ctx.reply(
-        `Transaction with hash \`${hash}\` and lt \`${numberLt}\` not found`,
-      )
+      return ctx.reply(`Transaction with hash \`${hash}\` and lt \`${numberLt}\` not found`)
     }
 
     if (trx.accepted) {
@@ -45,7 +44,7 @@ feature.command("transaction", logHandle("command-transaction"), async ctx => {
     // add points to user balance
     const ton = fromNano(trx.coins)
     const points = tonToPoints(Number(ton))
-    await addPoints(user.id, points)
+    await addPoints(user.id, points, BalanceChangeType.Donation)
 
     // send messages
     await sendPlaceInLine(ctx.api, user.id, true)

src/bot/features/balance.ts

@@ -0,0 +1,34 @@
+import { Composer } from "grammy"
+import { getMarkdownTable, Row } from "markdown-table-ts"
+import type { Context } from "#root/bot/context.js"
+import { logHandle } from "#root/bot/helpers/logging.js"
+import { kFormatter } from "#root/bot/helpers/numbers.js"
+import {
+  countAllBalanceRecords,
+  getBalanceChangeTypeName,
+  getUserBalanceRecords,
+} from "#root/bot/models/balance.js"
+import { formatDateTimeCompact } from "#root/bot/helpers/time.js"
+
+const composer = new Composer<Context>()
+const feature = composer.chatType("private")
+
+feature.command("balance", logHandle("command-balance"), async ctx => {
+  const count = await countAllBalanceRecords()
+  const records = await getUserBalanceRecords(ctx.dbuser.id, count)
+  const body: Row[] = records.map(v => [
+    kFormatter(v.amount),
+    getBalanceChangeTypeName(v.type),
+    v.createdAt ? formatDateTimeCompact(v.createdAt) : "",
+  ])
+  const md = `${ctx.t("line.count", { count })}
+\`\`\`\n${getMarkdownTable({
+    table: {
+      head: ["$CUBE", "Type", "Date"],
+      body,
+    },
+  })}\n\`\`\``
+  await ctx.replyWithMarkdown(md)
+})
+
+export { composer as balanceFeature }