diff --git a/.gitignore b/.gitignore index 39203b7c..b9bdcf5b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ config.yaml config.yaml* data/* -!data/.placeholder \ No newline at end of file +!data/.placeholder +LightningTipBot +LightningTipBot.exe \ No newline at end of file diff --git a/README.md b/README.md index 1a3e5b06..25bba6eb 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@

- logo + logo

-# @LightningTipBot 🏅 +# @BitcoinDeepaBot 🏅 A Telegram Lightning ⚡️ Bitcoin wallet and tip bot for group chats. -This repository contains everything you need to set up and run your own tip bot. If you simply want to use this bot in your group chat without having to install anything just start a conversation with [@LightningTipBot](https://t.me/LightningTipBot) and invite it into your group chat. +This repository contains everything you need to set up and run your own tip bot. If you simply want to use this bot in your group chat without having to install anything just start a conversation with [@](https://t.me/BitcoinDeepaBot) and invite it into your group chat. ## Setting up the bot @@ -15,8 +15,8 @@ This repository contains everything you need to set up and run your own tip bot. To build the bot from source, clone the repository and compile the source code. ``` -git clone /~https://github.com/LightningTipBot/LightningTipBot.git -cd LightningTipBot +git clone /~https://github.com/BitcoinDeepaBot/BitcoinDeepaBot.git +cd BitcoinDeepaBot go build . cp config.yaml.example config.yaml ``` @@ -24,7 +24,7 @@ cp config.yaml.example config.yaml After the configuration (see below), start it using the command ``` -./LightningTipBot +./BitcoinDeepaBot ``` ### Configuration @@ -86,14 +86,14 @@ You can either use your own LNbits instance (recommended) or create an account a ### Inline commands ``` -send 💸 Send sats to chat: @LightningTipBot send [] +send 💸 Send sats to chat: @BitcoinDeepaBot send [] ``` 📖 You can use inline commands in every chat, even in private conversations. Wait a second after entering an inline command and click the result, don't press enter. ### Inline send -You can use inline commands to send payments to anyone who can read your messages, even inside private chats and group chat in which the bot isn't part of. For that, you need to trigger an [inline command](https://core.telegram.org/bots/inline). Here is how it works: Enter the name of the bot (`@LightningTipBot`) and the command you want to trigger (`send 13 Hi friend!`). When the result pops up above the text field, click it to send it to the chat. Do not press enter. +You can use inline commands to send payments to anyone who can read your messages, even inside private chats and group chat in which the bot isn't part of. For that, you need to trigger an [inline command](https://core.telegram.org/bots/inline). Here is how it works: Enter the name of the bot (`@BitcoinDeepaBot`) and the command you want to trigger (`send 13 Hi friend!`). When the result pops up above the text field, click it to send it to the chat. Do not press enter.

Send sats inside any chat, including private conversations and groups. @@ -138,7 +138,7 @@ To minimize the clutter all the heavy tipping can cause in a group chat, the bot ## Full Guide to Install and run on a VPS -A complete guide to install and run LightningTipBot + LNBITS (on docker with PostgreSQL) on the same VPS with an external LND funding source has been prepared by Massimo Musumeci (@massmux) and it is available: [LightningTipBot full install](https://www.massmux.com/howto-complete-lightningtipbot-lnbits-setup-vps/) +A complete guide to install and run BitcoinDeepaBot + LNBITS (on docker with PostgreSQL) on the same VPS with an external LND funding source has been prepared by Massimo Musumeci (@massmux) and it is available: [BitcoinDeepaBot full install](https://www.massmux.com/howto-complete-lightningtipbot-lnbits-setup-vps/) ## Made with diff --git a/internal/telegram/buttons.go b/internal/telegram/buttons.go index 9d5b69cc..c30578b5 100644 --- a/internal/telegram/buttons.go +++ b/internal/telegram/buttons.go @@ -19,7 +19,7 @@ const ( // MainMenuCommandHelp = "📖 Help" // MainMenuCommandSend = "⤴️ Send" // SendMenuCommandEnter = "👤 Enter" - MainMenuCommandWebApp = "🗳️ App" + MainMenuCommandWebApp = "🤝 Community" MainMenuCommandBalance = "Balance" MainMenuCommandInvoice = "⚡️ Invoice" MainMenuCommandHelp = "📖 Help" @@ -81,6 +81,7 @@ func (bot *TipBot) appendWebAppLinkToButton(btn *tb.Btn, user *lnbits.User) { if strings.HasPrefix(url, "https://") { // prevent adding a link if not https is used, otherwise // Telegram returns an error and does not show the keyboard + url = "https://t.me/c/1869805823" btn.WebApp = &tb.WebAppInfo{Url: url} } } diff --git a/internal/telegram/inline_query.go b/internal/telegram/inline_query.go index 3e48d099..a239c8a1 100644 --- a/internal/telegram/inline_query.go +++ b/internal/telegram/inline_query.go @@ -18,7 +18,7 @@ import ( tb "gopkg.in/lightningtipbot/telebot.v3" ) -const queryImage = "/~https://avatars.githubusercontent.com/u/88730856?v=7" +const queryImage = "https://i.imgur.com/VB3zep8.png" func (bot TipBot) inlineQueryInstructions(ctx intercept.Context) (intercept.Context, error) { instructions := []struct { diff --git a/internal/telegram/invoice.go b/internal/telegram/invoice.go index eac162be..91189fb5 100644 --- a/internal/telegram/invoice.go +++ b/internal/telegram/invoice.go @@ -137,10 +137,10 @@ func (bot *TipBot) invoiceHandler(ctx intercept.Context) (intercept.Context, err } // check for memo in command - memo := "Powered by @LightningTipBot" + memo := "Powered by @BitcoinDeepaBot" if len(strings.Split(m.Text, " ")) > 2 { memo = GetMemoFromCommand(m.Text, 2) - tag := " (@LightningTipBot)" + tag := " (@BitcoinDeepaBot)" memoMaxLen := 159 - len(tag) if len(memo) > memoMaxLen { memo = memo[:memoMaxLen-len(tag)] diff --git a/internal/telegram/transaction.go b/internal/telegram/transaction.go index afadd4f3..edc18170 100644 --- a/internal/telegram/transaction.go +++ b/internal/telegram/transaction.go @@ -58,7 +58,7 @@ func NewTransaction(bot *TipBot, from *lnbits.User, to *lnbits.User, amount int6 FromId: from.Telegram.ID, ToId: to.Telegram.ID, Amount: amount, - Memo: "Powered by @LightningTipBot", + Memo: "Powered by @BitcoinDeepaBot", Time: time.Now(), Success: false, } diff --git a/translations/en.toml b/translations/en.toml index d1f2ab0c..22f668bc 100644 --- a/translations/en.toml +++ b/translations/en.toml @@ -63,12 +63,9 @@ payButtonEmoji = """💸""" # HELP -helpMessage = """⚡️ *Wallet* +helpMessage = """⚡️ *BitcoinDeepa Wallet* _This bot is a Bitcoin Lightning wallet that can sends tips on Telegram. To tip, add the bot to a group chat. The basic unit of tips are Satoshis (sat). 100,000,000 sat = 1 Bitcoin. Type 📚 /basics for more._ -❤️ *Donate* -_This bot charges no fees but costs Satoshis to operate. If you like the bot, please consider supporting this project with a donation. To donate, use_ `/donate 1000` - %s ⚙️ *Commands* @@ -77,7 +74,6 @@ _This bot charges no fees but costs Satoshis to operate. If you like the bot, pl */send* 💸 Send funds to a user: `/send @user or user@ln.tips []` */invoice* ⚡️ Receive with Lightning: `/invoice []` */pay* ⚡️ Pay with Lightning: `/pay ` -*/donate* ❤️ Donate to the project: `/donate 1000` */advanced* 🤖 Advanced features. */help* 📖 Read this help.""" @@ -97,16 +93,13 @@ _The Lightning Network is a payment protocol that enables fast and cheap Bitcoin _Your funds on this bot can be sent to any other Lightning wallet and vice versa. Recommended Lightning wallets for your phone are_ [Phoenix](https://phoenix.acinq.co/)_,_ [Breez](https://breez.technology/)_,_ [Muun](https://muun.com/)_ (non-custodial), or_ [Wallet of Satoshi](https://www.walletofsatoshi.com/) _(easy)_. 📄 *Open Source* -_This bot is free and_ [open source](/~https://github.com/LightningTipBot/LightningTipBot) _software. You can run it on your own computer and use it in your own community._ +_This bot is free and_ [open source](/~https://github.com/CeyLabs/BitcoinDeepaBot) _software. You can run it on your own computer and use it in your own community._ ✈️ *Telegram* _Add this bot to your Telegram group chat to /tip posts. If you make the bot admin of the group it will also clean up commands to keep the chat tidy._ 🏛 *Terms* -_We are not custodian of your funds. We will act in your best interest but we're also aware that the situation without KYC is tricky until we figure something out. Any amount you load onto your wallet will be considered a donation. Do not give us all your money. Be aware that this bot is in beta development. Use at your own risk._ - -❤️ *Donate* -_This bot charges no fees but costs satoshis to operate. If you like the bot, please consider supporting this project with a donation. To donate, use_ `/donate 1000`""" +_We are not custodian of your funds. We will act in your best interest but we're also aware that the situation without KYC is tricky until we figure something out. Any amount you load onto your wallet will be considered a donation. Do not give us all your money. Be aware that this bot is in beta development. Use at your own risk._""" helpNoUsernameMessage = """👋 Please, set a Telegram username.""" @@ -179,12 +172,12 @@ confirmSendMessage = """Do you want to pay to %s?\n\n💸 Amount: %d sat confirmSendAppendMemo = """\n✉️ %s""" sendCancelledMessage = """🚫 Send cancelled.""" errorTryLaterMessage = """🚫 Error. Please try again later.""" -sendSyntaxErrorMessage = """Did you enter an amount and a recipient? You can use the /send command to either send to Telegram users like %s or to a Lightning address like LightningTipBot@ln.tips.""" +sendSyntaxErrorMessage = """Did you enter an amount and a recipient? You can use the /send command to either send to Telegram users like %s or to a Lightning address like BitcoinDeepaBot@bitcoindeepa.com.""" sendHelpText = """📖 Oops, that didn't work. %s *Usage:* `/send []` -*Example:* `/send 1000 @LightningTipBot I just like the bot ❤️` -*Example:* `/send 1234 LightningTipBot@ln.tips`""" +*Example:* `/send 1000 @BitcoinDeepaBot I just like the bot ❤️` +*Example:* `/send 1234 BitcoinDeepaBot@bitcoindeepa.com`""" # INVOICE