libgm: remove go.mod and move into pkg

mautrix · Aug 15, 2024 · 96b2192 · 96b2192
1 parent 83bd0b1
commit 96b2192
Show file tree

Hide file tree

Showing 78 changed files with 67 additions and 187 deletions.
diff --git a/go.mod b/go.mod
@@ -4,9 +4,11 @@ go 1.22
 
 require (
 	github.com/gabriel-vasile/mimetype v1.4.5
+	github.com/google/uuid v1.6.0
 	github.com/rs/zerolog v1.33.0
-	go.mau.fi/mautrix-gmessages/libgm v0.4.3
+	github.com/stretchr/testify v1.9.0
 	go.mau.fi/util v0.6.1-0.20240815104112-77362c9b05dd
+	golang.org/x/crypto v0.26.0
 	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
 	google.golang.org/protobuf v1.34.2
 	gopkg.in/yaml.v3 v3.0.1
@@ -15,7 +17,7 @@ require (
 
 require (
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
@@ -24,6 +26,7 @@ require (
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mattn/go-sqlite3 v1.14.22 // indirect
 	github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rogpeppe/go-internal v1.10.0 // indirect
 	github.com/rs/xid v1.5.0 // indirect
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
@@ -33,15 +36,10 @@ require (
 	github.com/tidwall/sjson v1.2.5 // indirect
 	github.com/yuin/goldmark v1.7.4 // indirect
 	go.mau.fi/zeroconfig v0.1.3 // indirect
-	golang.org/x/crypto v0.26.0 // indirect
 	golang.org/x/net v0.28.0 // indirect
 	golang.org/x/sys v0.24.0 // indirect
 	golang.org/x/text v0.17.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	maunium.net/go/mauflag v1.0.0 // indirect
 )
-
-replace go.mau.fi/mautrix-gmessages/libgm => ./libgm
-
-//replace maunium.net/go/mautrix => ../mautrix-go
diff --git a/libgm/gmtest/go.mod b/libgm/gmtest/go.mod
diff --git a/libgm/gmtest/go.sum b/libgm/gmtest/go.sum
diff --git a/libgm/go.mod b/libgm/go.mod
diff --git a/libgm/go.sum b/libgm/go.sum
diff --git a/pkg/connector/backfill.go b/pkg/connector/backfill.go
@@ -28,8 +28,8 @@ import (
 	"maunium.net/go/mautrix/bridgev2"
 	"maunium.net/go/mautrix/bridgev2/networkid"
 
-	"go.mau.fi/mautrix-gmessages/libgm"
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
 )
 
 var _ bridgev2.BackfillingNetworkAPI = (*GMClient)(nil)

diff --git a/pkg/connector/capabilities.go b/pkg/connector/capabilities.go
@@ -22,7 +22,7 @@ import (
 	"maunium.net/go/mautrix/bridgev2"
 	"maunium.net/go/mautrix/bridgev2/database"
 
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
 )
 
 var generalCaps = &bridgev2.NetworkGeneralCapabilities{

diff --git a/pkg/connector/chatinfo.go b/pkg/connector/chatinfo.go
@@ -31,7 +31,7 @@ import (
 	"maunium.net/go/mautrix/bridgev2/networkid"
 	"maunium.net/go/mautrix/event"
 
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
 )
 
 var _ bridgev2.PortalBridgeInfoFillingNetwork = (*GMConnector)(nil)

diff --git a/pkg/connector/chatsync.go b/pkg/connector/chatsync.go
@@ -27,7 +27,7 @@ import (
 	"maunium.net/go/mautrix/bridgev2/networkid"
 	"maunium.net/go/mautrix/bridgev2/simplevent"
 
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
 )
 
 func (gc *GMClient) SyncConversations(ctx context.Context, lastDataReceived time.Time, minimalSync bool) {

diff --git a/pkg/connector/client.go b/pkg/connector/client.go
@@ -29,8 +29,8 @@ import (
 	"maunium.net/go/mautrix/bridgev2"
 	"maunium.net/go/mautrix/bridgev2/networkid"
 
-	"go.mau.fi/mautrix-gmessages/libgm"
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
 )
 
 type conversationMeta struct {

diff --git a/pkg/connector/connector.go b/pkg/connector/connector.go
@@ -21,9 +21,9 @@ import (
 
 	"maunium.net/go/mautrix/bridgev2"
 
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
-	"go.mau.fi/mautrix-gmessages/libgm/util"
 	"go.mau.fi/mautrix-gmessages/pkg/connector/gmdb"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/util"
 )
 
 type GMConnector struct {

diff --git a/pkg/connector/dbmeta.go b/pkg/connector/dbmeta.go
@@ -25,8 +25,8 @@ import (
 	"go.mau.fi/util/jsontime"
 	"maunium.net/go/mautrix/bridgev2/database"
 
-	"go.mau.fi/mautrix-gmessages/libgm"
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
 )
 
 func (gc *GMConnector) GetDBMetaTypes() database.MetaTypes {

diff --git a/pkg/connector/errors.go b/pkg/connector/errors.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
 )
 
 var ()

diff --git a/pkg/connector/handlegmessages.go b/pkg/connector/handlegmessages.go
@@ -39,9 +39,9 @@ import (
 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/id"
 
-	"go.mau.fi/mautrix-gmessages/libgm"
-	"go.mau.fi/mautrix-gmessages/libgm/events"
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/events"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
 )
 
 func (gc *GMClient) handleGMEvent(rawEvt any) {

diff --git a/pkg/connector/handlematrix.go b/pkg/connector/handlematrix.go
@@ -30,8 +30,8 @@ import (
 	"maunium.net/go/mautrix/bridgev2/networkid"
 	"maunium.net/go/mautrix/event"
 
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
-	"go.mau.fi/mautrix-gmessages/libgm/util"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/util"
 )
 
 var (

diff --git a/pkg/connector/login.go b/pkg/connector/login.go
@@ -28,8 +28,8 @@ import (
 	"maunium.net/go/mautrix/bridgev2/database"
 	"maunium.net/go/mautrix/bridgev2/networkid"
 
-	"go.mau.fi/mautrix-gmessages/libgm"
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
 )
 
 const (

diff --git a/pkg/connector/messagestatus.go b/pkg/connector/messagestatus.go
@@ -22,7 +22,7 @@ import (
 
 	"maunium.net/go/mautrix/bridgev2"
 
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
 )
 
 func isSuccessfullySentStatus(status gmproto.MessageStatusType) bool {

diff --git a/pkg/connector/startchat.go b/pkg/connector/startchat.go
@@ -30,7 +30,7 @@ import (
 	"maunium.net/go/mautrix/bridgev2"
 	"maunium.net/go/mautrix/bridgev2/networkid"
 
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
 )
 
 var (

diff --git a/libgm/client.go → pkg/libgm/client.go b/libgm/client.go → pkg/libgm/client.go
@@ -16,10 +16,10 @@ import (
 	"github.com/google/uuid"
 	"github.com/rs/zerolog"
 
-	"go.mau.fi/mautrix-gmessages/libgm/crypto"
-	"go.mau.fi/mautrix-gmessages/libgm/events"
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
-	"go.mau.fi/mautrix-gmessages/libgm/util"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/crypto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/events"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/util"
 )
 
 type AuthData struct {

diff --git a/libgm/crypto/aesctr.go → pkg/libgm/crypto/aesctr.go b/libgm/crypto/aesctr.go → pkg/libgm/crypto/aesctr.go
diff --git a/libgm/crypto/aesgcm.go → pkg/libgm/crypto/aesgcm.go b/libgm/crypto/aesgcm.go → pkg/libgm/crypto/aesgcm.go
diff --git a/libgm/crypto/ecdsa.go → pkg/libgm/crypto/ecdsa.go b/libgm/crypto/ecdsa.go → pkg/libgm/crypto/ecdsa.go
diff --git a/libgm/crypto/generate.go → pkg/libgm/crypto/generate.go b/libgm/crypto/generate.go → pkg/libgm/crypto/generate.go
diff --git a/libgm/event_handler.go → pkg/libgm/event_handler.go b/libgm/event_handler.go → pkg/libgm/event_handler.go
@@ -9,8 +9,8 @@ import (
 
 	"google.golang.org/protobuf/proto"
 
-	"go.mau.fi/mautrix-gmessages/libgm/events"
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/events"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
 )
 
 type IncomingRPCMessage struct {

diff --git a/libgm/events/qr.go → pkg/libgm/events/qr.go b/libgm/events/qr.go → pkg/libgm/events/qr.go
@@ -1,7 +1,7 @@
 package events
 
 import (
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
 )
 
 type QR struct {

diff --git a/libgm/events/ready.go → pkg/libgm/events/ready.go b/libgm/events/ready.go → pkg/libgm/events/ready.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
 )
 
 type ClientReady struct {

diff --git a/libgm/events/ready_test.go → pkg/libgm/events/ready_test.go b/libgm/events/ready_test.go → pkg/libgm/events/ready_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"go.mau.fi/mautrix-gmessages/libgm/events"
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
-	"go.mau.fi/mautrix-gmessages/libgm/pblite"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/events"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/pblite"
 )
 
 func TestRequestError_Is(t *testing.T) {

diff --git a/libgm/events/useralerts.go → pkg/libgm/events/useralerts.go b/libgm/events/useralerts.go → pkg/libgm/events/useralerts.go
diff --git a/libgm/gmproto/authentication.pb.go → pkg/libgm/gmproto/authentication.pb.go b/libgm/gmproto/authentication.pb.go → pkg/libgm/gmproto/authentication.pb.go
diff --git a/libgm/gmproto/authentication.pb.raw → pkg/libgm/gmproto/authentication.pb.raw b/libgm/gmproto/authentication.pb.raw → pkg/libgm/gmproto/authentication.pb.raw
diff --git a/libgm/gmproto/authentication.proto → pkg/libgm/gmproto/authentication.proto b/libgm/gmproto/authentication.proto → pkg/libgm/gmproto/authentication.proto
diff --git a/libgm/gmproto/client.pb.go → pkg/libgm/gmproto/client.pb.go b/libgm/gmproto/client.pb.go → pkg/libgm/gmproto/client.pb.go
diff --git a/libgm/gmproto/client.pb.raw → pkg/libgm/gmproto/client.pb.raw b/libgm/gmproto/client.pb.raw → pkg/libgm/gmproto/client.pb.raw
diff --git a/libgm/gmproto/client.proto → pkg/libgm/gmproto/client.proto b/libgm/gmproto/client.proto → pkg/libgm/gmproto/client.proto
diff --git a/libgm/gmproto/config-extra.go → pkg/libgm/gmproto/config-extra.go b/libgm/gmproto/config-extra.go → pkg/libgm/gmproto/config-extra.go
diff --git a/libgm/gmproto/config.pb.go → pkg/libgm/gmproto/config.pb.go b/libgm/gmproto/config.pb.go → pkg/libgm/gmproto/config.pb.go
diff --git a/libgm/gmproto/config.pb.raw → pkg/libgm/gmproto/config.pb.raw b/libgm/gmproto/config.pb.raw → pkg/libgm/gmproto/config.pb.raw
diff --git a/libgm/gmproto/config.proto → pkg/libgm/gmproto/config.proto b/libgm/gmproto/config.proto → pkg/libgm/gmproto/config.proto
diff --git a/libgm/gmproto/conversations.pb.go → pkg/libgm/gmproto/conversations.pb.go b/libgm/gmproto/conversations.pb.go → pkg/libgm/gmproto/conversations.pb.go
diff --git a/libgm/gmproto/conversations.pb.raw → pkg/libgm/gmproto/conversations.pb.raw b/libgm/gmproto/conversations.pb.raw → pkg/libgm/gmproto/conversations.pb.raw
diff --git a/libgm/gmproto/conversations.proto → pkg/libgm/gmproto/conversations.proto b/libgm/gmproto/conversations.proto → pkg/libgm/gmproto/conversations.proto
diff --git a/libgm/gmproto/emojitype.go → pkg/libgm/gmproto/emojitype.go b/libgm/gmproto/emojitype.go → pkg/libgm/gmproto/emojitype.go
diff --git a/libgm/gmproto/events.pb.go → pkg/libgm/gmproto/events.pb.go b/libgm/gmproto/events.pb.go → pkg/libgm/gmproto/events.pb.go
diff --git a/libgm/gmproto/events.pb.raw → pkg/libgm/gmproto/events.pb.raw b/libgm/gmproto/events.pb.raw → pkg/libgm/gmproto/events.pb.raw
diff --git a/libgm/gmproto/events.proto → pkg/libgm/gmproto/events.proto b/libgm/gmproto/events.proto → pkg/libgm/gmproto/events.proto
diff --git a/libgm/gmproto/pblite.pb.go → pkg/libgm/gmproto/pblite.pb.go b/libgm/gmproto/pblite.pb.go → pkg/libgm/gmproto/pblite.pb.go
diff --git a/libgm/gmproto/pblite.pb.raw → pkg/libgm/gmproto/pblite.pb.raw b/libgm/gmproto/pblite.pb.raw → pkg/libgm/gmproto/pblite.pb.raw
diff --git a/libgm/gmproto/pblite.proto → pkg/libgm/gmproto/pblite.proto b/libgm/gmproto/pblite.proto → pkg/libgm/gmproto/pblite.proto
diff --git a/libgm/gmproto/rpc.pb.go → pkg/libgm/gmproto/rpc.pb.go b/libgm/gmproto/rpc.pb.go → pkg/libgm/gmproto/rpc.pb.go
diff --git a/libgm/gmproto/rpc.pb.raw → pkg/libgm/gmproto/rpc.pb.raw b/libgm/gmproto/rpc.pb.raw → pkg/libgm/gmproto/rpc.pb.raw
diff --git a/libgm/gmproto/rpc.proto → pkg/libgm/gmproto/rpc.proto b/libgm/gmproto/rpc.proto → pkg/libgm/gmproto/rpc.proto
diff --git a/libgm/gmproto/settings.pb.go → pkg/libgm/gmproto/settings.pb.go b/libgm/gmproto/settings.pb.go → pkg/libgm/gmproto/settings.pb.go
diff --git a/libgm/gmproto/settings.pb.raw → pkg/libgm/gmproto/settings.pb.raw b/libgm/gmproto/settings.pb.raw → pkg/libgm/gmproto/settings.pb.raw
diff --git a/libgm/gmproto/settings.proto → pkg/libgm/gmproto/settings.proto b/libgm/gmproto/settings.proto → pkg/libgm/gmproto/settings.proto
diff --git a/libgm/gmproto/ukey.pb.go → pkg/libgm/gmproto/ukey.pb.go b/libgm/gmproto/ukey.pb.go → pkg/libgm/gmproto/ukey.pb.go
diff --git a/libgm/gmproto/ukey.pb.raw → pkg/libgm/gmproto/ukey.pb.raw b/libgm/gmproto/ukey.pb.raw → pkg/libgm/gmproto/ukey.pb.raw
diff --git a/libgm/gmproto/ukey.proto → pkg/libgm/gmproto/ukey.proto b/libgm/gmproto/ukey.proto → pkg/libgm/gmproto/ukey.proto
diff --git a/libgm/gmproto/util.pb.go → pkg/libgm/gmproto/util.pb.go b/libgm/gmproto/util.pb.go → pkg/libgm/gmproto/util.pb.go
diff --git a/libgm/gmproto/util.pb.raw → pkg/libgm/gmproto/util.pb.raw b/libgm/gmproto/util.pb.raw → pkg/libgm/gmproto/util.pb.raw
diff --git a/libgm/gmproto/util.proto → pkg/libgm/gmproto/util.proto b/libgm/gmproto/util.proto → pkg/libgm/gmproto/util.proto
diff --git a/libgm/gmtest/.gitignore → pkg/libgm/gmtest/.gitignore b/libgm/gmtest/.gitignore → pkg/libgm/gmtest/.gitignore
diff --git a/libgm/gmtest/main.go → pkg/libgm/gmtest/main.go b/libgm/gmtest/main.go → pkg/libgm/gmtest/main.go
@@ -14,9 +14,9 @@ import (
 
 	"github.com/rs/zerolog"
 
-	"go.mau.fi/mautrix-gmessages/libgm"
-	"go.mau.fi/mautrix-gmessages/libgm/events"
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/events"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
 )
 
 func must(err error) {

diff --git a/libgm/http.go → pkg/libgm/http.go b/libgm/http.go → pkg/libgm/http.go
@@ -14,10 +14,10 @@ import (
 	"github.com/rs/zerolog"
 	"google.golang.org/protobuf/proto"
 
-	"go.mau.fi/mautrix-gmessages/libgm/events"
-	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
-	"go.mau.fi/mautrix-gmessages/libgm/pblite"
-	"go.mau.fi/mautrix-gmessages/libgm/util"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/events"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/pblite"
+	"go.mau.fi/mautrix-gmessages/pkg/libgm/util"
 )
 
 const ContentTypeProtobuf = "application/x-protobuf"
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ import ( @@
     	"fmt"
     	"strings"
-    	"go.mau.fi/mautrix-gmessages/libgm/gmproto"
+    	"go.mau.fi/mautrix-gmessages/pkg/libgm/gmproto"
     )
     var ()
@@ Expand Down @@