5 Commits

Author SHA1 Message Date
dependabot[bot]
4d35c0010e Bump golang.org/x/image from 0.40.0 to 0.43.0
Bumps [golang.org/x/image](https://github.com/golang/image) from 0.40.0 to 0.43.0.
- [Commits](https://github.com/golang/image/compare/v0.40.0...v0.43.0)

---
updated-dependencies:
- dependency-name: golang.org/x/image
  dependency-version: 0.43.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-06-24 12:14:09 +00:00
prosolis
6e4928ca17 Merge pull request #11 from prosolis/forex-crypto-coingecko
Forex: convert to/from crypto via CoinGecko (keyless)
2026-05-21 22:21:52 -07:00
prosolis
72f4ef3b27 Forex: convert to/from crypto via CoinGecko (keyless)
Wire a curated set of crypto assets (BTC, ETH, SOL, XRP, DOGE, ADA, LTC)
into the !fx conversion path only. fxLivePairRate now resolves each side
to units-per-USD and crosses them, so USD/fiat/crypto mix uniformly; fiat
sides still batch into one Frankfurter call, crypto hits CoinGecko's
keyless simple/price with a 60s cache.

Analysis (rate/report/setalert) stays fiat-only on purpose -- a daily
snapshot buy-signal/52w range is meaningless for 24/7 crypto.
2026-05-21 18:05:37 -07:00
prosolis
6cda1cac38 Merge branch 'phase-H-harvest-charges': repo cleanup 2026-05-18 00:11:57 -07:00
prosolis
1f6c05a565 Merge pull request #10 from prosolis/phase-H-harvest-charges
Phase h harvest charges
2026-05-17 18:52:00 -07:00
6 changed files with 208 additions and 45 deletions

4
go.mod
View File

@@ -12,7 +12,7 @@ require (
github.com/olebedev/when v1.1.0
github.com/robfig/cron/v3 v3.0.1
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
golang.org/x/image v0.40.0
golang.org/x/image v0.43.0
maunium.net/go/mautrix v0.28.0
modernc.org/sqlite v1.50.1
)
@@ -40,7 +40,7 @@ require (
golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a // indirect
golang.org/x/net v0.54.0 // indirect
golang.org/x/sys v0.44.0 // indirect
golang.org/x/text v0.37.0 // indirect
golang.org/x/text v0.38.0 // indirect
modernc.org/libc v1.72.3 // indirect
modernc.org/mathutil v1.7.1 // indirect
modernc.org/memory v1.11.0 // indirect

12
go.sum
View File

@@ -85,8 +85,8 @@ golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI=
golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8=
golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a h1:+3jdDGGB8NGb1Zktc737jlt3/A5f6UlwSzmvqUuufxw=
golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a/go.mod h1:d2fgXJLVs4dYDHUk5lwMIfzRzSrWCfGZb0ZqeLa/Vcw=
golang.org/x/image v0.40.0 h1:Tw4GyDXMo+daZN1znreBRC3VayR1aLFUyUEOLUdW1a8=
golang.org/x/image v0.40.0/go.mod h1:uIc348UZMSvS5Z65CVZ7iDPaNobNFEPeJ4kbqTOszmA=
golang.org/x/image v0.43.0 h1:FLxcP4ec2350nTfOC8ysKtqYSIFbk/QGjw1ZHNP4tsY=
golang.org/x/image v0.43.0/go.mod h1:rrpelvGFt+kLPAjPM4HeWPgrl0FtafueU//e5N0qk/Q=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
@@ -112,8 +112,8 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -146,8 +146,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

View File

@@ -113,6 +113,7 @@ const fxHelpText = "**Forex Commands**\n\n" +
"`!fx rate EUR/USD` — cross-pair rate from first currency's perspective\n" +
"`!fx report [EUR|JPY|CAD]` — full analysis (averages, 52w range, buy score)\n" +
"`!fx 1500 USD to EUR` — convert an amount (also: `!fx convert 1500 USD EUR`)\n" +
"`!fx 100 USD to BTC` — convert to/from crypto (BTC, ETH, SOL, XRP, DOGE, ADA, LTC)\n" +
"`!fx setalert <currency> <rate>` — alert when USD/currency reaches threshold\n" +
"`!fx alerts` — list active alerts in this room\n" +
"`!fx delalert <currency> <rate>` — remove an alert\n" +
@@ -122,7 +123,7 @@ const fxHelpText = "**Forex Commands**\n\n" +
func (p *ForexPlugin) cmdRate(ctx MessageContext, args []string) error {
// Check for cross-pair syntax like EUR/USD or USD/JPY
if pair := fxParsePair(args); pair != nil {
if pair := fxParsePair(args, false); pair != nil {
return p.cmdPairRateOrReport(ctx, pair, false)
}
@@ -156,8 +157,10 @@ type fxPair struct {
}
// fxParsePair detects "XXX/YYY" syntax in args. Both sides must be USD or a
// tracked currency. Returns nil if no pair is found.
func fxParsePair(args []string) *fxPair {
// tracked currency; when allowCrypto is set, supported crypto assets are
// accepted too (used by the conversion path, not by analysis). Returns nil if
// no pair is found.
func fxParsePair(args []string, allowCrypto bool) *fxPair {
if len(args) == 0 {
return nil
}
@@ -174,7 +177,11 @@ func fxParsePair(args []string) *fxPair {
return nil
}
base, quote := parts[0], parts[1]
if !fxIsSupported(base) || !fxIsSupported(quote) {
ok := fxIsSupported
if allowCrypto {
ok = fxIsConvertible
}
if !ok(base) || !ok(quote) {
return nil
}
if base == quote {
@@ -215,46 +222,62 @@ func (p *ForexPlugin) cmdPairRateOrReport(ctx MessageContext, pair *fxPair, full
return p.SendReply(ctx.RoomID, ctx.EventID, sig.FormatQuick())
}
// fxLivePairRate computes the live cross-pair rate from USD-base rates.
// fxLivePairRate computes the live cross-pair rate (how many Quote per 1 Base).
// Each side is resolved to a "units per USD" figure, then crossed; this handles
// USD, fiat (Frankfurter), and crypto (CoinGecko) sides uniformly.
func (p *ForexPlugin) fxLivePairRate(pair *fxPair) (float64, error) {
var currencies []string
if pair.Base != "USD" {
currencies = append(currencies, pair.Base)
// Batch the fiat sides into a single Frankfurter call.
var fiat []string
for _, c := range []string{pair.Base, pair.Quote} {
if c != "USD" && !fxIsCrypto(c) {
fiat = append(fiat, c)
}
}
var fiatRates map[string]float64
if len(fiat) > 0 {
var err error
if fiatRates, err = p.fxLiveRates(fiat); err != nil {
return 0, err
}
if pair.Quote != "USD" {
currencies = append(currencies, pair.Quote)
}
rates, err := p.fxLiveRates(currencies)
basePer, err := p.fxPerUSD(pair.Base, fiatRates)
if err != nil {
return 0, err
}
switch {
case pair.Base == "USD":
r, ok := rates[pair.Quote]
if !ok {
return 0, fmt.Errorf("no rate data for %s", pair.Quote)
quotePer, err := p.fxPerUSD(pair.Quote, fiatRates)
if err != nil {
return 0, err
}
return r, nil
case pair.Quote == "USD":
r, ok := rates[pair.Base]
if !ok || r == 0 {
return 0, fmt.Errorf("no rate data for %s", pair.Base)
}
return 1.0 / r, nil
default:
br, ok1 := rates[pair.Base]
qr, ok2 := rates[pair.Quote]
if !ok1 || !ok2 || br == 0 {
if basePer == 0 {
return 0, fmt.Errorf("missing rate data for cross-pair")
}
return qr / br, nil
return quotePer / basePer, nil
}
// fxPerUSD returns how many units of cur equal 1 USD. Fiat rates are taken from
// the pre-fetched fiatRates map; crypto is fetched live from CoinGecko.
func (p *ForexPlugin) fxPerUSD(cur string, fiatRates map[string]float64) (float64, error) {
switch {
case cur == "USD":
return 1.0, nil
case fxIsCrypto(cur):
price, err := p.cgSpotUSD(cur)
if err != nil {
return 0, err
}
return 1.0 / price, nil
default:
r, ok := fiatRates[cur]
if !ok || r == 0 {
return 0, fmt.Errorf("no rate data for %s", cur)
}
return r, nil
}
}
func (p *ForexPlugin) cmdReport(ctx MessageContext, args []string) error {
if pair := fxParsePair(args); pair != nil {
if pair := fxParsePair(args, false); pair != nil {
return p.cmdPairRateOrReport(ctx, pair, true)
}
currencies := fxParseCurrencies(args)

View File

@@ -34,8 +34,12 @@ func fxIsTracked(cur string) bool {
return false
}
// fxFormatRate formats a rate: JPY uses 2 decimal places, others use 4.
// fxFormatRate formats a rate: crypto uses up to 8 decimals (trailing zeros
// trimmed) for tiny per-USD figures, JPY uses 2, others use 4.
func fxFormatRate(currency string, rate float64) string {
if fxIsCrypto(currency) {
return fxTrimZeros(fmt.Sprintf("%.8f", rate))
}
if currency == "JPY" {
return fmt.Sprintf("%.2f", rate)
}

View File

@@ -58,7 +58,7 @@ func fxParseConvert(args []string) (amount float64, base, quote string, err erro
for _, tok := range tokens {
// Pair form: USD/EUR
if strings.ContainsAny(tok, "/|-") {
pair := fxParsePair([]string{tok})
pair := fxParsePair([]string{tok}, true)
if pair != nil {
if base != "" {
return 0, "", "", fmt.Errorf("multiple currency pairs")
@@ -76,9 +76,9 @@ func fxParseConvert(args []string) (amount float64, base, quote string, err erro
amountSet = true
continue
}
// Currency code?
// Currency or crypto code?
up := strings.ToUpper(tok)
if fxIsSupported(up) {
if fxIsConvertible(up) {
currencies = append(currencies, up)
continue
}
@@ -127,12 +127,15 @@ func (p *ForexPlugin) cmdConvert(ctx MessageContext, args []string) error {
return p.SendReply(ctx.RoomID, ctx.EventID, msg)
}
// fxEmoji returns the flag emoji for a supported currency, falling back
// to USD's flag.
// fxEmoji returns the flag/symbol emoji for a supported currency or crypto
// asset, falling back to USD's flag.
func fxEmoji(cur string) string {
if m, ok := fxMeta[cur]; ok && m.Emoji != "" {
return m.Emoji
}
if c, ok := fxCryptoMeta[strings.ToUpper(cur)]; ok && c.Emoji != "" {
return c.Emoji
}
if cur == "USD" {
return "🇺🇸"
}
@@ -140,9 +143,13 @@ func fxEmoji(cur string) string {
}
// fxFormatAmount formats a converted amount with thousands separators.
// JPY uses 0 decimal places (yen are not subdivided in practice for display),
// other currencies use 2.
// Crypto uses up to 8 decimals (trailing zeros trimmed) since amounts are
// often fractional; JPY uses 0 (yen are not subdivided in practice for
// display); other currencies use 2.
func fxFormatAmount(currency string, amount float64) string {
if fxIsCrypto(currency) {
return fxTrimZeros(fxAddCommas(amount, 8))
}
decimals := 2
if currency == "JPY" {
decimals = 0
@@ -150,6 +157,16 @@ func fxFormatAmount(currency string, amount float64) string {
return fxAddCommas(amount, decimals)
}
// fxTrimZeros drops trailing fractional zeros (and a bare trailing dot) from a
// formatted decimal string, leaving integers untouched.
func fxTrimZeros(s string) string {
if !strings.Contains(s, ".") {
return s
}
s = strings.TrimRight(s, "0")
return strings.TrimRight(s, ".")
}
// fxAddCommas formats a float with N decimal places and thousands separators.
func fxAddCommas(v float64, decimals int) string {
s := strconv.FormatFloat(v, 'f', decimals, 64)

View File

@@ -0,0 +1,119 @@
package plugin
import (
"context"
"encoding/json"
"fmt"
"net/http"
"strings"
"sync"
"time"
)
// ── Crypto support (CoinGecko, keyless) ──────────────────────────────────────
//
// CoinGecko's public simple/price endpoint needs no API key and no usage tier,
// matching Frankfurter's keyless model. Crypto is wired into the *conversion*
// path only (`!fx 100 USD to BTC`). The rate/report/alert analysis stays
// fiat-only on purpose: a daily-snapshot "buy signal" or 52-week range is
// meaningless for 24/7 crypto markets.
type fxCryptoInfo struct {
CoinGeckoID string
Emoji string
Label string
}
// fxCryptoMeta maps a ticker to its CoinGecko coin ID and display metadata.
// Add a row here to support another asset.
var fxCryptoMeta = map[string]fxCryptoInfo{
"BTC": {"bitcoin", "₿", "Bitcoin"},
"ETH": {"ethereum", "Ξ", "Ethereum"},
"SOL": {"solana", "◎", "Solana"},
"XRP": {"ripple", "✕", "XRP"},
"DOGE": {"dogecoin", "🐕", "Dogecoin"},
"ADA": {"cardano", "₳", "Cardano"},
"LTC": {"litecoin", "Ł", "Litecoin"},
}
// fxIsCrypto reports whether sym is a supported crypto asset.
func fxIsCrypto(sym string) bool {
_, ok := fxCryptoMeta[strings.ToUpper(sym)]
return ok
}
// fxIsConvertible reports whether a symbol can appear in a conversion —
// USD, a tracked fiat currency, or a supported crypto asset.
func fxIsConvertible(cur string) bool {
return fxIsSupported(cur) || fxIsCrypto(cur)
}
const coinGeckoBaseURL = "https://api.coingecko.com/api/v3"
// Short-TTL price cache to stay well under CoinGecko's public rate limit and
// keep repeated conversions snappy.
const cgCacheTTL = 60 * time.Second
var (
cgMu sync.Mutex
cgCache = map[string]cgCacheEntry{}
)
type cgCacheEntry struct {
priceUSD float64
at time.Time
}
// cgSpotUSD returns the USD spot price for one unit of the given crypto symbol.
func (p *ForexPlugin) cgSpotUSD(sym string) (float64, error) {
sym = strings.ToUpper(sym)
info, ok := fxCryptoMeta[sym]
if !ok {
return 0, fmt.Errorf("unsupported crypto %s", sym)
}
cgMu.Lock()
if e, ok := cgCache[sym]; ok && time.Since(e.at) < cgCacheTTL {
cgMu.Unlock()
return e.priceUSD, nil
}
cgMu.Unlock()
ctx, cancel := context.WithTimeout(context.Background(), 8*time.Second)
defer cancel()
url := fmt.Sprintf("%s/simple/price?ids=%s&vs_currencies=usd", coinGeckoBaseURL, info.CoinGeckoID)
req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
if err != nil {
return 0, err
}
resp, err := p.httpClient.Do(req)
if err != nil {
return 0, fmt.Errorf("coingecko API error: %w", err)
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
return 0, fmt.Errorf("coingecko API returned %d", resp.StatusCode)
}
var data map[string]map[string]float64
if err := json.NewDecoder(resp.Body).Decode(&data); err != nil {
return 0, fmt.Errorf("coingecko decode error: %w", err)
}
entry, ok := data[info.CoinGeckoID]
if !ok {
return 0, fmt.Errorf("no price for %s", sym)
}
price, ok := entry["usd"]
if !ok || price <= 0 {
return 0, fmt.Errorf("invalid price for %s", sym)
}
cgMu.Lock()
cgCache[sym] = cgCacheEntry{priceUSD: price, at: time.Now()}
cgMu.Unlock()
return price, nil
}