diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b72f46c..0f28fca 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: go-imports-repo args: - "-local" - - "github.com/beeper/hungryserv" + - "github.com/beeper/groupme" - "-w" - id: go-vet-repo-mod # - id: go-staticcheck-repo-mod diff --git a/README.md b/README.md index df1c06c..2208579 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,7 @@ # Matrix GroupMe Go Bridge A Matrix-GroupMe puppeting bridge -### [Wiki](https://github.com/karmanyaahm/matrix-groupme-go/wiki) - -### [Features & Roadmap](https://github.com/karmanyaahm/matrix-groupme-go/blob/master/ROADMAP.md) +[Features & Roadmap](./ROADMAP.md) ## Discussion Matrix room: [#groupme-go-bridge:malhotra.cc](https://matrix.to/#/#groupme-go-bridge:malhotra.cc) diff --git a/commands.go b/commands.go index 2a6787c..13be648 100644 --- a/commands.go +++ b/commands.go @@ -24,9 +24,9 @@ import ( "strconv" "strings" - "github.com/karmanyaahm/matrix-groupme-go/database" - "github.com/karmanyaahm/matrix-groupme-go/types" - whatsappExt "github.com/karmanyaahm/matrix-groupme-go/whatsapp-ext" + "github.com/beeper/groupme/database" + "github.com/beeper/groupme/types" + whatsappExt "github.com/beeper/groupme/whatsapp-ext" "maunium.net/go/maulogger/v2" "maunium.net/go/mautrix" diff --git a/config/bridge.go b/config/bridge.go index 228d141..bea4bc4 100644 --- a/config/bridge.go +++ b/config/bridge.go @@ -26,7 +26,7 @@ import ( "maunium.net/go/mautrix/event" "maunium.net/go/mautrix/id" - "github.com/karmanyaahm/matrix-groupme-go/types" + "github.com/beeper/groupme/types" ) type BridgeConfig struct { diff --git a/crypto.go b/crypto.go index a3b6eff..65d3a37 100644 --- a/crypto.go +++ b/crypto.go @@ -31,7 +31,7 @@ import ( "maunium.net/go/mautrix/event" "maunium.net/go/mautrix/id" - "github.com/karmanyaahm/matrix-groupme-go/database" + "github.com/beeper/groupme/database" ) var NoSessionFound = crypto.NoSessionFound diff --git a/database/cryptostore.go b/database/cryptostore.go index bfd02f8..3bf81d7 100644 --- a/database/cryptostore.go +++ b/database/cryptostore.go @@ -40,7 +40,7 @@ func NewSQLCryptoStore(db *Database, userID id.UserID, ghostIDFormat string) *SQ raw, _ := db.DB.DB() return &SQLCryptoStore{ SQLCryptoStore: crypto.NewSQLCryptoStore(raw, db.dialect, "", "", - []byte("github.com/karmanyaahm/matrix-groupme-go"), + []byte("github.com/beeper/groupme"), &cryptoLogger{db.log.Sub("CryptoStore")}), UserID: userID, GhostIDFormat: ghostIDFormat, diff --git a/database/database.go b/database/database.go index 5e00081..9b61ba1 100644 --- a/database/database.go +++ b/database/database.go @@ -30,7 +30,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/schema" - "github.com/karmanyaahm/matrix-groupme-go/database/upgrades" + "github.com/beeper/groupme/database/upgrades" ) type Database struct { diff --git a/database/message.go b/database/message.go index 19c10cb..9c64614 100644 --- a/database/message.go +++ b/database/message.go @@ -18,10 +18,10 @@ package database import ( log "maunium.net/go/maulogger/v2" - - "github.com/karmanyaahm/matrix-groupme-go/groupmeExt" - "github.com/karmanyaahm/matrix-groupme-go/types" "maunium.net/go/mautrix/id" + + "github.com/beeper/groupme/groupmeExt" + "github.com/beeper/groupme/types" ) type MessageQuery struct { diff --git a/database/portal.go b/database/portal.go index a8e7b40..1531d28 100644 --- a/database/portal.go +++ b/database/portal.go @@ -24,7 +24,7 @@ import ( log "maunium.net/go/maulogger/v2" "maunium.net/go/mautrix/id" - "github.com/karmanyaahm/matrix-groupme-go/types" + "github.com/beeper/groupme/types" ) // JID is the puppet or the group diff --git a/database/puppet.go b/database/puppet.go index 877fdc7..65f1f63 100644 --- a/database/puppet.go +++ b/database/puppet.go @@ -21,7 +21,7 @@ import ( "maunium.net/go/mautrix/id" - "github.com/karmanyaahm/matrix-groupme-go/types" + "github.com/beeper/groupme/types" ) type PuppetQuery struct { diff --git a/database/reactions.go b/database/reactions.go index d1a2cb5..b55be57 100644 --- a/database/reactions.go +++ b/database/reactions.go @@ -1,9 +1,10 @@ package database import ( - "github.com/karmanyaahm/matrix-groupme-go/types" log "maunium.net/go/maulogger/v2" "maunium.net/go/mautrix/id" + + "github.com/beeper/groupme/types" ) type ReactionQuery struct { diff --git a/database/user.go b/database/user.go index 946c6ba..a781ef0 100644 --- a/database/user.go +++ b/database/user.go @@ -22,7 +22,7 @@ import ( log "maunium.net/go/maulogger/v2" - "github.com/karmanyaahm/matrix-groupme-go/types" + "github.com/beeper/groupme/types" "maunium.net/go/mautrix/id" ) diff --git a/formatting.go b/formatting.go index 2874ee2..29a99ee 100644 --- a/formatting.go +++ b/formatting.go @@ -24,7 +24,7 @@ import ( "maunium.net/go/mautrix/format" "maunium.net/go/mautrix/id" - "github.com/karmanyaahm/matrix-groupme-go/types" + "github.com/beeper/groupme/types" ) var italicRegex = regexp.MustCompile("([\\s>~*]|^)_(.+?)_([^a-zA-Z\\d]|$)") diff --git a/go.mod b/go.mod index d173ea3..46adfb9 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/karmanyaahm/matrix-groupme-go +module github.com/beeper/groupme go 1.15 diff --git a/groupmeExt/client.go b/groupmeExt/client.go index cb8ac90..7631fdb 100644 --- a/groupmeExt/client.go +++ b/groupmeExt/client.go @@ -3,8 +3,8 @@ package groupmeExt import ( "context" + "github.com/beeper/groupme/types" "github.com/karmanyaahm/groupme" - "github.com/karmanyaahm/matrix-groupme-go/types" ) type Client struct { diff --git a/groupmeExt/message.go b/groupmeExt/message.go index 5a421fe..a22a659 100644 --- a/groupmeExt/message.go +++ b/groupmeExt/message.go @@ -9,8 +9,8 @@ import ( "io/ioutil" "net/http" + "github.com/beeper/groupme/types" "github.com/karmanyaahm/groupme" - "github.com/karmanyaahm/matrix-groupme-go/types" ) type Message struct{ groupme.Message } diff --git a/main.go b/main.go index 614f22f..7aee427 100644 --- a/main.go +++ b/main.go @@ -34,10 +34,10 @@ import ( "maunium.net/go/mautrix/event" "maunium.net/go/mautrix/id" - "github.com/karmanyaahm/matrix-groupme-go/config" - "github.com/karmanyaahm/matrix-groupme-go/database" - "github.com/karmanyaahm/matrix-groupme-go/database/upgrades" - "github.com/karmanyaahm/matrix-groupme-go/types" + "github.com/beeper/groupme/config" + "github.com/beeper/groupme/database" + "github.com/beeper/groupme/database/upgrades" + "github.com/beeper/groupme/types" ) var ( diff --git a/matrix.go b/matrix.go index b5b3d61..02ac6c5 100644 --- a/matrix.go +++ b/matrix.go @@ -30,7 +30,7 @@ import ( "maunium.net/go/mautrix/format" "maunium.net/go/mautrix/id" - "github.com/karmanyaahm/matrix-groupme-go/database" + "github.com/beeper/groupme/database" ) type MatrixHandler struct { diff --git a/metrics.go b/metrics.go index a8b648e..5066ee0 100644 --- a/metrics.go +++ b/metrics.go @@ -30,8 +30,8 @@ import ( "maunium.net/go/mautrix/event" "maunium.net/go/mautrix/id" - "github.com/karmanyaahm/matrix-groupme-go/database" - "github.com/karmanyaahm/matrix-groupme-go/types" + "github.com/beeper/groupme/database" + "github.com/beeper/groupme/types" ) type MetricsHandler struct { diff --git a/portal.go b/portal.go index a7b030f..a92d1b4 100644 --- a/portal.go +++ b/portal.go @@ -55,10 +55,10 @@ import ( "maunium.net/go/mautrix/id" "maunium.net/go/mautrix/pushrules" - "github.com/karmanyaahm/matrix-groupme-go/database" - "github.com/karmanyaahm/matrix-groupme-go/groupmeExt" - "github.com/karmanyaahm/matrix-groupme-go/types" - whatsappExt "github.com/karmanyaahm/matrix-groupme-go/whatsapp-ext" + "github.com/beeper/groupme/database" + "github.com/beeper/groupme/groupmeExt" + "github.com/beeper/groupme/types" + whatsappExt "github.com/beeper/groupme/whatsapp-ext" ) func (bridge *Bridge) GetPortalByMXID(mxid id.RoomID) *Portal { diff --git a/puppet.go b/puppet.go index d2fae6f..3cf1175 100644 --- a/puppet.go +++ b/puppet.go @@ -28,10 +28,10 @@ import ( "maunium.net/go/mautrix/appservice" "maunium.net/go/mautrix/id" - "github.com/karmanyaahm/matrix-groupme-go/database" - "github.com/karmanyaahm/matrix-groupme-go/groupmeExt" - "github.com/karmanyaahm/matrix-groupme-go/types" - whatsappExt "github.com/karmanyaahm/matrix-groupme-go/whatsapp-ext" + "github.com/beeper/groupme/database" + "github.com/beeper/groupme/groupmeExt" + "github.com/beeper/groupme/types" + whatsappExt "github.com/beeper/groupme/whatsapp-ext" ) var userIDRegex *regexp.Regexp diff --git a/user.go b/user.go index ae52ecc..e790484 100644 --- a/user.go +++ b/user.go @@ -34,11 +34,11 @@ import ( "maunium.net/go/mautrix/format" "maunium.net/go/mautrix/id" + "github.com/beeper/groupme/database" + "github.com/beeper/groupme/groupmeExt" + "github.com/beeper/groupme/types" + whatsappExt "github.com/beeper/groupme/whatsapp-ext" "github.com/karmanyaahm/groupme" - "github.com/karmanyaahm/matrix-groupme-go/database" - "github.com/karmanyaahm/matrix-groupme-go/groupmeExt" - "github.com/karmanyaahm/matrix-groupme-go/types" - whatsappExt "github.com/karmanyaahm/matrix-groupme-go/whatsapp-ext" ) type User struct { diff --git a/whatsapp-ext/group.go b/whatsapp-ext/group.go index 1ea6cb0..9e2de34 100644 --- a/whatsapp-ext/group.go +++ b/whatsapp-ext/group.go @@ -17,7 +17,7 @@ package whatsappExt import ( - "github.com/karmanyaahm/matrix-groupme-go/types" + "github.com/beeper/groupme/types" ) type CreateGroupResponse struct {