fix(deps): update module github.com/rs/zerolog to v1.35.1

update sticker id
Merge branch 'main' of ssh://git.thuanle.me:2222/public/crypto-price-bot
2026-05-02 17:00:56 +00:00 · 2026-04-27 10:08:37 +07:00 · 2026-04-27 09:59:13 +07:00 · 2026-04-27 09:53:34 +07:00 · 2026-04-27 09:51:24 +07:00 · 2026-04-27 07:04:37 +07:00
34 changed files with 1591 additions and 347 deletions
@@ -1 +1,4 @@
 /.env
+/.worktrees/
+.DS_Store
+.idea/
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="Go" enabled="true" />
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/crypto-price-bot.iml" filepath="$PROJECT_DIR$/.idea/crypto-price-bot.iml" />
-    </modules>
-  </component>
-</project>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
@@ -1 +1,31 @@
 # crypto price bot
+
+Telegram bot tra giá crypto (Spot / Future / Alpha), funding rate và margin APR.
+
+## Environment variables
+
+Tạo file `.env` ở root project với các biến sau:
+
+```env
+# BẮT BUỘC: token bot Telegram
+TELEGRAM_TOKEN=your_telegram_bot_token
+
+# TÙY CHỌN: bật/tắt log env mode (mặc định true nếu không set)
+# giá trị hợp lệ: true / false
+LOG_ENV=true
+
+# TÙY CHỌN nhưng KHUYẾN NGHỊ: Telegram user id được phép dùng /refresh
+# nếu không set hoặc set sai format -> /refresh sẽ bị từ chối cho tất cả user
+ADMIN_CHAT_ID=123456789
+```
+
+## Run
+
+```bash
+go run ./cmd/tele
+```
+
+## Notes
+
+- `TELEGRAM_TOKEN` sai/thiếu: bot sẽ fail khi khởi tạo Telegram service.
+- `/refresh` dùng để refresh trading pair cache thủ công và chỉ cho `ADMIN_CHAT_ID`.
@@ -0,0 +1,130 @@
+# Token message rich design
+
+## Context
+
+Current token message flow returns early for Alpha tokens, so users cannot see Spot/Future together with Alpha when multiple sources are available. Message content is also rigid and less informative for partial-source cases.
+
+Goal: redesign Telegram token message so each available price source is shown in one rich message, with stable ordering and conditional rows.
+
+## Scope
+
+Applies to token query message rendering in Telegram bot (`OnTokenInfoByToken` flow and price view formatting).
+
+Out of scope:
+- changing market data fetch logic
+- changing command routing
+- trend arrows / historical diff
+
+## Requirements
+
+1. Rich, multi-line Telegram message format.
+2. Spot is primary source when present.
+3. Show all available sources in a single message: Spot, Future, Alpha.
+4. Hide rows for missing data.
+5. Show Basis only when both Spot and Future exist.
+6. Show Alpha 24h when Alpha data exists.
+7. No trend arrows.
+8. Preserve current behavior of no reply when no Spot/Future/Alpha data exists.
+
+## Message format
+
+Fixed row order (hide missing rows):
+
+1. `🪙 TOKEN`
+2. `💵 Spot: ...` (primary if exists)
+3. `📈 Future: ...`
+4. `🅰️ Alpha: ...`
+5. `🧭 Basis: Future-Spot` (only if Spot+Future)
+6. `💸 Funding: ... in ...` (if Future exists)
+7. `🏦 Margin: ... APR` (if margin exists)
+8. `📊 Alpha 24h: ...` (if Alpha change exists)
+
+## Fallback rules
+
+- **All three available**: render all rows above (except any missing optional fields).
+- **Spot + Future**: render Spot, Future, Basis, Funding, Margin.
+- **Alpha only**: render Alpha and Alpha 24h.
+- **Future only**: render Future, Funding, Margin.
+- **Spot only**: render Spot, Margin.
+- **No Spot/Future/Alpha**: no reply.
+
+## Data flow behavior
+
+1. Resolve token to candidate futures symbol(s) using existing resolver.
+2. Collect available values from Spot/Future/Alpha/margin sources.
+3. Build one unified message model.
+4. Render rows in fixed order; each row is conditional on availability.
+5. Send single Telegram message.
+
+Important behavioral change: remove alpha-first early-return behavior; Alpha becomes a peer data source in unified rendering.
+
+## Formatting notes
+
+- Reuse existing numeric formatter (`RenderPrice`) for price values.
+- Keep current funding icon and countdown style.
+- Basis format:
+  - absolute delta: `Future - Spot`
+  - percent delta: `(Future-Spot)/Spot*100`
+  - sign preserved (`+`/`-`)
+
+## Example outputs
+
+### A) Spot + Future + Alpha
+
+```text
+🪙 ETH
+💵 Spot: $3,245
+📈 Future: $3,251
+🅰️ Alpha: $3,248
+🧭 Basis: +$6 (+0.18%)
+💸 Funding: +0.0123% 🟢 in 05m
+🏦 Margin: 7.665% APR
+📊 Alpha 24h: 🔴 -3.21%
+```
+
+### B) Spot + Future
+
+```text
+🪙 SOL
+💵 Spot: $182.4
+📈 Future: $183.0
+🧭 Basis: +$0.6 (+0.33%)
+💸 Funding: -0.0041% 🔴 in 42m
+🏦 Margin: 5.110% APR
+```
+
+### C) Alpha only
+
+```text
+🪙 ABC
+🅰️ Alpha: $0.1234
+📊 Alpha 24h: 🟢 +12.40%
+```
+
+### D) Future only
+
+```text
+🪙 TOKEN
+📈 Future: $1,234
+💸 Funding: +0.0081% 🟢 in 17m
+🏦 Margin: 6.200% APR
+```
+
+### E) Spot only
+
+```text
+🪙 TOKEN
+💵 Spot: $1,228
+🏦 Margin: 6.200% APR
+```
+
+## Verification checklist
+
+- Token with all 3 sources -> all expected rows appear, ordered correctly.
+- Token with Spot+Future but no Alpha -> no Alpha rows.
+- Token with Alpha only -> no Spot/Future/Basis/Funding rows.
+- Token with Future only -> no Spot/Basis/Alpha rows.
+- Token with Spot only -> no Future/Basis/Funding/Alpha rows.
+- Token with no data -> no reply.
+- Basis not shown unless both Spot and Future exist.
+- No trend arrows anywhere.
@@ -0,0 +1,85 @@
+# Go filenames consistency design
+
+## Context
+
+The repository has inconsistent `.go` filename semantics in multiple areas (domain-oriented names, endpoint/history-oriented names, mixed singular/plural forms).
+This slows code navigation because filenames do not consistently communicate data dimension or responsibility.
+
+Goal: refactor `.go` filenames across the whole repository to a consistent naming model, and align declaration placement with filename responsibility, without changing runtime behavior.
+
+## Scope
+
+Applies to all `.go` files in the repository.
+
+In scope:
+- Rename `.go` files to consistent, responsibility-first names.
+- Mechanical updates required by rename/move.
+- Move declarations between files when needed so file responsibility is clear.
+
+Out of scope:
+- Any behavior or logic changes.
+- Non-`.go` files.
+- New feature work.
+
+## Requirements
+
+1. `.go` filename naming is consistent across the repository.
+2. Filenames follow responsibility-first conventions:
+   - data-dimension names where applicable (`spot_*`, `futures_*`, etc.)
+   - pluralized collection-oriented files (`*_pairs.go`, `*_prices.go`)
+   - avoid endpoint/history-oriented naming that obscures responsibility.
+3. Declarations in each file match filename responsibility.
+4. No public/package behavior change.
+5. Resulting PR remains reviewable by grouping changes mechanically and keeping logic untouched.
+
+## Design
+
+### Naming model
+
+Use a responsibility-first naming model for all `.go` files:
+- A reader should infer the primary responsibility from filename alone.
+- Prefer domain/data-dimension names over transport/implementation-history names.
+- Use consistent singular/plural convention based on file content (entity vs collection).
+
+### Refactor mechanics
+
+1. Inventory `.go` files by package and classify naming inconsistencies.
+2. Define target filename map package-by-package.
+3. Rename files with git-aware rename operations.
+4. Move declarations when file content does not match filename responsibility.
+5. Keep signatures and bodies unchanged.
+6. Apply only mechanical reference/import updates required by moves.
+
+### Execution strategy for reviewability
+
+- Use focused commits by package or subsystem.
+- Keep each commit behavior-neutral.
+- Separate any necessary declaration moves from broad rename waves when this improves diff readability.
+
+## Error handling and behavior
+
+No new error handling paths are introduced.
+Existing control flow and error behavior remain unchanged.
+
+## Testing and verification
+
+1. Run project tests after each major package/subsystem batch.
+2. Run full project test command before PR.
+3. Confirm no functional diff beyond rename/move/mechanical updates.
+4. Final check: each renamed file contains declarations aligned with its responsibility.
+
+## Risks and mitigations
+
+- Risk: accidental behavior change while moving declarations.
+  - Mitigation: keep signatures/bodies unchanged and validate with tests per batch.
+- Risk: review noise from repo-wide scope.
+  - Mitigation: package-grouped commits, strict mechanical-only edits, and explicit PR summary.
+- Risk: large PR becomes hard to review.
+  - Mitigation: preserve commit structure and provide a clear rename map in PR description.
+
+## Success criteria
+
+- `.go` filenames are consistent and responsibility-first across the repo.
+- Declarations in each file align with filename responsibility.
+- Tests pass with no behavior regression.
+- PR is understandable through structured, behavior-neutral commits.
@@ -4,10 +4,10 @@ go 1.25.0

 require (
 	github.com/adshao/go-binance/v2 v2.8.11
-	github.com/go-resty/resty/v2 v2.16.5
-	github.com/jedib0t/go-pretty/v6 v6.5.5
+	github.com/go-resty/resty/v2 v2.17.2
+	github.com/jedib0t/go-pretty/v6 v6.7.10
 	github.com/joho/godotenv v1.5.1
-	github.com/rs/zerolog v1.32.0
+	github.com/rs/zerolog v1.35.1
 	github.com/samber/lo v1.53.0
 	golang.org/x/text v0.36.0
 	gopkg.in/telebot.v3 v3.3.8
@@ -18,11 +18,11 @@ require (
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.15 // indirect
-	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/net v0.43.0 // indirect
+	golang.org/x/sys v0.35.0 // indirect
 )
@@ -99,7 +99,6 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -135,8 +134,8 @@ github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvSc
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM=
-github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA=
+github.com/go-resty/resty/v2 v2.17.2 h1:FQW5oHYcIlkCNrMD2lloGScxcHJ0gkjshV3qcQAyHQk=
+github.com/go-resty/resty/v2 v2.17.2/go.mod h1:kCKZ3wWmwJaNc7S29BRtUhJwy7iqmn+2mLtQrOyQlVA=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -257,8 +256,8 @@ github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpT
 github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/jedib0t/go-pretty/v6 v6.5.5 h1:PpIU8lOjxvVYGGKule0QxxJfNysUSbC9lggQU2cpZJc=
-github.com/jedib0t/go-pretty/v6 v6.5.5/go.mod h1:5LQIxa52oJ/DlDSLv0HEkWOFMDGoWkJb9ss5KqPpJBg=
+github.com/jedib0t/go-pretty/v6 v6.7.10 h1:B/2qW2Bkv2L6n14PP8o1kx75kWzHOQ3YTluWzg9icac=
+github.com/jedib0t/go-pretty/v6 v6.7.10/go.mod h1:YwC5CE4fJ1HFUDeivSV1r//AmANFHyqczZk+U6BDALU=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
@@ -294,20 +293,18 @@ github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
-github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
+github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
@@ -355,15 +352,15 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0=
-github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
+github.com/rs/zerolog v1.35.1 h1:m7xQeoiLIiV0BCEY4Hs+j2NG4Gp2o2KPKmhnnLiazKI=
+github.com/rs/zerolog v1.35.1/go.mod h1:EjML9kdfa/RMA7h/6z6pYmq1ykOuA8/mjWaEvGI+jcw=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sagikazarmark/crypt v0.6.0/go.mod h1:U8+INwJo3nBv1m6A/8OBXAq7Jnpspk5AxSgDyEQcea8=
 github.com/samber/lo v1.53.0 h1:t975lj2py4kJPQ6haz1QMgtId2gtmfktACxIXArw3HM=
@@ -394,8 +391,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -510,8 +507,8 @@ golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su
 golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
+golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -622,11 +619,9 @@ golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
+golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -643,8 +638,8 @@ golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
-golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
+golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -1,11 +1,21 @@
 package binance

 var SymbolPrefixList = []string{"1000000", "1000", "1M"}
+
+var SymbolSuffixList = []string{"USDT", "USDC", "FDUSD"}
+
 var SymbolSuffixMap = map[string]string{
-	"USDT": "",
-	"USDC": "c",
+	"USDT":  "",
+	"USDC":  "c",
+	"FDUSD": "fd",
 }

-var Future2SpotSymbolMap = map[string]string{
-	"LUNA2USDT": "LUNAUSDT",
+var QuotePriority = []string{"USDT", "USDC", "FDUSD"}
+
+var FutureToken2SpotTokenMap = map[string]string{
+	"LUNA2": "LUNA",
+}
+
+var SpotToken2FutureTokenMap = map[string]string{
+	"LUNA": "LUNA2",
 }
@@ -4,4 +4,5 @@ const (
 	LogEnv = "LOG_ENV"

 	TelegramToken = "TELEGRAM_TOKEN"
+	AdminChatID   = "ADMIN_CHAT_ID"
 )
@@ -8,7 +8,7 @@ const (

 var Token2StickerIdxMap = map[string]int{
 	"BNB": 3,
-	"TON": 7,
+	"TON": 5,
 }

 var Sticker2TokenMap = map[string]string{
@@ -4,6 +4,7 @@ import "me.thuanle/bbot/internal/data/market"

 type IMarket interface {
 	GetFuturePrice(symbol string) (float64, float64, int64, bool)
+	GetAllPremiumIndex() (map[string]market.PremiumIndex, error)
 	GetAllFundRate() (map[string]float64, map[string]int64)

 	GetSpotPrice(symbol string) (float64, bool)
@@ -12,4 +13,12 @@ type IMarket interface {
 	// Alpha token methods
 	IsAlphaToken(symbol string) bool
 	GetAlphaToken(symbol string) (market.AlphaTokenInfo, bool)
+	GetAlphaPrice(symbol string) (float64, bool)
+
+	// Trading pair methods
+	IsSpotPair(symbol string) bool
+	IsFuturesPair(symbol string) bool
+	GetSpotSymbolByToken(token string) (string, bool)
+	GetFutureSymbolByToken(token string) (string, bool)
+	RefreshTradingPairCache() error
 }
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"net/url"
 	"strconv"
 	"time"

@@ -54,10 +55,21 @@ type AlphaTokenInfo struct {

 // AlphaTokenResponse represents the API response structure
 type AlphaTokenResponse struct {
-	Code         string           `json:"code"`
-	Message      *string          `json:"message"`
+	Code          string           `json:"code"`
+	Message       *string          `json:"message"`
+	MessageDetail *string          `json:"messageDetail"`
+	Data          []AlphaTokenInfo `json:"data"`
+}
+
+type AlphaTickerData struct {
+	Price string `json:"price"`
+}
+
+type AlphaTickerResponse struct {
+	Code          string          `json:"code"`
+	Message       *string         `json:"message"`
 	MessageDetail *string         `json:"messageDetail"`
-	Data         []AlphaTokenInfo `json:"data"`
+	Data          AlphaTickerData `json:"data"`
 }

 // GetPrice returns the price as float64
@@ -150,3 +162,37 @@ func (ms *MarketData) IsAlphaToken(symbol string) bool {
 	_, exists := ms.GetAlphaToken(symbol)
 	return exists
 }
+
+func (ms *MarketData) GetAlphaPrice(symbol string) (float64, bool) {
+	const alphaTickerURL = "https://www.binance.com/bapi/defi/v1/public/alpha-trade/ticker"
+
+	client := &http.Client{Timeout: 5 * time.Second}
+	endpoint := alphaTickerURL + "?" + url.Values{"symbol": []string{symbol}}.Encode()
+
+	resp, err := client.Get(endpoint)
+	if err != nil {
+		log.Error().Err(err).Str("symbol", symbol).Msg("Failed to fetch Alpha ticker")
+		return 0, false
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return 0, false
+	}
+
+	var tickerResp AlphaTickerResponse
+	if err := json.NewDecoder(resp.Body).Decode(&tickerResp); err != nil {
+		return 0, false
+	}
+
+	if tickerResp.Code != "000000" {
+		return 0, false
+	}
+
+	price, err := strconv.ParseFloat(tickerResp.Data.Price, 64)
+	if err != nil || price <= 0 {
+		return 0, false
+	}
+
+	return price, true
+}
@@ -1,64 +0,0 @@
-package market
-
-import (
-	"github.com/adshao/go-binance/v2/futures"
-	"github.com/rs/zerolog/log"
-	"strconv"
-)
-
-func (ms *MarketData) GetFuturePrice(symbol string) (float64, float64, int64, bool) {
-	ms.mu.RLock()
-	defer ms.mu.RUnlock()
-	p, ok := ms.futureMarkPrice[symbol]
-	if !ok {
-		return 0, 0, 0, false
-	}
-	return p, ms.futureFundingRate[symbol], ms.futureNextFundingTime[symbol], true
-}
-
-func (ms *MarketData) StartFutureWsMarkPrice() error {
-	_, _, err := futures.WsAllMarkPriceServe(ms.futureWsMarkPriceHandler, ms.futureWsErrHandler)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (ms *MarketData) futureWsMarkPriceHandler(event futures.WsAllMarkPriceEvent) {
-	ms.mu.Lock()
-	defer ms.mu.Unlock()
-	for _, priceEvent := range event {
-		price, err := strconv.ParseFloat(priceEvent.MarkPrice, 64)
-		if err != nil {
-			continue
-		}
-
-		fundingRate, err := strconv.ParseFloat(priceEvent.FundingRate, 64)
-		if err != nil {
-			continue
-		}
-
-		ms.futureMarkPrice[priceEvent.Symbol] = price
-		ms.futureFundingRate[priceEvent.Symbol] = fundingRate
-		ms.futureNextFundingTime[priceEvent.Symbol] = priceEvent.NextFundingTime
-	}
-}
-
-func (ms *MarketData) futureWsErrHandler(err error) {
-	log.Debug().Err(err).Msg("Ws Error. Restart socket")
-	_ = ms.StartFutureWsMarkPrice()
-}
-
-func (ms *MarketData) GetAllFundRate() (map[string]float64, map[string]int64) {
-	ms.mu.RLock()
-	defer ms.mu.RUnlock()
-	rates := make(map[string]float64, len(ms.futureFundingRate))
-	for k, v := range ms.futureFundingRate {
-		rates[k] = v
-	}
-	times := make(map[string]int64, len(ms.futureNextFundingTime))
-	for k, v := range ms.futureNextFundingTime {
-		times[k] = v
-	}
-	return rates, times
-}
@@ -0,0 +1,65 @@
+package market
+
+import (
+	"context"
+	"strings"
+	"time"
+
+	"github.com/rs/zerolog/log"
+)
+
+func (ms *MarketData) refreshFuturePairCache() error {
+	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
+	defer cancel()
+
+	futuresInfo, err := ms.futuresClient.NewExchangeInfoService().Do(ctx)
+	if err != nil {
+		log.Error().Err(err).Msg("Failed to fetch futures exchange info")
+		return err
+	}
+
+	futurePairs := make(map[string]bool, len(futuresInfo.Symbols))
+	futureTokenCandidates := make(map[string][]string)
+	for _, s := range futuresInfo.Symbols {
+		if s.Status != "TRADING" {
+			continue
+		}
+		futurePairs[s.Symbol] = true
+		token := parseTokenFromSymbolByQuotePriority(s.Symbol)
+		if token == "" {
+			continue
+		}
+		token = futureCacheTokenKey(token)
+		futureTokenCandidates[token] = append(futureTokenCandidates[token], s.Symbol)
+	}
+
+	futureToken2Symbol := make(map[string]string, len(futureTokenCandidates))
+	for token, candidates := range futureTokenCandidates {
+		futureToken2Symbol[token] = selectCanonicalSymbolByQuotePriority(token, candidates)
+	}
+
+	ms.pairCacheMutex.Lock()
+	ms.futuresPairs = futurePairs
+	ms.futureToken2Symbol = futureToken2Symbol
+	ms.lastPairCacheUpdate = time.Now()
+	ms.pairCacheMutex.Unlock()
+
+	return nil
+}
+
+func futureCacheTokenKey(token string) string {
+	return strings.ToUpper(token)
+}
+
+func (ms *MarketData) IsFuturesPair(symbol string) bool {
+	ms.pairCacheMutex.RLock()
+	defer ms.pairCacheMutex.RUnlock()
+	return ms.futuresPairs[symbol]
+}
+
+func (ms *MarketData) GetFutureSymbolByToken(token string) (string, bool) {
+	ms.pairCacheMutex.RLock()
+	defer ms.pairCacheMutex.RUnlock()
+	sym, ok := ms.futureToken2Symbol[strings.ToUpper(token)]
+	return sym, ok
+}
@@ -0,0 +1,85 @@
+package market
+
+import (
+	"context"
+	"strconv"
+	"time"
+
+	"github.com/rs/zerolog/log"
+)
+
+func (ms *MarketData) GetFuturePrice(symbol string) (float64, float64, int64, bool) {
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	premiums, err := ms.futuresClient.NewPremiumIndexService().Symbol(symbol).Do(ctx)
+	if err != nil {
+		log.Error().Err(err).Str("symbol", symbol).Msg("Failed to fetch futures premium index")
+		return 0, 0, 0, false
+	}
+
+	if len(premiums) == 0 {
+		return 0, 0, 0, false
+	}
+
+	p := premiums[0]
+	markPrice, err := strconv.ParseFloat(p.MarkPrice, 64)
+	if err != nil {
+		return 0, 0, 0, false
+	}
+
+	fundingRate, err := strconv.ParseFloat(p.LastFundingRate, 64)
+	if err != nil {
+		fundingRate = 0
+	}
+
+	return markPrice, fundingRate, p.NextFundingTime, true
+}
+
+type PremiumIndex struct {
+	MarkPrice       float64
+	FundingRate     float64
+	NextFundingTime int64
+}
+
+func (ms *MarketData) GetAllPremiumIndex() (map[string]PremiumIndex, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	premiums, err := ms.futuresClient.NewPremiumIndexService().Do(ctx)
+	if err != nil {
+		log.Error().Err(err).Msg("Failed to fetch all futures premium index")
+		return nil, err
+	}
+
+	result := make(map[string]PremiumIndex, len(premiums))
+	for _, p := range premiums {
+		markPrice, err := strconv.ParseFloat(p.MarkPrice, 64)
+		if err != nil {
+			continue
+		}
+		rate, _ := strconv.ParseFloat(p.LastFundingRate, 64)
+		result[p.Symbol] = PremiumIndex{
+			MarkPrice:       markPrice,
+			FundingRate:     rate,
+			NextFundingTime: p.NextFundingTime,
+		}
+	}
+
+	return result, nil
+}
+
+func (ms *MarketData) GetAllFundRate() (map[string]float64, map[string]int64) {
+	all, err := ms.GetAllPremiumIndex()
+	if err != nil {
+		return make(map[string]float64), make(map[string]int64)
+	}
+
+	rates := make(map[string]float64, len(all))
+	times := make(map[string]int64, len(all))
+	for sym, p := range all {
+		rates[sym] = p.FundingRate
+		times[sym] = p.NextFundingTime
+	}
+	return rates, times
+}
@@ -4,47 +4,88 @@ import (
 	"sync"
 	"time"

+	"github.com/adshao/go-binance/v2"
+	"github.com/adshao/go-binance/v2/futures"
 	"github.com/rs/zerolog/log"
 )

 type MarketData struct {
-	mu                    sync.RWMutex
-	futureMarkPrice       map[string]float64
-	futureFundingRate     map[string]float64
-	futureNextFundingTime map[string]int64
-
-	spotPrice map[string]float64
+	// Trading pair caches
+	spotPairs           map[string]bool
+	futuresPairs        map[string]bool
+	spotToken2Symbol    map[string]string
+	futureToken2Symbol  map[string]string
+	pairCacheMutex      sync.RWMutex
+	lastPairCacheUpdate time.Time

 	// Alpha token cache
 	alphaTokens          map[string]AlphaTokenInfo
 	alphaCacheMutex      sync.RWMutex
 	lastAlphaCacheUpdate time.Time
+
+	// Binance REST clients
+	spotClient    *binance.Client
+	futuresClient *futures.Client
 }

 func NewMarketData() *MarketData {
 	log.Info().Msg("Start market service")
 	ms := &MarketData{
-		futureMarkPrice:       make(map[string]float64),
-		futureFundingRate:     make(map[string]float64),
-		futureNextFundingTime: make(map[string]int64),
-
-		spotPrice:   make(map[string]float64),
-		alphaTokens: make(map[string]AlphaTokenInfo),
+		spotPairs:          make(map[string]bool),
+		futuresPairs:       make(map[string]bool),
+		spotToken2Symbol:   make(map[string]string),
+		futureToken2Symbol: make(map[string]string),
+		alphaTokens:        make(map[string]AlphaTokenInfo),
+		spotClient:         binance.NewClient("", ""),
+		futuresClient:      futures.NewClient("", ""),
 	}
-	_ = ms.StartFutureWsMarkPrice()
-	_ = ms.StartSpotWsMarkPrice()

-	// Initialize Alpha token cache and refresh every hour
-	go ms.alphaCacheRefreshLoop()
+	ms.refreshAllCaches()
+	go ms.cacheRefreshLoop()

 	return ms
 }

-func (ms *MarketData) alphaCacheRefreshLoop() {
-	ms.refreshAlphaTokenCache()
+func (ms *MarketData) refreshTradingPairCache() error {
+	if err := ms.refreshSpotPairCache(); err != nil {
+		return err
+	}
+	if err := ms.refreshFuturePairCache(); err != nil {
+		return err
+	}
+
+	ms.pairCacheMutex.RLock()
+	spotCount := len(ms.spotPairs)
+	futureCount := len(ms.futuresPairs)
+	ms.pairCacheMutex.RUnlock()
+
+	log.Info().
+		Int("spot", spotCount).
+		Int("futures", futureCount).
+		Msg("Trading pair cache refreshed")
+
+	return nil
+}
+
+func (ms *MarketData) cacheRefreshLoop() {
+	ms.refreshAllCaches()
 	ticker := time.NewTicker(time.Hour)
 	defer ticker.Stop()
 	for range ticker.C {
-		ms.refreshAlphaTokenCache()
+		ms.refreshAllCaches()
 	}
 }
+
+func (ms *MarketData) refreshAllCaches() {
+	if err := ms.refreshSpotPairCache(); err != nil {
+		log.Error().Err(err).Msg("Failed spot pair refresh")
+	}
+	if err := ms.refreshFuturePairCache(); err != nil {
+		log.Error().Err(err).Msg("Failed futures pair refresh")
+	}
+	ms.refreshAlphaTokenCache()
+}
+
+func (ms *MarketData) RefreshTradingPairCache() error {
+	return ms.refreshTradingPairCache()
+}
@@ -0,0 +1,41 @@
+package market
+
+import "testing"
+
+func TestSelectCanonicalSymbolByQuotePriority(t *testing.T) {
+	pairs := []string{"DOGEFDUSD", "DOGEUSDC", "DOGEUSDT"}
+	got := selectCanonicalSymbolByQuotePriority("DOGE", pairs)
+	if got != "DOGEUSDT" {
+		t.Fatalf("expected DOGEUSDT, got %q", got)
+	}
+}
+
+func TestSelectCanonicalSymbolByQuotePriority_FallbackOrder(t *testing.T) {
+	pairs := []string{"DOGEFDUSD", "DOGEUSDC"}
+	got := selectCanonicalSymbolByQuotePriority("DOGE", pairs)
+	if got != "DOGEUSDC" {
+		t.Fatalf("expected DOGEUSDC, got %q", got)
+	}
+}
+
+func TestSelectCanonicalSymbolByQuotePriority_NoPreferredQuote(t *testing.T) {
+	pairs := []string{"DOGEBUSD"}
+	got := selectCanonicalSymbolByQuotePriority("DOGE", pairs)
+	if got != "DOGEBUSD" {
+		t.Fatalf("expected DOGEBUSD, got %q", got)
+	}
+}
+
+func TestFutureCacheTokenKey_PreservesRawFutureToken(t *testing.T) {
+	got := futureCacheTokenKey("LUNA2")
+	if got != "LUNA2" {
+		t.Fatalf("expected LUNA2, got %q", got)
+	}
+}
+
+func TestFutureCacheTokenKey_NoOverride(t *testing.T) {
+	got := futureCacheTokenKey("PEPE")
+	if got != "PEPE" {
+		t.Fatalf("expected PEPE, got %q", got)
+	}
+}
@@ -0,0 +1,103 @@
+package market
+
+import (
+	"context"
+	"sort"
+	"strings"
+	"time"
+
+	"github.com/rs/zerolog/log"
+	"me.thuanle/bbot/internal/configs/binance"
+)
+
+func (ms *MarketData) refreshSpotPairCache() error {
+	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
+	defer cancel()
+
+	spotInfo, err := ms.spotClient.NewExchangeInfoService().Do(ctx)
+	if err != nil {
+		log.Error().Err(err).Msg("Failed to fetch spot exchange info")
+		return err
+	}
+
+	spotPairs := make(map[string]bool, len(spotInfo.Symbols))
+	spotTokenCandidates := make(map[string][]string)
+	for _, s := range spotInfo.Symbols {
+		if s.Status != "TRADING" {
+			continue
+		}
+		spotPairs[s.Symbol] = true
+		token := parseTokenFromSymbolByQuotePriority(s.Symbol)
+		if token == "" {
+			continue
+		}
+		spotTokenCandidates[token] = append(spotTokenCandidates[token], s.Symbol)
+	}
+
+	spotToken2Symbol := make(map[string]string, len(spotTokenCandidates))
+	for token, candidates := range spotTokenCandidates {
+		spotToken2Symbol[token] = selectCanonicalSymbolByQuotePriority(token, candidates)
+	}
+
+	ms.pairCacheMutex.Lock()
+	ms.spotPairs = spotPairs
+	ms.spotToken2Symbol = spotToken2Symbol
+	ms.lastPairCacheUpdate = time.Now()
+	ms.pairCacheMutex.Unlock()
+
+	return nil
+}
+
+func parseTokenFromSymbolByQuotePriority(symbol string) string {
+	symbol = strings.ToUpper(symbol)
+	for _, quote := range binance.QuotePriority {
+		quote = strings.ToUpper(quote)
+		if strings.HasSuffix(symbol, quote) {
+			token := strings.TrimSuffix(symbol, quote)
+			if token != "" {
+				return token
+			}
+		}
+	}
+	return ""
+}
+
+func selectCanonicalSymbolByQuotePriority(token string, candidates []string) string {
+	if len(candidates) == 0 {
+		return ""
+	}
+	if len(candidates) == 1 {
+		return strings.ToUpper(candidates[0])
+	}
+
+	token = strings.ToUpper(token)
+	normalized := make([]string, 0, len(candidates))
+	for _, c := range candidates {
+		normalized = append(normalized, strings.ToUpper(c))
+	}
+
+	for _, quote := range binance.QuotePriority {
+		target := token + strings.ToUpper(quote)
+		for _, c := range normalized {
+			if c == target {
+				return c
+			}
+		}
+	}
+
+	sort.Strings(normalized)
+	return normalized[0]
+}
+
+func (ms *MarketData) IsSpotPair(symbol string) bool {
+	ms.pairCacheMutex.RLock()
+	defer ms.pairCacheMutex.RUnlock()
+	return ms.spotPairs[symbol]
+}
+
+func (ms *MarketData) GetSpotSymbolByToken(token string) (string, bool) {
+	ms.pairCacheMutex.RLock()
+	defer ms.pairCacheMutex.RUnlock()
+	sym, ok := ms.spotToken2Symbol[strings.ToUpper(token)]
+	return sym, ok
+}
@@ -1,54 +0,0 @@
-package market
-
-import (
-	"strconv"
-
-	"github.com/adshao/go-binance/v2"
-	"github.com/rs/zerolog/log"
-)
-
-func (ms *MarketData) GetSpotPrice(symbol string) (float64, bool) {
-	ms.mu.RLock()
-	p, ok := ms.spotPrice[symbol]
-	ms.mu.RUnlock()
-	if ok {
-		return p, true
-	}
-
-	// If not found, check if it's an Alpha token
-	if ms.IsAlphaToken(symbol) {
-		if alphaToken, exists := ms.GetAlphaToken(symbol); exists {
-			if price := alphaToken.GetPrice(); price > 0 {
-				return price, true
-			}
-		}
-	}
-
-	return 0, false
-}
-
-func (ms *MarketData) StartSpotWsMarkPrice() error {
-	_, _, err := binance.WsAllMarketsStatServe(ms.spotWsAllMarketsStatHandler, ms.spotWsErrHandler) //.WsAllMarkPriceServe(ms.futureWsMarkPriceHandler, ms.futureWsErrHandler)
-
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (ms *MarketData) spotWsAllMarketsStatHandler(event binance.WsAllMarketsStatEvent) {
-	ms.mu.Lock()
-	defer ms.mu.Unlock()
-	for _, priceEvent := range event {
-		price, err := strconv.ParseFloat(priceEvent.LastPrice, 64)
-		if err != nil {
-			continue
-		}
-		ms.spotPrice[priceEvent.Symbol] = price
-	}
-}
-
-func (ms *MarketData) spotWsErrHandler(err error) {
-	log.Debug().Err(err).Msg("Spot Ws Error. Restart socket")
-	_ = ms.StartSpotWsMarkPrice()
-}
@@ -0,0 +1,42 @@
+package market
+
+import (
+	"context"
+	"strconv"
+	"time"
+
+	"github.com/rs/zerolog/log"
+)
+
+func (ms *MarketData) GetSpotPrice(symbol string) (float64, bool) {
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	prices, err := ms.spotClient.NewListPricesService().Symbol(symbol).Do(ctx)
+	if err != nil {
+		log.Error().Err(err).Str("symbol", symbol).Msg("Failed to fetch spot price")
+		return ms.getAlphaPrice(symbol)
+	}
+
+	if len(prices) == 0 {
+		return ms.getAlphaPrice(symbol)
+	}
+
+	price, err := strconv.ParseFloat(prices[0].Price, 64)
+	if err != nil || price == 0 {
+		return ms.getAlphaPrice(symbol)
+	}
+
+	return price, true
+}
+
+func (ms *MarketData) getAlphaPrice(symbol string) (float64, bool) {
+	if ms.IsAlphaToken(symbol) {
+		if alphaToken, exists := ms.GetAlphaToken(symbol); exists {
+			if price := alphaToken.GetPrice(); price > 0 {
+				return price, true
+			}
+		}
+	}
+	return 0, false
+}
@@ -0,0 +1,68 @@
+package binancex
+
+import (
+	"strings"
+
+	"me.thuanle/bbot/internal/configs/binance"
+	"me.thuanle/bbot/internal/data"
+	"me.thuanle/bbot/internal/utils/stringx"
+)
+
+func Token2FutureSymbols(token string) []string {
+	if !stringx.IsAlphaNumeric(token) {
+		return nil
+	}
+
+	token = strings.ToUpper(token)
+	if mapped, ok := data.Market.GetFutureSymbolByToken(token); ok {
+		return []string{mapped}
+	}
+
+	if futureToken, ok := binance.SpotToken2FutureTokenMap[token]; ok {
+		if mapped, ok := data.Market.GetFutureSymbolByToken(strings.ToUpper(futureToken)); ok {
+			return []string{mapped}
+		}
+	}
+
+	return nil
+}
+
+func Token2SpotSymbols(token string) []string {
+	if !stringx.IsAlphaNumeric(token) {
+		return nil
+	}
+
+	token = strings.ToUpper(token)
+	if mapped, ok := data.Market.GetSpotSymbolByToken(token); ok {
+		return []string{mapped}
+	}
+
+	return nil
+}
+
+func Token2RelatedSpotSymbols(token string) []string {
+	token = strings.ToUpper(token)
+	seen := make(map[string]struct{}, 2)
+	spots := make([]string, 0, 2)
+
+	for _, futureSymbol := range Token2FutureSymbols(token) {
+		spotSymbol := Future2SpotSymbol(futureSymbol)
+		if _, ok := seen[spotSymbol]; ok {
+			continue
+		}
+		if data.Market.IsSpotPair(spotSymbol) {
+			seen[spotSymbol] = struct{}{}
+			spots = append(spots, spotSymbol)
+		}
+	}
+
+	for _, spotSymbol := range Token2SpotSymbols(token) {
+		if _, ok := seen[spotSymbol]; ok {
+			continue
+		}
+		seen[spotSymbol] = struct{}{}
+		spots = append(spots, spotSymbol)
+	}
+
+	return spots
+}
@@ -0,0 +1,202 @@
+package binancex
+
+import (
+	"strings"
+	"testing"
+
+	"me.thuanle/bbot/internal/configs/binance"
+	"me.thuanle/bbot/internal/data"
+	"me.thuanle/bbot/internal/data/market"
+)
+
+type resolverMarketStub struct {
+	alphaTokens  map[string]bool
+	spotPairs    map[string]bool
+	futuresPairs map[string]bool
+}
+
+func (m *resolverMarketStub) GetFuturePrice(symbol string) (float64, float64, int64, bool) {
+	return 0, 0, 0, false
+}
+func (m *resolverMarketStub) GetAllPremiumIndex() (map[string]market.PremiumIndex, error) {
+	return nil, nil
+}
+func (m *resolverMarketStub) GetAllFundRate() (map[string]float64, map[string]int64) { return nil, nil }
+func (m *resolverMarketStub) GetSpotPrice(symbol string) (float64, bool)             { return 0, false }
+func (m *resolverMarketStub) GetMarginInterestRates() map[string]float64             { return nil }
+func (m *resolverMarketStub) IsAlphaToken(symbol string) bool                        { return m.alphaTokens[symbol] }
+func (m *resolverMarketStub) GetAlphaToken(symbol string) (market.AlphaTokenInfo, bool) {
+	return market.AlphaTokenInfo{}, false
+}
+func (m *resolverMarketStub) GetAlphaPrice(symbol string) (float64, bool) { return 0, false }
+func (m *resolverMarketStub) IsSpotPair(symbol string) bool               { return m.spotPairs[symbol] }
+func (m *resolverMarketStub) IsFuturesPair(symbol string) bool            { return m.futuresPairs[symbol] }
+func (m *resolverMarketStub) GetSpotSymbolByToken(token string) (string, bool) {
+	token = strings.ToUpper(token)
+	for sym := range m.spotPairs {
+		if strings.ToUpper(Symbol2Token(sym)) == token {
+			return sym, true
+		}
+	}
+	return "", false
+}
+func (m *resolverMarketStub) GetFutureSymbolByToken(token string) (string, bool) {
+	token = strings.ToUpper(token)
+	for sym := range m.futuresPairs {
+		if strings.ToUpper(Symbol2Token(sym)) == token {
+			return sym, true
+		}
+	}
+	return "", false
+}
+func (m *resolverMarketStub) RefreshTradingPairCache() error { return nil }
+
+func withResolverMarketStub(t *testing.T, marketStub *resolverMarketStub) {
+	t.Helper()
+	orig := data.Market
+	data.Market = marketStub
+	t.Cleanup(func() { data.Market = orig })
+}
+
+func TestToken2FutureSymbols_ReturnsCanonicalFutureSymbol(t *testing.T) {
+	withResolverMarketStub(t, &resolverMarketStub{
+		futuresPairs: map[string]bool{
+			"1000PEPEUSDT": true,
+			"1000PEPEUSDC": true,
+		},
+	})
+
+	syms := Token2FutureSymbols("pepe")
+	if len(syms) != 1 || syms[0] != "1000PEPEUSDT" {
+		t.Fatalf("expected canonical [1000PEPEUSDT], got %+v", syms)
+	}
+}
+
+func TestToken2FutureSymbols_UsesCanonicalQuotePriority(t *testing.T) {
+	withResolverMarketStub(t, &resolverMarketStub{
+		futuresPairs: map[string]bool{
+			"1000PEPEUSDT": true,
+			"1000PEPEUSDC": true,
+			"PEPEUSDT":     true,
+			"PEPEUSDC":     true,
+		},
+	})
+
+	syms := Token2FutureSymbols("pepe")
+	if len(syms) != 1 || syms[0] != "1000PEPEUSDT" {
+		t.Fatalf("expected canonical [1000PEPEUSDT], got %+v", syms)
+	}
+}
+
+func TestToken2FutureSymbols_ResolvesUSDCAbbreviation(t *testing.T) {
+	withResolverMarketStub(t, &resolverMarketStub{
+		futuresPairs: map[string]bool{"PEPEUSDC": true},
+	})
+
+	syms := Token2FutureSymbols("pepec")
+	if len(syms) != 1 || syms[0] != "PEPEUSDC" {
+		t.Fatalf("expected [PEPEUSDC], got %+v", syms)
+	}
+}
+
+func TestSymbolSuffixListMatchesSymbolSuffixMap(t *testing.T) {
+	seen := make(map[string]struct{}, len(binance.SymbolSuffixList))
+	for _, suffix := range binance.SymbolSuffixList {
+		if _, ok := binance.SymbolSuffixMap[suffix]; !ok {
+			t.Fatalf("SymbolSuffixList contains %q missing from SymbolSuffixMap", suffix)
+		}
+		seen[suffix] = struct{}{}
+	}
+
+	for suffix := range binance.SymbolSuffixMap {
+		if _, ok := seen[suffix]; !ok {
+			t.Fatalf("SymbolSuffixMap contains %q missing from SymbolSuffixList", suffix)
+		}
+	}
+}
+
+func TestIsToken(t *testing.T) {
+	tests := []struct {
+		name       string
+		input      string
+		marketStub *resolverMarketStub
+		want       bool
+	}{
+		{
+			name:  "futures token resolution success",
+			input: "pepe",
+			marketStub: &resolverMarketStub{
+				futuresPairs: map[string]bool{"1000PEPEUSDT": true},
+			},
+			want: true,
+		},
+		{
+			name:  "alpha token fallback",
+			input: "alpha",
+			marketStub: &resolverMarketStub{
+				alphaTokens: map[string]bool{"ALPHA": true},
+			},
+			want: true,
+		},
+		{
+			name:  "spot only token fallback",
+			input: "abc",
+			marketStub: &resolverMarketStub{
+				spotPairs: map[string]bool{"ABCUSDT": true},
+			},
+			want: true,
+		},
+		{
+			name:       "non alphanumeric input",
+			input:      "bad!",
+			marketStub: &resolverMarketStub{},
+			want:       false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			withResolverMarketStub(t, tt.marketStub)
+
+			got := IsToken(tt.input)
+			if got != tt.want {
+				t.Fatalf("expected %v, got %v", tt.want, got)
+			}
+		})
+	}
+}
+
+func TestToken2SpotSymbols_DoesNotDependOnFutureMappings(t *testing.T) {
+	withResolverMarketStub(t, &resolverMarketStub{
+		futuresPairs: map[string]bool{"LUNA2USDT": true},
+		spotPairs:    map[string]bool{"LUNAUSDT": true},
+	})
+
+	spots := Token2SpotSymbols("luna2")
+	if len(spots) != 0 {
+		t.Fatalf("expected no direct spot symbols for LUNA2, got %+v", spots)
+	}
+}
+
+func TestToken2RelatedSpotSymbols_AppliesExplicitRemap(t *testing.T) {
+	withResolverMarketStub(t, &resolverMarketStub{
+		futuresPairs: map[string]bool{"LUNA2USDT": true},
+		spotPairs:    map[string]bool{"LUNAUSDT": true},
+	})
+
+	spots := Token2RelatedSpotSymbols("luna2")
+	if len(spots) != 1 || spots[0] != "LUNAUSDT" {
+		t.Fatalf("expected [LUNAUSDT], got %+v", spots)
+	}
+}
+
+func TestToken2SpotSymbols_SpotOnlyFallback(t *testing.T) {
+	withResolverMarketStub(t, &resolverMarketStub{
+		spotPairs: map[string]bool{"ABCUSDT": true},
+	})
+
+	spots := Token2SpotSymbols("abc")
+	if len(spots) != 1 || spots[0] != "ABCUSDT" {
+		t.Fatalf("expected [ABCUSDT], got %+v", spots)
+	}
+}
@@ -14,7 +14,8 @@ func Symbol2Token(sym string) string {
 	for _, prefix := range binance.SymbolPrefixList {
 		token, _ = strings.CutPrefix(token, prefix)
 	}
-	for suffix, abbr := range binance.SymbolSuffixMap {
+	for _, suffix := range binance.SymbolSuffixList {
+		abbr := binance.SymbolSuffixMap[suffix]
 		var f bool
 		token, f = stringx.ReplaceSuffix(token, suffix, abbr)
 		if f {
@@ -28,59 +29,14 @@ var (
 	checkingPrefixList = append(binance.SymbolPrefixList, "")
 )

-func testSym(sym string) bool {
-	_, _, _, test := data.Market.GetFuturePrice(sym)
-	return test
-}
-
-func Token2Symbols(token string) []string {
-	var syms []string
-	if !stringx.IsAlphaNumeric(token) {
-		return syms
-	}
-
-	token = strings.ToUpper(token)
-
-	for _, prefix := range checkingPrefixList {
-		prefix = strings.ToUpper(prefix)
-
-		s := prefix + token
-
-		//no suffix
-		if testSym(s) {
-			syms = append(syms, s)
-			continue
-		}
-
-		for suffix, abbr := range binance.SymbolSuffixMap {
-			suffix = strings.ToUpper(suffix)
-			abbr = strings.ToUpper(abbr)
-
-			//suffix
-			sym := s + suffix
-			if testSym(sym) {
-				syms = append(syms, sym)
-				continue
-			}
-
-			//suffix abbr
-			symAbr, found := stringx.ReplaceSuffix(s, abbr, suffix)
-			if found && testSym(symAbr) {
-				syms = append(syms, symAbr)
-				continue
-			}
-		}
-	}
-	return syms
-}
-
 func IsToken(s string) bool {
-	// First check regular symbols
-	if len(Token2Symbols(s)) > 0 {
+	if len(Token2FutureSymbols(s)) > 0 {
+		return true
+	}
+	if len(Token2SpotSymbols(s)) > 0 {
 		return true
 	}

-	// Then check Alpha tokens
 	s = strings.ToUpper(s)
 	return data.Market.IsAlphaToken(s)
 }
@@ -95,9 +51,9 @@ func Future2SpotSymbol(sym string) string {
 		}
 	}

-	spotSym, ok := binance.Future2SpotSymbolMap[sym]
-	if !ok {
-		return sym
+	token := Symbol2Token(sym)
+	if mapped, ok := binance.FutureToken2SpotTokenMap[token]; ok {
+		token = strings.ToUpper(mapped)
 	}
-	return spotSym
+	return token + "USDT"
 }
@@ -13,15 +13,19 @@ func GetTopPrices() ([]string, []float64, []float64) {
 	topPrice := make([]float64, n)
 	topRate := make([]float64, n)

+	all, err := data.Market.GetAllPremiumIndex()
+	if err != nil {
+		return topSym, topPrice, topRate
+	}
+
 	for i, sym := range strategy.TopPriceSymbols {
-		price, rate, _, ok := data.Market.GetFuturePrice(sym)
+		p, ok := all[sym]
 		if !ok {
 			continue
 		}
 		topSym[i] = sym
-		topPrice[i] = price
-		topRate[i] = rate
-
+		topPrice[i] = p.MarkPrice
+		topRate[i] = p.FundingRate
 	}
 	return topSym, topPrice, topRate
 }
@@ -16,6 +16,10 @@ var commandList = []telebot.Command{
 		Text:        "fee",
 		Description: "(f) - show top funding fee",
 	},
+	{
+		Text:        "refresh",
+		Description: "Refresh trading pair cache",
+	},
 }

 func setupCommands(b *telebot.Bot) error {
@@ -36,6 +40,7 @@ func setupCommands(b *telebot.Bot) error {
 	//info
 	b.Handle("/p", commands.OnGetTopPrices)
 	b.Handle("/fee", commands.OnGetTopFundingFee)
+	b.Handle("/refresh", commands.OnRefreshPairCache)

 	//any text
 	b.Handle(telebot.OnText, commands.OnChatHandler)
@@ -1,7 +1,12 @@
 package commands

 import (
+	"os"
+	"strconv"
+
 	"gopkg.in/telebot.v3"
+	"me.thuanle/bbot/internal/configs/key"
+	"me.thuanle/bbot/internal/data"
 	"me.thuanle/bbot/internal/services/controllers"
 	"me.thuanle/bbot/internal/services/tele/chat"
 	"me.thuanle/bbot/internal/services/tele/view"
@@ -16,3 +21,14 @@ func OnGetTopFundingFee(context telebot.Context) error {
 	fee, float64s, cds := controllers.GetTopFundingFee()
 	return chat.ReplyMessagePre(context, view.RenderOnGetTopFundingFeeMessage(fee, float64s, cds))
 }
+
+func OnRefreshPairCache(context telebot.Context) error {
+	adminID, err := strconv.ParseInt(os.Getenv(key.AdminChatID), 10, 64)
+	if err != nil || adminID == 0 || context.Sender().ID != adminID {
+		return nil
+	}
+	if err := data.Market.RefreshTradingPairCache(); err != nil {
+		return chat.ReplyMessage(context, "Failed to refresh trading pair cache")
+	}
+	return chat.ReplyMessage(context, "Trading pair cache refreshed")
+}
@@ -3,8 +3,6 @@ package commands
 import (
 	"strings"

-	"golang.org/x/text/language"
-	"golang.org/x/text/message"
 	"gopkg.in/telebot.v3"
 	"me.thuanle/bbot/internal/configs/tele"
 	"me.thuanle/bbot/internal/data"
@@ -13,7 +11,44 @@ import (
 	"me.thuanle/bbot/internal/services/tele/view"
 )

-var lastEthPrice float64
+type buildRichTokenMessageArgs struct {
+	Token string
+
+	HasSpot   bool
+	SpotPrice float64
+
+	HasFuture     bool
+	FuturePrice   float64
+	FundingRate   float64
+	FundingTimeMs int64
+
+	HasAlpha   bool
+	AlphaPrice float64
+
+	HasAlpha24h bool
+	Alpha24h    float64
+
+	HasMarginAPR     bool
+	MarginAPRPercent float64
+}
+
+func buildRichTokenMessageInput(a buildRichTokenMessageArgs) view.RichTokenMessageInput {
+	return view.RichTokenMessageInput{
+		Token:            a.Token,
+		HasSpot:          a.HasSpot,
+		SpotPrice:        a.SpotPrice,
+		HasFuture:        a.HasFuture,
+		FuturePrice:      a.FuturePrice,
+		FundingRate:      a.FundingRate,
+		FundingTimeMs:    a.FundingTimeMs,
+		HasAlpha:         a.HasAlpha,
+		AlphaPrice:       a.AlphaPrice,
+		HasAlpha24h:      a.HasAlpha24h,
+		Alpha24hChange:   a.Alpha24h,
+		HasMarginAPR:     a.HasMarginAPR,
+		MarginAPRPercent: a.MarginAPRPercent,
+	}
+}

 func showStickerMode(context telebot.Context, token string) {
 	token = strings.ToUpper(token)
@@ -27,86 +62,58 @@ func showStickerMode(context telebot.Context, token string) {
 	}
 }

+func collectRichTokenData(token string) buildRichTokenMessageArgs {
+	a := buildRichTokenMessageArgs{Token: token}
+
+	if alphaToken, ok := data.Market.GetAlphaToken(token); ok {
+		a.HasAlpha = true
+		a.HasAlpha24h = true
+		a.Alpha24h = alphaToken.GetPercentChange24h()
+		if alphaPrice, ok := data.Market.GetAlphaPrice(token + "USDT"); ok {
+			a.AlphaPrice = alphaPrice
+		} else {
+			a.AlphaPrice = alphaToken.GetPrice()
+		}
+	}
+
+	futureSymbols := binancex.Token2FutureSymbols(token)
+	for _, futureSymbol := range futureSymbols {
+		if fp, fr, ft, ok := data.Market.GetFuturePrice(futureSymbol); ok {
+			a.HasFuture = true
+			a.FuturePrice = fp
+			a.FundingRate = fr
+			a.FundingTimeMs = ft
+			break
+		}
+	}
+
+	spotSymbols := binancex.Token2RelatedSpotSymbols(token)
+	for _, spotSymbol := range spotSymbols {
+		if sp, ok := data.Market.GetSpotPrice(spotSymbol); ok {
+			a.HasSpot = true
+			a.SpotPrice = sp
+			break
+		}
+	}
+
+	marginRates := data.Market.GetMarginInterestRates()
+	a.MarginAPRPercent = marginRates[token] * 365 * 100
+	a.HasMarginAPR = marginRates[token] != 0
+
+	return a
+}
+
 func OnTokenInfoByToken(context telebot.Context, token string) error {
 	token = strings.ToUpper(token)
-
-	// Check if it's an Alpha token first
-	if data.Market.IsAlphaToken(token) {
-		showStickerMode(context, token)
-
-		if alphaToken, exists := data.Market.GetAlphaToken(token); exists {
-			sp := alphaToken.GetPrice()
-			change24h := alphaToken.GetPercentChange24h()
-			_ = chat.ReplyMessage(context, view.RenderOnAlphaPriceMessage(token, sp, change24h))
-		}
-		return nil
-	}
-
-	// Regular token handling
-	symbols := binancex.Token2Symbols(token)
-	if len(symbols) == 0 {
-		return nil
-	}
-
 	showStickerMode(context, token)

-	fp, fundRate, fundTime, ok := data.Market.GetFuturePrice(symbols[0])
-	marginRates := data.Market.GetMarginInterestRates()
-	tokenInterestRate := marginRates[token]
-	if !ok {
+	args := collectRichTokenData(token)
+	if !args.HasSpot && !args.HasFuture && !args.HasAlpha {
 		return nil
 	}
-	sSymbol := binancex.Future2SpotSymbol(symbols[0])
-	sp, _ := data.Market.GetSpotPrice(sSymbol)

-	_ = chat.ReplyMessage(context, view.RenderOnPriceMessage(symbols[0], sp, fp, fundRate, fundTime, tokenInterestRate))
-	if strings.ToUpper(token) == "ETH" {
-		mFmt := message.NewPrinter(language.AmericanEnglish)
-		realAmount := 35.
-		trangBucAmount := 14.
-		basePrice := 2500.0
-		baseTotal := realAmount * basePrice
-		trangBucTotal := trangBucAmount * basePrice
-		realCurTotal := realAmount * sp
-		trangBucCurTotal := trangBucAmount * sp
-
-		lastDelta := ""
-		if lastEthPrice == 0 {
-			lastEthPrice = sp
-		} else {
-			lastDelta = mFmt.Sprintf(
-				"Δ price: $%+.0f\n"+
-					"Δ Usdt: $%+.0f\n",
-				sp-lastEthPrice,
-				(sp-lastEthPrice)*realAmount,
-			)
-			lastEthPrice = sp
-		}
-
-		msg := mFmt.Sprintf(
-			"🎉🎊🎊🦈🦈🦈  @th13vn Real 🦈🦈🦈🎊🎊🎉\n"+
-				"∑ USDT: $%.0f\n"+
-				"Lợi nhuận: $%.0f\n"+
-				"%s\n"+
-				"\n"+
-				"🚀🚀🚀🚀🚀 Road to 5k 🚀🚀🚀🚀🚀: \n"+
-				"- Δ Price:  $%0.0f\n"+
-				"- Δ Vol:    $%0.0f\n"+
-				"\n"+
-				"💸💸💸💸💸 Trang Bức balance 💸💸💸💸💸\n"+
-				"∑ USDT: $%.0f\n"+
-				"Lợi nhuận: $%.0f\n",
-			realCurTotal,
-			realCurTotal-baseTotal,
-			lastDelta,
-			5000-sp,
-			5000*realAmount-realCurTotal,
-			trangBucCurTotal,
-			trangBucCurTotal-trangBucTotal,
-		)
-
-		_ = chat.ReplyMessage(context, msg)
-	}
+	msg := view.RenderRichTokenMessage(buildRichTokenMessageInput(args))
+	_ = chat.ReplyMessage(context, msg)
 	return nil
 }

@@ -0,0 +1,243 @@
+package commands
+
+import (
+	"strings"
+	"testing"
+
+	"me.thuanle/bbot/internal/data"
+	"me.thuanle/bbot/internal/data/market"
+	"me.thuanle/bbot/internal/helper/binancex"
+)
+
+func TestBuildRichTokenMessageInput_AllSources(t *testing.T) {
+	in := buildRichTokenMessageInput(buildRichTokenMessageArgs{
+		Token:            "ETH",
+		SpotPrice:        3245,
+		HasSpot:          true,
+		FuturePrice:      3251,
+		FundingRate:      0.000123,
+		FundingTimeMs:    1740000000000,
+		HasFuture:        true,
+		AlphaPrice:       3248,
+		HasAlpha:         true,
+		Alpha24h:         -3.21,
+		HasAlpha24h:      true,
+		MarginAPRPercent: 7.665,
+		HasMarginAPR:     true,
+	})
+
+	if !in.HasSpot || !in.HasFuture || !in.HasAlpha || !in.HasAlpha24h || !in.HasMarginAPR {
+		t.Fatalf("expected all source flags true: %+v", in)
+	}
+}
+
+func TestBuildRichTokenMessageInput_OnlyAlpha(t *testing.T) {
+	in := buildRichTokenMessageInput(buildRichTokenMessageArgs{
+		Token:       "ABC",
+		HasAlpha:    true,
+		AlphaPrice:  0.1234,
+		HasAlpha24h: true,
+		Alpha24h:    12.4,
+	})
+
+	if !in.HasAlpha || !in.HasAlpha24h {
+		t.Fatalf("expected alpha flags true: %+v", in)
+	}
+	if in.HasSpot || in.HasFuture {
+		t.Fatalf("did not expect spot/future flags true: %+v", in)
+	}
+}
+
+type marketStub struct {
+	spotPairs    map[string]bool
+	futuresPairs map[string]bool
+	spotPrices   map[string]float64
+	futurePrices map[string]struct {
+		price float64
+		rate  float64
+		time  int64
+	}
+	alphaTokens map[string]market.AlphaTokenInfo
+	alphaPrices map[string]float64
+	marginRates map[string]float64
+}
+
+func (m *marketStub) GetFuturePrice(symbol string) (float64, float64, int64, bool) {
+	v, ok := m.futurePrices[symbol]
+	if !ok {
+		return 0, 0, 0, false
+	}
+	return v.price, v.rate, v.time, true
+}
+func (m *marketStub) GetAllPremiumIndex() (map[string]market.PremiumIndex, error) { return nil, nil }
+func (m *marketStub) GetAllFundRate() (map[string]float64, map[string]int64)      { return nil, nil }
+func (m *marketStub) GetSpotPrice(symbol string) (float64, bool) {
+	v, ok := m.spotPrices[symbol]
+	return v, ok
+}
+func (m *marketStub) GetMarginInterestRates() map[string]float64 { return m.marginRates }
+func (m *marketStub) IsAlphaToken(symbol string) bool {
+	_, ok := m.alphaTokens[symbol]
+	return ok
+}
+func (m *marketStub) GetAlphaToken(symbol string) (market.AlphaTokenInfo, bool) {
+	v, ok := m.alphaTokens[symbol]
+	return v, ok
+}
+func (m *marketStub) GetAlphaPrice(symbol string) (float64, bool) {
+	v, ok := m.alphaPrices[symbol]
+	return v, ok
+}
+func (m *marketStub) IsSpotPair(symbol string) bool    { return m.spotPairs[symbol] }
+func (m *marketStub) IsFuturesPair(symbol string) bool { return m.futuresPairs[symbol] }
+func (m *marketStub) GetSpotSymbolByToken(token string) (string, bool) {
+	token = strings.ToUpper(token)
+	for symbol := range m.spotPairs {
+		if binancex.Symbol2Token(symbol) == token {
+			return symbol, true
+		}
+	}
+	return "", false
+}
+func (m *marketStub) GetFutureSymbolByToken(token string) (string, bool) {
+	token = strings.ToUpper(token)
+	for symbol := range m.futuresPairs {
+		if binancex.Symbol2Token(symbol) == token {
+			return symbol, true
+		}
+	}
+	return "", false
+}
+func (m *marketStub) RefreshTradingPairCache() error { return nil }
+
+func TestCollectRichTokenData_SpotOnlyReachable(t *testing.T) {
+	orig := data.Market
+	defer func() { data.Market = orig }()
+
+	data.Market = &marketStub{
+		spotPairs:  map[string]bool{"ABCUSDT": true},
+		spotPrices: map[string]float64{"ABCUSDT": 1.23},
+	}
+
+	args := collectRichTokenData("ABC")
+	if !args.HasSpot {
+		t.Fatalf("expected spot to be reachable for spot-only token: %+v", args)
+	}
+	if args.HasFuture || args.HasAlpha {
+		t.Fatalf("did not expect future/alpha for spot-only token: %+v", args)
+	}
+}
+
+func TestCollectRichTokenData_FutureFailureStillKeepsSpot(t *testing.T) {
+	orig := data.Market
+	defer func() { data.Market = orig }()
+
+	data.Market = &marketStub{
+		spotPairs: map[string]bool{
+			"ETHUSDT": true,
+		},
+		futuresPairs: map[string]bool{
+			"ETHUSDT": true,
+		},
+		spotPrices: map[string]float64{
+			"ETHUSDT": 3245,
+		},
+		futurePrices: map[string]struct {
+			price float64
+			rate  float64
+			time  int64
+		}{},
+	}
+
+	args := collectRichTokenData("ETH")
+	if !args.HasSpot {
+		t.Fatalf("expected spot to remain available when future lookup fails: %+v", args)
+	}
+	if args.HasFuture {
+		t.Fatalf("did not expect future when future lookup fails: %+v", args)
+	}
+}
+
+func TestCollectRichTokenData_UsesSharedResolverMapping(t *testing.T) {
+	orig := data.Market
+	defer func() { data.Market = orig }()
+
+	data.Market = &marketStub{
+		spotPairs: map[string]bool{
+			"LUNAUSDT": true,
+		},
+		futuresPairs: map[string]bool{
+			"LUNA2USDT": true,
+		},
+		spotPrices: map[string]float64{
+			"LUNAUSDT": 0.49,
+		},
+		futurePrices: map[string]struct {
+			price float64
+			rate  float64
+			time  int64
+		}{
+			"LUNA2USDT": {price: 0.50, rate: 0.0001, time: 1740000000000},
+		},
+	}
+
+	args := collectRichTokenData("LUNA2")
+	if !args.HasFuture || !args.HasSpot {
+		t.Fatalf("expected both future and mapped spot, got %+v", args)
+	}
+	if args.SpotPrice != 0.49 {
+		t.Fatalf("expected mapped spot price 0.49, got %f", args.SpotPrice)
+	}
+}
+
+func TestCollectRichTokenData_PrefixFutureMapsToSpot(t *testing.T) {
+	orig := data.Market
+	defer func() { data.Market = orig }()
+
+	data.Market = &marketStub{
+		spotPairs: map[string]bool{
+			"PEPEUSDT": true,
+		},
+		futuresPairs: map[string]bool{
+			"1000PEPEUSDT": true,
+		},
+		spotPrices: map[string]float64{
+			"PEPEUSDT": 0.000012,
+		},
+		futurePrices: map[string]struct {
+			price float64
+			rate  float64
+			time  int64
+		}{
+			"1000PEPEUSDT": {price: 0.000013, rate: 0.0002, time: 1740000000000},
+		},
+	}
+
+	args := collectRichTokenData("PEPE")
+	if !args.HasFuture || !args.HasSpot {
+		t.Fatalf("expected both future and mapped spot for prefixed contract, got %+v", args)
+	}
+}
+
+func TestCollectRichTokenData_AlphaUsesSymbolPrice(t *testing.T) {
+	orig := data.Market
+	defer func() { data.Market = orig }()
+
+	data.Market = &marketStub{
+		alphaTokens: map[string]market.AlphaTokenInfo{
+			"ABC": {Symbol: "ABC", PercentChange24h: "12.4", Price: "0.1"},
+		},
+		alphaPrices: map[string]float64{"ABCUSDT": 0.1234},
+	}
+
+	args := collectRichTokenData("ABC")
+	if !args.HasAlpha {
+		t.Fatalf("expected alpha to be available: %+v", args)
+	}
+	if !args.HasAlpha24h {
+		t.Fatalf("expected alpha 24h to be available: %+v", args)
+	}
+	if args.AlphaPrice != 0.1234 {
+		t.Fatalf("expected alpha price from symbol lookup, got %.4f", args.AlphaPrice)
+	}
+}
@@ -2,13 +2,16 @@ package view

 import (
 	"fmt"
+	"math"
+	"strings"
+	"time"
+
 	"github.com/jedib0t/go-pretty/v6/table"
 	"golang.org/x/text/language"
 	"golang.org/x/text/message"
 	"me.thuanle/bbot/internal/helper/binancex"
 	"me.thuanle/bbot/internal/services/tele/view/helper"
 	"me.thuanle/bbot/internal/utils/timex"
-	"time"
 )

 func RenderPrice(price float64) string {
@@ -63,6 +66,73 @@ func RenderOnAlphaPriceMessage(symbol string, price float64, change24h float64)
 	)
 }

+type RichTokenMessageInput struct {
+	Token string
+
+	HasSpot   bool
+	SpotPrice float64
+
+	HasFuture     bool
+	FuturePrice   float64
+	FundingRate   float64
+	FundingTimeMs int64
+
+	HasAlpha   bool
+	AlphaPrice float64
+
+	HasAlpha24h    bool
+	Alpha24hChange float64
+
+	HasMarginAPR     bool
+	MarginAPRPercent float64
+}
+
+func RenderRichTokenMessage(in RichTokenMessageInput) string {
+	rows := []string{fmt.Sprintf("🪙 %s", strings.ToUpper(in.Token))}
+
+	if in.HasSpot {
+		rows = append(rows, fmt.Sprintf("💵 Spot: $%s", RenderPrice(in.SpotPrice)))
+	}
+	if in.HasFuture {
+		rows = append(rows, fmt.Sprintf("📈 Future: $%s", RenderPrice(in.FuturePrice)))
+	}
+	if in.HasAlpha {
+		rows = append(rows, fmt.Sprintf("🅰️ Alpha: $%s", RenderPrice(in.AlphaPrice)))
+	}
+
+	if in.HasSpot && in.HasFuture && in.SpotPrice > 0 {
+		delta := in.FuturePrice - in.SpotPrice
+		deltaPct := delta / in.SpotPrice * 100
+		sign := "+"
+		if delta < 0 {
+			sign = "-"
+		}
+		rows = append(rows, fmt.Sprintf("🧭 Basis: %s$%s (%+.2f%%)", sign, RenderPrice(math.Abs(delta)), deltaPct))
+	}
+
+	if in.HasFuture {
+		rows = append(rows, fmt.Sprintf("💸 Funding: %.4f%% %s in %s",
+			in.FundingRate*100,
+			IconOfFundingFeeDirection(in.FundingRate),
+			timex.CdMinuteStringTime(time.UnixMilli(in.FundingTimeMs)),
+		))
+	}
+
+	if in.HasMarginAPR {
+		rows = append(rows, fmt.Sprintf("🏦 Margin: %.3f%% APR", in.MarginAPRPercent))
+	}
+
+	if in.HasAlpha24h {
+		icon := "🟢"
+		if in.Alpha24hChange < 0 {
+			icon = "🔴"
+		}
+		rows = append(rows, fmt.Sprintf("📊 Alpha 24h: %s%+.2f%%", icon, in.Alpha24hChange))
+	}
+
+	return strings.Join(rows, "\n")
+}
+
 func RenderOnGetTopPricesMessage(symbols []string, price []float64, fundRate []float64) string {
 	t := helper.NewNoBorderTableWriter("", "Price", "Fund")
 	mFmt := message.NewPrinter(language.AmericanEnglish)
@@ -0,0 +1,137 @@
+package view
+
+import (
+	"strings"
+	"testing"
+)
+
+func assertContainsAll(t *testing.T, msg string, rows ...string) {
+	t.Helper()
+	for _, r := range rows {
+		if !strings.Contains(msg, r) {
+			t.Fatalf("expected row %q in message:\n%s", r, msg)
+		}
+	}
+}
+
+func assertContainsNone(t *testing.T, msg string, rows ...string) {
+	t.Helper()
+	for _, r := range rows {
+		if strings.Contains(msg, r) {
+			t.Fatalf("unexpected row %q in message:\n%s", r, msg)
+		}
+	}
+}
+
+func TestRenderRichTokenMessage_AllSources(t *testing.T) {
+	msg := RenderRichTokenMessage(RichTokenMessageInput{
+		Token:            "ETH",
+		HasSpot:          true,
+		SpotPrice:        3245,
+		HasFuture:        true,
+		FuturePrice:      3251,
+		FundingRate:      0.000123,
+		FundingTimeMs:    1740000000000,
+		HasAlpha:         true,
+		AlphaPrice:       3248,
+		HasAlpha24h:      true,
+		Alpha24hChange:   -3.21,
+		HasMarginAPR:     true,
+		MarginAPRPercent: 7.665,
+	})
+
+	expectedOrder := []string{
+		"🪙 ETH",
+		"💵 Spot:",
+		"📈 Future:",
+		"🅰️ Alpha:",
+		"🧭 Basis:",
+		"💸 Funding:",
+		"🏦 Margin:",
+		"📊 Alpha 24h:",
+	}
+
+	last := -1
+	for _, part := range expectedOrder {
+		i := strings.Index(msg, part)
+		if i == -1 {
+			t.Fatalf("missing row %q in message:\n%s", part, msg)
+		}
+		if i < last {
+			t.Fatalf("row %q appears out of order in message:\n%s", part, msg)
+		}
+		last = i
+	}
+}
+
+func TestRenderRichTokenMessage_FutureOnly(t *testing.T) {
+	msg := RenderRichTokenMessage(RichTokenMessageInput{
+		Token:            "ABC",
+		HasFuture:        true,
+		FuturePrice:      1234,
+		FundingRate:      0.000081,
+		FundingTimeMs:    1740000000000,
+		HasMarginAPR:     true,
+		MarginAPRPercent: 6.2,
+	})
+
+	assertContainsAll(t, msg, "🪙 ABC", "📈 Future:", "💸 Funding:", "🏦 Margin:")
+	assertContainsNone(t, msg, "💵 Spot:", "🅰️ Alpha:", "🧭 Basis:", "📊 Alpha 24h:")
+}
+
+func TestRenderRichTokenMessage_SpotOnly(t *testing.T) {
+	msg := RenderRichTokenMessage(RichTokenMessageInput{
+		Token:            "XRP",
+		HasSpot:          true,
+		SpotPrice:        2.1,
+		HasMarginAPR:     true,
+		MarginAPRPercent: 5.11,
+	})
+
+	assertContainsAll(t, msg, "🪙 XRP", "💵 Spot:", "🏦 Margin:")
+	assertContainsNone(t, msg, "📈 Future:", "🅰️ Alpha:", "🧭 Basis:", "💸 Funding:", "📊 Alpha 24h:")
+}
+
+func TestRenderRichTokenMessage_AlphaOnly(t *testing.T) {
+	msg := RenderRichTokenMessage(RichTokenMessageInput{
+		Token:          "ABC",
+		HasAlpha:       true,
+		AlphaPrice:     0.1234,
+		HasAlpha24h:    true,
+		Alpha24hChange: 12.4,
+	})
+
+	assertContainsAll(t, msg, "🪙 ABC", "🅰️ Alpha:", "📊 Alpha 24h:")
+	assertContainsNone(t, msg, "💵 Spot:", "📈 Future:", "🧭 Basis:", "💸 Funding:", "🏦 Margin:")
+}
+
+func TestRenderRichTokenMessage_SpotAndFuture(t *testing.T) {
+	msg := RenderRichTokenMessage(RichTokenMessageInput{
+		Token:            "SOL",
+		HasSpot:          true,
+		SpotPrice:        182.4,
+		HasFuture:        true,
+		FuturePrice:      183.0,
+		FundingRate:      -0.000041,
+		FundingTimeMs:    1740000000000,
+		HasMarginAPR:     true,
+		MarginAPRPercent: 5.11,
+	})
+
+	assertContainsAll(t, msg, "🪙 SOL", "💵 Spot:", "📈 Future:", "🧭 Basis: +$0.6000", "💸 Funding:", "🏦 Margin:")
+	assertContainsNone(t, msg, "🅰️ Alpha:", "📊 Alpha 24h:")
+}
+
+func TestRenderRichTokenMessage_SpotAndFutureNegativeBasis(t *testing.T) {
+	msg := RenderRichTokenMessage(RichTokenMessageInput{
+		Token:         "ADA",
+		HasSpot:       true,
+		SpotPrice:     1.2,
+		HasFuture:     true,
+		FuturePrice:   1.1,
+		FundingRate:   0.000011,
+		FundingTimeMs: 1740000000000,
+	})
+
+	assertContainsAll(t, msg, "🧭 Basis: -$0.10000 (-8.33%)")
+}
@@ -1 +0,0 @@
-go run cmd/tele/main.go                                                                                                                                                                                                                                                                                  ─╯
Author	SHA1	Message	Date
renovatebot	0583f90e82	fix(deps): update module github.com/rs/zerolog to v1.35.1	2026-05-02 17:00:56 +00:00
thuanle	0a1a61d8d3	update sticker id Build Docker Image / build (amd64) (push) Successful in 1m3s Details	2026-04-27 10:08:37 +07:00
thuanle	5912157ed1	Merge branch 'main' of ssh://git.thuanle.me:2222/public/crypto-price-bot Build Docker Image / build (amd64) (push) Failing after 32s Details	2026-04-27 09:59:13 +07:00
thuanle	c5ff494e13	Merge pull request 'refactor: standardize market file naming by data dimension' (#27 ) from worktree-issue-26-go-filename-consistency into main Build Docker Image / build (amd64) (push) Successful in 1m38s Details Reviewed-on: #27	2026-04-27 09:53:34 +07:00
thuanle	617b067203	chore: address review for market filename refactor Rename pair tests to match post-refactor boundaries and remove unused alpha cache refresh helper. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-27 09:51:24 +07:00
thuanle	f5e2e178e1	refactor: standardize market filenames by data dimension Split market pair logic into spot and futures files and rename price files to plural data-dimension names without changing behavior. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-27 07:04:37 +07:00
thuanle	bc99d40713	docs: broaden spec to repo-wide go filename consistency Update issue #26 design scope from market-only to repository-wide .go filename refactor while keeping behavior unchanged. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-27 05:14:49 +07:00
thuanle	8010a00e4d	docs: add market filename refactor design spec Capture approved design for issue #26 to standardize market package filenames by data dimension without behavior changes. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-27 05:12:35 +07:00
thuanle	259a630b78	giảm file	2026-04-27 05:03:05 +07:00
thuanle	f64a3521c4	remove redundant file	2026-04-27 05:03:05 +07:00
thuanle	635b0c5b39	Merge pull request 'fix: recognize spot-only tokens in IsToken' (#25 ) from fix/issue-24-is-token-spot-only into main Build Docker Image / build (amd64) (push) Successful in 1m1s Details Reviewed-on: #25	2026-04-27 05:00:41 +07:00
thuanle	d6338fa092	fix: preserve futures token identity in canonical cache Keep futureToken2Symbol keyed by raw futures token and use explicit spot-to-future alias mapping during resolver fallback lookups. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-27 04:53:54 +07:00
thuanle	711721c1ee	refactor: use canonical token-to-symbol maps for market lookup Build canonical spot/future token maps with quote priority, unify cache refresh scheduling, and switch resolver/token tests to map-based token lookups. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-27 04:44:30 +07:00
thuanle	06c40ef30f	refactor: separate direct and related spot resolvers Keep IsToken checks explicit across futures and direct spot symbols, move futures-derived spot mapping to a clearly named helper, and update token data collection to use related spot resolution. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-27 04:10:06 +07:00
thuanle	0705e909dc	fix: recognize spot-only tokens in IsToken Gate token detection via spot symbol resolution so chat flow accepts spot-only tokens, and add regression coverage for the fallback path. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-27 03:59:32 +07:00
thuanle	72bbe66c3e	Merge pull request 'Refactor Binance symbol resolver' (#23 ) from binance-symbol-resolver-refactor into main Build Docker Image / build (amd64) (push) Successful in 1m39s Details Reviewed-on: #23 Reviewed-by: claudecode <38+claudecode@noreply.localhost>	2026-04-27 03:54:01 +07:00
thuanle	252e77c000	test binance symbol resolver	2026-04-27 03:46:46 +07:00
thuanle	2c5a9e23bf	refactor binance symbol resolver	2026-04-27 03:32:59 +07:00
thuanle	47d07f2092	style: fix gofmt alignment in resolver_test.go stub Build Docker Image / build (amd64) (push) Successful in 1m3s Details Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-26 21:15:53 +07:00
thuanle	72fdb598af	fix: resolve shared symbol mapping for token command (#22 ) Build Docker Image / build (amd64) (push) Successful in 1m36s Details Co-authored-by: thuanle <tl@thuanle.me> Co-committed-by: thuanle <tl@thuanle.me>	2026-04-26 21:13:06 +07:00
thuanle	1486681ef9	Merge pull request 'fix: independent token source lookups' (#19 ) from feat/token-message-rich into main Build Docker Image / build (amd64) (push) Successful in 2m10s Details	2026-04-26 18:51:17 +07:00
thuanle	a4644f5982	Merge branch 'main' into feat/token-message-rich	2026-04-26 18:39:53 +07:00
thuanle	82b0f2f1a8	feat: fetch alpha price by symbol ticker Keep alpha token existence from list cache and fetch live alpha price via symbol ticker endpoint for richer token response accuracy. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-26 18:22:48 +07:00
thuanle	6e8a2e8f68	fix: decouple token spot/future/alpha lookups Collect token market data independently for spot, futures, and alpha so any available source can be rendered even if others fail. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-26 18:13:13 +07:00
thuanle	194a235065	docs: document required environment variables Build Docker Image / build (amd64) (push) Successful in 59s Details Expand README with env setup, required TELEGRAM_TOKEN, optional LOG_ENV and ADMIN_CHAT_ID, plus run notes. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-26 17:50:41 +07:00
thuanle	c841ca4421	Merge pull request 'Add rich unified token price message' (#17 ) from feat/token-message-rich into main Build Docker Image / build (amd64) (push) Successful in 1m2s Details	2026-04-26 17:41:17 +07:00
thuanle	95e9217ef4	fix: render basis with explicit sign and absolute delta Format basis row as +/-$abs(delta) to match the spec and avoid awkward %+s formatting behavior. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-26 17:39:57 +07:00
thuanle	88de029e14	feat: unify token message composition across sources Remove alpha-first early return and build one rich message from all available sources (spot/future/alpha) with conditional rows. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-26 17:19:59 +07:00
thuanle	2f875032f6	feat: add rich token message renderer with conditional rows Introduce unified rich token message rendering with fixed row order and conditional visibility based on available sources. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-26 17:18:34 +07:00
thuanle	b376eba674	Ignore local worktree directory Add .worktrees to gitignore to prevent worktree contents from being tracked in the repository. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-26 17:14:52 +07:00
thuanle	e565503f24	Add rich token message design spec Document unified Telegram token message format that includes all available sources (spot/future/alpha) with conditional rows. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-26 17:09:23 +07:00
thuanle	77036f2211	Merge pull request 'Update module github.com/jedib0t/go-pretty/v6 to v6.7.10' (#14 ) from renovate/github.com-jedib0t-go-pretty-v6-6.x into main Build Docker Image / build (amd64) (push) Successful in 1m11s Details	2026-04-26 16:52:45 +07:00
renovatebot	d13c76a93d	Update module github.com/jedib0t/go-pretty/v6 to v6.7.10	2026-04-26 16:52:29 +07:00
thuanle	cdd5f8d4af	Merge pull request 'Update module github.com/go-resty/resty/v2 to v2.17.2' (#13 ) from renovate/github.com-go-resty-resty-v2-2.x into main Build Docker Image / build (amd64) (push) Successful in 2m16s Details	2026-04-26 16:51:22 +07:00
renovatebot	93b6c42842	Update module github.com/go-resty/resty/v2 to v2.17.2	2026-04-26 16:49:28 +07:00
thuanle	ee6c181cd6	Merge pull request 'Remove ETH special portfolio tracking' (#16 ) from chore/remove-eth-special-case into main Build Docker Image / build (amd64) (push) Successful in 1m0s Details Reviewed-on: #16	2026-04-26 16:45:36 +07:00
thuanle	4cab108549	Merge branch 'main' into chore/remove-eth-special-case	2026-04-26 16:45:27 +07:00
thuanle	733cf48e41	Merge pull request 'Rewrite price lookup from WebSocket to REST API' (#15 ) from feat/rest-price-lookup into main Build Docker Image / build (amd64) (push) Successful in 1m37s Details Reviewed-on: #15	2026-04-26 16:19:28 +07:00
thuanle	914beea5ce	Address PR #15 round 2: fail-closed admin guard, sync init, error reporting 1. /refresh now fail-closed: rejects all if ADMIN_CHAT_ID unset or invalid 2. Initial pair cache fill is synchronous — bot waits before accepting queries 3. /refresh reports failure when API fetch fails instead of always saying success Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-26 16:03:22 +07:00
thuanle	c7128ff516	Address PR #15 review: batch API calls and admin-guard /refresh 1. Add GetAllPremiumIndex() to fetch all futures data in one call, used by GetTopPrices instead of per-symbol sequential calls. 2. Add ADMIN_CHAT_ID env check to /refresh command to restrict access to authorized users only. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-26 15:40:00 +07:00
thuanle	59da49c17f	Remove ETH special portfolio tracking Treat ETH like any other token — display only spot/future price and funding rate, removing personal portfolio calculations. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-26 15:14:39 +07:00
thuanle	9c39423315	Rewrite price lookup from WebSocket to REST API Replace unreliable WebSocket connections with on-demand REST API calls for spot and futures prices. Add cached trading pair list (refreshed hourly) for symbol validation, and /refresh command for manual updates. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-04-26 15:14:09 +07:00