treewide: upgrading to latest mautrix standards

Signed-off-by: Sumner Evans <sumner@beeper.com>

.drone.yaml

@@ -1,34 +0,0 @@
-kind: pipeline
-type: docker
-name: default
-
-steps:
-  - name: Build and Publish
-    image: plugins/docker
-    settings:
-      username:
-        from_secret: docker_user
-      password:
-        from_secret: docker_password
-      repo: gitea.watsonlabs.net/watsonb8/groupme
-      registry: gitea.watsonlabs.net
-      dockerfile: Dockerfile
-      auto_tag: true
-    when:
-      branch:
-        - master
-      event:
-        exclude:
-          - pull_request
-  - name: Notify
-    image: drillster/drone-email
-    settings:
-      host: 10.44.1.13
-      username: srvGitea
-      password:
-        from_secret: smtp_password
-      from: drone@watsonlabs.net
-      skip_verify: true
-    when:
-      status:
-        - failure

.gitea/workflows/ci.yaml

@@ -1,34 +0,0 @@
-name: Build and Publish Docker Image
-on: 
-  workflow_dispatch:
-  push:
-    branches:
-      - master
-
-jobs:
-  build_and_publish:
-    name: Build and Publish Docker
-    steps:
-      - uses: actions/checkout@v4
-      - name: Log in to Docker Registry
-        uses: docker/login-action@v3
-        with:
-          registry: gitea.watsonlabs.net/watsonb8/groupme
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: gitea.watsonlabs.net/watsonb8/groupme
-
-      - name: Build and push Docker image
-        id: push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/deploy.yaml

@@ -22,7 +22,6 @@ jobs:
 
       - name: Install dependencies
         run: |
-          sudo apt-get install libolm-dev libolm3
           go install golang.org/x/tools/cmd/goimports@latest
           go install honnef.co/go/tools/cmd/staticcheck@latest
           export PATH="$HOME/go/bin:$PATH"
@@ -43,7 +42,6 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          sudo apt-get install libolm-dev libolm3
           go install -v github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest
 
       - name: Run tests

.gitignore

@@ -1,5 +1,4 @@
 .idea
-logs/*
 
 *.session
 *.json
@@ -10,6 +9,3 @@ logs/*
 .profile
 
 groupme
-config.yaml
-!.pre-commit-config.yaml
-!example-config.yaml

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.1.0
     hooks:
       - id: trailing-whitespace
         exclude_types: [markdown]
@@ -9,7 +9,7 @@ repos:
       - id: check-added-large-files
 
   - repo: https://github.com/tekwizely/pre-commit-golang
-    rev: v1.0.0-rc.1
+    rev: v1.0.0-beta.5
     hooks:
       - id: go-imports-repo
         args:

.run/go build github.com_beeper_groupme.run.xml

@@ -1,16 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="go build github.com/beeper/groupme" type="GoApplicationRunConfiguration" factoryName="Go Application" nameIsGenerated="true">
-    <module name="groupme" />
-    <working_directory value="$PROJECT_DIR$" />
-    <envs>
-      <env name="CPATH" value="/opt/homebrew/include" />
-      <env name="LIBRARY_PATH" value="/opt/homebrew/lib" />
-      <env name="PATH" value="/opt/homebrew/bin:/usr/local/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin" />
-    </envs>
-    <kind value="PACKAGE" />
-    <package value="github.com/beeper/groupme" />
-    <directory value="$PROJECT_DIR$" />
-    <filePath value="$PROJECT_DIR$" />
-    <method v="2" />
-  </configuration>
-</component>

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.19-alpine3.16 AS builder
+FROM golang:1-alpine3.14 AS builder
 
 RUN apk add --no-cache git ca-certificates build-base su-exec olm-dev
 
@@ -6,7 +6,7 @@ COPY . /build
 WORKDIR /build
 RUN go build -o /usr/bin/go-groupme
 
-FROM alpine:3.16
+FROM alpine:3.14
 
 ENV UID=1337 \
     GID=1337

Dockerfile.ci

@@ -0,0 +1,14 @@
+FROM alpine:3.14
+
+ENV UID=1337 \
+    GID=1337
+
+RUN apk add --no-cache ffmpeg su-exec ca-certificates bash jq curl yq
+
+ARG EXECUTABLE=./go-groupme
+COPY $EXECUTABLE /usr/bin/go-groupme
+COPY ./example-config.yaml /opt/go-groupme/example-config.yaml
+COPY ./docker-run.sh /docker-run.sh
+VOLUME /data
+
+CMD ["/docker-run.sh"]

README.md

@@ -5,7 +5,3 @@ A Matrix-GroupMe puppeting bridge
 
 ## Discussion
 Matrix room: [#groupme-go-bridge:malhotra.cc](https://matrix.to/#/#groupme-go-bridge:malhotra.cc)
-
-## Credits
-
-Forked from https://github.com/karmanyaahm/matrix-groupme-go which was archived.

ROADMAP.md

@@ -69,10 +69,10 @@
     * [x] At startup
     * [x] When receiving invite
     * [x] When receiving message
-  * [ ] Private chat creation by inviting Matrix puppet of GroupMe user to new room
+  * [ ] Private chat creation by inviting Matrix puppet of WhatsApp user to new room
-  * [ ] Option to use own Matrix account for messages sent from GroupMe mobile/other web clients
+  * [ ] Option to use own Matrix account for messages sent from WhatsApp mobile/other web clients
   * [ ] Shared group chat portals
 
-<sup>[1]</sup> Basic feature works. Improvements are TODO.
+<sup>[1]</sup> Basic feature works. Improvements are TODO. 
-<sup>[2]</sup> May already work
+<sup>[2]</sup> May already work  
-<sup>[3]</sup> May not be possible
+<sup>[3]</sup> May not be possible  

bridgestate.go

@@ -1,17 +0,0 @@
-package main
-
-import "fmt"
-
-func (user *User) GetRemoteID() string {
-	if user == nil || !user.GMID.Valid() {
-		return ""
-	}
-	return user.GMID.String()
-}
-
-func (user *User) GetRemoteName() string {
-	if user == nil || !user.GMID.Valid() {
-		return ""
-	}
-	return fmt.Sprintf("+%s", user.GMID.String())
-}

commands.go

@@ -27,37 +27,17 @@ type WrappedCommandEvent struct {
 	Portal *Portal
 }
 
-func wrapCommand(handler func(*WrappedCommandEvent)) func(*commands.Event) {
-	return func(ce *commands.Event) {
-		user := ce.User.(*User)
-		var portal *Portal
-		if ce.Portal != nil {
-			portal = ce.Portal.(*Portal)
-		}
-		br := ce.Bridge.Child.(*GMBridge)
-		handler(&WrappedCommandEvent{ce, br, user, portal})
-	}
-}
-
-var (
-	HelpSectionConnectionManagement = commands.HelpSection{Name: "Connection management", Order: 11}
-	HelpSectionCreatingPortals      = commands.HelpSection{Name: "Creating portals", Order: 15}
-	HelpSectionPortalManagement     = commands.HelpSection{Name: "Portal management", Order: 20}
-	HelpSectionInvites              = commands.HelpSection{Name: "Group invites", Order: 25}
-	HelpSectionMiscellaneous        = commands.HelpSection{Name: "Miscellaneous", Order: 30}
-)
-
 func (br *GMBridge) RegisterCommands() {
 	proc := br.CommandProcessor.(*commands.Processor)
 	proc.AddHandlers(
-		// cmdSetRelay,
+	// cmdSetRelay,
-		// cmdUnsetRelay,
+	// cmdUnsetRelay,
-		// cmdInviteLink,
+	// cmdInviteLink,
-		// cmdResolveLink,
+	// cmdResolveLink,
-		// cmdJoin,
+	// cmdJoin,
-		// cmdAccept,
+	// cmdAccept,
-		// cmdCreate,
+	// cmdCreate,
-		cmdLogin,
+	// cmdLogin,
 	// cmdLogout,
 	// cmdTogglePresence,
 	// cmdDeleteSession,
@@ -75,41 +55,3 @@ func (br *GMBridge) RegisterCommands() {
 	// cmdDisappearingTimer,
 	)
 }
-
-var cmdLogin = &commands.FullHandler{
-	Func: wrapCommand(fnLogin),
-	Name: "login",
-	Help: commands.HelpMeta{
-		Section:     commands.HelpSectionAuth,
-		Description: "Link the bridge to your GroupMe account.",
-	},
-}
-
-func fnLogin(ce *WrappedCommandEvent) {
-	if ce.Args != nil && len(ce.Args) > 0 {
-		_, err := ce.Bot.RedactEvent(ce.RoomID, ce.EventID)
-		if err != nil {
-			ce.User.log.Errorln("Failed to redact auth token")
-		}
-	}
-	if ce.User.Client != nil {
-		if ce.User.IsConnected() {
-			ce.Reply("You're already logged in")
-		} else {
-			ce.Reply("You're already logged in. Perhaps you wanted to `reconnect`?")
-		}
-		return
-	}
-
-	if len(ce.Args) < 1 {
-		ce.Reply(`Get your access token from https://dev.groupme.com/ which should be the first argument to login`)
-		return
-	}
-
-	err := ce.User.Login(ce.Args[0])
-	if err != nil {
-		ce.Reply("Failed to log in: %v", err)
-	}
-
-	ce.Reply("Logged in successfully!")
-}

config/bridge.go

@@ -26,8 +26,6 @@ import (
 	"maunium.net/go/mautrix/bridge/bridgeconfig"
 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/id"
-
-	"gitea.watsonlabs.net/watsonb8/groupme-lib"
 )
 
 type DeferredConfig struct {
@@ -75,9 +73,7 @@ type BridgeConfig struct {
 
 	ResendBridgeInfo bool `yaml:"resend_bridge_info"`
 
-	PrivateChatPortalMeta bool `yaml:"private_chat_portal_meta"`
+	AllowUserInvite bool `yaml:"allow_user_invite"`
-	FederateRooms         bool `yaml:"federate_rooms"`
-	AllowUserInvite       bool `yaml:"allow_user_invite"`
 
 	MessageHandlingTimeout struct {
 		ErrorAfterStr string `yaml:"error_after"`
@@ -104,11 +100,6 @@ type BridgeConfig struct {
 	displaynameTemplate    *template.Template `yaml:"-"`
 }
 
-func (bc BridgeConfig) GetDoublePuppetConfig() bridgeconfig.DoublePuppetConfig {
-	//TODO implement me
-	panic("implement me")
-}
-
 func (bc BridgeConfig) GetEncryptionConfig() bridgeconfig.EncryptionConfig {
 	return bc.Encryption
 }
@@ -191,18 +182,6 @@ type UsernameTemplateArgs struct {
 	UserID id.UserID
 }
 
-func (bc BridgeConfig) FormatDisplayname(gmid groupme.ID, member groupme.Member) string {
-	var buf strings.Builder
-	err := bc.displaynameTemplate.Execute(&buf, map[string]string{
-		"Name": member.Nickname,
-		"GMID": gmid.String(),
-	})
-	if err != nil {
-		fmt.Println(err)
-	}
-	return buf.String()
-}
-
 func (bc BridgeConfig) FormatUsername(username string) string {
 	var buf strings.Builder
 	_ = bc.ParsedUsernameTemplate.Execute(&buf, username)

config/config.go

@@ -24,19 +24,16 @@ import (
 type Config struct {
 	*bridgeconfig.BaseConfig `yaml:",inline"`
 
-	SegmentKey    string `yaml:"segment_key"`
+	SegmentKey string `yaml:"segment_key"`
-	SegmentUserID string `yaml:"segment_user_id"`
 
 	Metrics struct {
 		Enabled bool   `yaml:"enabled"`
 		Listen  string `yaml:"listen"`
 	} `yaml:"metrics"`
 
-	// TODO need these?
 	GroupMe struct {
-		OSName            string `yaml:"os_name"`
+		OSName      string `yaml:"os_name"`
-		BrowserName       string `yaml:"browser_name"`
+		BrowserName string `yaml:"browser_name"`
-		ConnectionTimeout int    `yaml:"connection_timeout"`
 	} `yaml:"groupme"`
 
 	Bridge BridgeConfig `yaml:"bridge"`

config/upgrade.go

@@ -1,11 +1,11 @@
 package config
 
 import (
-	"go.mau.fi/util/random"
 	"strings"
 
-	up "go.mau.fi/util/configupgrade"
 	"maunium.net/go/mautrix/bridge/bridgeconfig"
+	"maunium.net/go/mautrix/util"
+	up "maunium.net/go/mautrix/util/configupgrade"
 )
 
 func DoUpgrade(helper *up.Helper) {
@@ -57,6 +57,8 @@ func DoUpgrade(helper *up.Helper) {
 	helper.Copy(up.Bool, "bridge", "enable_status_broadcast")
 	helper.Copy(up.Bool, "bridge", "disable_status_broadcast_send")
 	helper.Copy(up.Bool, "bridge", "mute_status_broadcast")
+	helper.Copy(up.Str|up.Null, "bridge", "status_broadcast_tag")
+	helper.Copy(up.Bool, "bridge", "whatsapp_thumbnail")
 	helper.Copy(up.Bool, "bridge", "allow_user_invite")
 	helper.Copy(up.Str, "bridge", "command_prefix")
 	helper.Copy(up.Bool, "bridge", "federate_rooms")
@@ -65,6 +67,7 @@ func DoUpgrade(helper *up.Helper) {
 	helper.Copy(up.Bool, "bridge", "crash_on_stream_replaced")
 	helper.Copy(up.Bool, "bridge", "url_previews")
 	helper.Copy(up.Bool, "bridge", "caption_in_message")
+	helper.Copy(up.Bool, "bridge", "send_whatsapp_edits")
 	helper.Copy(up.Str|up.Null, "bridge", "message_handling_timeout", "error_after")
 	helper.Copy(up.Str|up.Null, "bridge", "message_handling_timeout", "deadline")
 
@@ -103,12 +106,15 @@ func DoUpgrade(helper *up.Helper) {
 	if secret, ok := helper.Get(up.Str, "appservice", "provisioning", "shared_secret"); ok && secret != "generate" {
 		helper.Set(up.Str, secret, "bridge", "provisioning", "shared_secret")
 	} else if secret, ok = helper.Get(up.Str, "bridge", "provisioning", "shared_secret"); !ok || secret == "generate" {
-		sharedSecret := random.String(64)
+		sharedSecret := util.RandomString(64)
 		helper.Set(up.Str, sharedSecret, "bridge", "provisioning", "shared_secret")
 	} else {
 		helper.Copy(up.Str, "bridge", "provisioning", "shared_secret")
 	}
 	helper.Copy(up.Map, "bridge", "permissions")
+	helper.Copy(up.Bool, "bridge", "relay", "enabled")
+	helper.Copy(up.Bool, "bridge", "relay", "admin_only")
+	helper.Copy(up.Map, "bridge", "relay", "message_formats")
 }
 
 var SpacedBlocks = [][]string{
@@ -127,5 +133,6 @@ var SpacedBlocks = [][]string{
 	{"bridge", "encryption"},
 	{"bridge", "provisioning"},
 	{"bridge", "permissions"},
+	{"bridge", "relay"},
 	{"logging"},
 }

custompuppet.go

@@ -98,7 +98,7 @@ func (br *GMBridge) newDoublePuppetClient(mxid id.UserID, accessToken string) (*
 	homeserverURL, found := br.Config.Bridge.DoublePuppetServerMap[homeserver]
 	if !found {
 		if homeserver == br.AS.HomeserverDomain {
-			homeserverURL = ""
+			homeserverURL = br.AS.HomeserverURL
 		} else if br.Config.Bridge.DoublePuppetAllowDiscovery {
 			resp, err := mautrix.DiscoverClientAPI(homeserver)
 			if err != nil {
@@ -110,7 +110,14 @@ func (br *GMBridge) newDoublePuppetClient(mxid id.UserID, accessToken string) (*
 			return nil, fmt.Errorf("double puppeting from %s is not allowed", homeserver)
 		}
 	}
-	return br.AS.NewExternalMautrixClient(mxid, accessToken, homeserverURL)
+	client, err := mautrix.NewClient(homeserverURL, mxid, accessToken)
+	if err != nil {
+		return nil, err
+	}
+	client.Logger = br.AS.Log.Sub(mxid.String())
+	client.Client = br.AS.HTTPClient
+	client.DefaultHTTPRetries = br.AS.DefaultHTTPRetries
+	return client, nil
 }
 
 func (puppet *Puppet) newCustomIntent() (*appservice.IntentAPI, error) {
@@ -228,7 +235,7 @@ func (puppet *Puppet) tryRelogin(cause error, action string) bool {
 }
 
 func (puppet *Puppet) OnFailedSync(_ *mautrix.RespSync, err error) (time.Duration, error) {
-	puppet.log.Warnln("SyncGroup error:", err)
+	puppet.log.Warnln("Sync error:", err)
 	if errors.Is(err, mautrix.MUnknownToken) {
 		if !puppet.tryRelogin(err, "syncing") {
 			return 0, err

database/database.go

@@ -18,7 +18,6 @@ package database
 
 import (
 	"errors"
-	"go.mau.fi/util/dbutil"
 	"net"
 
 	"github.com/lib/pq"
@@ -26,6 +25,7 @@ import (
 	_ "github.com/mattn/go-sqlite3"
 
 	"maunium.net/go/maulogger/v2"
+	"maunium.net/go/mautrix/util/dbutil"
 
 	"github.com/beeper/groupme/database/upgrades"
 )

database/message.go

@@ -19,14 +19,13 @@ package database
 import (
 	"database/sql"
 	"errors"
-	"fmt"
-	"go.mau.fi/util/dbutil"
 	"time"
 
 	log "maunium.net/go/maulogger/v2"
 	"maunium.net/go/mautrix/id"
+	"maunium.net/go/mautrix/util/dbutil"
 
-	"gitea.watsonlabs.net/watsonb8/groupme-lib"
+	"github.com/beeper/groupme/types"
 )
 
 type MessageQuery struct {
@@ -44,12 +43,12 @@ func (mq *MessageQuery) New() *Message {
 const (
 	getAllMessagesSelect = `
 		SELECT chat_gmid, chat_receiver, gmid, mxid, sender, timestamp, sent
-		FROM message
+		FROM messages
 	`
 	getAllMessagesQuery = getAllMessagesSelect + `
 		WHERE chat_gmid=$1 AND chat_receiver=$2
 	`
-	getByGMIDQuery            = getAllMessagesQuery + "AND gmid=$3"
+	getByGMIDQuery            = getAllMessagesQuery + "AND jid=$3"
 	getByMXIDQuery            = getAllMessagesSelect + "WHERE mxid=$1"
 	getLastMessageInChatQuery = getAllMessagesQuery + `
 		AND timestamp<=$3 AND sent=true
@@ -78,7 +77,7 @@ func (mq *MessageQuery) GetAll(chat PortalKey) (messages []*Message) {
 	return
 }
 
-func (mq *MessageQuery) GetByGMID(chat PortalKey, gmid groupme.ID) *Message {
+func (mq *MessageQuery) GetByGMID(chat PortalKey, gmid types.GroupMeMessageID) *Message {
 	return mq.maybeScan(mq.db.QueryRow(getByGMIDQuery, chat.GMID, chat.Receiver, gmid))
 }
 
@@ -121,9 +120,9 @@ type Message struct {
 	log log.Logger
 
 	Chat      PortalKey
-	GMID      groupme.ID
+	GMID      types.GroupMeID
 	MXID      id.EventID
-	Sender    groupme.ID
+	Sender    types.GroupMeID
 	Timestamp time.Time
 	Sent      bool
 
@@ -144,22 +143,3 @@ func (msg *Message) Scan(row dbutil.Scannable) *Message {
 	}
 	return msg
 }
-
-func (msg *Message) Insert() {
-	query := fmt.Sprintf(`
-		INSERT INTO message (chat_gmid, chat_receiver, gmid, mxid, sender, timestamp, sent)
-		VALUES ('%s', '%s', '%s', '%s', '%s', '%d', '%t')
-	`, msg.Chat.GMID, msg.Chat.Receiver, msg.GMID, msg.MXID, msg.Sender, msg.Timestamp.Unix(), msg.Sent)
-	_, err := msg.db.Exec(query)
-
-	if err != nil {
-		msg.log.Warnfln("Failed to insert %s: %v", msg.MXID, err)
-	}
-}
-
-//func (msg *Message) Delete() {
-//	ans := msg.db.Delete(&msg)
-//	if ans.Error != nil {
-//		msg.log.Warnfln("Failed to delete %s@%s: %v", msg.Chat, msg.JID, ans.Error)
-//	}
-//}

database/portal.go

@@ -19,21 +19,21 @@ package database
 import (
 	"database/sql"
 	"fmt"
-	"go.mau.fi/util/dbutil"
 	"strconv"
 	"strings"
 
 	log "maunium.net/go/maulogger/v2"
 	"maunium.net/go/mautrix/id"
+	"maunium.net/go/mautrix/util/dbutil"
 
-	"gitea.watsonlabs.net/watsonb8/groupme-lib"
+	"github.com/beeper/groupme/types"
 )
 
 // GMID is the puppet or the group
 // Receiver is the "Other Person" in a DM or the group itself in a group
 type PortalKey struct {
-	GMID     groupme.ID
+	GMID     types.GroupMeID
-	Receiver groupme.ID
+	Receiver types.GroupMeID
 }
 
 func ParsePortalKey(inp string) *PortalKey {
@@ -43,7 +43,7 @@ func ParsePortalKey(inp string) *PortalKey {
 		if i, err := strconv.Atoi(inp); i == 0 || err != nil {
 			return nil
 		}
-		return &PortalKey{groupme.ID(inp), groupme.ID(inp)}
+		return &PortalKey{types.NewGroupMeID(inp), types.NewGroupMeID(inp)}
 	} else if len(parts) == 2 {
 		if i, err := strconv.Atoi(parts[0]); i == 0 || err != nil {
 			return nil
@@ -53,22 +53,22 @@ func ParsePortalKey(inp string) *PortalKey {
 		}
 
 		return &PortalKey{
-			GMID:     groupme.ID(parts[1]),
+			GMID:     types.NewGroupMeID(parts[1]),
-			Receiver: groupme.ID(parts[0]),
+			Receiver: types.NewGroupMeID(parts[0]),
 		}
 	} else {
 		return nil
 	}
 }
 
-func GroupPortalKey(gmid groupme.ID) PortalKey {
+func GroupPortalKey(gmid types.GroupMeID) PortalKey {
 	return PortalKey{
 		GMID:     gmid,
 		Receiver: gmid,
 	}
 }
 
-func NewPortalKey(gmid, receiver groupme.ID) PortalKey {
+func NewPortalKey(gmid, receiver types.GroupMeID) PortalKey {
 	return PortalKey{
 		GMID:     gmid,
 		Receiver: receiver,
@@ -120,11 +120,11 @@ func (pq *PortalQuery) GetByMXID(mxid id.RoomID) *Portal {
 	return pq.get(getPortalByMXIDQuery, mxid)
 }
 
-func (pq *PortalQuery) GetAllByGMID(gmid groupme.ID) []*Portal {
+func (pq *PortalQuery) GetAllByGMID(gmid types.GroupMeID) []*Portal {
 	return pq.getAll(getAllPortalsByGMID, gmid)
 }
 
-func (pq *PortalQuery) FindPrivateChats(receiver groupme.ID) []*Portal {
+func (pq *PortalQuery) FindPrivateChats(receiver types.GroupMeID) []*Portal {
 	return pq.getAll(getAllPrivateChats, receiver)
 }
 

database/puppet.go

@@ -18,13 +18,13 @@ package database
 
 import (
 	"database/sql"
-	"go.mau.fi/util/dbutil"
 
 	log "maunium.net/go/maulogger/v2"
 
 	"maunium.net/go/mautrix/id"
+	"maunium.net/go/mautrix/util/dbutil"
 
-	"gitea.watsonlabs.net/watsonb8/groupme-lib"
+	"github.com/beeper/groupme/types"
 )
 
 type PuppetQuery struct {
@@ -43,7 +43,7 @@ func (pq *PuppetQuery) New() *Puppet {
 
 const (
 	puppetColumns                    = "gmid, displayname, name_set, avatar, avatar_url, avatar_set, custom_mxid, access_token, next_batch, enable_receipts"
-	getAllPuppetsQuery               = "SELECT " + puppetColumns + " FROM puppet"
+	getAllPuppetsQuery               = "SELECT " + puppetColumns + " FROM puppets"
 	getPuppetQuery                   = getAllPuppetsQuery + " WHERE gmid=$1"
 	getPuppetByCustomMXIDQuery       = getAllPuppetsQuery + " WHERE custom_mxid=$1"
 	getAllPuppetsWithCustomMXIDQuery = getAllPuppetsQuery + " WHERE custom_mxid<>''"
@@ -61,7 +61,7 @@ func (pq *PuppetQuery) GetAll() (puppets []*Puppet) {
 	return
 }
 
-func (pq *PuppetQuery) Get(gmid groupme.ID) *Puppet {
+func (pq *PuppetQuery) Get(gmid types.GroupMeID) *Puppet {
 	row := pq.db.QueryRow(getPuppetQuery, gmid)
 	if row == nil {
 		return nil
@@ -94,7 +94,7 @@ type Puppet struct {
 	db  *Database
 	log log.Logger
 
-	GMID groupme.ID
+	GMID types.GroupMeID
 
 	Displayname string
 	NameSet     bool
@@ -120,7 +120,7 @@ func (puppet *Puppet) Scan(row dbutil.Scannable) *Puppet {
 		}
 		return nil
 	}
-	puppet.GMID = groupme.ID(gmid)
+	puppet.GMID = types.NewGroupMeID(gmid)
 	puppet.Displayname = displayname.String
 	puppet.NameSet = nameSet.Bool
 	puppet.Avatar = avatar.String
@@ -135,7 +135,7 @@ func (puppet *Puppet) Scan(row dbutil.Scannable) *Puppet {
 
 func (puppet *Puppet) Insert() {
 	_, err := puppet.db.Exec(`
-		INSERT INTO puppet (gmid, avatar, avatar_url, avatar_set, displayname, name_set,
+		INSERT INTO puppet (username, avatar, avatar_url, avatar_set, displayname, name_set,
 		                    custom_mxid, access_token, next_batch, enable_receipts)
 		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
 	`, puppet.GMID, puppet.Avatar, puppet.AvatarURL.String(), puppet.AvatarSet, puppet.Displayname,
@@ -151,8 +151,8 @@ func (puppet *Puppet) Update() {
 	_, err := puppet.db.Exec(`
 		UPDATE puppet
 		SET displayname=$1, name_set=$2, avatar=$3, avatar_url=$4, avatar_set=$5, custom_mxid=$6,
-		access_token=$7, next_batch=$8, enable_receipts=$9
+		access_token=$7, next_batch=$8, enable_receipts=$10
-		WHERE GMID=$10
+		WHERE username=$11
 	`, puppet.Displayname, puppet.NameSet, puppet.Avatar, puppet.AvatarURL.String(), puppet.AvatarSet,
 		puppet.CustomMXID, puppet.AccessToken, puppet.NextBatch, puppet.EnableReceipts,
 		puppet.GMID)

database/reactions.go

@@ -3,11 +3,12 @@ package database
 import (
 	"database/sql"
 	"errors"
-	"go.mau.fi/util/dbutil"
 
-	"gitea.watsonlabs.net/watsonb8/groupme-lib"
 	log "maunium.net/go/maulogger/v2"
 	"maunium.net/go/mautrix/id"
+	"maunium.net/go/mautrix/util/dbutil"
+
+	"github.com/beeper/groupme/types"
 )
 
 type ReactionQuery struct {
@@ -43,7 +44,7 @@ const (
 	`
 )
 
-func (rq *ReactionQuery) GetByTargetGMID(chat PortalKey, gmid groupme.ID, sender groupme.ID) *Reaction {
+func (rq *ReactionQuery) GetByTargetGMID(chat PortalKey, gmid types.GroupMeMessageID, sender types.GroupMeID) *Reaction {
 	return rq.maybeScan(rq.db.QueryRow(getReactionByTargetGMIDQuery, chat.GMID, chat.Receiver, gmid, sender))
 }
 
@@ -63,10 +64,10 @@ type Reaction struct {
 	log log.Logger
 
 	Chat       PortalKey
-	TargetGMID groupme.ID
+	TargetGMID types.GroupMeMessageID
-	Sender     groupme.ID
+	Sender     types.GroupMeID
 	MXID       id.EventID
-	GMID       groupme.ID
+	GMID       types.GroupMeID
 }
 
 func (reaction *Reaction) Scan(row dbutil.Scannable) *Reaction {

database/upgrades/00-latest-revision.sql

@@ -1,19 +1,19 @@
 -- v0 -> v1: Latest revision
 
 CREATE TABLE "user" (
-    mxid TEXT PRIMARY KEY,
+	mxid TEXT PRIMARY KEY,
-    gmid TEXT UNIQUE,
+	gmid TEXT UNIQUE,
 
     auth_token TEXT,
 
-    management_room TEXT,
+	management_room TEXT,
-    space_room      TEXT
+    space_room      TEXT,
 );
 
 CREATE TABLE portal (
     gmid     TEXT,
-    receiver TEXT,
+	receiver TEXT,
-    mxid     TEXT UNIQUE,
+	mxid     TEXT UNIQUE,
 
     name       TEXT    NOT NULL,
     name_set   BOOLEAN NOT NULL DEFAULT false,
@@ -22,38 +22,38 @@ CREATE TABLE portal (
     avatar     TEXT    NOT NULL,
     avatar_url TEXT,
     avatar_set BOOLEAN NOT NULL DEFAULT false,
-    encrypted  BOOLEAN NOT NULL DEFAULT false,
+	encrypted  BOOLEAN NOT NULL DEFAULT false,
 
-    PRIMARY KEY (gmid, receiver)
+	PRIMARY KEY (gmid, receiver)
 );
 
 CREATE TABLE puppet (
-    gmid            TEXT PRIMARY KEY,
+	gmid            TEXT PRIMARY KEY,
-    displayname     TEXT,
+	displayname     TEXT,
     name_set        BOOLEAN NOT NULL DEFAULT false,
-    avatar          TEXT,
+	avatar          TEXT,
-    avatar_url      TEXT,
+	avatar_url      TEXT,
     avatar_set      BOOLEAN NOT NULL DEFAULT false,
 
-    custom_mxid     TEXT,
+	custom_mxid     TEXT,
-    access_token    TEXT,
+	access_token    TEXT,
-    next_batch      TEXT,
+	next_batch      TEXT,
 
-    enable_presence BOOLEAN NOT NULL DEFAULT true,
+	enable_presence BOOLEAN NOT NULL DEFAULT true,
-    enable_receipts BOOLEAN NOT NULL DEFAULT true
+	enable_receipts BOOLEAN NOT NULL DEFAULT true
 );
 
 CREATE TABLE message (
-    chat_gmid     TEXT,
+	chat_gmid     TEXT,
-    chat_receiver TEXT,
+	chat_receiver TEXT,
-    gmid          TEXT,
+	gmid          TEXT,
-    mxid          TEXT UNIQUE,
+	mxid          TEXT UNIQUE,
-    sender        TEXT,
+	sender        TEXT,
-    timestamp     BIGINT,
+	timestamp     BIGINT,
     sent          BOOLEAN,
 
-    PRIMARY KEY (chat_gmid, chat_receiver, gmid),
+	PRIMARY KEY (chat_gmid, chat_receiver, gmid),
-    FOREIGN KEY (chat_gmid, chat_receiver) REFERENCES portal(gmid, receiver) ON DELETE CASCADE
+	FOREIGN KEY (chat_gmid, chat_receiver) REFERENCES portal(gmid, receiver) ON DELETE CASCADE
 );
 
 CREATE TABLE reaction (
@@ -68,16 +68,16 @@ CREATE TABLE reaction (
     PRIMARY KEY (chat_gmid, chat_receiver, target_gmid, sender),
     FOREIGN KEY (chat_gmid, chat_receiver, target_gmid) REFERENCES message(chat_gmid, chat_receiver, gmid)
         ON DELETE CASCADE ON UPDATE CASCADE
-);
+)
 
 CREATE TABLE user_portal (
-    user_mxid       TEXT,
+	user_mxid       TEXT,
-    portal_gmid     TEXT,
+	portal_gmid     TEXT,
-    portal_receiver TEXT,
+	portal_receiver TEXT,
-    in_space        BOOLEAN NOT NULL DEFAULT false,
+	in_space        BOOLEAN NOT NULL DEFAULT false,
 
-    PRIMARY KEY (user_mxid, portal_gmid, portal_receiver),
+	PRIMARY KEY (user_mxid, portal_gmid, portal_receiver),
 
-    FOREIGN KEY (user_mxid)                    REFERENCES "user"(mxid)           ON UPDATE CASCADE ON DELETE CASCADE,
+	FOREIGN KEY (user_mxid)                    REFERENCES "user"(mxid)           ON UPDATE CASCADE ON DELETE CASCADE,
-    FOREIGN KEY (portal_gmid, portal_receiver) REFERENCES portal(gmid, receiver) ON UPDATE CASCADE ON DELETE CASCADE
+	FOREIGN KEY (portal_gmid, portal_receiver) REFERENCES portal(gmid, receiver) ON UPDATE CASCADE ON DELETE CASCADE
 );

database/upgrades/upgrades.go

@@ -1,4 +1,4 @@
-// mautrix-groupme - A Matrix-GroupMe puppeting bridge.
+// mautrix-whatsapp - A Matrix-WhatsApp puppeting bridge.
 // Copyright (C) 2022 Tulir Asokan
 //
 // This program is free software: you can redistribute it and/or modify
@@ -18,8 +18,9 @@ package upgrades
 
 import (
 	"embed"
+	"errors"
 
-	"go.mau.fi/util/dbutil"
+	"maunium.net/go/mautrix/util/dbutil"
 )
 
 var Table dbutil.UpgradeTable
@@ -28,5 +29,8 @@ var Table dbutil.UpgradeTable
 var rawUpgrades embed.FS
 
 func init() {
+	Table.Register(-1, 35, "Unsupported version", func(tx dbutil.Transaction, database *dbutil.Database) error {
+		return errors.New("please upgrade to mautrix-whatsapp v0.4.0 before upgrading to a newer version")
+	})
 	Table.RegisterFS(rawUpgrades)
 }

database/user.go

@@ -18,15 +18,16 @@ package database
 
 import (
 	"database/sql"
-	"go.mau.fi/util/dbutil"
 	"strings"
 	"sync"
 	"time"
 
 	log "maunium.net/go/maulogger/v2"
 
-	"gitea.watsonlabs.net/watsonb8/groupme-lib"
 	"maunium.net/go/mautrix/id"
+	"maunium.net/go/mautrix/util/dbutil"
+
+	"github.com/beeper/groupme/types"
 )
 
 type UserQuery struct {
@@ -71,7 +72,7 @@ func (uq *UserQuery) GetByMXID(userID id.UserID) *User {
 	return uq.New().Scan(row)
 }
 
-func (uq *UserQuery) GetByGMID(gmid groupme.ID) *User {
+func (uq *UserQuery) GetByGMID(gmid types.GroupMeID) *User {
 	row := uq.db.QueryRow(getUserByGMIDQuery, gmid)
 	if row == nil {
 		return nil
@@ -84,11 +85,11 @@ type User struct {
 	log log.Logger
 
 	MXID           id.UserID
-	GMID           groupme.ID
+	GMID           types.GroupMeID
 	ManagementRoom id.RoomID
 	SpaceRoom      id.RoomID
 
-	Token string
+	Token types.AuthToken
 
 	lastReadCache     map[PortalKey]time.Time
 	lastReadCacheLock sync.Mutex
@@ -106,13 +107,15 @@ func (user *User) Scan(row dbutil.Scannable) *User {
 		return nil
 	}
 	if len(gmid.String) > 0 {
-		user.GMID = groupme.ID(gmid.String)
+		user.GMID = types.NewGroupMeID(gmid.String)
+	}
+	if len(authToken.String) > 0 {
+		user.Token = types.AuthToken(authToken.String)
 	}
-	user.Token = authToken.String
 	return user
 }
 
-func stripSuffix(gmid groupme.ID) string {
+func stripSuffix(gmid types.GroupMeID) string {
 	if len(gmid) == 0 {
 		return gmid.String()
 	}

database/userportal.go

@@ -33,37 +33,3 @@ func (user *User) MarkInSpace(portal PortalKey) {
 		user.inSpaceCache[portal] = true
 	}
 }
-
-func (user *User) SetPortalKeys(newKeys []PortalKey) error {
-	tx, err := user.db.Begin()
-	if err != nil {
-		_ = tx.Rollback()
-		return nil
-	}
-	ans, err := tx.Query("DELETE FROM user_portal WHERE user_mxid = $1", user.MXID)
-	if err != nil {
-		_ = tx.Rollback()
-		return err
-	}
-	err = ans.Close()
-	if err != nil {
-		return err
-	}
-
-	for _, key := range newKeys {
-		ans, err = tx.Query("INSERT INTO user_portal (user_mxid, portal_gmid, portal_receiver, in_space) VALUES ($1, $2, $3, $4)",
-			user.MXID, key.GMID, key.Receiver, true)
-
-		if err != nil {
-			_ = tx.Rollback()
-			return err
-		}
-		err = ans.Close()
-		if err != nil {
-			return err
-		}
-	}
-
-	println("portalkey transaction complete")
-	return tx.Commit()
-}

docker-compose.yaml

@@ -1,11 +0,0 @@
-version: "3.9"
-services:
-    postgres:
-      image: postgres
-      restart: always
-      environment:
-        POSTGRES_USER: postgres
-        POSTGRES_DB: groupme
-        POSTGRES_PASSWORD: postgres
-      ports:
-        - "5432:5432"

example-config.yaml

@@ -5,45 +5,35 @@ homeserver:
     # The domain of the homeserver (for MXIDs, etc).
     domain: example.com
 
-    # What software is the homeserver running?
-    # Standard Matrix homeservers like Synapse, Dendrite and Conduit should just use "standard" here.
-    software: standard
-    # The URL to push real-time bridge status to.
-    # If set, the bridge will make POST requests to this URL whenever a user's GroupMe connection state changes.
-    # The bridge will use the appservice as_token to authorize requests.
-    status_endpoint: null
-    # Endpoint for reporting per-message status.
-    message_send_checkpoint_endpoint: null
-    # Does the homeserver support https://github.com/matrix-org/matrix-spec-proposals/pull/2246?
-    async_media: false
-
 # Application service host/registration related details.
 # Changing these values requires regeneration of the registration.
 appservice:
     # The address that the homeserver can use to connect to this appservice.
-    address: http://localhost:29328
+    address: http://localhost:29318
 
     # The hostname and port where this appservice should listen.
     hostname: 0.0.0.0
-    port: 29328
+    port: 29318
 
     # Database config.
     database:
-        # The database type. "sqlite3-fk-wal" and "postgres" are supported.
+        # The database type. only "postgres" is supported for now. sqlite is TODO
         type: postgres
         # The database URI.
-        #   SQLite: A raw file path is supported, but `file:<path>?_txlock=immediate` is recommended.
+        #   SQLite: File name is enough. https://github.com/mattn/go-sqlite3#connection-string
-        #           https://github.com/mattn/go-sqlite3#connection-string
         #   Postgres: Connection string. For example, postgres://user:password@host/database?sslmode=disable
-        #             To connect via Unix socket, use something like postgres:///dbname?host=/var/run/postgresql
         uri: postgres://user:password@host/database?sslmode=disable
         # Maximum number of connections. Mostly relevant for Postgres.
         max_open_conns: 20
         max_idle_conns: 2
-        # Maximum connection idle time and lifetime before they're closed. Disabled if null.
+
-        # Parsed with https://pkg.go.dev/time#ParseDuration
+    # NOT TESTED YET
-        max_conn_idle_time: null
+    # Settings for provisioning API
-        max_conn_lifetime: null
+    provisioning:
+        # Prefix for the provisioning API paths.
+        prefix: /_matrix/provision/v1
+        # Shared secret for authentication. If set to "disable", the provisioning API will be disabled.
+        shared_secret: disable
 
     # The unique ID of this appservice.
     id: groupme
@@ -54,19 +44,12 @@ appservice:
         # Display name and avatar for bot. Set to "remove" to remove display name/avatar, leave empty
         # to leave display name/avatar as-is.
         displayname: GroupMe bridge bot
-        avatar: mxc://nevarro.space/eoAJPcSuTEvffoNycrXjvsmj
+        avatar: mxc://malhotra.cc/YTWNAdhgJhYOPsKIxyfFZsrA
-
-    # Whether or not to receive ephemeral events via appservice transactions.
-    # Requires MSC2409 support (i.e. Synapse 1.22+).
-    ephemeral_events: true
 
     # Authentication tokens for AS <-> HS communication. Autogenerated; do not modify.
     as_token: "This value is generated when generating the registration"
     hs_token: "This value is generated when generating the registration"
 
-# Segment API key to track some events, like provisioning API login and encryption errors.
-segment_key: null
-
 # Metrics not yet tested!
 metrics:
     # Whether or not to enable prometheus metrics
@@ -85,18 +68,18 @@ groupme:
 
 # Bridge config
 bridge:
-    # Localpart template of MXIDs for GroupMe users.
+    # Localpart template of MXIDs for WhatsApp users.
-    # {{.}} is replaced with the phone number of the GroupMe user.
+    # {{.}} is replaced with the phone number of the WhatsApp user.
     username_template: groupme_{{.}}
     # Displayname template for GroupMe users.
     # {{call .UserID.String}} - the number GroupMe assigns to the user
     # {{.Nickname}} - the nickname in that room
     # {{.ImageURL}} - User's avatar URL is available but irrelevant here
-    displayname_template: "{{if .Name}}{{.Name}}{{else}}{{.GMID}}{{end}} (GM)"
+    displayname_template: "{{if .Nickname}}{{.Nickname}}{{else}}{{call .UserID.String}}{{end}} (GM)"
     # Should the bridge create a space for each logged-in user and add bridged rooms to it?
     # Users who logged in before turning this on should run `!wa sync space` to create and fill the space for the first time.
     personal_filtering_spaces: false
-    # Should the bridge send a read receipt from the bridge bot when a message has been sent to GroupMe?
+    # Should the bridge send a read receipt from the bridge bot when a message has been sent to WhatsApp?
     delivery_receipts: false
     # Whether the bridge should send the message status as a custom com.beeper.message_send_status event.
     message_status_events: false
@@ -157,16 +140,13 @@ bridge:
     default_bridge_receipts: true
     default_bridge_presence: true
     # Shared secret for https://github.com/devture/matrix-synapse-shared-secret-auth
-    
-    login_shared_secret_map:
-        example.com: null
     #
     # If set, custom puppets will be enabled automatically for local users
     # instead of users having to find an access token and run `login-matrix`
     # manually.
     login_shared_secret: null
 
-    # Whether or not to invite own GroupMe user's Matrix puppet into private
+    # Whether or not to invite own WhatsApp user's Matrix puppet into private
     # chat portals when backfilling if needed.
     # This always uses the default puppet instead of custom puppets due to
     # rate limits and timestamp massaging.
@@ -180,91 +160,47 @@ bridge:
     # except if the config file is not writable.
     resend_bridge_info: false
 
-    # Whether or not thumbnails from GroupMe should be sent.
+    # Whether or not thumbnails from WhatsApp should be sent.
     # They're disabled by default due to very low resolution.
-    groupme_thumbnail: false
+    whatsapp_thumbnail: false
 
-    # Allow invite permission for user. User can invite any bots to room with GroupMe
+    # Allow invite permission for user. User can invite any bots to room with whatsapp
     # users (private chat and groups)
     allow_user_invite: false
 
     # The prefix for commands. Only required in non-management rooms.
     command_prefix: "!gm"
 
-    # Messages sent upon joining a management room.
+    # NOT TESTED in GroupMe
-    # Markdown is supported. The defaults are listed below.
+    # End-to-bridge encryption support options. This requires login_shared_secret to be configured
-    management_room_text:
+    # in order to get a device for the bridge bot.
-        # Sent when joining a room.
-        welcome: "Hello, I'm a GroupMe bridge bot."
-        # Sent when joining a management room and the user is already logged in.
-        welcome_connected: "Use `help` for help."
-        # Sent when joining a management room and the user is not logged in.
-        welcome_unconnected: "Use `help` for help or `login` to log in."
-        # Optional extra text sent when joining a management room.
-        additional_help: ""
-
-    # End-to-bridge encryption support options.
     #
-    # See https://docs.mau.fi/bridges/general/end-to-bridge-encryption.html for more info.
+    # Additionally, https://github.com/matrix-org/synapse/pull/5758 is required if using a normal
+    # application service.
     encryption:
         # Allow encryption, work in group chat rooms with e2ee enabled
         allow: false
         # Default to encryption, force-enable encryption in all portals the bridge creates
         # This will cause the bridge bot to be in private chats for the encryption to work properly.
+        # It is recommended to also set private_chat_portal_meta to true when using this.
         default: false
-        # Whether to use MSC2409/MSC3202 instead of /sync long polling for receiving encryption-related data.
+        # Options for automatic key sharing.
-        appservice: false
+        key_sharing:
-        # Require encryption, drop any unencrypted messages.
+            # Enable key sharing? If enabled, key requests for rooms where users are in will be fulfilled.
-        require: false
+            # You must use a client that supports requesting keys from other users to use this feature.
-        # Enable key sharing? If enabled, key requests for rooms where users are in will be fulfilled.
+            allow: false
-        # You must use a client that supports requesting keys from other users to use this feature.
+            # Require the requesting device to have a valid cross-signing signature?
-        allow_key_sharing: false
+            # This doesn't require that the bridge has verified the device, only that the user has verified it.
-        # What level of device verification should be required from users?
+            # Not yet implemented.
-        #
+            require_cross_signing: false
-        # Valid levels:
+            # Require devices to be verified by the bridge?
-        #   unverified - Send keys to all device in the room.
+            # Verification by the bridge is not yet implemented.
-        #   cross-signed-untrusted - Require valid cross-signing, but trust all cross-signing keys.
+            require_verification: true
-        #   cross-signed-tofu - Require valid cross-signing, trust cross-signing keys on first use (and reject changes).
-        #   cross-signed-verified - Require valid cross-signing, plus a valid user signature from the bridge bot.
-        #                           Note that creating user signatures from the bridge bot is not currently possible.
-        #   verified - Require manual per-device verification
-        #              (currently only possible by modifying the `trust` column in the `crypto_device` database table).
-        verification_levels:
-            # Minimum level for which the bridge should send keys to when bridging messages from GroupMe to Matrix.
-            receive: unverified
-            # Minimum level that the bridge should accept for incoming Matrix messages.
-            send: unverified
-            # Minimum level that the bridge should require for accepting key requests.
-            share: cross-signed-tofu
-        # Options for Megolm room key rotation. These options allow you to
-        # configure the m.room.encryption event content. See:
-        # https://spec.matrix.org/v1.3/client-server-api/#mroomencryption for
-        # more information about that event.
-        rotation:
-            # Enable custom Megolm room key rotation settings. Note that these
-            # settings will only apply to rooms created after this option is
-            # set.
-            enable_custom: false
-            # The maximum number of milliseconds a session should be used
-            # before changing it. The Matrix spec recommends 604800000 (a week)
-            # as the default.
-            milliseconds: 604800000
-            # The maximum number of messages that should be sent with a given a
-            # session before changing it. The Matrix spec recommends 100 as the
-            # default.
-            messages: 100
-
-    # Settings for provisioning API
-    provisioning:
-        # Prefix for the provisioning API paths.
-        prefix: /_matrix/provision/v1
-        # Shared secret for authentication. If set to "disable", the provisioning API will be disabled.
-        shared_secret: disable
 
     # Permissions for using the bridge.
     # Permitted values:
     # relaybot - Talk through the relaybot (if enabled), no access otherwise
-    #     user - Access to use the bridge to chat with a GroupMe account.
+    #     user - Access to use the bridge to chat with a WhatsApp account.
     #    admin - User level and some additional administration tools
     # Permitted keys:
     #        * - All Matrix users
@@ -275,15 +211,39 @@ bridge:
         "example.com": user
         "@admin:example.com": admin
 
-# Logging config. See https://github.com/tulir/zeroconfig for details.
+    # GroupMe not tested
+    relaybot:
+        # Whether or not relaybot support is enabled.
+        enabled: false
+        # The management room for the bot. This is where all status notifications are posted and
+        # in this room, you can use `!wa <command>` instead of `!wa relaybot <command>`. Omitting
+        # the command prefix completely like in user management rooms is not possible.
+        management: "!foo:example.com"
+        # List of users to invite to all created rooms that include the relaybot.
+        invites: []
+        # The formats to use when sending messages to WhatsApp via the relaybot.
+        message_formats:
+            m.text: "<b>{{ .Sender.Displayname }}</b>: {{ .Message }}"
+            m.notice: "<b>{{ .Sender.Displayname }}</b>: {{ .Message }}"
+            m.emote: "* <b>{{ .Sender.Displayname }}</b> {{ .Message }}"
+            m.file: "<b>{{ .Sender.Displayname }}</b> sent a file"
+            m.image: "<b>{{ .Sender.Displayname }}</b> sent an image"
+            m.audio: "<b>{{ .Sender.Displayname }}</b> sent an audio file"
+            m.video: "<b>{{ .Sender.Displayname }}</b> sent a video"
+            m.location: "<b>{{ .Sender.Displayname }}</b> sent a location"
+
+# Logging config.
 logging:
-    min_level: debug
+    # The directory for log files. Will be created if not found.
-    writers:
+    directory: ./logs
-    - type: stdout
+    # Available variables: .Date for the file date and .Index for different log files on the same day.
-      format: pretty-colored
+    file_name_format: "{{.Date}}-{{.Index}}.log"
-    - type: file
+    # Date format for file names in the Go time format: https://golang.org/pkg/time/#pkg-constants
-      format: json
+    file_date_format: 2006-01-02
-      filename: ./logs/mautrix-groupme.log
+    # Log file permissions.
-      max_size: 100
+    file_mode: 0600
-      max_backups: 10
+    # Timestamp format for log entries in the Go time format.
-      compress: true
+    timestamp_format: Jan _2, 2006 15:04:05
+    # Minimum severity for log messages.
+    # Options: debug, info, warn, error, fatal
+    print_level: debug

formatting.go

@@ -18,33 +18,127 @@ package main
 
 import (
 	"fmt"
-	"go.mau.fi/util/variationselector"
+	"regexp"
+	"strings"
 
-	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/format"
+	"maunium.net/go/mautrix/id"
+
+	"github.com/beeper/groupme/types"
 )
 
-const formatterContextAllowedMentionsKey = "com.beeper.groupme.allowed_mentions"
+var italicRegex = regexp.MustCompile("([\\s>~*]|^)_(.+?)_([^a-zA-Z\\d]|$)")
+var boldRegex = regexp.MustCompile("([\\s>_~]|^)\\*(.+?)\\*([^a-zA-Z\\d]|$)")
+var strikethroughRegex = regexp.MustCompile("([\\s>_*]|^)~(.+?)~([^a-zA-Z\\d]|$)")
+var codeBlockRegex = regexp.MustCompile("```(?:.|\n)+?```")
 
-func (br *GMBridge) pillConverter(displayname, mxid, eventID string, ctx format.Context) string {
+const mentionedGMIDsContextKey = "net.maunium.groupme.mentioned_gmids"
-	// GroupMe only supports user mentions.
+
-	if len(mxid) == 0 || mxid[0] != '@' {
+type Formatter struct {
-		return displayname
+	bridge *GMBridge
+
+	matrixHTMLParser *format.HTMLParser
+
+	waReplString   map[*regexp.Regexp]string
+	waReplFunc     map[*regexp.Regexp]func(string) string
+	waReplFuncText map[*regexp.Regexp]func(string) string
+}
+
+func NewFormatter(bridge *GMBridge) *Formatter {
+	formatter := &Formatter{
+		bridge: bridge,
+		matrixHTMLParser: &format.HTMLParser{
+			TabsToSpaces: 4,
+			Newline:      "\n",
+
+			PillConverter: func(displayname, mxid, eventID string, ctx format.Context) string {
+				if mxid[0] == '@' {
+					puppet := bridge.GetPuppetByMXID(id.UserID(mxid))
+					if puppet != nil {
+						gmids, ok := ctx[mentionedGMIDsContextKey].([]types.GroupMeID)
+						if !ok {
+							ctx[mentionedGMIDsContextKey] = []types.GroupMeID{puppet.GMID}
+						} else {
+							ctx[mentionedGMIDsContextKey] = append(gmids, puppet.GMID)
+						}
+						return "@" + puppet.PhoneNumber()
+					}
+				}
+				return mxid
+			},
+			BoldConverter: func(text string, _ format.Context) string {
+				return fmt.Sprintf("*%s*", text)
+			},
+			ItalicConverter: func(text string, _ format.Context) string {
+				return fmt.Sprintf("_%s_", text)
+			},
+			StrikethroughConverter: func(text string, _ format.Context) string {
+				return fmt.Sprintf("~%s~", text)
+			},
+			MonospaceConverter: func(text string, _ format.Context) string {
+				return fmt.Sprintf("```%s```", text)
+			},
+			MonospaceBlockConverter: func(text, language string, _ format.Context) string {
+				return fmt.Sprintf("```%s```", text)
+			},
+		},
+		waReplString: map[*regexp.Regexp]string{
+			italicRegex:        "$1<em>$2</em>$3",
+			boldRegex:          "$1<strong>$2</strong>$3",
+			strikethroughRegex: "$1<del>$2</del>$3",
+		},
 	}
-
+	formatter.waReplFunc = map[*regexp.Regexp]func(string) string{
-	return fmt.Sprintf("@%s", displayname)
+		codeBlockRegex: func(str string) string {
-}
+			str = str[3 : len(str)-3]
-
+			if strings.ContainsRune(str, '\n') {
-var matrixHTMLParser = &format.HTMLParser{
+				return fmt.Sprintf("<pre><code>%s</code></pre>", str)
-	TabsToSpaces:   4,
+			}
-	Newline:        "\n",
+			return fmt.Sprintf("<code>%s</code>", str)
-	HorizontalLine: "\n---\n",
+		},
-}
-
-func (portal *Portal) parseMatrixHTML(content *event.MessageEventContent) string {
-	if content.Format == event.FormatHTML && len(content.FormattedBody) > 0 {
-		return variationselector.FullyQualify(matrixHTMLParser.Parse(content.FormattedBody, format.NewContext()))
-	} else {
-		return variationselector.FullyQualify(content.Body)
 	}
+	formatter.waReplFuncText = map[*regexp.Regexp]func(string) string{}
+	return formatter
+}
+
+//func (formatter *Formatter) getMatrixInfoByJID(jid types.GroupMeID) (mxid id.UserID, displayname string) {
+//	if user := formatter.bridge.GetUserByJID(jid); user != nil {
+//		mxid = user.MXID
+//		displayname = string(user.MXID)
+//	} else if puppet := formatter.bridge.GetPuppetByJID(jid); puppet != nil {
+//		mxid = puppet.MXID
+//		displayname = puppet.Displayname
+//	}
+//	return
+//}
+
+//func (formatter *Formatter) ParseWhatsApp(content *event.MessageEventContent, mentionedJIDs []types.GroupMeID) {
+//	output := html.EscapeString(content.Body)
+//	for regex, replacement := range formatter.waReplString {
+//		output = regex.ReplaceAllString(output, replacement)
+//	}
+//	for regex, replacer := range formatter.waReplFunc {
+//		output = regex.ReplaceAllStringFunc(output, replacer)
+//	}
+//	for _, jid := range mentionedJIDs {
+//		mxid, displayname := formatter.getMatrixInfoByJID(jid)
+//		number := "@" + strings.Replace(jid, whatsappExt.NewUserSuffix, "", 1)
+//		output = strings.Replace(output, number, fmt.Sprintf(`<a href="https://matrix.to/#/%s">%s</a>`, mxid, displayname), -1)
+//		content.Body = strings.Replace(content.Body, number, displayname, -1)
+//	}
+//	if output != content.Body {
+//		output = strings.Replace(output, "\n", "<br/>", -1)
+//		content.FormattedBody = output
+//		content.Format = event.FormatHTML
+//		for regex, replacer := range formatter.waReplFuncText {
+//			content.Body = regex.ReplaceAllStringFunc(content.Body, replacer)
+//		}
+//	}
+//}
+
+func (formatter *Formatter) ParseMatrix(html string) (string, []types.GroupMeID) {
+	ctx := make(format.Context)
+	result := formatter.matrixHTMLParser.Parse(html, ctx)
+	mentionedJIDs, _ := ctx[mentionedGMIDsContextKey].([]types.GroupMeID)
+	return result, mentionedJIDs
 }

go.mod

@@ -3,47 +3,47 @@ module github.com/beeper/groupme
 go 1.19
 
 require (
-	github.com/gabriel-vasile/mimetype v0.3.23
+	github.com/Rhymen/go-whatsapp v0.1.1
-	github.com/lib/pq v1.10.9
+	github.com/gabriel-vasile/mimetype v1.1.2
-	github.com/mattn/go-sqlite3 v1.14.17
+	github.com/gorilla/websocket v1.5.0
-	github.com/prometheus/client_golang v1.11.1
+	github.com/karmanyaahm/groupme v0.0.0
-	maunium.net/go/maulogger/v2 v2.4.1
+	github.com/karmanyaahm/wray v0.0.0-20210303233435-756d58657c14
-	maunium.net/go/mautrix v0.16.1-0.20230821105106-ac5c2c22102c
+	github.com/lib/pq v1.10.7
+	github.com/mattn/go-sqlite3 v1.14.15
+	github.com/prometheus/client_golang v1.9.0
+	gorm.io/gorm v1.20.12
+	maunium.net/go/mauflag v1.0.0
+	maunium.net/go/maulogger/v2 v2.3.2
+	maunium.net/go/mautrix v0.12.3-0.20221020190005-d0c13d2f04a1
 )
 
-require go.mau.fi/util v0.0.0-20230805171708-199bf3eec776
-
 require (
-	gitea.watsonlabs.net/watsonb8/fayec v0.0.5 // indirect
-	gitea.watsonlabs.net/watsonb8/groupme-lib v0.3.7 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect
-	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/golang/protobuf v1.4.3 // indirect
-	github.com/google/go-cmp v0.5.8 // indirect
+	github.com/google/uuid v1.2.0 // indirect
-	github.com/google/uuid v1.3.1 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.1 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.26.0 // indirect
+	github.com/prometheus/common v0.15.0 // indirect
 	github.com/prometheus/procfs v0.6.0 // indirect
-	github.com/rs/zerolog v1.30.0 // indirect
+	github.com/rs/zerolog v1.28.0 // indirect
-	github.com/stretchr/testify v1.8.4 // indirect
+	github.com/tidwall/gjson v1.14.3 // indirect
-	github.com/tidwall/gjson v1.16.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tidwall/sjson v1.2.5 // indirect
-	github.com/yuin/goldmark v1.5.5 // indirect
+	github.com/yuin/goldmark v1.5.2 // indirect
-	go.mau.fi/zeroconfig v0.1.2 // indirect
+	golang.org/x/crypto v0.0.0-20221012134737-56aed061732a // indirect
-	golang.org/x/crypto v0.12.0 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
-	golang.org/x/exp v0.0.0-20230810033253-352e893a4cad // indirect
+	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/net v0.14.0 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	golang.org/x/sys v0.11.0 // indirect
+	google.golang.org/protobuf v1.25.0 // indirect
-	google.golang.org/protobuf v1.26.0-rc.1 // indirect
-	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	maunium.net/go/mauflag v1.0.0 // indirect
 )
+
+replace github.com/karmanyaahm/groupme => ../groupme-lib

go.sum

@@ -1,81 +1,93 @@
-cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg=
+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=
-gitea.watsonlabs.net/watsonb8/fayec v0.0.0-20230919020138-8f0db7048755 h1:FEhNSjSNvZ+nVg5Z3ds6X8ys3qjM+mmyLTSqKhCUHuQ=
+github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f/go.mod h1:4a58ifQTEe2uwwsaqbh3i2un5/CBPg+At/qHpt18Tmk=
-gitea.watsonlabs.net/watsonb8/fayec v0.0.0-20230919020138-8f0db7048755/go.mod h1:gv8CWMq6dFJQhH30u8bO3u4k2irKlclZktLNYDebQ/0=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-gitea.watsonlabs.net/watsonb8/fayec v0.0.0-20230919151904-5ca9ade6f946 h1:loc70tiaFs1U4sqn+lKMSBlo5OfvVfClYnWjfGLXaSg=
-gitea.watsonlabs.net/watsonb8/fayec v0.0.0-20230919151904-5ca9ade6f946/go.mod h1:gv8CWMq6dFJQhH30u8bO3u4k2irKlclZktLNYDebQ/0=
-gitea.watsonlabs.net/watsonb8/fayec v0.0.2 h1:tqbgr1vRZ6Wq4W81xBg+FTOywSv3EJpK263SAVXXTco=
-gitea.watsonlabs.net/watsonb8/fayec v0.0.2/go.mod h1:gv8CWMq6dFJQhH30u8bO3u4k2irKlclZktLNYDebQ/0=
-gitea.watsonlabs.net/watsonb8/fayec v0.0.3 h1:YpaZBIee8Ix6uGm1UoEtBix1dEU1TURChAsJGJ3pVRo=
-gitea.watsonlabs.net/watsonb8/fayec v0.0.3/go.mod h1:gv8CWMq6dFJQhH30u8bO3u4k2irKlclZktLNYDebQ/0=
-gitea.watsonlabs.net/watsonb8/fayec v0.0.4 h1:SLvwip1DQy13QngVsEgoLtN7T6bS+X6348p6PQhUF2A=
-gitea.watsonlabs.net/watsonb8/fayec v0.0.4/go.mod h1:gv8CWMq6dFJQhH30u8bO3u4k2irKlclZktLNYDebQ/0=
-gitea.watsonlabs.net/watsonb8/fayec v0.0.5 h1:9+UHzUuEcLuZ5Gx5S/NTBxYshUhsiQ5M3vzUF8RAKxw=
-gitea.watsonlabs.net/watsonb8/fayec v0.0.5/go.mod h1:gv8CWMq6dFJQhH30u8bO3u4k2irKlclZktLNYDebQ/0=
-gitea.watsonlabs.net/watsonb8/groupme-lib v0.2.1-0.20230919023741-5727a20506fa h1:dFNaDeztJzo26t7URiOvaWNUDxve80tAAEHTKpi5JEk=
-gitea.watsonlabs.net/watsonb8/groupme-lib v0.2.1-0.20230919023741-5727a20506fa/go.mod h1:QRCibl6Tpr/uBtXD46qXqEkxqR5tQa5vdw+0j7hn+Mw=
-gitea.watsonlabs.net/watsonb8/groupme-lib v0.3.0 h1:Uz5TIIF9tFf0LYEbCJqP8axufdBfsVorAYOaal2NmPw=
-gitea.watsonlabs.net/watsonb8/groupme-lib v0.3.0/go.mod h1:vddDne/D5rrUUQkiIXveB7R3rONGEy4wtAIpGL+yFXA=
-gitea.watsonlabs.net/watsonb8/groupme-lib v0.3.1 h1:2HE8pyjczDZ74rhUE2fLvubiknR9Aj+izTcCewiTdik=
-gitea.watsonlabs.net/watsonb8/groupme-lib v0.3.1/go.mod h1:7pn2rsi3Axc15rW24idJfBjuXAFxvjLRmMK/0Ex0dKM=
-gitea.watsonlabs.net/watsonb8/groupme-lib v0.3.2 h1:QJLwAqYoIxhTtZIzMsjZGiLcml6NCS91DLvnmt/N7bM=
-gitea.watsonlabs.net/watsonb8/groupme-lib v0.3.2/go.mod h1:htgKMGvk2QieyYT69DWnTLABFc/6ttMlIRIr6zPXNfo=
-gitea.watsonlabs.net/watsonb8/groupme-lib v0.3.3 h1:sBmF/10Zk0iyKs1nakHfOeB9BUoSyemCpDUEux+BpMk=
-gitea.watsonlabs.net/watsonb8/groupme-lib v0.3.3/go.mod h1:htgKMGvk2QieyYT69DWnTLABFc/6ttMlIRIr6zPXNfo=
-gitea.watsonlabs.net/watsonb8/groupme-lib v0.3.4 h1:RnvQlgcBIyTSnrG7E311Zuy/A3avSuBYUb8lDN9sw5Q=
-gitea.watsonlabs.net/watsonb8/groupme-lib v0.3.4/go.mod h1:htgKMGvk2QieyYT69DWnTLABFc/6ttMlIRIr6zPXNfo=
-gitea.watsonlabs.net/watsonb8/groupme-lib v0.3.5 h1:J8r/xl8mcQ5mkR/3+gWxu0WdD4CecX42iqB+GLRhNt4=
-gitea.watsonlabs.net/watsonb8/groupme-lib v0.3.5/go.mod h1:3tsM98NYRgbrGrHokW/FYSoETCIaZVhfV+UGcDymQGg=
-gitea.watsonlabs.net/watsonb8/groupme-lib v0.3.6 h1:eITXFX7JHleKD7e2BAUjdX9eDxlxHeMGDRSA/wQa9xI=
-gitea.watsonlabs.net/watsonb8/groupme-lib v0.3.6/go.mod h1:3tsM98NYRgbrGrHokW/FYSoETCIaZVhfV+UGcDymQGg=
-gitea.watsonlabs.net/watsonb8/groupme-lib v0.3.7 h1:/rPp/sNfPqVomm950dL5ANooTTJ501ehvV3y/tC307g=
-gitea.watsonlabs.net/watsonb8/groupme-lib v0.3.7/go.mod h1:opuYpFdMeeGB87rS0KBkawDb74Hiaw24Lg+EOT6SlKY=
 github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
-github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
+github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
+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=
+github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
+github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
+github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
+github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
+github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
+github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
 github.com/autogrowsystems/wray v0.0.0-20160519030252-f36984f6648c/go.mod h1:druJ8QMeBCUmwJ7ZSFowx77dWxEWF3SYlQlsqZaLZQg=
-github.com/beeper/groupme-lib v0.2.0 h1:d/RSHPso6qjG80cH4nFEBeGnoEo7LJfKdvM+nCBLkqk=
+github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
-github.com/beeper/groupme-lib v0.2.0/go.mod h1:i+bzB18n8RntitrMbr65boSHU0HfjDcbEUEIPPAV+QU=
+github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/beeper/groupme-lib v0.2.1-0.20221021205945-8f23e04eea71 h1:QfLfltOhTgjFQAY1P8dkDx1NhXPmo21vxmlgnh4NiEc=
+github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
-github.com/beeper/groupme-lib v0.2.1-0.20221021205945-8f23e04eea71/go.mod h1:8AdyorS5ZuqSarqY/HD+p6sYf+gMr8+pm33U687568g=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
+github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
+github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
-github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
+github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 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=
-github.com/densestvoid/groupme v0.2.0/go.mod h1:i+bzB18n8RntitrMbr65boSHU0HfjDcbEUEIPPAV+QU=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/gabriel-vasile/mimetype v0.3.23 h1:4qH4dGPSe+MBFBkWDag41c+5YFasJjyP4KwI+t6Ukz8=
+github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/gabriel-vasile/mimetype v0.3.23/go.mod h1:6CDPel/o/3/s4+bp6kIbsWATq8pmgOisOPG40CJa6To=
+github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
+github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
+github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
+github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
+github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
+github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/gabriel-vasile/mimetype v1.1.2 h1:gaPnPcNor5aZSVCJVSGipcpbgMWiAAj9z182ocSGbHU=
 github.com/gabriel-vasile/mimetype v1.1.2/go.mod h1:6CDPel/o/3/s4+bp6kIbsWATq8pmgOisOPG40CJa6To=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/log v0.1.0 h1:DGJh0Sm43HbOeYDNnVZFl8BvcYVvjD5bqYJvp0REbwQ=
+github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
-github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo=
+github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+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=
@@ -83,217 +95,405 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
-github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
-github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 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.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
+github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
+github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
+github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
+github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
+github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
+github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
+github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
+github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
+github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
+github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
+github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E=
+github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ=
-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/karmanyaahm/wray v0.0.0-20210303233435-756d58657c14 h1:NrATjZKvkY+ojL8FXTWa3fQ+wihFrAxLNE6T+wOkIcY=
 github.com/karmanyaahm/wray v0.0.0-20210303233435-756d58657c14/go.mod h1:ysD86MIEevmAkdfdg5s6Qt3I07RN6fvMAyna7jCGG2o=
+github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
-github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
+github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
+github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
+github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
+github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
+github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
+github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
+github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
+github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
+github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
+github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
+github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k=
+github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
+github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
+github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
+github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
+github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
+github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
+github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
+github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
+github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA=
+github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
+github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
+github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
+github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
+github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
+github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
+github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
+github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.11.1 h1:+4eQaD7vAZ6DsfsxB15hbE0odUjGI5ARs9yskGu1v4s=
+github.com/prometheus/client_golang v1.9.0 h1:Rrch9mh17XcxvEu9D9DEpb4isxjGBtcevQjKvxPRQIU=
-github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
+github.com/prometheus/client_golang v1.9.0/go.mod h1:FqZLKOZnGdFAhOK4nqGHa7D66IdsO+O441Eve7ptJDU=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.26.0 h1:iMAkS2TDoNWnKM+Kopnx/8tnEStIfpYA0ur0xQzzhMQ=
+github.com/prometheus/common v0.15.0 h1:4fgOnadei3EZvgRwxJ7RMpG1k1pOZth5Pc13tyspaKM=
-github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
+github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
+github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
-github.com/rs/zerolog v1.30.0 h1:SymVODrcRsaRaSInD9yQtKbtWqwsfoPcRff/oRXLj4c=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rs/zerolog v1.30.0/go.mod h1:/tk+P47gFdPXq4QYjvCmT5/Gsug2nagsFWBWhAiSi1w=
+github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY=
+github.com/rs/zerolog v1.28.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
+github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+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=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
+github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
+github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
+github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/gjson v1.16.0 h1:SyXa+dsSPpUlcwEDuKuEBJEz5vzTvOea+9rjyYodQFg=
+github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw=
-github.com/tidwall/gjson v1.16.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.14.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
 github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
-github.com/yuin/goldmark v1.5.5 h1:IJznPe8wOzfIKETmMkd06F8nXkmlhaHqFRM9l1hAGsU=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/yuin/goldmark v1.5.5/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
-go.mau.fi/util v0.0.0-20230805171708-199bf3eec776 h1:VrxDCO/gLFHLQywGUsJzertrvt2mUEMrZPf4hEL/s18=
+github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-go.mau.fi/util v0.0.0-20230805171708-199bf3eec776/go.mod h1:AxuJUMCxpzgJ5eV9JbPWKRH8aAJJidxetNdUj7qcb84=
+github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-go.mau.fi/zeroconfig v0.1.2 h1:DKOydWnhPMn65GbXZOafgkPm11BvFashZWLct0dGFto=
+github.com/yuin/goldmark v1.5.2 h1:ALmeCk/px5FSm1MAcFBAsVKZjDuMVj8Tm7FFIlMJnqU=
-go.mau.fi/zeroconfig v0.1.2/go.mod h1:NcSJkf180JT+1IId76PcMuLTNa1CzsFFZ0nBygIQM70=
+github.com/yuin/goldmark v1.5.2/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
+go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
+go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
+go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
+go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 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-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
+golang.org/x/crypto v0.0.0-20221012134737-56aed061732a h1:NmSIgad6KjE6VvHciPZuNRTKxGhlPfD6OA87W/PLkqg=
-golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
+golang.org/x/crypto v0.0.0-20221012134737-56aed061732a/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/exp v0.0.0-20230810033253-352e893a4cad h1:g0bG7Z4uG+OgH2QDODnjp6ggkk1bJDsINcuWmJN1iJU=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20230810033253-352e893a4cad/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
-golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 h1:Wo7BWFiOk0QRFMLYMqJGFMd9CgUAcGx7V+qEg/h5IBI=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a h1:DcqTD9SDLc+1P/r1EmRBwnVsrOwW+kk2vWf9n+1sGhs=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0=
-golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
+golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+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=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+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.26.0-rc.1 h1:7QnIQpGRHE5RnLKnESfDoxm2dTapTZua5a0kS0A+VXQ=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
+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=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
+gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
-gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
+gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
+gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gorm.io/gorm v1.20.12 h1:ebZ5KrSHzet+sqOCVdH9mTjW91L298nX3v5lVxAzSUY=
+gorm.io/gorm v1.20.12/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 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.4.1 h1:N7zSdd0mZkB2m2JtFUsiGTQQAdP0YeFWT7YMc80yAL8=
+maunium.net/go/maulogger/v2 v2.3.2 h1:1XmIYmMd3PoQfp9J+PaHhpt80zpfmMqaShzUTC7FwY0=
-maunium.net/go/maulogger/v2 v2.4.1/go.mod h1:omPuYwYBILeVQobz8uO3XC8DIRuEb5rXYlQSuqrbCho=
+maunium.net/go/maulogger/v2 v2.3.2/go.mod h1:TYWy7wKwz/tIXTpsx8G3mZseIRiC5DoMxSZazOHy68A=
-maunium.net/go/mautrix v0.15.0 h1:gkK9HXc1SSPwY7qOAqchzj2xxYqiOYeee8lr28A2g/o=
+maunium.net/go/mautrix v0.12.3-0.20221020190005-d0c13d2f04a1 h1:daraaP+GcSrFLgVckFpp+ciVrtQeG5s2w3Fi8AInaj8=
-maunium.net/go/mautrix v0.15.0/go.mod h1:1v8QVDd7q/eJ+eg4sgeOSEafBAFhkt4ab2i97M3IkNQ=
+maunium.net/go/mautrix v0.12.3-0.20221020190005-d0c13d2f04a1/go.mod h1:bCw45Qx/m9qsz7eazmbe7Rzq5ZbTPzwRE1UgX2S9DXs=
-maunium.net/go/mautrix v0.16.0 h1:iUqCzJE2yqBC1ddAK6eAn159My8rLb4X8g4SFtQh2Dk=
+sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
-maunium.net/go/mautrix v0.16.0/go.mod h1:XAjE9pTSGcr6vXaiNgQGiip7tddJ8FQV1a29u2QdBG4=
+sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
-maunium.net/go/mautrix v0.16.1-0.20230821105106-ac5c2c22102c h1:oRIaFbS4ds9biwJVguT+9Zu7n5zDbKQeuGklXHQxvCU=
-maunium.net/go/mautrix v0.16.1-0.20230821105106-ac5c2c22102c/go.mod h1:XAjE9pTSGcr6vXaiNgQGiip7tddJ8FQV1a29u2QdBG4=

groupmeExt/client.go

@@ -1,9 +1,11 @@
-package groupmeext
+package groupmeExt
 
 import (
 	"context"
 
-	"gitea.watsonlabs.net/watsonb8/groupme-lib"
+	"github.com/karmanyaahm/groupme"
+
+	"github.com/beeper/groupme/types"
 )
 
 type Client struct {
@@ -11,35 +13,35 @@ type Client struct {
 }
 
 // NewClient creates a new GroupMe API Client
-func NewClient() *Client {
+func NewClient(authToken string) *Client {
 	n := Client{
-		Client: groupme.NewClient(),
+		Client: groupme.NewClient(authToken),
 	}
 	return &n
 }
-func (c Client) IndexAllGroups(authToken string) ([]*groupme.Group, error) {
+func (c Client) IndexAllGroups() ([]*groupme.Group, error) {
 	return c.IndexGroups(context.TODO(), &groupme.GroupsQuery{
 		//	Omit:    "memberships",
 		PerPage: 100, //TODO: Configurable and add multipage support
-	}, authToken)
+	})
 }
 
-func (c Client) IndexAllRelations(authToken string) ([]*groupme.User, error) {
+func (c Client) IndexAllRelations() ([]*groupme.User, error) {
-	return c.IndexRelations(context.TODO(), authToken)
+	return c.IndexRelations(context.TODO())
 }
 
-func (c Client) IndexAllChats(authToken string) ([]*groupme.Chat, error) {
+func (c Client) IndexAllChats() ([]*groupme.Chat, error) {
 	return c.IndexChats(context.TODO(), &groupme.IndexChatsQuery{
 		PerPage: 100, //TODO?
-	}, authToken)
+	})
 }
 
-func (c Client) LoadMessagesAfter(groupID groupme.ID, lastMessageID string, lastMessageFromMe bool, private bool, authToken string) ([]*groupme.Message, error) {
+func (c Client) LoadMessagesAfter(groupID, lastMessageID string, lastMessageFromMe bool, private bool) ([]*groupme.Message, error) {
 	if private {
-		ans, e := c.IndexDirectMessages(context.TODO(), groupID.String(), &groupme.IndexDirectMessagesQuery{
+		ans, e := c.IndexDirectMessages(context.TODO(), groupID, &groupme.IndexDirectMessagesQuery{
 			SinceID: groupme.ID(lastMessageID),
 			//Limit:    num,
-		}, authToken)
+		})
 		//fmt.Println(groupID, lastMessageID, num, i.Count, e)
 		if e != nil {
 			return nil, e
@@ -50,11 +52,11 @@ func (c Client) LoadMessagesAfter(groupID groupme.ID, lastMessageID string, last
 		}
 		return ans.Messages, nil
 	} else {
-		i, e := c.IndexMessages(context.TODO(), groupID, &groupme.IndexMessagesQuery{
+		i, e := c.IndexMessages(context.TODO(), groupme.ID(groupID), &groupme.IndexMessagesQuery{
 			AfterID: groupme.ID(lastMessageID),
 			//20 for consistency with dms
 			Limit: 20,
-		}, authToken)
+		})
 		//fmt.Println(groupID, lastMessageID, num, i.Count, e)
 		if e != nil {
 			return nil, e
@@ -63,12 +65,12 @@ func (c Client) LoadMessagesAfter(groupID groupme.ID, lastMessageID string, last
 	}
 }
 
-func (c Client) LoadMessagesBefore(groupID, lastMessageID string, private bool, authToken string) ([]*groupme.Message, error) {
+func (c Client) LoadMessagesBefore(groupID, lastMessageID string, private bool) ([]*groupme.Message, error) {
 	if private {
 		i, e := c.IndexDirectMessages(context.TODO(), groupID, &groupme.IndexDirectMessagesQuery{
 			BeforeID: groupme.ID(lastMessageID),
 			//Limit:    num,
-		}, authToken)
+		})
 		//fmt.Println(groupID, lastMessageID, num, i.Count, e)
 		if e != nil {
 			return nil, e
@@ -80,7 +82,7 @@ func (c Client) LoadMessagesBefore(groupID, lastMessageID string, private bool,
 			BeforeID: groupme.ID(lastMessageID),
 			//20 for consistency with dms
 			Limit: 20,
-		}, authToken)
+		})
 		//fmt.Println(groupID, lastMessageID, num, i.Count, e)
 		if e != nil {
 			return nil, e
@@ -89,10 +91,11 @@ func (c Client) LoadMessagesBefore(groupID, lastMessageID string, private bool,
 	}
 }
 
-func (c *Client) RemoveFromGroup(uid, groupID groupme.ID, authToken string) error {
+func (c *Client) RemoveFromGroup(uid, groupID types.GroupMeID) error {
-	group, err := c.ShowGroup(context.TODO(), groupID, authToken)
+
+	group, err := c.ShowGroup(context.TODO(), groupme.ID(groupID))
 	if err != nil {
 		return err
 	}
-	return c.RemoveMember(context.TODO(), groupID, group.GetMemberByUserID(uid).ID, authToken)
+	return c.RemoveMember(context.TODO(), groupme.ID(groupID), group.GetMemberByUserID(groupme.ID(uid)).ID)
 }

groupmeExt/message.go

@@ -1,4 +1,4 @@
-package groupmeext
+package groupmeExt
 
 import (
 	"bytes"
@@ -9,7 +9,9 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"gitea.watsonlabs.net/watsonb8/groupme-lib"
+	"github.com/karmanyaahm/groupme"
+
+	"github.com/beeper/groupme/types"
 )
 
 type Message struct{ groupme.Message }
@@ -58,7 +60,7 @@ func DownloadImage(URL string) (bytes *[]byte, mime string, err error) {
 	return
 }
 
-func DownloadFile(RoomJID groupme.ID, FileID string, token string) (contents []byte, fname, mime string) {
+func DownloadFile(RoomJID types.GroupMeID, FileID string, token string) (contents []byte, fname, mime string) {
 	client := &http.Client{}
 	b, _ := json.Marshal(struct {
 		FileIDS []string `json:"file_ids"`

groupmeExt/subscription.go

@@ -0,0 +1,58 @@
+package groupmeExt
+
+import (
+	log "maunium.net/go/maulogger/v2"
+
+	"github.com/karmanyaahm/groupme"
+	"github.com/karmanyaahm/wray"
+)
+
+type fayeLogger struct {
+	log.Logger
+}
+
+func (f fayeLogger) Debugf(i string, a ...interface{}) {
+	f.Logger.Debugfln(i, a...)
+}
+func (f fayeLogger) Errorf(i string, a ...interface{}) {
+	f.Logger.Errorfln(i, a...)
+}
+func (f fayeLogger) Warnf(i string, a ...interface{}) {
+	f.Logger.Warnfln(i, a...)
+}
+func (f fayeLogger) Infof(i string, a ...interface{}) {
+	f.Logger.Infofln(i, a...)
+}
+
+type FayeClient struct {
+	*wray.FayeClient
+}
+
+func (fc FayeClient) WaitSubscribe(channel string, msgChannel chan groupme.PushMessage) {
+	c_new := make(chan wray.Message)
+	fc.FayeClient.WaitSubscribe(channel, c_new)
+	//converting between types because channels don't support interfaces well
+	go func() {
+		for i := range c_new {
+			msgChannel <- i
+		}
+	}()
+}
+
+//for authentication, specific implementation will vary based on faye library
+type AuthExt struct{}
+
+func (a *AuthExt) In(wray.Message) {}
+func (a *AuthExt) Out(m wray.Message) {
+	groupme.OutMsgProc(m)
+}
+
+func NewFayeClient(logger log.Logger) *FayeClient {
+
+	fc := &FayeClient{wray.NewFayeClient(groupme.PushServer)}
+	fc.SetLogger(fayeLogger{logger.Sub("FayeClient")})
+	fc.AddExtension(&AuthExt{})
+	//fc.AddExtension(fc.FayeClient)
+
+	return fc
+}

groupmeExt/user.go

@@ -1,4 +1,4 @@
-package groupmeext
+package groupmeExt
 
 const (
 	OldUserSuffix = "@c.groupme.com"

main.go

@@ -17,25 +17,17 @@
 package main
 
 import (
-	"context"
-	_ "embed"
-	"fmt"
-	"gitea.watsonlabs.net/watsonb8/groupme-lib"
-	"github.com/beeper/groupme/groupmeext"
-	"go.mau.fi/util/configupgrade"
-	"maunium.net/go/mautrix/bridge/bridgeconfig"
-	"maunium.net/go/mautrix/event"
-	"regexp"
 	"sync"
 
-	"maunium.net/go/mautrix"
 	"maunium.net/go/mautrix/bridge"
 	"maunium.net/go/mautrix/bridge/commands"
 	"maunium.net/go/mautrix/bridge/status"
 	"maunium.net/go/mautrix/id"
+	"maunium.net/go/mautrix/util/configupgrade"
 
 	"github.com/beeper/groupme/config"
 	"github.com/beeper/groupme/database"
+	"github.com/beeper/groupme/types"
 )
 
 // Information to find out exactly which commit the bridge was built from.
@@ -49,17 +41,17 @@ var (
 //go:embed example-config.yaml
 var ExampleConfig string
 
-const unstableFeatureBatchSending = "org.matrix.msc2716"
-
 type GMBridge struct {
 	bridge.Bridge
 	Config       *config.Config
 	DB           *database.Database
 	Provisioning *ProvisioningAPI
+	Formatter    *Formatter
 	Metrics      *MetricsHandler
 
 	usersByMXID         map[id.UserID]*User
-	usersByGMID         map[groupme.ID]*User
+	usersByUsername     map[string]*User
+	usersByGMID         map[types.GroupMeID]*User // TODO REMOVE?
 	usersLock           sync.Mutex
 	spaceRooms          map[id.RoomID]*User
 	spaceRoomsLock      sync.Mutex
@@ -68,31 +60,19 @@ type GMBridge struct {
 	portalsByMXID       map[id.RoomID]*Portal
 	portalsByGMID       map[database.PortalKey]*Portal
 	portalsLock         sync.Mutex
-	puppets             map[groupme.ID]*Puppet
+	puppets             map[types.GroupMeID]*Puppet
 	puppetsByCustomMXID map[id.UserID]*Puppet
 	puppetsLock         sync.Mutex
 }
 
-var (
-	TypeMSC3381PollStart      = event.Type{Class: event.MessageEventType, Type: "org.matrix.msc3381.poll.start"}
-	TypeMSC3381PollResponse   = event.Type{Class: event.MessageEventType, Type: "org.matrix.msc3381.poll.response"}
-	TypeMSC3381V2PollResponse = event.Type{Class: event.MessageEventType, Type: "org.matrix.msc3381.v2.poll.response"}
-)
-
 func (br *GMBridge) Init() {
 	br.CommandProcessor = commands.NewProcessor(&br.Bridge)
 	br.RegisterCommands()
 
-	matrixHTMLParser.PillConverter = br.pillConverter
-
 	Segment.log = br.Log.Sub("Segment")
 	Segment.key = br.Config.SegmentKey
-	Segment.userID = br.Config.SegmentUserID
 	if Segment.IsEnabled() {
 		Segment.log.Infoln("Segment metrics are enabled")
-		if Segment.userID != "" {
-			Segment.log.Infoln("Overriding Segment user_id with %v", Segment.userID)
-		}
 	}
 
 	br.DB = database.New(br.Bridge.DB, br.Log.Sub("Database"))
@@ -102,32 +82,58 @@ func (br *GMBridge) Init() {
 		br.Provisioning = &ProvisioningAPI{bridge: br}
 	}
 
+	br.Formatter = NewFormatter(br)
 	br.Metrics = NewMetricsHandler(br.Config.Metrics.Listen, br.Log.Sub("Metrics"), br.DB)
 	br.MatrixHandler.TrackEventDuration = br.Metrics.TrackMatrixEvent
 }
 
-func (br *GMBridge) Start() {
+func (bridge *GMBridge) Start() {
-	if br.Provisioning != nil {
+	if bridge.Provisioning != nil {
-		br.Log.Debugln("Initializing provisioning API")
+		bridge.Log.Debugln("Initializing provisioning API")
-		br.Provisioning.Init()
+		bridge.Provisioning.Init()
 	}
-	go br.StartUsers()
+	go bridge.StartUsers()
-	if br.Config.Metrics.Enabled {
+	if bridge.Config.Metrics.Enabled {
-		go br.Metrics.Start()
+		go bridge.Metrics.Start()
+	}
+}
+
+func (bridge *GMBridge) UpdateBotProfile() {
+	bridge.Log.Debugln("Updating bot profile")
+	botConfig := bridge.Config.AppService.Bot
+
+	var err error
+	var mxc id.ContentURI
+	if botConfig.Avatar == "remove" {
+		err = bridge.Bot.SetAvatarURL(mxc)
+	} else if len(botConfig.Avatar) > 0 {
+		mxc, err = id.ParseContentURI(botConfig.Avatar)
+		if err == nil {
+			err = bridge.Bot.SetAvatarURL(mxc)
+		}
+	}
+	if err != nil {
+		bridge.Log.Warnln("Failed to update bot avatar:", err)
+	}
+
+	if botConfig.Displayname == "remove" {
+		err = bridge.Bot.SetDisplayName("")
+	} else if len(botConfig.Avatar) > 0 {
+		err = bridge.Bot.SetDisplayName(botConfig.Displayname)
+	}
+	if err != nil {
+		bridge.Log.Warnln("Failed to update bot displayname:", err)
 	}
 }
 
 func (br *GMBridge) StartUsers() {
 	br.Log.Debugln("Starting users")
 	foundAnySessions := false
-	gmc := groupmeext.NewClient()
-	conn := groupme.NewPushSubscription(context.Background())
-	conn.Connect(context.Background())
 	for _, user := range br.GetAllUsers() {
-		if user.GMID.Valid() {
+		if !user.GMID.IsEmpty() {
 			foundAnySessions = true
 		}
-		go user.Connect(gmc, &conn)
+		go user.Connect()
 	}
 	if !foundAnySessions {
 		br.SendGlobalBridgeState(status.BridgeState{StateEvent: status.StateUnconfigured}.Fill(nil))
@@ -147,7 +153,7 @@ func (br *GMBridge) StartUsers() {
 func (br *GMBridge) Stop() {
 	br.Metrics.Stop()
 	// TODO anything needed to disconnect the users?
-	for _, user := range br.usersByGMID {
+	for _, user := range br.usersByUsername {
 		if user.Client == nil {
 			continue
 		}
@@ -167,355 +173,15 @@ func (br *GMBridge) GetConfigPtr() interface{} {
 	return br.Config
 }
 
-func (bridge *GMBridge) GetPortalByGMID(key database.PortalKey) *Portal {
-	bridge.portalsLock.Lock()
-	defer bridge.portalsLock.Unlock()
-	portal, ok := bridge.portalsByGMID[key]
-	if !ok {
-		dbPortal := bridge.DB.Portal.GetByGMID(key)
-		return bridge.loadDBPortal(dbPortal, &key)
-	}
-	return portal
-}
-
-func (br *GMBridge) GetAllPortals() []*Portal {
-	return br.dbPortalsToPortals(br.DB.Portal.GetAll())
-}
-
-func (br *GMBridge) GetAllIPortals() (iportals []bridge.Portal) {
-	portals := br.GetAllPortals()
-	iportals = make([]bridge.Portal, len(portals))
-	for i, portal := range portals {
-		iportals[i] = portal
-	}
-	return iportals
-}
-
-func (br *GMBridge) GetAllPortalsByGMID(gmid groupme.ID) []*Portal {
-	return br.dbPortalsToPortals(br.DB.Portal.GetAllByGMID(gmid))
-}
-
-func (bridge *GMBridge) GetPortalByMXID(mxid id.RoomID) *Portal {
-	bridge.portalsLock.Lock()
-	defer bridge.portalsLock.Unlock()
-	portal, ok := bridge.portalsByMXID[mxid]
-	if !ok {
-		return bridge.loadDBPortal(bridge.DB.Portal.GetByMXID(mxid), nil)
-	}
-	return portal
-}
-
-func (br *GMBridge) GetIPortal(mxid id.RoomID) bridge.Portal {
-	p := br.GetPortalByMXID(mxid)
-	if p == nil {
-		return nil
-	}
-	return p
-}
-
-func (br *GMBridge) getUserByMXID(userID id.UserID, onlyIfExists bool) *User {
-	_, isPuppet := br.ParsePuppetMXID(userID)
-	if isPuppet || userID == br.Bot.UserID {
-		return nil
-	}
-	br.usersLock.Lock()
-	defer br.usersLock.Unlock()
-	user, ok := br.usersByMXID[userID]
-	if !ok {
-		userIDPtr := &userID
-		if onlyIfExists {
-			userIDPtr = nil
-		}
-		return br.loadDBUser(br.DB.User.GetByMXID(userID), userIDPtr)
-	}
-	return user
-}
-
-func (br *GMBridge) GetUserByMXID(userID id.UserID) *User {
-	return br.getUserByMXID(userID, false)
-}
-
-func (br *GMBridge) GetIUser(userID id.UserID, create bool) bridge.User {
-	u := br.getUserByMXID(userID, !create)
-	if u == nil {
-		return nil
-	}
-	return u
-}
-
-func (br *GMBridge) GetUserByMXIDIfExists(userID id.UserID) *User {
-	return br.getUserByMXID(userID, true)
-}
-
-func (bridge *GMBridge) GetUserByGMID(gmid groupme.ID) *User {
-	bridge.usersLock.Lock()
-	defer bridge.usersLock.Unlock()
-	user, ok := bridge.usersByGMID[gmid]
-	if !ok {
-		return bridge.loadDBUser(bridge.DB.User.GetByGMID(gmid), nil)
-	}
-	return user
-}
-
-func (br *GMBridge) GetAllUsers() []*User {
-	br.usersLock.Lock()
-	defer br.usersLock.Unlock()
-	dbUsers := br.DB.User.GetAll()
-	output := make([]*User, len(dbUsers))
-	for index, dbUser := range dbUsers {
-		user, ok := br.usersByMXID[dbUser.MXID]
-		if !ok {
-			user = br.loadDBUser(dbUser, nil)
-		}
-		output[index] = user
-	}
-	return output
-}
-
-func (br *GMBridge) loadDBUser(dbUser *database.User, mxid *id.UserID) *User {
-	if dbUser == nil {
-		if mxid == nil {
-			return nil
-		}
-		dbUser = br.DB.User.New()
-		dbUser.MXID = *mxid
-		dbUser.Insert()
-	}
-	user := br.NewUser(dbUser)
-	br.usersByMXID[user.MXID] = user
-	if len(user.GMID) > 0 {
-		br.usersByGMID[user.GMID] = user
-	}
-	if len(user.ManagementRoom) > 0 {
-		br.managementRooms[user.ManagementRoom] = user
-	}
-	return user
-}
-
-func (br *GMBridge) NewUser(dbUser *database.User) *User {
-	user := &User{
-		User:   dbUser,
-		bridge: br,
-		log:    br.Log.Sub("User").Sub(string(dbUser.MXID)),
-
-		chatListReceived: make(chan struct{}, 1),
-		syncPortalsDone:  make(chan struct{}, 1),
-		syncStart:        make(chan struct{}, 1),
-		messageInput:     make(chan PortalMessage),
-		messageOutput:    make(chan PortalMessage, br.Config.Bridge.PortalMessageBuffer),
-	}
-
-	user.PermissionLevel = user.bridge.Config.Bridge.Permissions.Get(user.MXID)
-	user.Whitelisted = user.PermissionLevel >= bridgeconfig.PermissionLevelUser
-	user.Admin = user.PermissionLevel >= bridgeconfig.PermissionLevelAdmin
-	user.BridgeState = br.NewBridgeStateQueue(user)
-	go user.handleMessageLoop()
-	go user.runMessageRingBuffer()
-	return user
-}
-
-func (bridge *GMBridge) GetAllPuppetsWithCustomMXID() []*Puppet {
-	return bridge.dbPuppetsToPuppets(bridge.DB.Puppet.GetAllWithCustomMXID())
-}
-
-func (bridge *GMBridge) GetAllPuppets() []*Puppet {
-	return bridge.dbPuppetsToPuppets(bridge.DB.Puppet.GetAll())
-}
-
-func (bridge *GMBridge) dbPuppetsToPuppets(dbPuppets []*database.Puppet) []*Puppet {
-	bridge.puppetsLock.Lock()
-	defer bridge.puppetsLock.Unlock()
-	output := make([]*Puppet, len(dbPuppets))
-	for index, dbPuppet := range dbPuppets {
-		if dbPuppet == nil {
-			continue
-		}
-		puppet, ok := bridge.puppets[dbPuppet.GMID]
-		if !ok {
-			puppet = bridge.NewPuppet(dbPuppet)
-			bridge.puppets[dbPuppet.GMID] = puppet
-			if len(dbPuppet.CustomMXID) > 0 {
-				bridge.puppetsByCustomMXID[dbPuppet.CustomMXID] = puppet
-			}
-		}
-		output[index] = puppet
-	}
-	return output
-}
-
-func (bridge *GMBridge) FormatPuppetMXID(gmid groupme.ID) id.UserID {
-	return id.NewUserID(
-		bridge.Config.Bridge.FormatUsername(gmid.String()),
-		bridge.Config.Homeserver.Domain)
-}
-
-func (bridge *GMBridge) NewPuppet(dbPuppet *database.Puppet) *Puppet {
-	return &Puppet{
-		Puppet: dbPuppet,
-		bridge: bridge,
-		log:    bridge.Log.Sub(fmt.Sprintf("Puppet/%s", dbPuppet.GMID)),
-
-		MXID: bridge.FormatPuppetMXID(dbPuppet.GMID),
-	}
-}
-
-func (br *GMBridge) IsGhost(id id.UserID) bool {
-	_, ok := br.ParsePuppetMXID(id)
-	return ok
-}
-
-func (br *GMBridge) GetIGhost(id id.UserID) bridge.Ghost {
-	p := br.GetPuppetByMXID(id)
-	if p == nil {
-		return nil
-	}
-	return p
-}
-
-func (bridge *GMBridge) ParsePuppetMXID(mxid id.UserID) (groupme.ID, bool) {
-	if userIDRegex == nil {
-		userIDRegex = regexp.MustCompile(fmt.Sprintf("^@%s:%s$",
-			bridge.Config.Bridge.FormatUsername("([0-9]+)"),
-			bridge.Config.Homeserver.Domain))
-	}
-	match := userIDRegex.FindStringSubmatch(string(mxid))
-	if match == nil || len(match) != 2 {
-		return "", false
-	}
-
-	return groupme.ID(match[1]), true
-}
-
-func (bridge *GMBridge) GetPuppetByMXID(mxid id.UserID) *Puppet {
-	gmid, ok := bridge.ParsePuppetMXID(mxid)
-	if !ok {
-		return nil
-	}
-
-	return bridge.GetPuppetByGMID(gmid)
-}
-
-func (bridge *GMBridge) GetPuppetByGMID(gmid groupme.ID) *Puppet {
-	bridge.puppetsLock.Lock()
-	defer bridge.puppetsLock.Unlock()
-	puppet, ok := bridge.puppets[gmid]
-	if !ok {
-		dbPuppet := bridge.DB.Puppet.Get(gmid)
-		if dbPuppet == nil {
-			dbPuppet = bridge.DB.Puppet.New()
-			dbPuppet.GMID = gmid
-			dbPuppet.Insert()
-		}
-		puppet = bridge.NewPuppet(dbPuppet)
-		bridge.puppets[puppet.GMID] = puppet
-		if len(puppet.CustomMXID) > 0 {
-			bridge.puppetsByCustomMXID[puppet.CustomMXID] = puppet
-		}
-	}
-	return puppet
-}
-
-func (bridge *GMBridge) GetPuppetByCustomMXID(mxid id.UserID) *Puppet {
-	bridge.puppetsLock.Lock()
-	defer bridge.puppetsLock.Unlock()
-	puppet, ok := bridge.puppetsByCustomMXID[mxid]
-	if !ok {
-		dbPuppet := bridge.DB.Puppet.GetByCustomMXID(mxid)
-		if dbPuppet == nil {
-			return nil
-		}
-		puppet = bridge.NewPuppet(dbPuppet)
-		bridge.puppets[puppet.GMID] = puppet
-		bridge.puppetsByCustomMXID[puppet.CustomMXID] = puppet
-	}
-	return puppet
-}
-
-func (bridge *GMBridge) dbPortalsToPortals(dbPortals []*database.Portal) []*Portal {
-	bridge.portalsLock.Lock()
-	defer bridge.portalsLock.Unlock()
-	output := make([]*Portal, len(dbPortals))
-	for index, dbPortal := range dbPortals {
-		if dbPortal == nil {
-			continue
-		}
-		portal, ok := bridge.portalsByGMID[dbPortal.Key]
-		if !ok {
-			portal = bridge.loadDBPortal(dbPortal, nil)
-		}
-		output[index] = portal
-	}
-	return output
-}
-
-func (bridge *GMBridge) loadDBPortal(dbPortal *database.Portal, key *database.PortalKey) *Portal {
-	if dbPortal == nil {
-		if key == nil {
-			return nil
-		}
-		dbPortal = bridge.DB.Portal.New()
-		dbPortal.Key = *key
-		dbPortal.Insert()
-	}
-	portal := bridge.NewPortal(dbPortal)
-	bridge.portalsByGMID[portal.Key] = portal
-	if len(portal.MXID) > 0 {
-		bridge.portalsByMXID[portal.MXID] = portal
-	}
-	return portal
-}
-
-func (bridge *GMBridge) NewManualPortal(key database.PortalKey) *Portal {
-	portal := &Portal{
-		Portal: bridge.DB.Portal.New(),
-		bridge: bridge,
-		log:    bridge.Log.Sub(fmt.Sprintf("Portal/%s", key)),
-
-		recentlyHandled: make([]string, recentlyHandledLength),
-
-		messages: make(chan PortalMessage, bridge.Config.Bridge.PortalMessageBuffer),
-	}
-	portal.Key = key
-	go portal.handleMessageLoop()
-	return portal
-}
-
-func (bridge *GMBridge) NewPortal(dbPortal *database.Portal) *Portal {
-	portal := &Portal{
-		Portal: dbPortal,
-		bridge: bridge,
-		log:    bridge.Log.Sub(fmt.Sprintf("Portal/%s", dbPortal.Key)),
-
-		recentlyHandled: make([]string, recentlyHandledLength),
-
-		messages:       make(chan PortalMessage, bridge.Config.Bridge.PortalMessageBuffer),
-		matrixMessages: make(chan PortalMatrixMessage, bridge.Config.Bridge.PortalMessageBuffer),
-	}
-	go portal.handleMessageLoop()
-	return portal
-}
-
-func (br *GMBridge) CheckFeatures(versions *mautrix.RespVersions) (string, bool) {
-	if br.Config.Bridge.HistorySync.Backfill {
-		supported, known := versions.UnstableFeatures[unstableFeatureBatchSending]
-		if !known {
-			return "Backfilling is enabled in bridge config, but homeserver does not support MSC2716 batch sending", false
-		} else if !supported {
-			return "Backfilling is enabled in bridge config, but MSC2716 batch sending is not enabled on homeserver", false
-		}
-	}
-	return "", true
-}
-
 func main() {
 	br := &GMBridge{
 		usersByMXID:         make(map[id.UserID]*User),
-		usersByGMID:         make(map[groupme.ID]*User),
+		usersByUsername:     make(map[string]*User),
 		spaceRooms:          make(map[id.RoomID]*User),
 		managementRooms:     make(map[id.RoomID]*User),
 		portalsByMXID:       make(map[id.RoomID]*Portal),
 		portalsByGMID:       make(map[database.PortalKey]*Portal),
-		puppets:             make(map[groupme.ID]*Puppet),
+		puppets:             make(map[types.GroupMeID]*Puppet),
 		puppetsByCustomMXID: make(map[id.UserID]*Puppet),
 	}
 	br.Bridge = bridge.Bridge{

matrix.go

@@ -64,6 +64,7 @@ func (br *GMBridge) createPrivatePortalFromInvite(roomID id.RoomID, inviter *Use
 		encryptionEnabled = existingEncryption.Algorithm == id.AlgorithmMegolmV1
 	}
 	portal.MXID = roomID
+	portal.Topic = PrivateChatTopic
 	_, _ = portal.MainIntent().SetRoomTopic(portal.MXID, portal.Topic)
 	if portal.bridge.Config.Bridge.PrivateChatPortalMeta || br.Config.Bridge.Encryption.Default || encryptionEnabled {
 		portal.Name = puppet.Displayname

messagetracking.go

@@ -1,207 +0,0 @@
-// mautrix-groupme - A Matrix-GroupMe puppeting bridge.
-// Copyright (C) 2022 Sumner Evans, Karmanyaah Malhotra
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-package main
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-
-	log "maunium.net/go/maulogger/v2"
-
-	"maunium.net/go/mautrix"
-	"maunium.net/go/mautrix/bridge/status"
-	"maunium.net/go/mautrix/event"
-	"maunium.net/go/mautrix/id"
-)
-
-var (
-	errMessageTakingLong = errors.New("bridging the message is taking longer than usual")
-)
-
-func errorToStatusReason(err error) (reason event.MessageStatusReason, status event.MessageStatus, isCertain, sendNotice bool, humanMessage string) {
-	switch {
-	case errors.Is(err, errMessageTakingLong):
-		return event.MessageStatusTooOld, event.MessageStatusPending, false, true, err.Error()
-	default:
-		return event.MessageStatusGenericError, event.MessageStatusRetriable, false, true, ""
-	}
-}
-
-func (portal *Portal) sendErrorMessage(evt *event.Event, err error, msgType string, confirmed bool, editID id.EventID) id.EventID {
-	if !portal.bridge.Config.Bridge.MessageErrorNotices {
-		return ""
-	}
-	certainty := "may not have been"
-	if confirmed {
-		certainty = "was not"
-	}
-	msg := fmt.Sprintf("\u26a0 Your %s %s bridged: %v", msgType, certainty, err)
-	if errors.Is(err, errMessageTakingLong) {
-		msg = fmt.Sprintf("\u26a0 Bridging your %s is taking longer than usual", msgType)
-	}
-	content := &event.MessageEventContent{
-		MsgType: event.MsgNotice,
-		Body:    msg,
-	}
-	if editID != "" {
-		content.SetEdit(editID)
-	} else {
-		content.SetReply(evt)
-	}
-	resp, err := portal.sendMainIntentMessage(content)
-	if err != nil {
-		portal.log.Warnfln("Failed to send bridging error message:", err)
-		return ""
-	}
-	return resp.EventID
-}
-
-func (portal *Portal) sendStatusEvent(evtID, lastRetry id.EventID, err error) {
-	if !portal.bridge.Config.Bridge.MessageStatusEvents {
-		return
-	}
-	if lastRetry == evtID {
-		lastRetry = ""
-	}
-	intent := portal.bridge.Bot
-	if !portal.Encrypted {
-		// Bridge bot isn't present in unencrypted DMs
-		intent = portal.MainIntent()
-	}
-	content := event.BeeperMessageStatusEventContent{
-		Network: portal.getBridgeInfoStateKey(),
-		RelatesTo: event.RelatesTo{
-			Type:    event.RelReference,
-			EventID: evtID,
-		},
-		LastRetry: lastRetry,
-	}
-	if err == nil {
-		content.Status = event.MessageStatusSuccess
-	} else {
-		content.Reason, content.Status, _, _, content.Message = errorToStatusReason(err)
-		content.Error = err.Error()
-	}
-	_, err = intent.SendMessageEvent(portal.MXID, event.BeeperMessageStatus, &content)
-	if err != nil {
-		portal.log.Warnln("Failed to send message status event:", err)
-	}
-}
-
-func (portal *Portal) sendDeliveryReceipt(eventID id.EventID) {
-	if portal.bridge.Config.Bridge.DeliveryReceipts {
-		err := portal.bridge.Bot.MarkRead(portal.MXID, eventID)
-		if err != nil {
-			portal.log.Debugfln("Failed to send delivery receipt for %s: %v", eventID, err)
-		}
-	}
-}
-
-func (portal *Portal) sendMessageMetrics(evt *event.Event, err error, part string, ms *metricSender) {
-	var msgType string
-	switch evt.Type {
-	case event.EventMessage:
-		msgType = "message"
-	case event.EventReaction:
-		msgType = "reaction"
-	case event.EventRedaction:
-		msgType = "redaction"
-	default:
-		msgType = "unknown event"
-	}
-	evtDescription := evt.ID.String()
-	if evt.Type == event.EventRedaction {
-		evtDescription += fmt.Sprintf(" of %s", evt.Redacts)
-	}
-	origEvtID := evt.ID
-	if retryMeta := evt.Content.AsMessage().MessageSendRetry; retryMeta != nil {
-		origEvtID = retryMeta.OriginalEventID
-	}
-	if err != nil {
-		level := log.LevelError
-		if part == "Ignoring" {
-			level = log.LevelDebug
-		}
-		portal.log.Logfln(level, "%s %s %s from %s: %v", part, msgType, evtDescription, evt.Sender, err)
-		reason, statusCode, isCertain, sendNotice, _ := errorToStatusReason(err)
-		checkpointStatus := status.ReasonToCheckpointStatus(reason, statusCode)
-		portal.bridge.SendMessageCheckpoint(evt, status.MsgStepRemote, err, checkpointStatus, ms.getRetryNum())
-		if sendNotice {
-			ms.setNoticeID(portal.sendErrorMessage(evt, err, msgType, isCertain, ms.getNoticeID()))
-		}
-		portal.sendStatusEvent(origEvtID, evt.ID, err)
-	} else {
-		portal.log.Debugfln("Handled Matrix %s %s", msgType, evtDescription)
-		portal.sendDeliveryReceipt(evt.ID)
-		portal.bridge.SendMessageSuccessCheckpoint(evt, status.MsgStepRemote, ms.getRetryNum())
-		portal.sendStatusEvent(origEvtID, evt.ID, nil)
-		if prevNotice := ms.popNoticeID(); prevNotice != "" {
-			_, _ = portal.MainIntent().RedactEvent(portal.MXID, prevNotice, mautrix.ReqRedact{
-				Reason: "error resolved",
-			})
-		}
-	}
-}
-
-type metricSender struct {
-	portal         *Portal
-	previousNotice id.EventID
-	lock           sync.Mutex
-	completed      bool
-	retryNum       int
-}
-
-func (ms *metricSender) getRetryNum() int {
-	if ms != nil {
-		return ms.retryNum
-	}
-	return 0
-}
-
-func (ms *metricSender) getNoticeID() id.EventID {
-	if ms == nil {
-		return ""
-	}
-	return ms.previousNotice
-}
-
-func (ms *metricSender) popNoticeID() id.EventID {
-	if ms == nil {
-		return ""
-	}
-	evtID := ms.previousNotice
-	ms.previousNotice = ""
-	return evtID
-}
-
-func (ms *metricSender) setNoticeID(evtID id.EventID) {
-	if ms != nil && ms.previousNotice == "" {
-		ms.previousNotice = evtID
-	}
-}
-
-func (ms *metricSender) sendMessageMetrics(evt *event.Event, err error, part string, completed bool) {
-	ms.lock.Lock()
-	defer ms.lock.Unlock()
-	if !completed && ms.completed {
-		return
-	}
-	ms.portal.sendMessageMetrics(evt, err, part, ms)
-	ms.retryNum++
-	ms.completed = completed
-}

metrics.go

@@ -27,12 +27,11 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	log "maunium.net/go/maulogger/v2"
 
-	"gitea.watsonlabs.net/watsonb8/groupme-lib"
-
 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/id"
 
 	"github.com/beeper/groupme/database"
+	"github.com/beeper/groupme/types"
 )
 
 type MetricsHandler struct {
@@ -57,11 +56,11 @@ type MetricsHandler struct {
 	unencryptedPrivateCount prometheus.Gauge
 
 	connected       prometheus.Gauge
-	connectedState  map[groupme.ID]bool
+	connectedState  map[types.GroupMeID]bool
 	loggedIn        prometheus.Gauge
-	loggedInState   map[groupme.ID]bool
+	loggedInState   map[types.GroupMeID]bool
 	syncLocked      prometheus.Gauge
-	syncLockedState map[groupme.ID]bool
+	syncLockedState map[types.GroupMeID]bool
 	bufferLength    *prometheus.GaugeVec
 }
 
@@ -110,17 +109,17 @@ func NewMetricsHandler(address string, log log.Logger, db *database.Database) *M
 			Name: "bridge_logged_in",
 			Help: "Users logged into the bridge",
 		}),
-		loggedInState: make(map[groupme.ID]bool),
+		loggedInState: make(map[types.GroupMeID]bool),
 		connected: promauto.NewGauge(prometheus.GaugeOpts{
 			Name: "bridge_connected",
 			Help: "Bridge users connected to GroupMe",
 		}),
-		connectedState: make(map[groupme.ID]bool),
+		connectedState: make(map[types.GroupMeID]bool),
 		syncLocked: promauto.NewGauge(prometheus.GaugeOpts{
 			Name: "bridge_sync_locked",
 			Help: "Bridge users locked in post-login sync",
 		}),
-		syncLockedState: make(map[groupme.ID]bool),
+		syncLockedState: make(map[types.GroupMeID]bool),
 		bufferLength: promauto.NewGaugeVec(prometheus.GaugeOpts{
 			Name: "bridge_buffer_size",
 			Help: "Number of messages in buffer",
@@ -150,13 +149,13 @@ func (mh *MetricsHandler) TrackDisconnection(userID id.UserID) {
 	mh.disconnections.With(prometheus.Labels{"user_id": string(userID)}).Inc()
 }
 
-func (mh *MetricsHandler) TrackLoginState(gmid groupme.ID, loggedIn bool) {
+func (mh *MetricsHandler) TrackLoginState(jid types.GroupMeID, loggedIn bool) {
 	if !mh.running {
 		return
 	}
-	currentVal, ok := mh.loggedInState[gmid]
+	currentVal, ok := mh.loggedInState[jid]
 	if !ok || currentVal != loggedIn {
-		mh.loggedInState[gmid] = loggedIn
+		mh.loggedInState[jid] = loggedIn
 		if loggedIn {
 			mh.loggedIn.Inc()
 		} else {
@@ -165,13 +164,13 @@ func (mh *MetricsHandler) TrackLoginState(gmid groupme.ID, loggedIn bool) {
 	}
 }
 
-func (mh *MetricsHandler) TrackConnectionState(gmid groupme.ID, connected bool) {
+func (mh *MetricsHandler) TrackConnectionState(jid types.GroupMeID, connected bool) {
 	if !mh.running {
 		return
 	}
-	currentVal, ok := mh.connectedState[gmid]
+	currentVal, ok := mh.connectedState[jid]
 	if !ok || currentVal != connected {
-		mh.connectedState[gmid] = connected
+		mh.connectedState[jid] = connected
 		if connected {
 			mh.connected.Inc()
 		} else {
@@ -180,13 +179,13 @@ func (mh *MetricsHandler) TrackConnectionState(gmid groupme.ID, connected bool)
 	}
 }
 
-func (mh *MetricsHandler) TrackSyncLock(gmid groupme.ID, locked bool) {
+func (mh *MetricsHandler) TrackSyncLock(jid types.GroupMeID, locked bool) {
 	if !mh.running {
 		return
 	}
-	currentVal, ok := mh.syncLockedState[gmid]
+	currentVal, ok := mh.syncLockedState[jid]
 	if !ok || currentVal != locked {
-		mh.syncLockedState[gmid] = locked
+		mh.syncLockedState[jid] = locked
 		if locked {
 			mh.syncLocked.Inc()
 		} else {
@@ -231,10 +230,10 @@ func (mh *MetricsHandler) updateStats() {
 	// var encryptedGroupCount, encryptedPrivateCount, unencryptedGroupCount, unencryptedPrivateCount int
 	// err = mh.db.QueryRowContext(mh.ctx, `
 	// 		SELECT
-	// 			COUNT(CASE WHEN gmid LIKE '%@g.us' AND encrypted THEN 1 END) AS encrypted_group_portals,
+	// 			COUNT(CASE WHEN jid LIKE '%@g.us' AND encrypted THEN 1 END) AS encrypted_group_portals,
-	// 			COUNT(CASE WHEN gmid LIKE '%@s.groupme.net' AND encrypted THEN 1 END) AS encrypted_private_portals,
+	// 			COUNT(CASE WHEN jid LIKE '%@s.groupme.net' AND encrypted THEN 1 END) AS encrypted_private_portals,
-	// 			COUNT(CASE WHEN gmid LIKE '%@g.us' AND NOT encrypted THEN 1 END) AS unencrypted_group_portals,
+	// 			COUNT(CASE WHEN jid LIKE '%@g.us' AND NOT encrypted THEN 1 END) AS unencrypted_group_portals,
-	// 			COUNT(CASE WHEN gmid LIKE '%@s.groupme.net' AND NOT encrypted THEN 1 END) AS unencrypted_private_portals
+	// 			COUNT(CASE WHEN jid LIKE '%@s.groupme.net' AND NOT encrypted THEN 1 END) AS unencrypted_private_portals
 	// 		FROM portal WHERE mxid<>''
 	// 	`).Scan(&encryptedGroupCount, &encryptedPrivateCount, &unencryptedGroupCount, &unencryptedPrivateCount)
 	// if err != nil {

no-crypto.go

@@ -0,0 +1,18 @@
+//go:build !cgo || nocrypto
+// +build !cgo nocrypto
+
+package main
+
+import (
+	"errors"
+)
+
+func NewCryptoHelper(bridge *Bridge) Crypto {
+	if !bridge.Config.Bridge.Encryption.Allow {
+		bridge.Log.Warnln("Bridge built without end-to-bridge encryption, but encryption is enabled in config")
+	}
+	bridge.Log.Debugln("Bridge built without end-to-bridge encryption")
+	return nil
+}
+
+var NoSessionFound = errors.New("nil")

provisioning.go

@@ -21,6 +21,7 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/gorilla/websocket"
 	log "maunium.net/go/maulogger/v2"
 
 	"maunium.net/go/mautrix/id"
@@ -33,9 +34,16 @@ type ProvisioningAPI struct {
 
 func (prov *ProvisioningAPI) Init() {
 	prov.log = prov.bridge.Log.Sub("Provisioning")
-	prov.log.Debugln("Enabling provisioning API at", prov.bridge.Config.Bridge.Provisioning.Prefix)
+	prov.log.Debugln("Enabling provisioning API at", prov.bridge.Config.AppService.Provisioning.Prefix)
-	r := prov.bridge.AS.Router.PathPrefix(prov.bridge.Config.Bridge.Provisioning.Prefix).Subrouter()
+	r := prov.bridge.AS.Router.PathPrefix(prov.bridge.Config.AppService.Provisioning.Prefix).Subrouter()
 	r.Use(prov.AuthMiddleware)
+	r.HandleFunc("/ping", prov.Ping).Methods(http.MethodGet)
+	r.HandleFunc("/login", prov.Login)
+	r.HandleFunc("/logout", prov.Logout).Methods(http.MethodPost)
+	r.HandleFunc("/delete_session", prov.DeleteSession).Methods(http.MethodPost)
+	r.HandleFunc("/delete_connection", prov.DeleteConnection).Methods(http.MethodPost)
+	r.HandleFunc("/disconnect", prov.Disconnect).Methods(http.MethodPost)
+	r.HandleFunc("/reconnect", prov.Reconnect).Methods(http.MethodPost)
 }
 
 func (prov *ProvisioningAPI) AuthMiddleware(h http.Handler) http.Handler {
@@ -45,15 +53,15 @@ func (prov *ProvisioningAPI) AuthMiddleware(h http.Handler) http.Handler {
 			authParts := strings.Split(r.Header.Get("Sec-WebSocket-Protocol"), ",")
 			for _, part := range authParts {
 				part = strings.TrimSpace(part)
-				if strings.HasPrefix(part, "com.beeper.groupme.auth-") {
+				if strings.HasPrefix(part, "net.maunium.whatsapp.auth-") {
-					auth = part[len("com.beeper.groupme.auth-"):]
+					auth = part[len("net.maunium.whatsapp.auth-"):]
 					break
 				}
 			}
 		} else if strings.HasPrefix(auth, "Bearer ") {
 			auth = auth[len("Bearer "):]
 		}
-		if auth != prov.bridge.Config.Bridge.Provisioning.SharedSecret {
+		if auth != prov.bridge.Config.AppService.Provisioning.SharedSecret {
 			jsonResponse(w, http.StatusForbidden, map[string]interface{}{
 				"error":   "Invalid auth token",
 				"errcode": "M_FORBIDDEN",
@@ -77,8 +85,326 @@ type Response struct {
 	Status  string `json:"status"`
 }
 
+func (prov *ProvisioningAPI) DeleteSession(w http.ResponseWriter, r *http.Request) {
+	// user := r.Context().Value("user").(*User)
+	// if user.Session == nil && user.Conn == nil {
+	// 	jsonResponse(w, http.StatusNotFound, Error{
+	// 		Error:   "Nothing to purge: no session information stored and no active connection.",
+	// 		ErrCode: "no session",
+	// 	})
+	// 	return
+	// }
+	// user.SetSession(nil)
+	// if user.Conn != nil {
+	// 	_, _ = user.Conn.Disconnect()
+	// 	user.Conn.RemoveHandlers()
+	// 	user.Conn = nil
+	// 	user.bridge.Metrics.TrackConnectionState(user.JID, false)
+	// }
+	// jsonResponse(w, http.StatusOK, Response{true, "Session information purged"})
+}
+
+func (prov *ProvisioningAPI) DeleteConnection(w http.ResponseWriter, r *http.Request) {
+	// user := r.Context().Value("user").(*User)
+	// if user.Conn == nil {
+	// 	jsonResponse(w, http.StatusNotFound, Error{
+	// 		Error:   "You don't have a WhatsApp connection.",
+	// 		ErrCode: "not connected",
+	// 	})
+	// 	return
+	// }
+	// sess, err := user.Conn.Disconnect()
+	// if err == nil && len(sess.Wid) > 0 {
+	// 	user.SetSession(&sess)
+	// }
+	// user.Conn.RemoveHandlers()
+	// user.Conn = nil
+	// user.bridge.Metrics.TrackConnectionState(user.JID, false)
+	// jsonResponse(w, http.StatusOK, Response{true, "Disconnected from WhatsApp and connection deleted"})
+}
+
+func (prov *ProvisioningAPI) Disconnect(w http.ResponseWriter, r *http.Request) {
+	user := r.Context().Value("user").(*User)
+	if user.Conn == nil {
+		jsonResponse(w, http.StatusNotFound, Error{
+			Error:   "You don't have a WhatsApp connection.",
+			ErrCode: "no connection",
+		})
+		return
+	}
+	//sess, err :=
+	//user.Conn.Stop(context.TODO())
+	// if err == whatsapp.ErrNotConnected {
+	// 	jsonResponse(w, http.StatusNotFound, Error{
+	// 		Error:   "You were not connected",
+	// 		ErrCode: "not connected",
+	// 	})
+	// 	return
+	// } else if err != nil {
+	// 	user.log.Warnln("Error while disconnecting:", err)
+	// 	jsonResponse(w, http.StatusInternalServerError, Error{
+	// 		Error:   fmt.Sprintf("Unknown error while disconnecting: %v", err),
+	// 		ErrCode: err.Error(),
+	// 	})
+	// 	return
+	// } else if len(sess.Wid) > 0 {
+	// 	user.SetSession(&sess)
+	// }
+	user.bridge.Metrics.TrackConnectionState(user.JID, false)
+	jsonResponse(w, http.StatusOK, Response{true, "Disconnected from WhatsApp"})
+}
+
+func (prov *ProvisioningAPI) Reconnect(w http.ResponseWriter, r *http.Request) {
+	// user := r.Context().Value("user").(*User)
+	// if user.Conn == nil {
+	// 	if user.Session == nil {
+	// 		jsonResponse(w, http.StatusForbidden, Error{
+	// 			Error:   "No existing connection and no session. Please log in first.",
+	// 			ErrCode: "no session",
+	// 		})
+	// 	} else {
+	// 		user.Connect(false)
+	// 		jsonResponse(w, http.StatusOK, Response{true, "Created connection to WhatsApp."})
+	// 	}
+	// 	return
+	// }
+
+	// wasConnected := true
+	// sess, err := user.Conn.Disconnect()
+	// if err == whatsapp.ErrNotConnected {
+	// 	wasConnected = false
+	// } else if err != nil {
+	// 	user.log.Warnln("Error while disconnecting:", err)
+	// } else if len(sess.Wid) > 0 {
+	// 	user.SetSession(&sess)
+	// }
+
+	// err = user.Conn.Restore()
+	// if err == whatsapp.ErrInvalidSession {
+	// 	if user.Session != nil {
+	// 		user.log.Debugln("Got invalid session error when reconnecting, but user has session. Retrying using RestoreWithSession()...")
+	// 		var sess whatsapp.Session
+	// 		sess, err = user.Conn.RestoreWithSession(*user.Session)
+	// 		if err == nil {
+	// 			user.SetSession(&sess)
+	// 		}
+	// 	} else {
+	// 		jsonResponse(w, http.StatusForbidden, Error{
+	// 			Error:   "You're not logged in",
+	// 			ErrCode: "not logged in",
+	// 		})
+	// 		return
+	// 	}
+	// } else if err == whatsapp.ErrLoginInProgress {
+	// 	jsonResponse(w, http.StatusConflict, Error{
+	// 		Error:   "A login or reconnection is already in progress.",
+	// 		ErrCode: "login in progress",
+	// 	})
+	// 	return
+	// } else if err == whatsapp.ErrAlreadyLoggedIn {
+	// 	jsonResponse(w, http.StatusConflict, Error{
+	// 		Error:   "You were already connected.",
+	// 		ErrCode: err.Error(),
+	// 	})
+	// 	return
+	// }
+	// if err != nil {
+	// 	user.log.Warnln("Error while reconnecting:", err)
+	// 	if err.Error() == "restore session connection timed out" {
+	// 		jsonResponse(w, http.StatusForbidden, Error{
+	// 			Error:   "Reconnection timed out. Is WhatsApp on your phone reachable?",
+	// 			ErrCode: err.Error(),
+	// 		})
+	// 	} else {
+	// 		jsonResponse(w, http.StatusForbidden, Error{
+	// 			Error:   fmt.Sprintf("Unknown error while reconnecting: %v", err),
+	// 			ErrCode: err.Error(),
+	// 		})
+	// 	}
+	// 	user.log.Debugln("Disconnecting due to failed session restore in reconnect command...")
+	// 	sess, err := user.Conn.Disconnect()
+	// 	if err != nil {
+	// 		user.log.Errorln("Failed to disconnect after failed session restore in reconnect command:", err)
+	// 	} else if len(sess.Wid) > 0 {
+	// 		user.SetSession(&sess)
+	// 	}
+	// 	return
+	// }
+	// user.ConnectionErrors = 0
+	// user.PostLogin()
+
+	// var msg string
+	// if wasConnected {
+	// 	msg = "Reconnected successfully."
+	// } else {
+	// 	msg = "Connected successfully."
+	// }
+
+	// jsonResponse(w, http.StatusOK, Response{true, msg})
+}
+
+func (prov *ProvisioningAPI) Ping(w http.ResponseWriter, r *http.Request) {
+	// user := r.Context().Value("user").(*User)
+	// wa := map[string]interface{}{
+	// 	"has_session":     user.Client != nil,
+	// 	"management_room": user.ManagementRoom,
+	// 	"jid":             user.JID,
+	// 	"conn":            nil,
+	// 	"ping":            nil,
+	// }
+	// if user.Conn != nil {
+	// 	wa["conn"] = map[string]interface{}{
+	// 		"is_connected":         user.IsConnected(),
+	// 		"is_logged_in":         user.IsLoggedIn(),
+	// 		"is_login_in_progress": user.IsLoginInProgress(),
+	// 	}
+	// 	err := user.Conn.AdminTest()
+	// 	wa["ping"] = map[string]interface{}{
+	// 		"ok":  err == nil,
+	// 		"err": err,
+	// 	}
+	// }
+	// resp := map[string]interface{}{
+	// 	"mxid":                 user.MXID,
+	// 	"admin":                user.Admin,
+	// 	"whitelisted":          user.Whitelisted,
+	// 	"relaybot_whitelisted": user.RelaybotWhitelisted,
+	// 	"whatsapp":             wa,
+	// }
+	// jsonResponse(w, http.StatusOK, resp)
+}
+
 func jsonResponse(w http.ResponseWriter, status int, response interface{}) {
 	w.Header().Add("Content-Type", "application/json")
 	w.WriteHeader(status)
 	_ = json.NewEncoder(w).Encode(response)
 }
+
+func (prov *ProvisioningAPI) Logout(w http.ResponseWriter, r *http.Request) {
+	// user := r.Context().Value("user").(*User)
+	// if user.Session == nil {
+	// 	jsonResponse(w, http.StatusNotFound, Error{
+	// 		Error:   "You're not logged in",
+	// 		ErrCode: "not logged in",
+	// 	})
+	// 	return
+	// }
+
+	// force := strings.ToLower(r.URL.Query().Get("force")) != "false"
+
+	// if user.Conn == nil {
+	// 	if !force {
+	// 		jsonResponse(w, http.StatusNotFound, Error{
+	// 			Error:   "You're not connected",
+	// 			ErrCode: "not connected",
+	// 		})
+	// 	}
+	// } else {
+	// 	err := user.Conn.Logout()
+	// 	if err != nil {
+	// 		user.log.Warnln("Error while logging out:", err)
+	// 		if !force {
+	// 			jsonResponse(w, http.StatusInternalServerError, Error{
+	// 				Error:   fmt.Sprintf("Unknown error while logging out: %v", err),
+	// 				ErrCode: err.Error(),
+	// 			})
+	// 			return
+	// 		}
+	// 	}
+	// 	_, err = user.Conn.Disconnect()
+	// 	if err != nil {
+	// 		user.log.Warnln("Error while disconnecting after logout:", err)
+	// 	}
+	// 	user.Conn.RemoveHandlers()
+	// 	user.Conn = nil
+	// }
+
+	// user.bridge.Metrics.TrackConnectionState(user.JID, false)
+	// user.removeFromJIDMap()
+
+	// // TODO this causes a foreign key violation, which should be fixed
+	// //ce.User.JID = ""
+	// user.SetSession(nil)
+	// jsonResponse(w, http.StatusOK, Response{true, "Logged out successfully."})
+}
+
+var upgrader = websocket.Upgrader{
+	CheckOrigin: func(r *http.Request) bool {
+		return true
+	},
+	Subprotocols: []string{"net.maunium.whatsapp.login"},
+}
+
+func (prov *ProvisioningAPI) Login(w http.ResponseWriter, r *http.Request) {
+	// userID := r.URL.Query().Get("user_id")
+	// user := prov.bridge.GetUserByMXID(id.UserID(userID))
+
+	// if len(ce.Args) < 1 {
+	// 	// Return error that the token needs to be longer than 0 length
+	// 	// ce.Reply(`Get your access token from https://dev.groupme.com/ which should be the first argument to login`)
+	// 	return
+	// }
+	// user.Token = ce.Args[0]
+
+	// user.addToJIDMap()
+	// // ce.Reply("Successfully logged in, synchronizing chats...")
+	// user.PostLogin()
+	// user.Connect()
+
+	// c, err := upgrader.Upgrade(w, r, nil)
+	// if err != nil {
+	// 	prov.log.Errorfln("Failed to upgrade connection to websocket:", err)
+	// 	return
+	// }
+	// defer c.Close()
+
+	// if !user.Connect(true) {
+	// 	user.log.Debugln("Connect() returned false, assuming error was logged elsewhere and canceling login.")
+	// 	_ = c.WriteJSON(Error{
+	// 		Error:   "Failed to connect to WhatsApp",
+	// 		ErrCode: "connection error",
+	// 	})
+	// 	return
+	// }
+
+	// qrChan := make(chan string, 3)
+	// go func() {
+	// 	for code := range qrChan {
+	// 		if code == "stop" {
+	// 			return
+	// 		}
+	// 		_ = c.WriteJSON(map[string]interface{}{
+	// 			"code": code,
+	// 		})
+	// 	}
+	// }()
+	// session, err := user.Conn.LoginWithRetry(qrChan, user.bridge.Config.Bridge.LoginQRRegenCount)
+	// qrChan <- "stop"
+	// if err != nil {
+	// 	var msg string
+	// 	if err == whatsapp.ErrAlreadyLoggedIn {
+	// 		msg = "You're already logged in"
+	// 	} else if err == whatsapp.ErrLoginInProgress {
+	// 		msg = "You have a login in progress already."
+	// 	} else if err == whatsapp.ErrLoginTimedOut {
+	// 		msg = "QR code scan timed out. Please try again."
+	// 	} else {
+	// 		user.log.Warnln("Failed to log in:", err)
+	// 		msg = fmt.Sprintf("Unknown error while logging in: %v", err)
+	// 	}
+	// 	_ = c.WriteJSON(Error{
+	// 		Error:   msg,
+	// 		ErrCode: err.Error(),
+	// 	})
+	// 	return
+	// }
+	// user.ConnectionErrors = 0
+	// user.JID = strings.Replace(user.Conn.Info.Wid, whatsappExt.OldUserSuffix, whatsappExt.NewUserSuffix, 1)
+	// user.addToJIDMap()
+	// user.SetSession(&session)
+	// _ = c.WriteJSON(map[string]interface{}{
+	// 	"success": true,
+	// 	"jid":     user.JID,
+	// })
+	// user.PostLogin()
+}

puppet.go

@@ -17,21 +17,133 @@
 package main
 
 import (
+	"fmt"
+	"os"
 	"regexp"
-	"sync"
+	"strings"
 
+	"github.com/karmanyaahm/groupme"
 	log "maunium.net/go/maulogger/v2"
 
-	"gitea.watsonlabs.net/watsonb8/groupme-lib"
-
 	"maunium.net/go/mautrix/appservice"
 	"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"
 )
 
 var userIDRegex *regexp.Regexp
 
+func (bridge *GMBridge) ParsePuppetMXID(mxid id.UserID) (types.GroupMeID, bool) {
+	if userIDRegex == nil {
+		userIDRegex = regexp.MustCompile(fmt.Sprintf("^@%s:%s$",
+			bridge.Config.Bridge.FormatUsername("([0-9]+)"),
+			bridge.Config.Homeserver.Domain))
+	}
+	match := userIDRegex.FindStringSubmatch(string(mxid))
+	if match == nil || len(match) != 2 {
+		return "", false
+	}
+
+	jid := types.GroupMeID(match[1])
+	return jid, true
+}
+
+func (bridge *GMBridge) GetPuppetByMXID(mxid id.UserID) *Puppet {
+	jid, ok := bridge.ParsePuppetMXID(mxid)
+	if !ok {
+		return nil
+	}
+
+	return bridge.GetPuppetByJID(jid)
+}
+
+func (bridge *GMBridge) GetPuppetByJID(jid types.GroupMeID) *Puppet {
+	bridge.puppetsLock.Lock()
+	defer bridge.puppetsLock.Unlock()
+	puppet, ok := bridge.puppets[jid]
+	if !ok {
+		dbPuppet := bridge.DB.Puppet.Get(jid)
+		if dbPuppet == nil {
+			dbPuppet = bridge.DB.Puppet.New()
+			dbPuppet.JID = jid
+			dbPuppet.Insert()
+		}
+		puppet = bridge.NewPuppet(dbPuppet)
+		bridge.puppets[puppet.JID] = puppet
+		if len(puppet.CustomMXID) > 0 {
+			bridge.puppetsByCustomMXID[puppet.CustomMXID] = puppet
+		}
+	}
+	return puppet
+}
+
+func (bridge *GMBridge) GetPuppetByCustomMXID(mxid id.UserID) *Puppet {
+	bridge.puppetsLock.Lock()
+	defer bridge.puppetsLock.Unlock()
+	puppet, ok := bridge.puppetsByCustomMXID[mxid]
+	if !ok {
+		dbPuppet := bridge.DB.Puppet.GetByCustomMXID(mxid)
+		if dbPuppet == nil {
+			return nil
+		}
+		puppet = bridge.NewPuppet(dbPuppet)
+		bridge.puppets[puppet.JID] = puppet
+		bridge.puppetsByCustomMXID[puppet.CustomMXID] = puppet
+	}
+	return puppet
+}
+
+func (bridge *GMBridge) GetAllPuppetsWithCustomMXID() []*Puppet {
+	return bridge.dbPuppetsToPuppets(bridge.DB.Puppet.GetAllWithCustomMXID())
+}
+
+func (bridge *GMBridge) GetAllPuppets() []*Puppet {
+	return bridge.dbPuppetsToPuppets(bridge.DB.Puppet.GetAll())
+}
+
+func (bridge *GMBridge) dbPuppetsToPuppets(dbPuppets []*database.Puppet) []*Puppet {
+	bridge.puppetsLock.Lock()
+	defer bridge.puppetsLock.Unlock()
+	output := make([]*Puppet, len(dbPuppets))
+	for index, dbPuppet := range dbPuppets {
+		if dbPuppet == nil {
+			continue
+		}
+		puppet, ok := bridge.puppets[dbPuppet.JID]
+		if !ok {
+			puppet = bridge.NewPuppet(dbPuppet)
+			bridge.puppets[dbPuppet.JID] = puppet
+			if len(dbPuppet.CustomMXID) > 0 {
+				bridge.puppetsByCustomMXID[dbPuppet.CustomMXID] = puppet
+			}
+		}
+		output[index] = puppet
+	}
+	return output
+}
+
+func (bridge *GMBridge) FormatPuppetMXID(jid types.GroupMeID) id.UserID {
+	return id.NewUserID(
+		bridge.Config.Bridge.FormatUsername(
+			strings.Replace(
+				jid,
+				whatsappExt.NewUserSuffix, "", 1)),
+		bridge.Config.Homeserver.Domain)
+}
+
+func (bridge *GMBridge) NewPuppet(dbPuppet *database.Puppet) *Puppet {
+	return &Puppet{
+		Puppet: dbPuppet,
+		bridge: bridge,
+		log:    bridge.Log.Sub(fmt.Sprintf("Puppet/%s", dbPuppet.JID)),
+
+		MXID: bridge.FormatPuppetMXID(dbPuppet.JID),
+	}
+}
+
 type Puppet struct {
 	*database.Puppet
 
@@ -46,29 +158,17 @@ type Puppet struct {
 	customIntent   *appservice.IntentAPI
 	customTypingIn map[id.RoomID]bool
 	customUser     *User
-
-	syncLock sync.Mutex
-}
-
-func (puppet *Puppet) ClearCustomMXID() {
-	//TODO implement me
-	panic("implement me")
-}
-
-// Public Properties
-
-func (puppet *Puppet) GetMXID() id.UserID {
-	return puppet.MXID
 }
 
 func (puppet *Puppet) PhoneNumber() string {
-	return puppet.GMID.String()
+	println("phone num")
+	return strings.Replace(puppet.JID, whatsappExt.NewUserSuffix, "", 1)
 }
 
-// Public Methods
-
 func (puppet *Puppet) IntentFor(portal *Portal) *appservice.IntentAPI {
-	if puppet.customIntent == nil || portal.Key.GMID == puppet.GMID {
+	if (!portal.IsPrivateChat() && puppet.customIntent == nil) ||
+		(portal.backfilling && portal.bridge.Config.Bridge.InviteOwnPuppetForBackfilling) ||
+		portal.Key.GMID == puppet.JID {
 		return puppet.DefaultIntent()
 	}
 	return puppet.customIntent
@@ -82,97 +182,135 @@ func (puppet *Puppet) DefaultIntent() *appservice.IntentAPI {
 	return puppet.bridge.AS.Intent(puppet.MXID)
 }
 
-func (puppet *Puppet) UpdateAvatar(source *User, forcePortalSync bool) bool {
+//func (puppet *Puppet) SetRoomMetadata(name, avatarURL string) bool {
-	changed := source.updateAvatar(puppet.GMID, &puppet.Avatar, &puppet.AvatarURL, &puppet.AvatarSet, puppet.log, puppet.DefaultIntent())
+//
-	if !changed || puppet.Avatar == "unauthorized" {
+//}
-		if forcePortalSync {
+
-			go puppet.updatePortalAvatar()
+func (puppet *Puppet) UpdateAvatar(source *User, portalMXID id.RoomID, avatar string) bool {
-		}
+	memberRaw, _ := puppet.bridge.StateStore.TryGetMemberRaw(portalMXID, puppet.MXID) //TODO Handle
-		return changed
+
+	if memberRaw.Avatar == avatar {
+		return false // up to date
 	}
-	err := puppet.DefaultIntent().SetAvatarURL(puppet.AvatarURL)
+
+	if len(avatar) == 0 {
+		var err error
+		// err = puppet.DefaultIntent().SetRoomAvatarURL(portalMXID, id.ContentURI{})
+
+		if err != nil {
+			puppet.log.Warnln("Failed to remove avatar:", err, puppet.MXID)
+			os.Exit(1)
+		}
+		memberRaw.Avatar = avatar
+		memberRaw.AvatarURL = ""
+
+		go puppet.updatePortalAvatar()
+
+		puppet.bridge.StateStore.SetMemberRaw(&memberRaw) //TODO handle
+		return true
+	}
+
+	//TODO check its actually groupme?
+	image, mime, err := groupmeExt.DownloadImage(avatar + ".large")
+	if err != nil {
+		puppet.log.Warnln(err)
+		return false
+	}
+
+	resp, err := puppet.DefaultIntent().UploadBytes(*image, mime)
+	if err != nil {
+		puppet.log.Warnln("Failed to upload avatar:", err)
+		return false
+	}
+	// err = puppet.DefaultIntent().SetRoomAvatarURL(portalMXID, resp.ContentURI)
 	if err != nil {
 		puppet.log.Warnln("Failed to set avatar:", err)
-	} else {
-		puppet.AvatarSet = true
 	}
+
+	memberRaw.AvatarURL = resp.ContentURI.String()
+	memberRaw.Avatar = avatar
+
+	puppet.bridge.StateStore.SetMemberRaw(&memberRaw) //TODO handle
+
 	go puppet.updatePortalAvatar()
 	return true
 }
 
-func (puppet *Puppet) UpdateName(member groupme.Member, forcePortalSync bool) bool {
+func (puppet *Puppet) UpdateName(source *User, portalMXID id.RoomID, contact groupme.Member) bool {
-	newName := puppet.bridge.Config.Bridge.FormatDisplayname(puppet.GMID, member)
+	newName, _ := puppet.bridge.Config.Bridge.FormatDisplayname(contact)
-	if puppet.Displayname != newName || !puppet.NameSet {
+
-		oldName := puppet.Displayname
+	memberRaw, _ := puppet.bridge.StateStore.TryGetMemberRaw(portalMXID, puppet.MXID) //TODO Handle
-		puppet.Displayname = newName
+
-		puppet.NameSet = false
+	if memberRaw.DisplayName != newName { //&& quality >= puppet.NameQuality[portalMXID] {
-		err := puppet.DefaultIntent().SetDisplayName(newName)
+		var err error
+		// err = puppet.DefaultIntent().SetRoomDisplayName(portalMXID, newName)
+
 		if err == nil {
-			puppet.log.Debugln("Updated name", oldName, "->", newName)
+			memberRaw.DisplayName = newName
-			puppet.NameSet = true
+			//	puppet.NameQuality[portalMXID] = quality
+
+			puppet.bridge.StateStore.SetMemberRaw(&memberRaw) //TODO handle; maybe .Update() ?
 			go puppet.updatePortalName()
 		} else {
 			puppet.log.Warnln("Failed to set display name:", err)
 		}
 		return true
-	} else if forcePortalSync {
-		go puppet.updatePortalName()
 	}
 	return false
 }
 
 func (puppet *Puppet) updatePortalMeta(meta func(portal *Portal)) {
-	if puppet.bridge.Config.Bridge.PrivateChatPortalMeta || puppet.bridge.Config.Bridge.Encryption.Allow {
+	if puppet.bridge.Config.Bridge.PrivateChatPortalMeta {
-		for _, portal := range puppet.bridge.GetAllPortalsByGMID(puppet.GMID) {
+		for _, portal := range puppet.bridge.GetAllPortalsByJID(puppet.JID) {
-			if !puppet.bridge.Config.Bridge.PrivateChatPortalMeta && !portal.Encrypted {
-				continue
-			}
-			// Get room create lock to prevent races between receiving contact info and room creation.
-			portal.roomCreateLock.Lock()
 			meta(portal)
-			portal.roomCreateLock.Unlock()
 		}
 	}
 }
 
 func (puppet *Puppet) updatePortalAvatar() {
 	puppet.updatePortalMeta(func(portal *Portal) {
-		if portal.Avatar == puppet.Avatar && portal.AvatarURL == puppet.AvatarURL && portal.AvatarSet {
+
-			return
+		m, _ := puppet.bridge.StateStore.TryGetMemberRaw(portal.MXID, puppet.MXID)
-		}
-		portal.AvatarURL = puppet.AvatarURL
-		portal.Avatar = puppet.Avatar
-		portal.AvatarSet = false
-		defer portal.Update(nil)
 		if len(portal.MXID) > 0 {
-			_, err := portal.MainIntent().SetRoomAvatar(portal.MXID, puppet.AvatarURL)
+			_, err := portal.MainIntent().SetRoomAvatar(portal.MXID, id.MustParseContentURI(m.AvatarURL))
 			if err != nil {
 				portal.log.Warnln("Failed to set avatar:", err)
-			} else {
-				portal.AvatarSet = true
-				portal.UpdateBridgeInfo()
 			}
 		}
+		portal.AvatarURL = id.MustParseContentURI(m.AvatarURL)
+		portal.Avatar = m.Avatar
+		portal.Update()
 	})
 }
 
 func (puppet *Puppet) updatePortalName() {
 	puppet.updatePortalMeta(func(portal *Portal) {
-		portal.UpdateName(puppet.Displayname, groupme.ID(""), true)
+		m, _ := puppet.bridge.StateStore.TryGetMemberRaw(portal.MXID, puppet.MXID)
+		if len(portal.MXID) > 0 {
+			_, err := portal.MainIntent().SetRoomName(portal.MXID, m.DisplayName)
+			if err != nil {
+				portal.log.Warnln("Failed to set name:", err)
+			}
+		}
+		portal.Name = m.DisplayName
+		portal.Update()
 	})
 }
 
-func (puppet *Puppet) Sync(source *User, member *groupme.Member, forceAvatarSync bool, forcePortalSync bool) {
+func (puppet *Puppet) Sync(source *User, portalMXID id.RoomID, contact groupme.Member) {
-	puppet.syncLock.Lock()
+	if contact.UserID.String() == "system" {
-	defer puppet.syncLock.Unlock()
+		puppet.log.Warnln("Trying to sync system puppet")
+		return
+	}
+
 	err := puppet.DefaultIntent().EnsureRegistered()
 	if err != nil {
 		puppet.log.Errorln("Failed to ensure registered:", err)
 	}
 
 	update := false
-	update = puppet.UpdateName(*member, forcePortalSync) || update
+	update = puppet.UpdateName(source, portalMXID, contact) || update
-	update = puppet.UpdateAvatar(source, forcePortalSync) || update
+	update = puppet.UpdateAvatar(source, portalMXID, contact.ImageURL) || update
 	if update {
 		puppet.Update()
 	}

segment.go

@@ -30,7 +30,6 @@ const SegmentURL = "https://api.segment.io/v1/track"
 
 type SegmentClient struct {
 	key    string
-	userID string
 	log    log.Logger
 	client http.Client
 }
@@ -39,14 +38,8 @@ var Segment SegmentClient
 
 func (sc *SegmentClient) trackSync(userID id.UserID, event string, properties map[string]interface{}) error {
 	var buf bytes.Buffer
-	var segmentUserID string
-	if Segment.userID != "" {
-		segmentUserID = Segment.userID
-	} else {
-		segmentUserID = userID.String()
-	}
 	err := json.NewEncoder(&buf).Encode(map[string]interface{}{
-		"userId":     segmentUserID,
+		"userId":     userID,
 		"event":      event,
 		"properties": properties,
 	})

types/types.go

@@ -0,0 +1,37 @@
+// mautrix-groupme - A Matrix-GroupMe puppeting bridge.
+// Copyright (C) 2022 Sumner Evans, Karmanyaah Malhotra
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package types
+
+// GroupMeID is a string that represents a GroupMe ID.
+type GroupMeID string
+
+func NewGroupMeID(id string) GroupMeID {
+	return GroupMeID(id)
+}
+
+func (gmid GroupMeID) String() string {
+	return string(gmid)
+}
+
+func (gmid GroupMeID) IsEmpty() bool {
+	return gmid == ""
+}
+
+type GroupMeMessageID string
+
+// AuthToken is the authentication token
+type AuthToken string

whatsapp-ext/call.go

@@ -0,0 +1,72 @@
+// mautrix-groupme - A Matrix-GroupMe puppeting bridge.
+// Copyright (C) 2022 Sumner Evans, Karmanyaah Malhotra
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package whatsappExt
+
+import (
+	"encoding/json"
+	"strings"
+
+	"github.com/Rhymen/go-whatsapp"
+)
+
+type CallInfoType string
+
+const (
+	CallOffer        CallInfoType = "offer"
+	CallOfferVideo   CallInfoType = "offer_video"
+	CallTransport    CallInfoType = "transport"
+	CallRelayLatency CallInfoType = "relaylatency"
+	CallTerminate    CallInfoType = "terminate"
+)
+
+type CallInfo struct {
+	ID   string       `json:"id"`
+	Type CallInfoType `json:"type"`
+	From string       `json:"from"`
+
+	Platform string `json:"platform"`
+	Version  []int  `json:"version"`
+
+	Data [][]interface{} `json:"data"`
+}
+
+type CallInfoHandler interface {
+	whatsapp.Handler
+	HandleCallInfo(CallInfo)
+}
+
+func (ext *ExtendedConn) handleMessageCall(message []byte) {
+	var event CallInfo
+	err := json.Unmarshal(message, &event)
+	if err != nil {
+		ext.jsonParseError(err)
+		return
+	}
+	event.From = strings.Replace(event.From, OldUserSuffix, NewUserSuffix, 1)
+	for _, handler := range ext.handlers {
+		callInfoHandler, ok := handler.(CallInfoHandler)
+		if !ok {
+			continue
+		}
+
+		if ext.shouldCallSynchronously(callInfoHandler) {
+			callInfoHandler.HandleCallInfo(event)
+		} else {
+			go callInfoHandler.HandleCallInfo(event)
+		}
+	}
+}

whatsapp-ext/chat.go

@@ -0,0 +1,183 @@
+// mautrix-groupme - A Matrix-GroupMe puppeting bridge.
+// Copyright (C) 2022 Sumner Evans, Karmanyaah Malhotra
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package whatsappExt
+
+import (
+	"encoding/json"
+	"strings"
+
+	"github.com/Rhymen/go-whatsapp"
+)
+
+type ChatUpdateCommand string
+
+const (
+	ChatUpdateCommandAction ChatUpdateCommand = "action"
+)
+
+type ChatUpdate struct {
+	JID     string            `json:"id"`
+	Command ChatUpdateCommand `json:"cmd"`
+	Data    ChatUpdateData    `json:"data"`
+}
+
+type ChatActionType string
+
+const (
+	ChatActionNameChange  ChatActionType = "subject"
+	ChatActionAddTopic    ChatActionType = "desc_add"
+	ChatActionRemoveTopic ChatActionType = "desc_remove"
+	ChatActionRestrict    ChatActionType = "restrict"
+	ChatActionAnnounce    ChatActionType = "announce"
+	ChatActionPromote     ChatActionType = "promote"
+	ChatActionDemote      ChatActionType = "demote"
+	ChatActionIntroduce   ChatActionType = "introduce"
+	ChatActionCreate      ChatActionType = "create"
+	ChatActionRemove      ChatActionType = "remove"
+	ChatActionAdd         ChatActionType = "add"
+)
+
+type ChatUpdateData struct {
+	Action    ChatActionType
+	SenderJID string
+
+	NameChange struct {
+		Name  string `json:"subject"`
+		SetAt int64  `json:"s_t"`
+		SetBy string `json:"s_o"`
+	}
+
+	AddTopic struct {
+		Topic string `json:"desc"`
+		ID    string `json:"descId"`
+		SetAt int64  `json:"descTime"`
+		SetBy string `json:"descOwner"`
+	}
+
+	RemoveTopic struct {
+		ID string `json:"descId"`
+	}
+
+	Introduce struct {
+		CreationTime int64    `json:"creation"`
+		Admins       []string `json:"admins"`
+		SuperAdmins  []string `json:"superadmins"`
+		Regulars     []string `json:"regulars"`
+	}
+
+	Restrict bool
+
+	Announce bool
+
+	UserChange struct {
+		JIDs []string `json:"participants"`
+	}
+}
+
+func (cud *ChatUpdateData) UnmarshalJSON(data []byte) error {
+	var arr []json.RawMessage
+	err := json.Unmarshal(data, &arr)
+	if err != nil {
+		return err
+	} else if len(arr) < 3 {
+		return nil
+	}
+
+	err = json.Unmarshal(arr[0], &cud.Action)
+	if err != nil {
+		return err
+	}
+
+	err = json.Unmarshal(arr[1], &cud.SenderJID)
+	if err != nil {
+		return err
+	}
+	cud.SenderJID = strings.Replace(cud.SenderJID, OldUserSuffix, NewUserSuffix, 1)
+
+	var unmarshalTo interface{}
+	switch cud.Action {
+	case ChatActionIntroduce, ChatActionCreate:
+		err = json.Unmarshal(arr[2], &cud.NameChange)
+		if err != nil {
+			return err
+		}
+		err = json.Unmarshal(arr[2], &cud.AddTopic)
+		if err != nil {
+			return err
+		}
+		unmarshalTo = &cud.Introduce
+	case ChatActionNameChange:
+		unmarshalTo = &cud.NameChange
+	case ChatActionAddTopic:
+		unmarshalTo = &cud.AddTopic
+	case ChatActionRemoveTopic:
+		unmarshalTo = &cud.RemoveTopic
+	case ChatActionRestrict:
+		unmarshalTo = &cud.Restrict
+	case ChatActionAnnounce:
+		unmarshalTo = &cud.Announce
+	case ChatActionPromote, ChatActionDemote, ChatActionRemove, ChatActionAdd:
+		unmarshalTo = &cud.UserChange
+	default:
+		return nil
+	}
+	err = json.Unmarshal(arr[2], unmarshalTo)
+	if err != nil {
+		return err
+	}
+	cud.NameChange.SetBy = strings.Replace(cud.NameChange.SetBy, OldUserSuffix, NewUserSuffix, 1)
+	for index, jid := range cud.UserChange.JIDs {
+		cud.UserChange.JIDs[index] = strings.Replace(jid, OldUserSuffix, NewUserSuffix, 1)
+	}
+	for index, jid := range cud.Introduce.SuperAdmins {
+		cud.Introduce.SuperAdmins[index] = strings.Replace(jid, OldUserSuffix, NewUserSuffix, 1)
+	}
+	for index, jid := range cud.Introduce.Admins {
+		cud.Introduce.Admins[index] = strings.Replace(jid, OldUserSuffix, NewUserSuffix, 1)
+	}
+	for index, jid := range cud.Introduce.Regulars {
+		cud.Introduce.Regulars[index] = strings.Replace(jid, OldUserSuffix, NewUserSuffix, 1)
+	}
+	return nil
+}
+
+type ChatUpdateHandler interface {
+	whatsapp.Handler
+	HandleChatUpdate(ChatUpdate)
+}
+
+func (ext *ExtendedConn) handleMessageChatUpdate(message []byte) {
+	var event ChatUpdate
+	err := json.Unmarshal(message, &event)
+	if err != nil {
+		ext.jsonParseError(err)
+		return
+	}
+	event.JID = strings.Replace(event.JID, OldUserSuffix, NewUserSuffix, 1)
+	for _, handler := range ext.handlers {
+		chatUpdateHandler, ok := handler.(ChatUpdateHandler)
+		if !ok {
+			continue
+		}
+
+		if ext.shouldCallSynchronously(chatUpdateHandler) {
+			chatUpdateHandler.HandleChatUpdate(event)
+		} else {
+			go chatUpdateHandler.HandleChatUpdate(event)
+		}
+	}
+}

whatsapp-ext/cmd.go

@@ -0,0 +1,69 @@
+// mautrix-groupme - A Matrix-GroupMe puppeting bridge.
+// Copyright (C) 2022 Sumner Evans, Karmanyaah Malhotra
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package whatsappExt
+
+import (
+	"encoding/json"
+	"strings"
+
+	"github.com/Rhymen/go-whatsapp"
+)
+
+type CommandType string
+
+const (
+	CommandPicture    CommandType = "picture"
+	CommandDisconnect CommandType = "disconnect"
+)
+
+type Command struct {
+	Type CommandType `json:"type"`
+	JID  string      `json:"jid"`
+
+	*ProfilePicInfo
+	Kind string `json:"kind"`
+
+	Raw json.RawMessage `json:"-"`
+}
+
+type CommandHandler interface {
+	whatsapp.Handler
+	HandleCommand(Command)
+}
+
+func (ext *ExtendedConn) handleMessageCommand(message []byte) {
+	var event Command
+	err := json.Unmarshal(message, &event)
+	if err != nil {
+		ext.jsonParseError(err)
+		return
+	}
+	event.Raw = message
+	event.JID = strings.Replace(event.JID, OldUserSuffix, NewUserSuffix, 1)
+	for _, handler := range ext.handlers {
+		commandHandler, ok := handler.(CommandHandler)
+		if !ok {
+			continue
+		}
+
+		if ext.shouldCallSynchronously(commandHandler) {
+			commandHandler.HandleCommand(event)
+		} else {
+			go commandHandler.HandleCommand(event)
+		}
+	}
+}

whatsapp-ext/conn.go

@@ -0,0 +1,65 @@
+// mautrix-groupme - A Matrix-GroupMe puppeting bridge.
+// Copyright (C) 2022 Sumner Evans, Karmanyaah Malhotra
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package whatsappExt
+
+import (
+	"encoding/json"
+
+	"github.com/Rhymen/go-whatsapp"
+)
+
+type ConnInfo struct {
+	ProtocolVersion []int `json:"protoVersion"`
+	BinaryVersion   int   `json:"binVersion"`
+	Phone           struct {
+		WhatsAppVersion    string `json:"wa_version"`
+		MCC                string `json:"mcc"`
+		MNC                string `json:"mnc"`
+		OSVersion          string `json:"os_version"`
+		DeviceManufacturer string `json:"device_manufacturer"`
+		DeviceModel        string `json:"device_model"`
+		OSBuildNumber      string `json:"os_build_number"`
+	} `json:"phone"`
+	Features map[string]interface{} `json:"features"`
+	PushName string                 `json:"pushname"`
+}
+
+type ConnInfoHandler interface {
+	whatsapp.Handler
+	HandleConnInfo(ConnInfo)
+}
+
+func (ext *ExtendedConn) handleMessageConn(message []byte) {
+	var event ConnInfo
+	err := json.Unmarshal(message, &event)
+	if err != nil {
+		ext.jsonParseError(err)
+		return
+	}
+	for _, handler := range ext.handlers {
+		connInfoHandler, ok := handler.(ConnInfoHandler)
+		if !ok {
+			continue
+		}
+
+		if ext.shouldCallSynchronously(connInfoHandler) {
+			connInfoHandler.HandleConnInfo(event)
+		} else {
+			go connInfoHandler.HandleConnInfo(event)
+		}
+	}
+}

whatsapp-ext/group.go

@@ -0,0 +1,66 @@
+// mautrix-groupme - A Matrix-GroupMe puppeting bridge.
+// Copyright (C) 2022 Sumner Evans, Karmanyaah Malhotra
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package whatsappExt
+
+import (
+	"github.com/beeper/groupme/types"
+)
+
+type CreateGroupResponse struct {
+	Status       int             `json:"status"`
+	GroupID      types.GroupMeID `json:"gid"`
+	Participants map[types.GroupMeID]struct {
+		Code string `json:"code"`
+	} `json:"participants"`
+
+	Source string `json:"-"`
+}
+
+type actualCreateGroupResponse struct {
+	Status       int             `json:"status"`
+	GroupID      types.GroupMeID `json:"gid"`
+	Participants []map[types.GroupMeID]struct {
+		Code string `json:"code"`
+	} `json:"participants"`
+}
+
+func (ext *ExtendedConn) CreateGroup(subject string, participants []types.GroupMeID) (*CreateGroupResponse, error) {
+	// respChan, err := ext.Conn.CreateGroup(subject, participants)
+	// if err != nil {
+	// 	return nil, err
+	// }
+	// var resp CreateGroupResponse
+	// var actualResp actualCreateGroupResponse
+	// resp.Source = <-respChan
+	// fmt.Println(">>>>>>", resp.Source)
+	// err = json.Unmarshal([]byte(resp.Source), &actualResp)
+	// if err != nil {
+	// 	return nil, err
+	// }
+	// resp.Status = actualResp.Status
+	// resp.GroupID = actualResp.GroupID
+	// resp.Participants = make(map[types.GroupMeID]struct {
+	// 	Code string `json:"code"`
+	// })
+	// for _, participantMap := range actualResp.Participants {
+	// 	for jid, status := range participantMap {
+	// 		resp.Participants[jid] = status
+	// 	}
+	// }
+	// return &resp, nil
+	return nil, nil
+}

whatsapp-ext/jsonmessage.go

@@ -0,0 +1,105 @@
+// mautrix-groupme - A Matrix-GroupMe puppeting bridge.
+// Copyright (C) 2022 Sumner Evans, Karmanyaah Malhotra
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package whatsappExt
+
+import (
+	"encoding/json"
+
+	"github.com/Rhymen/go-whatsapp"
+)
+
+type JSONMessage []json.RawMessage
+
+type JSONMessageType string
+
+const (
+	MessageMsgInfo  JSONMessageType = "MsgInfo"
+	MessageMsg      JSONMessageType = "Msg"
+	MessagePresence JSONMessageType = "Presence"
+	MessageStream   JSONMessageType = "Stream"
+	MessageConn     JSONMessageType = "Conn"
+	MessageProps    JSONMessageType = "Props"
+	MessageCmd      JSONMessageType = "Cmd"
+	MessageChat     JSONMessageType = "Chat"
+	MessageCall     JSONMessageType = "Call"
+)
+
+func (ext *ExtendedConn) HandleError(error) {}
+
+type UnhandledJSONMessageHandler interface {
+	whatsapp.Handler
+	HandleUnhandledJSONMessage(string)
+}
+
+type JSONParseErrorHandler interface {
+	whatsapp.Handler
+	HandleJSONParseError(error)
+}
+
+func (ext *ExtendedConn) jsonParseError(err error) {
+	for _, handler := range ext.handlers {
+		errorHandler, ok := handler.(JSONParseErrorHandler)
+		if !ok {
+			continue
+		}
+		errorHandler.HandleJSONParseError(err)
+	}
+}
+
+func (ext *ExtendedConn) HandleJsonMessage(message string) {
+	msg := JSONMessage{}
+	err := json.Unmarshal([]byte(message), &msg)
+	if err != nil || len(msg) < 2 {
+		ext.jsonParseError(err)
+		return
+	}
+
+	var msgType JSONMessageType
+	json.Unmarshal(msg[0], &msgType)
+
+	switch msgType {
+	case MessagePresence:
+		ext.handleMessagePresence(msg[1])
+	case MessageStream:
+		ext.handleMessageStream(msg[1:])
+	case MessageConn:
+		ext.handleMessageConn(msg[1])
+	case MessageProps:
+		ext.handleMessageProps(msg[1])
+	case MessageMsgInfo, MessageMsg:
+		ext.handleMessageMsgInfo(msgType, msg[1])
+	case MessageCmd:
+		ext.handleMessageCommand(msg[1])
+	case MessageChat:
+		ext.handleMessageChatUpdate(msg[1])
+	case MessageCall:
+		ext.handleMessageCall(msg[1])
+	default:
+		for _, handler := range ext.handlers {
+			ujmHandler, ok := handler.(UnhandledJSONMessageHandler)
+			if !ok {
+				continue
+			}
+
+			if ext.shouldCallSynchronously(ujmHandler) {
+				ujmHandler.HandleUnhandledJSONMessage(message)
+			} else {
+				go ujmHandler.HandleUnhandledJSONMessage(message)
+			}
+		}
+	}
+}

whatsapp-ext/msginfo.go

@@ -0,0 +1,95 @@
+// mautrix-groupme - A Matrix-GroupMe puppeting bridge.
+// Copyright (C) 2022 Sumner Evans, Karmanyaah Malhotra
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package whatsappExt
+
+import (
+	"encoding/json"
+	"strings"
+
+	"github.com/Rhymen/go-whatsapp"
+)
+
+type MsgInfoCommand string
+
+const (
+	MsgInfoCommandAck  MsgInfoCommand = "ack"
+	MsgInfoCommandAcks MsgInfoCommand = "acks"
+)
+
+type Acknowledgement int
+
+const (
+	AckMessageSent      Acknowledgement = 1
+	AckMessageDelivered Acknowledgement = 2
+	AckMessageRead      Acknowledgement = 3
+)
+
+type JSONStringOrArray []string
+
+func (jsoa *JSONStringOrArray) UnmarshalJSON(data []byte) error {
+	var str string
+	if json.Unmarshal(data, &str) == nil {
+		*jsoa = []string{str}
+		return nil
+	}
+	var strs []string
+	json.Unmarshal(data, &strs)
+	*jsoa = strs
+	return nil
+}
+
+type MsgInfo struct {
+	Command         MsgInfoCommand    `json:"cmd"`
+	IDs             JSONStringOrArray `json:"id"`
+	Acknowledgement Acknowledgement   `json:"ack"`
+	MessageFromJID  string            `json:"from"`
+	SenderJID       string            `json:"participant"`
+	ToJID           string            `json:"to"`
+	Timestamp       int64             `json:"t"`
+}
+
+type MsgInfoHandler interface {
+	whatsapp.Handler
+	HandleMsgInfo(MsgInfo)
+}
+
+func (ext *ExtendedConn) handleMessageMsgInfo(msgType JSONMessageType, message []byte) {
+	var event MsgInfo
+	err := json.Unmarshal(message, &event)
+	if err != nil {
+		ext.jsonParseError(err)
+		return
+	}
+	event.MessageFromJID = strings.Replace(event.MessageFromJID, OldUserSuffix, NewUserSuffix, 1)
+	event.SenderJID = strings.Replace(event.SenderJID, OldUserSuffix, NewUserSuffix, 1)
+	event.ToJID = strings.Replace(event.ToJID, OldUserSuffix, NewUserSuffix, 1)
+	if msgType == MessageMsg {
+		event.SenderJID = event.ToJID
+	}
+	for _, handler := range ext.handlers {
+		msgInfoHandler, ok := handler.(MsgInfoHandler)
+		if !ok {
+			continue
+		}
+
+		if ext.shouldCallSynchronously(msgInfoHandler) {
+			msgInfoHandler.HandleMsgInfo(event)
+		} else {
+			go msgInfoHandler.HandleMsgInfo(event)
+		}
+	}
+}

whatsapp-ext/presence.go

@@ -0,0 +1,64 @@
+// mautrix-groupme - A Matrix-GroupMe puppeting bridge.
+// Copyright (C) 2022 Sumner Evans, Karmanyaah Malhotra
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package whatsappExt
+
+import (
+	"encoding/json"
+	"strings"
+
+	"github.com/Rhymen/go-whatsapp"
+)
+
+type Presence struct {
+	JID       string            `json:"id"`
+	SenderJID string            `json:"participant"`
+	Status    whatsapp.Presence `json:"type"`
+	Timestamp int64             `json:"t"`
+	Deny      bool              `json:"deny"`
+}
+
+type PresenceHandler interface {
+	whatsapp.Handler
+	HandlePresence(Presence)
+}
+
+func (ext *ExtendedConn) handleMessagePresence(message []byte) {
+	var event Presence
+	err := json.Unmarshal(message, &event)
+	if err != nil {
+		ext.jsonParseError(err)
+		return
+	}
+	event.JID = strings.Replace(event.JID, OldUserSuffix, NewUserSuffix, 1)
+	if len(event.SenderJID) == 0 {
+		event.SenderJID = event.JID
+	} else {
+		event.SenderJID = strings.Replace(event.SenderJID, OldUserSuffix, NewUserSuffix, 1)
+	}
+	for _, handler := range ext.handlers {
+		presenceHandler, ok := handler.(PresenceHandler)
+		if !ok {
+			continue
+		}
+
+		if ext.shouldCallSynchronously(presenceHandler) {
+			presenceHandler.HandlePresence(event)
+		} else {
+			go presenceHandler.HandlePresence(event)
+		}
+	}
+}

whatsapp-ext/props.go

@@ -0,0 +1,73 @@
+// mautrix-groupme - A Matrix-GroupMe puppeting bridge.
+// Copyright (C) 2022 Sumner Evans, Karmanyaah Malhotra
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package whatsappExt
+
+import (
+	"encoding/json"
+
+	"github.com/Rhymen/go-whatsapp"
+)
+
+type ProtocolProps struct {
+	WebPresence            bool   `json:"webPresence"`
+	NotificationQuery      bool   `json:"notificationQuery"`
+	FacebookCrashLog       bool   `json:"fbCrashlog"`
+	Bucket                 string `json:"bucket"`
+	GIFSearch              string `json:"gifSearch"`
+	Spam                   bool   `json:"SPAM"`
+	SetBlock               bool   `json:"SET_BLOCK"`
+	MessageInfo            bool   `json:"MESSAGE_INFO"`
+	MaxFileSize            int    `json:"maxFileSize"`
+	Media                  int    `json:"media"`
+	GroupNameLength        int    `json:"maxSubject"`
+	GroupDescriptionLength int    `json:"groupDescLength"`
+	MaxParticipants        int    `json:"maxParticipants"`
+	VideoMaxEdge           int    `json:"videoMaxEdge"`
+	ImageMaxEdge           int    `json:"imageMaxEdge"`
+	ImageMaxKilobytes      int    `json:"imageMaxKBytes"`
+	Edit                   int    `json:"edit"`
+	FwdUIStartTimestamp    int    `json:"fwdUiStartTs"`
+	GroupsV3               int    `json:"groupsV3"`
+	RestrictGroups         int    `json:"restrictGroups"`
+	AnnounceGroups         int    `json:"announceGroups"`
+}
+
+type ProtocolPropsHandler interface {
+	whatsapp.Handler
+	HandleProtocolProps(ProtocolProps)
+}
+
+func (ext *ExtendedConn) handleMessageProps(message []byte) {
+	var event ProtocolProps
+	err := json.Unmarshal(message, &event)
+	if err != nil {
+		ext.jsonParseError(err)
+		return
+	}
+	for _, handler := range ext.handlers {
+		protocolPropsHandler, ok := handler.(ProtocolPropsHandler)
+		if !ok {
+			continue
+		}
+
+		if ext.shouldCallSynchronously(protocolPropsHandler) {
+			protocolPropsHandler.HandleProtocolProps(event)
+		} else {
+			go protocolPropsHandler.HandleProtocolProps(event)
+		}
+	}
+}

whatsapp-ext/protomessage.go

@@ -0,0 +1,59 @@
+// mautrix-groupme - A Matrix-GroupMe puppeting bridge.
+// Copyright (C) 2022 Sumner Evans, Karmanyaah Malhotra
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package whatsappExt
+
+import (
+	"github.com/Rhymen/go-whatsapp"
+	"github.com/Rhymen/go-whatsapp/binary/proto"
+)
+
+type MessageRevokeHandler interface {
+	whatsapp.Handler
+	HandleMessageRevoke(key MessageRevocation)
+}
+
+type MessageRevocation struct {
+	Id          string
+	RemoteJid   string
+	FromMe      bool
+	Participant string
+}
+
+func (ext *ExtendedConn) HandleRawMessage(message *proto.WebMessageInfo) {
+	protoMsg := message.GetMessage().GetProtocolMessage()
+	if protoMsg != nil && protoMsg.GetType() == proto.ProtocolMessage_REVOKE {
+		key := protoMsg.GetKey()
+		deletedMessage := MessageRevocation{
+			Id:          key.GetId(),
+			RemoteJid:   key.GetRemoteJid(),
+			FromMe:      key.GetFromMe(),
+			Participant: key.GetParticipant(),
+		}
+		for _, handler := range ext.handlers {
+			mrHandler, ok := handler.(MessageRevokeHandler)
+			if !ok {
+				continue
+			}
+
+			if ext.shouldCallSynchronously(mrHandler) {
+				mrHandler.HandleMessageRevoke(deletedMessage)
+			} else {
+				go mrHandler.HandleMessageRevoke(deletedMessage)
+			}
+		}
+	}
+}

whatsapp-ext/stream.go

@@ -0,0 +1,76 @@
+// mautrix-groupme - A Matrix-GroupMe puppeting bridge.
+// Copyright (C) 2022 Sumner Evans, Karmanyaah Malhotra
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package whatsappExt
+
+import (
+	"encoding/json"
+
+	"github.com/Rhymen/go-whatsapp"
+)
+
+type StreamType string
+
+const (
+	StreamUpdate = "update"
+	StreamSleep  = "asleep"
+)
+
+type StreamEvent struct {
+	Type StreamType
+
+	IsOutdated bool
+	Version    string
+
+	Extra []json.RawMessage
+}
+
+type StreamEventHandler interface {
+	whatsapp.Handler
+	HandleStreamEvent(StreamEvent)
+}
+
+func (ext *ExtendedConn) handleMessageStream(message []json.RawMessage) {
+	var event StreamEvent
+	err := json.Unmarshal(message[0], &event.Type)
+	if err != nil {
+		ext.jsonParseError(err)
+		return
+	}
+
+	if event.Type == StreamUpdate && len(message) >= 3 {
+		_ = json.Unmarshal(message[1], &event.IsOutdated)
+		_ = json.Unmarshal(message[2], &event.Version)
+		if len(message) >= 4 {
+			event.Extra = message[3:]
+		}
+	} else if len(message) >= 2 {
+		event.Extra = message[1:]
+	}
+
+	for _, handler := range ext.handlers {
+		streamHandler, ok := handler.(StreamEventHandler)
+		if !ok {
+			continue
+		}
+
+		if ext.shouldCallSynchronously(streamHandler) {
+			streamHandler.HandleStreamEvent(event)
+		} else {
+			go streamHandler.HandleStreamEvent(event)
+		}
+	}
+}

whatsapp-ext/whatsapp.go

@@ -0,0 +1,164 @@
+// mautrix-groupme - A Matrix-GroupMe puppeting bridge.
+// Copyright (C) 2022 Sumner Evans, Karmanyaah Malhotra
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package whatsappExt
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"strings"
+
+	"github.com/Rhymen/go-whatsapp"
+)
+
+const (
+	OldUserSuffix = "@c.us"
+	NewUserSuffix = "@s.whatsapp.net"
+)
+
+type ExtendedConn struct {
+	*whatsapp.Conn
+
+	handlers []whatsapp.Handler
+}
+
+func ExtendConn(conn *whatsapp.Conn) *ExtendedConn {
+	ext := &ExtendedConn{
+		Conn: conn,
+	}
+	ext.Conn.AddHandler(ext)
+	return ext
+}
+
+func (ext *ExtendedConn) AddHandler(handler whatsapp.Handler) {
+	ext.Conn.AddHandler(handler)
+	ext.handlers = append(ext.handlers, handler)
+}
+
+func (ext *ExtendedConn) RemoveHandler(handler whatsapp.Handler) bool {
+	ext.Conn.RemoveHandler(handler)
+	for i, v := range ext.handlers {
+		if v == handler {
+			ext.handlers = append(ext.handlers[:i], ext.handlers[i+1:]...)
+			return true
+		}
+	}
+	return false
+}
+
+func (ext *ExtendedConn) RemoveHandlers() {
+	ext.Conn.RemoveHandlers()
+	ext.handlers = make([]whatsapp.Handler, 0)
+}
+
+func (ext *ExtendedConn) shouldCallSynchronously(handler whatsapp.Handler) bool {
+	sh, ok := handler.(whatsapp.SyncHandler)
+	return ok && sh.ShouldCallSynchronously()
+}
+
+func (ext *ExtendedConn) ShouldCallSynchronously() bool {
+	return true
+}
+
+type GroupInfo struct {
+	JID      string `json:"jid"`
+	OwnerJID string `json:"owner"`
+
+	Name        string `json:"subject"`
+	NameSetTime int64  `json:"subjectTime"`
+	NameSetBy   string `json:"subjectOwner"`
+
+	Announce bool `json:"announce"` // Can only admins send messages?
+
+	Topic      string `json:"desc"`
+	TopicID    string `json:"descId"`
+	TopicSetAt int64  `json:"descTime"`
+	TopicSetBy string `json:"descOwner"`
+
+	GroupCreated int64 `json:"creation"`
+
+	Status int16 `json:"status"`
+
+	Participants []struct {
+		JID          string `json:"id"`
+		IsAdmin      bool   `json:"isAdmin"`
+		IsSuperAdmin bool   `json:"isSuperAdmin"`
+	} `json:"participants"`
+}
+
+func (ext *ExtendedConn) GetGroupMetaData(jid string) (*GroupInfo, error) {
+	data, err := ext.Conn.GetGroupMetaData(jid)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get group metadata: %v", err)
+	}
+	content := <-data
+
+	info := &GroupInfo{}
+	err = json.Unmarshal([]byte(content), info)
+	if err != nil {
+		return info, fmt.Errorf("failed to unmarshal group metadata: %v", err)
+	}
+
+	for index, participant := range info.Participants {
+		info.Participants[index].JID = strings.Replace(participant.JID, OldUserSuffix, NewUserSuffix, 1)
+	}
+	info.NameSetBy = strings.Replace(info.NameSetBy, OldUserSuffix, NewUserSuffix, 1)
+	info.TopicSetBy = strings.Replace(info.TopicSetBy, OldUserSuffix, NewUserSuffix, 1)
+
+	return info, nil
+}
+
+type ProfilePicInfo struct {
+	URL string `json:"eurl"`
+	Tag string `json:"tag"`
+
+	Status int `json:"status"`
+}
+
+func (ppi *ProfilePicInfo) Download() (io.ReadCloser, error) {
+	resp, err := http.Get(ppi.URL)
+	if err != nil {
+		return nil, err
+	}
+	return resp.Body, nil
+}
+
+func (ppi *ProfilePicInfo) DownloadBytes() ([]byte, error) {
+	body, err := ppi.Download()
+	if err != nil {
+		return nil, err
+	}
+	defer body.Close()
+	data, err := ioutil.ReadAll(body)
+	return data, err
+}
+
+func (ext *ExtendedConn) GetProfilePicThumb(jid string) (*ProfilePicInfo, error) {
+	data, err := ext.Conn.GetProfilePicThumb(jid)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get avatar: %v", err)
+	}
+	content := <-data
+	info := &ProfilePicInfo{}
+	err = json.Unmarshal([]byte(content), info)
+	if err != nil {
+		return info, fmt.Errorf("failed to unmarshal avatar info: %v", err)
+	}
+	return info, nil
+}