Switched from RasmusLindroth/go-mastodon to blacklight/go-mastodon

The new fork has the required ContentType field in the Toot struct to support Markdown posts from Pleroma/Akkoma instances.
4 months ago · bfa06a58c5
27 changed files with 29 additions and 26 deletions
--- a/api/feed.go
+++ b/api/feed.go
@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/RasmusLindroth/tut/config"
 )

--- a/api/item.go
+++ b/api/item.go
@ -4,7 +4,7 @@ import (
 	"strings"
 	"sync"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/RasmusLindroth/tut/config"
 	"github.com/RasmusLindroth/tut/util"
 	"golang.org/x/exp/slices"
--- a/api/poll.go
+++ b/api/poll.go
@ -3,7 +3,7 @@ package api
 import (
 	"context"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 )

 func (ac *AccountClient) Vote(poll *mastodon.Poll, choices ...int) (*mastodon.Poll, error) {
--- a/api/status.go
+++ b/api/status.go
@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/RasmusLindroth/tut/util"
 )

--- a/api/stream.go
+++ b/api/stream.go
@ -4,7 +4,7 @@ import (
 	"context"
 	"sync"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 )

 type MastodonType uint
--- a/api/tags.go
+++ b/api/tags.go
@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 )

 func (ac *AccountClient) FollowTag(tag string) error {
--- a/api/types.go
+++ b/api/types.go
@ -1,6 +1,6 @@
 package api

-import "github.com/RasmusLindroth/go-mastodon"
+import "github.com/blacklight/go-mastodon"

 type RequestData struct {
 	MinID mastodon.ID
--- a/api/user.go
+++ b/api/user.go
@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 )

 func (ac *AccountClient) GetUserByID(id mastodon.ID) (Item, error) {
--- a/auth/add.go
+++ b/auth/add.go
@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/RasmusLindroth/tut/util"
 )

--- a/feed/feed.go
+++ b/feed/feed.go
@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/RasmusLindroth/tut/api"
 	"github.com/RasmusLindroth/tut/config"
 	"golang.org/x/exp/slices"
--- a/go.mod
+++ b/go.mod
@ -3,9 +3,9 @@ module github.com/RasmusLindroth/tut
 go 1.18

 require (
-	github.com/RasmusLindroth/go-mastodon v0.0.21
 	github.com/adrg/xdg v0.4.0
 	github.com/atotto/clipboard v0.1.4
+	github.com/blacklight/go-mastodon v0.0.23
 	github.com/gdamore/tcell/v2 v2.5.4
 	github.com/gen2brain/beeep v0.0.0-20220909211152-5a9ec94374f6
 	github.com/gobwas/glob v0.2.3
@ -21,6 +21,7 @@ require (
 )

 require (
+	github.com/RasmusLindroth/go-mastodon v0.0.21 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/gdamore/encoding v1.0.0 // indirect
 	github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 // indirect
--- a/go.sum
+++ b/go.sum
@ -6,6 +6,8 @@ github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z
 github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
+github.com/blacklight/go-mastodon v0.0.23 h1:gU2FMkXAQYz505SXCe4t3N/b1HwsobEEb9VpAossqgQ=
+github.com/blacklight/go-mastodon v0.0.23/go.mod h1:xXQxOPtM05cbeq/p5eBPFjawo6520+wdamVa7MxLQwo=
 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=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
--- a/ui/commands.go
+++ b/ui/commands.go
@ -5,7 +5,7 @@ import (
 	"os"
 	"strconv"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/RasmusLindroth/tut/api"
 	"github.com/RasmusLindroth/tut/config"
 	"github.com/RasmusLindroth/tut/util"
--- a/ui/composeview.go
+++ b/ui/composeview.go
@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/RasmusLindroth/tut/api"
 	"github.com/RasmusLindroth/tut/config"
 	"github.com/RasmusLindroth/tut/util"
--- a/ui/feed.go
+++ b/ui/feed.go
@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/RasmusLindroth/tut/api"
 	"github.com/RasmusLindroth/tut/config"
 	"github.com/RasmusLindroth/tut/feed"
--- a/ui/input.go
+++ b/ui/input.go
@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/RasmusLindroth/tut/api"
 	"github.com/RasmusLindroth/tut/config"
 	"github.com/RasmusLindroth/tut/util"
--- a/ui/item.go
+++ b/ui/item.go
@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/RasmusLindroth/tut/api"
 	"github.com/RasmusLindroth/tut/config"
 	"github.com/icza/gox/timex"
--- a/ui/item_list.go
+++ b/ui/item_list.go
@ -3,7 +3,7 @@ package ui
 import (
 	"fmt"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/rivo/tview"
 )

--- a/ui/item_status.go
+++ b/ui/item_status.go
@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/RasmusLindroth/tut/api"
 	"github.com/RasmusLindroth/tut/config"
 	"github.com/RasmusLindroth/tut/util"
--- a/ui/item_tag.go
+++ b/ui/item_tag.go
@ -5,7 +5,7 @@ import (
 	"strconv"
 	"time"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/rivo/tview"
 )

--- a/ui/media.go
+++ b/ui/media.go
@ -8,7 +8,7 @@ import (
 	"os/exec"
 	"path/filepath"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/atotto/clipboard"
 )

--- a/ui/pollview.go
+++ b/ui/pollview.go
@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/gdamore/tcell/v2"
 	"github.com/rivo/tview"
 )
--- a/ui/preferenceview.go
+++ b/ui/preferenceview.go
@ -3,7 +3,7 @@ package ui
 import (
 	"fmt"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/gdamore/tcell/v2"
 	"github.com/rivo/tview"
 )
--- a/ui/tutview.go
+++ b/ui/tutview.go
@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/RasmusLindroth/tut/api"
 	"github.com/RasmusLindroth/tut/auth"
 	"github.com/RasmusLindroth/tut/config"
--- a/ui/view.go
+++ b/ui/view.go
@ -3,7 +3,7 @@ package ui
 import (
 	"log"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/RasmusLindroth/tut/api"
 )

--- a/ui/voteview.go
+++ b/ui/voteview.go
@ -3,7 +3,7 @@ package ui
 import (
 	"fmt"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/rivo/tview"
 )

--- a/util/util.go
+++ b/util/util.go
@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strings"

-	"github.com/RasmusLindroth/go-mastodon"
+	"github.com/blacklight/go-mastodon"
 	"github.com/adrg/xdg"
 	"github.com/microcosm-cc/bluemonday"
 	"github.com/rivo/tview"