Skip to content

Commit

Permalink
messagix: move into pkg
Browse files Browse the repository at this point in the history
  • Loading branch information
tulir committed Aug 16, 2024
1 parent 1518179 commit 9c06ecb
Show file tree
Hide file tree
Showing 101 changed files with 117 additions and 117 deletions.
8 changes: 4 additions & 4 deletions cmd/lscli/lscli.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
"github.com/zyedidia/clipboard"
"go.mau.fi/util/exerrors"

"go.mau.fi/mautrix-meta/messagix"
"go.mau.fi/mautrix-meta/messagix/lightspeed"
"go.mau.fi/mautrix-meta/messagix/socket"
"go.mau.fi/mautrix-meta/messagix/table"
"go.mau.fi/mautrix-meta/pkg/messagix"
"go.mau.fi/mautrix-meta/pkg/messagix/lightspeed"
"go.mau.fi/mautrix-meta/pkg/messagix/socket"
"go.mau.fi/mautrix-meta/pkg/messagix/table"
)

var taskNames = make(map[string]string)
Expand Down
2 changes: 1 addition & 1 deletion cmd/mautrix-meta/legacyprovision.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"maunium.net/go/mautrix"
"maunium.net/go/mautrix/bridgev2"

"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/connector"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
)

func jsonResponse(w http.ResponseWriter, status int, response any) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/mautrix-meta/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"maunium.net/go/mautrix/bridgev2/bridgeconfig"
"maunium.net/go/mautrix/bridgev2/matrix/mxmain"

"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/connector"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
)

// Information to find out exactly which commit the bridge was built from.
Expand Down
4 changes: 2 additions & 2 deletions pkg/connector/backfill.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"maunium.net/go/mautrix/bridgev2"
"maunium.net/go/mautrix/bridgev2/database"

"go.mau.fi/mautrix-meta/messagix/socket"
"go.mau.fi/mautrix-meta/messagix/table"
"go.mau.fi/mautrix-meta/pkg/messagix/socket"
"go.mau.fi/mautrix-meta/pkg/messagix/table"
"go.mau.fi/mautrix-meta/pkg/metaid"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/connector/chatinfo.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"maunium.net/go/mautrix/bridgev2/simplevent"
"maunium.net/go/mautrix/event"

"go.mau.fi/mautrix-meta/messagix/table"
"go.mau.fi/mautrix-meta/pkg/messagix/table"
"go.mau.fi/mautrix-meta/pkg/metaid"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/connector/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"maunium.net/go/mautrix/bridgev2"
"maunium.net/go/mautrix/bridgev2/networkid"

"go.mau.fi/mautrix-meta/messagix"
"go.mau.fi/mautrix-meta/messagix/table"
"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix"
"go.mau.fi/mautrix-meta/pkg/messagix/table"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
"go.mau.fi/mautrix-meta/pkg/metaid"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/connector/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
up "go.mau.fi/util/configupgrade"
"gopkg.in/yaml.v3"

"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
)

//go:embed example-config.yaml
Expand Down
2 changes: 1 addition & 1 deletion pkg/connector/connector.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
waLog "go.mau.fi/whatsmeow/util/log"
"maunium.net/go/mautrix/bridgev2"

"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
"go.mau.fi/mautrix-meta/pkg/msgconv"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/connector/dbmeta.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"maunium.net/go/mautrix/bridgev2/database"
"maunium.net/go/mautrix/bridgev2/networkid"

"go.mau.fi/mautrix-meta/messagix/table"
"go.mau.fi/mautrix-meta/pkg/messagix/table"
"go.mau.fi/mautrix-meta/pkg/metaid"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/connector/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"maunium.net/go/mautrix/bridgev2/networkid"
"maunium.net/go/mautrix/event"

"go.mau.fi/mautrix-meta/messagix/socket"
"go.mau.fi/mautrix-meta/messagix/table"
"go.mau.fi/mautrix-meta/pkg/messagix/socket"
"go.mau.fi/mautrix-meta/pkg/messagix/table"
"go.mau.fi/mautrix-meta/pkg/metaid"
)

Expand Down
8 changes: 4 additions & 4 deletions pkg/connector/handlematrix.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (
"maunium.net/go/mautrix/bridgev2/database"
"maunium.net/go/mautrix/bridgev2/networkid"

"go.mau.fi/mautrix-meta/messagix"
"go.mau.fi/mautrix-meta/messagix/socket"
"go.mau.fi/mautrix-meta/messagix/table"
"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix"
"go.mau.fi/mautrix-meta/pkg/messagix/socket"
"go.mau.fi/mautrix-meta/pkg/messagix/table"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
"go.mau.fi/mautrix-meta/pkg/metaid"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/connector/handlemeta.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"maunium.net/go/mautrix/bridgev2/simplevent"
"maunium.net/go/mautrix/event"

"go.mau.fi/mautrix-meta/messagix"
"go.mau.fi/mautrix-meta/messagix/table"
"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix"
"go.mau.fi/mautrix-meta/pkg/messagix/table"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
"go.mau.fi/mautrix-meta/pkg/metaid"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/connector/handlewhatsapp.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"maunium.net/go/mautrix/bridgev2/networkid"
"maunium.net/go/mautrix/bridgev2/simplevent"

"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
"go.mau.fi/mautrix-meta/pkg/metaid"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/connector/ids.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"maunium.net/go/mautrix/bridgev2"
"maunium.net/go/mautrix/bridgev2/networkid"

"go.mau.fi/mautrix-meta/messagix/table"
"go.mau.fi/mautrix-meta/pkg/messagix/table"
"go.mau.fi/mautrix-meta/pkg/metaid"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/connector/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"maunium.net/go/mautrix/bridgev2/database"
"maunium.net/go/mautrix/bridgev2/networkid"

"go.mau.fi/mautrix-meta/messagix"
"go.mau.fi/mautrix-meta/messagix/cookies"
"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix"
"go.mau.fi/mautrix-meta/pkg/messagix/cookies"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
"go.mau.fi/mautrix-meta/pkg/metaid"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/connector/startchat.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"maunium.net/go/mautrix/bridgev2"
"maunium.net/go/mautrix/bridgev2/networkid"

"go.mau.fi/mautrix-meta/messagix/socket"
"go.mau.fi/mautrix-meta/messagix/table"
"go.mau.fi/mautrix-meta/pkg/messagix/socket"
"go.mau.fi/mautrix-meta/pkg/messagix/table"
"go.mau.fi/mautrix-meta/pkg/metaid"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/connector/userinfo.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"maunium.net/go/mautrix/bridgev2"
"maunium.net/go/mautrix/bridgev2/networkid"

"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
"go.mau.fi/mautrix-meta/pkg/metaid"
"go.mau.fi/mautrix-meta/pkg/msgconv"
)
Expand Down
2 changes: 1 addition & 1 deletion messagix/account.go → pkg/messagix/account.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"net/http"

"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
)

func (c *Client) processLogin(resp *http.Response, respBody []byte) error {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions messagix/client.go → pkg/messagix/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (
"go.mau.fi/whatsmeow/store"
"golang.org/x/net/proxy"

"go.mau.fi/mautrix-meta/messagix/cookies"
"go.mau.fi/mautrix-meta/messagix/crypto"
"go.mau.fi/mautrix-meta/messagix/data/endpoints"
"go.mau.fi/mautrix-meta/messagix/table"
"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix/cookies"
"go.mau.fi/mautrix-meta/pkg/messagix/crypto"
"go.mau.fi/mautrix-meta/pkg/messagix/data/endpoints"
"go.mau.fi/mautrix-meta/pkg/messagix/table"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
)

const DPR = "1"
Expand Down
File renamed without changes.
12 changes: 6 additions & 6 deletions messagix/configs.go → pkg/messagix/configs.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"fmt"
"reflect"

"go.mau.fi/mautrix-meta/messagix/crypto"
"go.mau.fi/mautrix-meta/messagix/graphql"
"go.mau.fi/mautrix-meta/messagix/methods"
"go.mau.fi/mautrix-meta/messagix/socket"
"go.mau.fi/mautrix-meta/messagix/table"
"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix/crypto"
"go.mau.fi/mautrix-meta/pkg/messagix/graphql"
"go.mau.fi/mautrix-meta/pkg/messagix/methods"
"go.mau.fi/mautrix-meta/pkg/messagix/socket"
"go.mau.fi/mautrix-meta/pkg/messagix/table"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
)

type Configs struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"sync"
"time"

"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
)

type MetaCookieName string
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion messagix/e2ee-client.go → pkg/messagix/e2ee-client.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
waLog "go.mau.fi/whatsmeow/util/log"
"google.golang.org/protobuf/proto"

"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
)

func (c *Client) PrepareE2EEClient() *whatsmeow.Client {
Expand Down
File renamed without changes.
10 changes: 5 additions & 5 deletions messagix/events.go → pkg/messagix/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"github.com/google/uuid"
badGlobalLog "github.com/rs/zerolog/log"

"go.mau.fi/mautrix-meta/messagix/lightspeed"
"go.mau.fi/mautrix-meta/messagix/methods"
"go.mau.fi/mautrix-meta/messagix/packets"
"go.mau.fi/mautrix-meta/messagix/socket"
"go.mau.fi/mautrix-meta/messagix/table"
"go.mau.fi/mautrix-meta/pkg/messagix/lightspeed"
"go.mau.fi/mautrix-meta/pkg/messagix/methods"
"go.mau.fi/mautrix-meta/pkg/messagix/packets"
"go.mau.fi/mautrix-meta/pkg/messagix/socket"
"go.mau.fi/mautrix-meta/pkg/messagix/table"
)

func (s *Socket) handleReadyEvent(data *Event_Ready) error {
Expand Down
6 changes: 3 additions & 3 deletions messagix/facebook.go → pkg/messagix/facebook.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (

"github.com/google/go-querystring/query"

"go.mau.fi/mautrix-meta/messagix/cookies"
"go.mau.fi/mautrix-meta/messagix/crypto"
"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix/cookies"
"go.mau.fi/mautrix-meta/pkg/messagix/crypto"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
)

type FacebookMethods struct {
Expand Down
8 changes: 4 additions & 4 deletions messagix/graphql.go → pkg/messagix/graphql.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (

"github.com/google/go-querystring/query"

"go.mau.fi/mautrix-meta/messagix/graphql"
"go.mau.fi/mautrix-meta/messagix/lightspeed"
"go.mau.fi/mautrix-meta/messagix/table"
"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix/graphql"
"go.mau.fi/mautrix-meta/pkg/messagix/lightspeed"
"go.mau.fi/mautrix-meta/pkg/messagix/table"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
)

func (c *Client) makeGraphQLRequest(name string, variables interface{}) (*http.Response, []byte, error) {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package graphql

import (
"go.mau.fi/mautrix-meta/messagix/lightspeed"
"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix/lightspeed"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
)

/*
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions messagix/http.go → pkg/messagix/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"strings"
"time"

"go.mau.fi/mautrix-meta/messagix/cookies"
"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix/cookies"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
)

type HttpQuery struct {
Expand Down
10 changes: 5 additions & 5 deletions messagix/instagram.go → pkg/messagix/instagram.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"github.com/google/go-querystring/query"
"github.com/google/uuid"

"go.mau.fi/mautrix-meta/messagix/cookies"
"go.mau.fi/mautrix-meta/messagix/crypto"
"go.mau.fi/mautrix-meta/messagix/data/responses"
"go.mau.fi/mautrix-meta/messagix/table"
"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix/cookies"
"go.mau.fi/mautrix-meta/pkg/messagix/crypto"
"go.mau.fi/mautrix-meta/pkg/messagix/data/responses"
"go.mau.fi/mautrix-meta/pkg/messagix/table"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
)

// specific methods for insta api, not socket related
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (

"golang.org/x/net/html"

"go.mau.fi/mautrix-meta/messagix/cookies"
"go.mau.fi/mautrix-meta/messagix/methods"
"go.mau.fi/mautrix-meta/messagix/table"
"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix/cookies"
"go.mau.fi/mautrix-meta/pkg/messagix/methods"
"go.mau.fi/mautrix-meta/pkg/messagix/table"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
)

var jsDatrPattern = regexp.MustCompile(`"_js_datr","([^"]+)"`)
Expand Down
2 changes: 1 addition & 1 deletion messagix/json.go → pkg/messagix/json.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"slices"
"strconv"

"go.mau.fi/mautrix-meta/messagix/packets"
"go.mau.fi/mautrix-meta/pkg/messagix/packets"
)

type ConnectPostMessage struct {
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions messagix/mercury.go → pkg/messagix/mercury.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/google/go-querystring/query"
"github.com/rs/zerolog"

"go.mau.fi/mautrix-meta/messagix/methods"
"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix/methods"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
)

type MercuryUploadMedia struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/google/uuid"
"go.mau.fi/util/exerrors"

"go.mau.fi/mautrix-meta/messagix/table"
"go.mau.fi/mautrix-meta/pkg/messagix/table"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions messagix/modules.go → pkg/messagix/modules.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
badGlobalLog "github.com/rs/zerolog/log"
"github.com/tidwall/gjson"

"go.mau.fi/mautrix-meta/messagix/graphql"
"go.mau.fi/mautrix-meta/messagix/lightspeed"
"go.mau.fi/mautrix-meta/messagix/types"
"go.mau.fi/mautrix-meta/pkg/messagix/graphql"
"go.mau.fi/mautrix-meta/pkg/messagix/lightspeed"
"go.mau.fi/mautrix-meta/pkg/messagix/types"
)

func (m *ModuleParser) HandleRawJSON(data []byte, id string) error {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions messagix/payload.go → pkg/messagix/payload.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package messagix

import (
"go.mau.fi/mautrix-meta/messagix/byter"
"go.mau.fi/mautrix-meta/messagix/packets"
"go.mau.fi/mautrix-meta/pkg/messagix/byter"
"go.mau.fi/mautrix-meta/pkg/messagix/packets"
)

type Payload interface {
Expand Down
Loading

0 comments on commit 9c06ecb

Please sign in to comment.