diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 28ae973..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2026 astra.blue - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/README.md b/README.md index 0786164..77f033f 100644 --- a/README.md +++ b/README.md @@ -1,188 +1,50 @@ -# bsky2tg +bsky2tg +======= -A real-time bridge that forwards Bluesky posts to Telegram. Monitor your Bluesky account and automatically send posts to a Telegram channel with full media support, quote posts, and more. +**bsky2tg** will mirror posts from your Bluesky account to a Telegram channel through a bot. It supports creation and deletion of posts on Bluesky but not the other way. -## Features +--- -- 🦋 **Real-time sync** - Posts appear on Telegram seconds after posting on Bluesky -- 📸 **Full media support** - Images, videos, GIFs (from Tenor) -- 💬 **Quote posts** - Properly formatted with links to original posts -- ✏️ **Edit support** - Updates Telegram message when you edit a Bluesky post -- 🗑️ **Delete sync** - Removes from Telegram when you delete from Bluesky -- 🔗 **Rich links** - @mentions, hashtags, and custom aliases converted to clickable links -- ⏰ **Time filtering** - Ignore old posts and replies if desired -- 🎬 **Video metadata** - Includes duration, dimensions, and thumbnail +### Usage -## Setup +Create a `.env` file with the following: -### Prerequisites +```properties +TG_TOKEN= +TG_CHANNEL_ID= +BSKY_HANDLE= +BSKY_PASSWORD= +``` -- Go 1.21+ -- A Bluesky account -- A Telegram bot and channel +If you use a different Telegram bot endpoint, you can set it with -### Installation +```properties +TG_API_ENDPOINT=https://api.domain.com/bot%s/%s +``` -1. **Clone the repository** - ```bash - git clone https://git.zio.sh/astra/bsky2tg - cd bsky2tg - ``` +# Podman -2. **Build the project** - ```bash - go build - ``` - -3. **Set environment variables** - ```bash - export BSKY_HANDLE="your.bsky.handle" - export BSKY_PASSWORD="your-app-password" # NOT your main password - export TG_TOKEN="your-telegram-bot-token" - export TG_CHANNEL_ID="your-channel-id" - ``` - - **Optional:** - ```bash - export TG_API_ENDPOINT="https://api.telegram.org/bot%s/%s" # Custom Telegram API endpoint - export OLDPOSTTIME="1" # Ignore posts older than this many hours (default: 1) - ``` - -4. **Run the daemon** - ```bash - ./bsky2tg - ``` - -## Running with Podman - -Run the bot in a container using Podman: - -### With `.env` file ```bash podman run -it --name bsky2tg_ \ --env-file /path/to/.env \ git.zio.sh/astra/bsky2tg:latest ``` -### With environment variables +Or without `.env` file: + ```bash podman run -it --name bsky2tg_ \ - --env TG_TOKEN= \ - --env TG_CHANNEL_ID= \ - --env BSKY_HANDLE= \ - --env BSKY_PASSWORD= \ + --env TG_TOKEN= \ + --env TG_CHANNEL_ID= \ + --env BSKY_HANDLE= \ + --env BSKY_PASSWORD= \ git.zio.sh/astra/bsky2tg:latest ``` -### Getting Your Credentials -**Bluesky App Password:** -- Go to Settings → Privacy and Security → App Passwords -- Create a new app password (NOT your main Bluesky password) +## Bash -**Telegram Bot Token:** -- Message [@BotFather](https://t.me/BotFather) on Telegram -- Create a new bot with `/newbot` -- Copy the token - -**Telegram Channel ID:** -- Create a channel (can also be private) -- Add your bot as an admin -- Use `@userinfobot` to get the channel ID - -## Usage - -### Daemon Mode -The bot runs continuously and syncs new posts in real-time: ```bash +source .env ./bsky2tg -``` - -### One-Shot Post Sync -Send a specific post to Telegram: -```bash -./bsky2tg -post "https://bsky.app/profile/user.bsky/post/abc123" -``` - -### Delete a Post -Remove a post from Telegram (delete from Bluesky first): -```bash -./bsky2tg -post "https://bsky.app/profile/user.bsky/post/abc123" -delete -``` - -### Ignore Old Posts -Ignore posts created more than 2 hours ago: -```bash -./bsky2tg -oldposttime 2 -``` - -## How It Works - -1. **Authentication** - Logs into Bluesky via ATProto and stores the session -2. **Jetstream Connection** - Subscribes to real-time post events from your account -3. **Post Processing** - Parses posts, extracts media, processes facets (links/mentions) -4. **Telegram Delivery** - Sends formatted messages with media to your channel -5. **Metadata Storage** - Records post mapping (Bluesky → Telegram) for edits/deletes - -## Configuration - -### Post Format - -Posts are sent with this format: -``` -[Post text with @mentions and #hashtags] -— -🦋 @your.handle -``` - -Quote posts include the quoted post above in a blockquote. - -### Custom Aliases - -You can set up custom link replacements by creating entries in the `blue.zio.bsky2tg.alias` collection on your PDS. - -## Troubleshooting - -### Auth errors -- Verify `BSKY_HANDLE` and `BSKY_PASSWORD` are correct -- Use an app password, not your main Bluesky password -- Check `auth-session.json` file permissions - -### Posts not syncing -- Ensure the bot is admin in the channel -- Check `TG_CHANNEL_ID` is correct -- Verify Jetstream connection with logs - -### Video errors -- FFmpeg must be installed for video processing -- Check that video file can be read - -## Project Structure - -``` -. -├── main.go # Event handler, post processing, Telegram sender -├── bsky/ -│ ├── client.go # Bluesky session management, handle resolution -│ ├── bluesky.go # ATProto API calls (posts, records, sessions) -│ └── parse.go # Post parsing, facet processing -├── auth-session.json # Stored auth session (auto-created) -└── README.md # This file -``` - -## API Integration - -- **Bluesky ATProto** - Session creation, post fetching, record management -- **Jetstream** - Real-time firehose subscription -- **Telegram Bot API** - Message/media sending, editing, deleting - -## Notes - -- Auth sessions are persisted in `auth-session.json` -- Tokens are automatically refreshed when expired -- Posts are deduplicated to prevent duplicates on sync restart -- Media is fetched from your PDS via blob endpoints - -## License - -See LICENSE file +``` \ No newline at end of file diff --git a/bsky/bluesky.go b/bsky/bluesky.go index 4e69a78..33aa06a 100644 --- a/bsky/bluesky.go +++ b/bsky/bluesky.go @@ -10,17 +10,6 @@ import ( "github.com/dghubble/sling" ) -const ( - // URI parsing indices for at:// URIs split by "/" - uriRepoIndex = 2 - uriCollectionIndex = 3 - uriRkeyIndex = 4 - - // Custom collections - PostCollection = "blue.zio.bsky2tg.post" - AliasCollection = "blue.zio.bsky2tg.alias" -) - type BlueskyConfig struct { PDSURL string `json:"pds-url"` Repo string `json:"repo"` @@ -83,11 +72,10 @@ type Link struct { } type Bluesky struct { - Cfg *BlueskyConfig - HttpClient *http.Client - Logger *log.Logger - sling *sling.Sling - publicSling *sling.Sling + Cfg *BlueskyConfig + HttpClient *http.Client + Logger *log.Logger + sling *sling.Sling } func (bluesky *Bluesky) CreateSession(cfg *BlueskyConfig) error { @@ -100,18 +88,18 @@ func (bluesky *Bluesky) CreateSession(cfg *BlueskyConfig) error { } resp := new(BSkySessionResponse) - bluesky.sling.New().Client(bluesky.HttpClient). - Post("/xrpc/com.atproto.server.createSession").BodyJSON(body).ReceiveSuccess(resp) + bluesky.sling.New().Post("/xrpc/com.atproto.server.createSession").BodyJSON(body).ReceiveSuccess(resp) if resp.AccessJWT != "" { cfg.AccessJWT = resp.AccessJWT cfg.RefreshJWT = resp.RefreshJWT return nil } + bluesky.sling.New().Set("Authorization", fmt.Sprintf("Bearer %s", bluesky.Cfg.AccessJWT)) return errors.New("unable to authenticate, check handle/password") } -func (bluesky *Bluesky) RefreshSession() { +func (bluesky *Bluesky) RefreshSession() error { resp := new(BSkySessionResponse) bluesky.sling.New().Set("Authorization", fmt.Sprintf("Bearer %s", bluesky.Cfg.RefreshJWT)). @@ -121,13 +109,10 @@ func (bluesky *Bluesky) RefreshSession() { bluesky.Cfg.RefreshJWT = resp.RefreshJWT PersistAuthSession(bluesky.Cfg) bluesky.sling.Set("Authorization", fmt.Sprintf("Bearer %s", bluesky.Cfg.AccessJWT)) - return - } - if resp.Error != "" { - log.Fatalf("RefreshSession error: %s", resp.Message) + return nil } - bluesky.CreateSession(bluesky.Cfg) + return bluesky.CreateSession(bluesky.Cfg) } func (bluesky *Bluesky) CheckSessionValid() { @@ -141,7 +126,7 @@ func (bluesky *Bluesky) CheckSessionValid() { bluesky.sling.New().Set("Authorization", fmt.Sprintf("Bearer %s", bluesky.Cfg.AccessJWT)). Get("/xrpc/app.bsky.actor.getProfile").QueryStruct(params).Receive(resp, resp) - if resp.Error != "" { + if resp.Error == "ExpiredToken" { bluesky.RefreshSession() } } @@ -173,7 +158,7 @@ func (bluesky *Bluesky) CommitTelegramResponse(data *TelegramRecord, rkey string Record TelegramRecord `json:"record"` }{ Repo: bluesky.Cfg.DID, - Collection: PostCollection, + Collection: "blue.zio.bsky2tg.post", RKey: rkey, Record: TelegramRecord{ ChannelID: data.ChannelID, @@ -205,7 +190,7 @@ func (bluesky *Bluesky) GetTelegramData(rkey string) (*TelegramRecord, string) { RKey string `url:"rkey"` }{ Repo: bluesky.Cfg.DID, - Collection: PostCollection, + Collection: "blue.zio.bsky2tg.post", RKey: rkey, } @@ -227,9 +212,9 @@ func (bluesky *Bluesky) GetPost(uri string) *Post { Repo string `url:"repo"` Collection string `url:"collection"` }{ - RKey: args[uriRkeyIndex], - Repo: args[uriRepoIndex], - Collection: args[uriCollectionIndex], + RKey: args[4], + Repo: args[2], + Collection: args[3], } bluesky.sling.New().Get("/xrpc/com.atproto.repo.getRecord").QueryStruct(params).ReceiveSuccess(&post) @@ -261,7 +246,7 @@ func (bluesky *Bluesky) FetchAliases() []Records { Collection string `url:"collection"` }{ Repo: bluesky.Cfg.DID, - Collection: AliasCollection, + Collection: "blue.zio.bsky2tg.alias", } bluesky.sling.New().Get("/xrpc/com.atproto.repo.listRecords").QueryStruct(¶ms).Receive(resp, resp) @@ -294,6 +279,7 @@ func (bluesky *Bluesky) FetchPost(did string, rkey string) FetchedPost { }{ URIs: fmt.Sprintf("at://%s/app.bsky.feed.post/%s", did, rkey), } - bluesky.sling.New().Get("/xrpc/app.bsky.feed.getPosts").QueryStruct(¶ms).Receive(resp, resp) + bluesky.sling.New().Base("https://public.api.bsky.app"). + Get("/xrpc/app.bsky.feed.getPosts").QueryStruct(¶ms).Receive(resp, resp) return resp.Posts[0] } diff --git a/bsky/client.go b/bsky/client.go index 6158d00..aa6dc83 100644 --- a/bsky/client.go +++ b/bsky/client.go @@ -13,28 +13,23 @@ import ( "github.com/dghubble/sling" ) -const ( - didWebPrefixLen = len("did:web:") - atPrefixLen = len("at://") - httpClientTimeout = 3 * time.Second -) - type BSky struct { Bluesky *Bluesky + DID string } func NewBSky() *BSky { return &BSky{ Bluesky: &Bluesky{ - Cfg: &BlueskyConfig{}, - HttpClient: &http.Client{}, - sling: sling.New().Client(&http.Client{Timeout: httpClientTimeout}), - publicSling: sling.New().Base("https://public.api.bsky.app/").Client(&http.Client{Timeout: httpClientTimeout}), + Cfg: &BlueskyConfig{}, + HttpClient: &http.Client{}, + sling: sling.New().Client(&http.Client{Timeout: time.Second * 3}), }, } } func (b *BSky) ResolveHandle(handle string) (string, error) { + httpClient := &http.Client{Timeout: 3 * time.Second} resp := new(BSkySessionResponse) errResp := &struct { Message string `json:"message"` @@ -45,7 +40,8 @@ func (b *BSky) ResolveHandle(handle string) (string, error) { }{ Handle: handle, } - b.Bluesky.publicSling.New().Get("/xrpc/com.atproto.identity.resolveHandle").QueryStruct(params). + sling.New().Base("https://public.api.bsky.app/").Client(httpClient). + Get("/xrpc/com.atproto.identity.resolveHandle").QueryStruct(params). Receive(resp, errResp) if errResp.Error != "" { @@ -55,70 +51,62 @@ func (b *BSky) ResolveHandle(handle string) (string, error) { return resp.DID, nil } -func parseDIDURL(did string) (*url.URL, error) { - if strings.HasPrefix(did, "did:web:") { - return url.Parse("https://" + did[didWebPrefixLen:] + "/.well-known/did.json") - } else if strings.HasPrefix(did, "did:plc:") { - return url.Parse("https://plc.directory/" + did) - } - return nil, errors.New("DID is not supported") -} - func (b *BSky) getPDS() error { did, _ := b.ResolveHandle(b.Bluesky.Cfg.Handle) - didURL, err := parseDIDURL(did) - if err != nil { - return err + var didURL url.URL + if strings.HasPrefix(did, "did:web:") { + didURL.Host = "https://" + did[8:] + didURL.Path = "/.well-known/did.json" + } else if strings.HasPrefix(did, "did:plc:") { + didURL.Host = "https://plc.directory" + didURL.Path = "/" + did + } else { + return errors.New("DID is not supported") } didResp := new(DIDResponse) - baseURL := fmt.Sprintf("%s://%s", didURL.Scheme, didURL.Host) - sling.New().Base(baseURL).Get(didURL.Path).ReceiveSuccess(didResp) + sling.New().Base(didURL.Host).Get(didURL.Path).ReceiveSuccess(didResp) if didResp.ID == "" { return errors.New("unable to resolve DID") } b.Bluesky.Cfg.DID = didResp.ID - if len(didResp.Service) == 0 { - return errors.New("DID response has no services") - } - - pdsURL := didResp.Service[0].ServiceEndpoint - if pdsURL == "" { - return errors.New("service endpoint is empty") - } - - b.Bluesky.Cfg.PDSURL = pdsURL - b.Bluesky.sling.Base(pdsURL) + b.Bluesky.Cfg.PDSURL = didResp.Service[0].ServiceEndpoint + b.Bluesky.sling.Base(didResp.Service[0].ServiceEndpoint) return nil } func (b *BSky) GetHandleFromDID(did string) (handle string, err error) { - didURL, err := parseDIDURL(did) - if err != nil { - return "", err + var didURL url.URL + if strings.HasPrefix(did, "did:web:") { + didURL.Host = "https://" + did[8:] + didURL.Path = "/.well-known/did.json" + } else if strings.HasPrefix(did, "did:plc:") { + didURL.Host = "https://plc.directory" + didURL.Path = "/" + did + } else { + return "", errors.New("DID is not supported") } didResp := new(DIDResponse) - baseURL := fmt.Sprintf("%s://%s", didURL.Scheme, didURL.Host) - sling.New().Base(baseURL).Get(didURL.Path).ReceiveSuccess(didResp) + sling.New().Base(didURL.Host).Get(didURL.Path).ReceiveSuccess(didResp) if didResp.ID == "" { return "", errors.New("unable to resolve DID") } - return didResp.AlsoKnownAs[0][atPrefixLen:], nil + return didResp.AlsoKnownAs[0][5:], nil } -func (b *BSky) GetPDS() string { +func (b *BSky) GetPDS(handle string) string { return b.Bluesky.Cfg.PDSURL } func (b *BSky) Auth(authData []string) error { b.Bluesky.Cfg.Handle = authData[0] b.getPDS() - auth, err := loadAuth() - if err != nil { // no auth session found + auth, _ := loadAuth() + if auth == nil || auth.AccessJWT == "" { // no auth session found b.Bluesky.Cfg.AppPassword = authData[1] err := b.Bluesky.CreateSession(b.Bluesky.Cfg) if err != nil { @@ -130,6 +118,7 @@ func (b *BSky) Auth(authData []string) error { b.Bluesky.Cfg.Cursor = auth.Cursor b.Bluesky.Cfg.AccessJWT = auth.AccessJWT b.Bluesky.Cfg.RefreshJWT = auth.RefreshJWT + // b.RefreshSession() b.Bluesky.CheckSessionValid() } @@ -162,9 +151,6 @@ func loadAuth() (*BlueskyConfig, error) { } var auth *BlueskyConfig - err = json.Unmarshal(fBytes, &auth) - if err != nil { - return nil, fmt.Errorf("failed to parse auth file: %w", err) - } + json.Unmarshal(fBytes, &auth) return auth, nil } diff --git a/main.go b/main.go index 34d2b0b..d40afb3 100644 --- a/main.go +++ b/main.go @@ -97,7 +97,7 @@ func main() { log.Printf("Found post %s in channel %d, deleting", s[2], tgpost.ChannelID) m := tgbotapi.NewDeleteMessages(tgpost.ChannelID, tgpost.MessageID) h.tg.Send(m) - h.bsky.Bluesky.DeleteRecord([]string{s[2], s[1], bsky.PostCollection}) + h.bsky.Bluesky.DeleteRecord([]string{s[2], s[1], "blue.zio.bsky2tg.post"}) } else { log.Printf("Unable to find post %s on PDS", s[2]) } @@ -179,7 +179,7 @@ func (h *handler) HandleEvent(ctx context.Context, event *models.Event) error { if e == "" { m := tgbotapi.NewDeleteMessages(r.ChannelID, r.MessageID) h.tg.Send(m) - h.bsky.Bluesky.DeleteRecord([]string{event.Commit.RKey, event.Did, bsky.PostCollection}) + h.bsky.Bluesky.DeleteRecord([]string{event.Commit.RKey, event.Did, "blue.zio.bsky2tg.post"}) } } @@ -206,9 +206,6 @@ func (h *handler) ProcessPost(event *models.Event) error { isEditedPost = true } - aliases := h.bsky.Bluesky.FetchAliases() - facets := ps.ProcessFacets(aliases) - var captionText string if ps.IsQuotePost() { ownHandle, handleErr := h.bsky.GetHandleFromDID(h.bsky.Bluesky.Cfg.DID) @@ -219,7 +216,7 @@ func (h *handler) ProcessPost(event *models.Event) error { handle, _ := h.bsky.GetHandleFromDID(strings.Split(ps.Embed.Record.Record.URI, "/")[2]) captionText = fmt.Sprintf( quotePostFormat, - facets, + ps.ProcessFacets(h.bsky.Bluesky.FetchAliases()), strings.Split(ps.Embed.Record.Record.URI, "/")[2], strings.Split(ps.Embed.Record.Record.URI, "/")[4], handle, @@ -230,7 +227,7 @@ func (h *handler) ProcessPost(event *models.Event) error { handle, _ := h.bsky.GetHandleFromDID(strings.Split(ps.Embed.Record.URI, "/")[2]) captionText = fmt.Sprintf( quotePostFormat, - facets, + ps.ProcessFacets(h.bsky.Bluesky.FetchAliases()), strings.Split(ps.Embed.Record.URI, "/")[2], strings.Split(ps.Embed.Record.URI, "/")[4], handle, @@ -245,8 +242,8 @@ func (h *handler) ProcessPost(event *models.Event) error { if handleErr != nil { ownHandle = h.bsky.Bluesky.Cfg.Handle } - if facets != "" { - captionText = fmt.Sprintf(postFormat, facets, h.bsky.Bluesky.Cfg.DID, event.Commit.RKey, ownHandle) + if ps.ProcessFacets(h.bsky.Bluesky.FetchAliases()) != "" { + captionText = fmt.Sprintf(postFormat, ps.ProcessFacets(h.bsky.Bluesky.FetchAliases()), h.bsky.Bluesky.Cfg.DID, event.Commit.RKey, ownHandle) } else { captionText = fmt.Sprintf("🦋 @%s", h.bsky.Bluesky.Cfg.DID, event.Commit.RKey, ownHandle) } @@ -328,7 +325,7 @@ func (h *handler) ProcessPost(event *models.Event) error { } else { m := tgbotapi.MessageConfig{} if captionText == "" { - m = tgbotapi.NewMessage(cid, fmt.Sprintf(postFormat, facets, h.bsky.Bluesky.Cfg.DID, event.Commit.RKey, h.bsky.Bluesky.Cfg.Handle)) + m = tgbotapi.NewMessage(cid, fmt.Sprintf(postFormat, ps.ProcessFacets(h.bsky.Bluesky.FetchAliases()), h.bsky.Bluesky.Cfg.DID, event.Commit.RKey, h.bsky.Bluesky.Cfg.Handle)) } else { m = tgbotapi.NewMessage(cid, captionText) }