diff --git a/commands.go b/commands.go index cb3ddfe..68f5d63 100644 --- a/commands.go +++ b/commands.go @@ -28,10 +28,10 @@ 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" "maunium.net/go/maulogger/v2" - "maunium.net/go/mautrix-whatsapp/database" - "maunium.net/go/mautrix-whatsapp/types" - whatsappExt "maunium.net/go/mautrix-whatsapp/whatsapp-ext" "maunium.net/go/mautrix" "maunium.net/go/mautrix/appservice" diff --git a/config/bridge.go b/config/bridge.go index 80ab46a..f9c335e 100644 --- a/config/bridge.go +++ b/config/bridge.go @@ -26,7 +26,7 @@ import ( "maunium.net/go/mautrix/event" "maunium.net/go/mautrix/id" - "maunium.net/go/mautrix-whatsapp/types" + "github.com/karmanyaahm/matrix-groupme-go/types" ) type BridgeConfig struct { diff --git a/crypto.go b/crypto.go index 9e92264..be5447f 100644 --- a/crypto.go +++ b/crypto.go @@ -30,7 +30,7 @@ import ( "maunium.net/go/mautrix/event" "maunium.net/go/mautrix/id" - "maunium.net/go/mautrix-whatsapp/database" + "github.com/karmanyaahm/matrix-groupme-go/database" ) var NoSessionFound = crypto.NoSessionFound diff --git a/database/cryptostore.go b/database/cryptostore.go index 51f0d01..2de88f5 100644 --- a/database/cryptostore.go +++ b/database/cryptostore.go @@ -39,7 +39,7 @@ func NewSQLCryptoStore(db *Database, userID id.UserID, ghostIDFormat string) *SQ raw, _ := db.DB.DB() return &SQLCryptoStore{ SQLCryptoStore: crypto.NewSQLCryptoStore(raw, db.dialect, "", "", - []byte("maunium.net/go/mautrix-whatsapp"), + []byte("github.com/karmanyaahm/matrix-groupme-go"), &cryptoLogger{db.log.Sub("CryptoStore")}), UserID: userID, GhostIDFormat: ghostIDFormat, diff --git a/database/database.go b/database/database.go index 0cdcc73..2b02570 100644 --- a/database/database.go +++ b/database/database.go @@ -24,7 +24,7 @@ import ( _ "github.com/mattn/go-sqlite3" log "maunium.net/go/maulogger/v2" - "maunium.net/go/mautrix-whatsapp/database/upgrades" + "github.com/karmanyaahm/matrix-groupme-go/database/upgrades" "gorm.io/driver/postgres" "gorm.io/driver/sqlite" diff --git a/database/message.go b/database/message.go index e9e22b5..6b4a6d1 100644 --- a/database/message.go +++ b/database/message.go @@ -19,8 +19,8 @@ package database import ( log "maunium.net/go/maulogger/v2" - "maunium.net/go/mautrix-whatsapp/groupmeExt" - "maunium.net/go/mautrix-whatsapp/types" + "github.com/karmanyaahm/matrix-groupme-go/groupmeExt" + "github.com/karmanyaahm/matrix-groupme-go/types" "maunium.net/go/mautrix/id" ) diff --git a/database/portal.go b/database/portal.go index c8a7b5e..2837a64 100644 --- a/database/portal.go +++ b/database/portal.go @@ -21,7 +21,7 @@ import ( log "maunium.net/go/maulogger/v2" "maunium.net/go/mautrix/id" - "maunium.net/go/mautrix-whatsapp/types" + "github.com/karmanyaahm/matrix-groupme-go/types" ) type PortalKey struct { diff --git a/database/puppet.go b/database/puppet.go index 9896232..e7879b7 100644 --- a/database/puppet.go +++ b/database/puppet.go @@ -21,7 +21,7 @@ import ( "maunium.net/go/mautrix/id" - "maunium.net/go/mautrix-whatsapp/types" + "github.com/karmanyaahm/matrix-groupme-go/types" ) type PuppetQuery struct { diff --git a/database/user.go b/database/user.go index 98dfe28..f15866a 100644 --- a/database/user.go +++ b/database/user.go @@ -22,7 +22,7 @@ import ( log "maunium.net/go/maulogger/v2" - "maunium.net/go/mautrix-whatsapp/types" + "github.com/karmanyaahm/matrix-groupme-go/types" "maunium.net/go/mautrix/id" ) diff --git a/formatting.go b/formatting.go index 6835e53..3d1d544 100644 --- a/formatting.go +++ b/formatting.go @@ -26,8 +26,8 @@ import ( "maunium.net/go/mautrix/format" "maunium.net/go/mautrix/id" - "maunium.net/go/mautrix-whatsapp/types" - whatsappExt "maunium.net/go/mautrix-whatsapp/whatsapp-ext" + "github.com/karmanyaahm/matrix-groupme-go/types" + whatsappExt "github.com/karmanyaahm/matrix-groupme-go/whatsapp-ext" ) var italicRegex = regexp.MustCompile("([\\s>~*]|^)_(.+?)_([^a-zA-Z\\d]|$)") diff --git a/go.mod b/go.mod index 7472a27..72692cf 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module maunium.net/go/mautrix-whatsapp +module github.com/karmanyaahm/matrix-groupme-go go 1.15 @@ -13,7 +13,6 @@ require ( github.com/prometheus/client_golang v1.9.0 github.com/prometheus/procfs v0.6.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e github.com/tidwall/sjson v1.1.5 // indirect golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect @@ -29,8 +28,6 @@ require ( maunium.net/go/mautrix v0.8.2 ) -replace github.com/Rhymen/go-whatsapp => github.com/tulir/go-whatsapp v0.3.16 - replace github.com/karmanyaahm/groupme => ../groupme replace maunium.net/go/mautrix => ../mautrix diff --git a/go.sum b/go.sum index fa669e5..7673bbd 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,16 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f/go.mod h1:4a58ifQTEe2uwwsaqbh3i2un5/CBPg+At/qHpt18Tmk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= +github.com/Rhymen/go-whatsapp v0.0.0/go.mod h1:rdQr95g2C1xcOfM7QGOhza58HeI3I+tZ/bbluv7VazA= +github.com/Rhymen/go-whatsapp v0.1.1 h1:OK+bCugQcr2YjyYKeDzULqCtM50TPUFM6LvQtszKfcw= +github.com/Rhymen/go-whatsapp v0.1.1/go.mod h1:o7jjkvKnigfu432dMbQ/w4PH0Yp5u4Y6ysCNjUlcYCk= +github.com/Rhymen/go-whatsapp/examples/echo v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:zgCiQtBtZ4P4gFWvwl9aashsdwOcbb/EHOGRmSzM8ME= +github.com/Rhymen/go-whatsapp/examples/restoreSession v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:5sCUSpG616ZoSJhlt9iBNI/KXBqrVLcNUJqg7J9+8pU= +github.com/Rhymen/go-whatsapp/examples/sendImage v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:RdiyhanVEGXTam+mZ3k6Y3VDCCvXYCwReOoxGozqhHw= +github.com/Rhymen/go-whatsapp/examples/sendTextMessages v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:suwzklatySS3Q0+NCxCDh5hYfgXdQUWU1DNcxwAxStM= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= @@ -94,6 +102,7 @@ github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= @@ -130,6 +139,8 @@ github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB7 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= @@ -380,8 +391,7 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= -github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M= +github.com/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9/go.mod h1:PLPIyL7ikehBD1OAjmKKiOEhbvWyHGaNDjquXMcYABo= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= @@ -421,8 +431,6 @@ github.com/tidwall/sjson v1.1.1/go.mod h1:yvVuSnpEQv5cYIrO+AT6kw4QVfd5SDZoGIS7/5 github.com/tidwall/sjson v1.1.5 h1:wsUceI/XDyZk3J1FUvuuYlK62zJv2HO2Pzb8A5EWdUE= github.com/tidwall/sjson v1.1.5/go.mod h1:VuJzsZnTowhSxWdOgsAnb886i4AjEyTkk7tNtsL7EYE= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tulir/go-whatsapp v0.3.16 h1:NfcXC2DQXwls3qkAjbFqSeoMX+rUbbpBBGGvCXI3RUw= -github.com/tulir/go-whatsapp v0.3.16/go.mod h1:U5+sm33vrv3wz62YyRM/VS7q2ObXkxU4Xqj/3KOmN9o= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= @@ -446,6 +454,7 @@ go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -455,7 +464,6 @@ golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -571,6 +579,7 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= @@ -594,8 +603,6 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= @@ -637,7 +644,5 @@ maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M= maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA= maunium.net/go/maulogger/v2 v2.1.1 h1:NAZNc6XUFJzgzfewCzVoGkxNAsblLCSSEdtDuIjP0XA= maunium.net/go/maulogger/v2 v2.1.1/go.mod h1:TYWy7wKwz/tIXTpsx8G3mZseIRiC5DoMxSZazOHy68A= -maunium.net/go/mautrix v0.8.2 h1:E3NudQ/QolmE/yhHau8iCkbmcq6gCLvoEvukdqPFJu4= -maunium.net/go/mautrix v0.8.2/go.mod h1:KiViCshKBUZwrVRvTOXsJBFfstvR/btxckHUbOPdu54= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/groupmeExt/client.go b/groupmeExt/client.go index 1802cc4..ca6a8f2 100644 --- a/groupmeExt/client.go +++ b/groupmeExt/client.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/karmanyaahm/groupme" - "maunium.net/go/mautrix-whatsapp/types" + "github.com/karmanyaahm/matrix-groupme-go/types" ) type Client struct { diff --git a/main.go b/main.go index 3ca459c..8cd0d7f 100644 --- a/main.go +++ b/main.go @@ -35,10 +35,10 @@ import ( "maunium.net/go/mautrix/event" "maunium.net/go/mautrix/id" - "maunium.net/go/mautrix-whatsapp/config" - "maunium.net/go/mautrix-whatsapp/database" - "maunium.net/go/mautrix-whatsapp/database/upgrades" - "maunium.net/go/mautrix-whatsapp/types" + "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" ) var ( diff --git a/matrix.go b/matrix.go index 9b4ce30..e647146 100644 --- a/matrix.go +++ b/matrix.go @@ -30,7 +30,7 @@ import ( "maunium.net/go/mautrix/format" "maunium.net/go/mautrix/id" - "maunium.net/go/mautrix-whatsapp/database" + "github.com/karmanyaahm/matrix-groupme-go/database" ) type MatrixHandler struct { diff --git a/metrics.go b/metrics.go index 211f7fa..e741ce2 100644 --- a/metrics.go +++ b/metrics.go @@ -30,8 +30,8 @@ import ( "maunium.net/go/mautrix/event" "maunium.net/go/mautrix/id" - "maunium.net/go/mautrix-whatsapp/database" - "maunium.net/go/mautrix-whatsapp/types" + "github.com/karmanyaahm/matrix-groupme-go/database" + "github.com/karmanyaahm/matrix-groupme-go/types" ) type MetricsHandler struct { diff --git a/portal.go b/portal.go index e66f829..14a7249 100644 --- a/portal.go +++ b/portal.go @@ -53,10 +53,10 @@ import ( "maunium.net/go/mautrix/id" "maunium.net/go/mautrix/pushrules" - "maunium.net/go/mautrix-whatsapp/database" - "maunium.net/go/mautrix-whatsapp/groupmeExt" - "maunium.net/go/mautrix-whatsapp/types" - whatsappExt "maunium.net/go/mautrix-whatsapp/whatsapp-ext" + "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" ) func (bridge *Bridge) GetPortalByMXID(mxid id.RoomID) *Portal { diff --git a/puppet.go b/puppet.go index c72f257..7a5126a 100644 --- a/puppet.go +++ b/puppet.go @@ -29,9 +29,9 @@ import ( "maunium.net/go/mautrix/appservice" "maunium.net/go/mautrix/id" - "maunium.net/go/mautrix-whatsapp/database" - "maunium.net/go/mautrix-whatsapp/types" - whatsappExt "maunium.net/go/mautrix-whatsapp/whatsapp-ext" + "github.com/karmanyaahm/matrix-groupme-go/database" + "github.com/karmanyaahm/matrix-groupme-go/types" + whatsappExt "github.com/karmanyaahm/matrix-groupme-go/whatsapp-ext" ) var userIDRegex *regexp.Regexp diff --git a/user.go b/user.go index c685b3e..a2a1cf9 100644 --- a/user.go +++ b/user.go @@ -35,10 +35,10 @@ import ( "maunium.net/go/mautrix/id" "github.com/karmanyaahm/groupme" - "maunium.net/go/mautrix-whatsapp/database" - "maunium.net/go/mautrix-whatsapp/groupmeExt" - "maunium.net/go/mautrix-whatsapp/types" - whatsappExt "maunium.net/go/mautrix-whatsapp/whatsapp-ext" + "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 3d5814c..e067377 100644 --- a/whatsapp-ext/group.go +++ b/whatsapp-ext/group.go @@ -17,7 +17,7 @@ package whatsappExt import ( - "maunium.net/go/mautrix-whatsapp/types" + "github.com/karmanyaahm/matrix-groupme-go/types" ) type CreateGroupResponse struct {