Skip to content

Add error handling for mastodon client #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jorgerasillo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add error handling for mastodon client #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion bot/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,13 @@ func main() {
cancel()
}()

go mastodonClient.Run(ctx, cancel, errs)
go func(){
err := mastodonClient.Run(ctx, cancel, errs)
if err != nil {
errs <- err
}
}()

go mastodonClient.Write(ctx)

go bskyClient.Run(errs)
Expand Down
19 changes: 13 additions & 6 deletions bot/pkg/mastodon/mastodon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,21 @@ func NewClient(logger *slog.Logger, ch chan interface{}, gsheetsClient *gsheets.
}, nil
}

func (c *Client) Run(ctx context.Context, cancel context.CancelFunc, errs chan error) {
func (c *Client) Run(ctx context.Context, cancel context.CancelFunc, errs chan error) error {
streamCh := make(chan mastodon.Event)

// stream from public and then iterate to the known supported tags
// to use the hashtag api
events, err := c.mastodonClient.StreamingPublic(ctx, false)
sendToStream(streamCh, errs, events, err)
for _, tag := range post.GetHashtagsFromTypes() {
ch, err := c.mastodonClient.StreamingHashtag(ctx, tag, false)
sendToStream(streamCh, errs, ch, err)
if err != nil {
c.logger.Error("unable to send a request to mastodon API", "err", err)
return err
}
sendToStream(streamCh, errs, events, err)
// for _, tag := range post.GetHashtagsFromTypes() {
// ch, err := c.mastodonClient.StreamingHashtag(ctx, tag, false)
// sendToStream(streamCh, errs, ch, err)
// }

for {
select {
Expand Down Expand Up @@ -118,12 +122,15 @@ func (c *Client) Run(ctx context.Context, cancel context.CancelFunc, errs chan e
c.logger.Error("Unable to parse post", "err", err)

}
case *mastodon.ErrorEvent:
c.logger.Error("Unable to handle event", "err", e.Error())
default:
// How should we handle this?
c.logger.Error("Unable to handle event", "err", err)
}
case <-ctx.Done():
c.logger.Info("Context cancelled, shutting down Mastodon client...")
return
return nil
}
}
}
Expand Down