Switch core functionality to Mautrix

Signed-off-by: Nikos Filippakis <me@nfil.dev>

.travis.yml

@@ -1,7 +1,11 @@
+os: linux
+dist: bionic
 language: go
 go:
  - 1.14
 install:
+ - sudo apt-get update
+ - sudo apt-get -y install libolm2 libolm-dev
  - go get golang.org/x/lint/golint
  - go get github.com/fzipp/gocyclo
 

Dockerfile

@@ -1,7 +1,11 @@
 # Build go-neb
 FROM golang:1.14-alpine as builder
 
-RUN apk add --no-cache -t build-deps git gcc musl-dev go
+RUN apk add --no-cache -t build-deps git gcc musl-dev go make g++
+
+RUN git clone https://gitlab.matrix.org/matrix-org/olm.git /tmp/libolm \
+    && cd /tmp/libolm \
+    && make install
 
 COPY . /tmp/go-neb
 WORKDIR /tmp/go-neb
@@ -22,7 +26,11 @@ ENV BIND_ADDRESS=:4050 \
     GID=1337
 
 COPY --from=builder /tmp/go-neb/go-neb /usr/local/bin/go-neb
+# Copy libolm.so
+COPY --from=builder /usr/local/lib/* /usr/local/lib/
+
 RUN apk add --no-cache \
+      libstdc++ \
       ca-certificates \
       su-exec \
       s6

README.md

@@ -169,6 +169,10 @@ Before submitting pull requests, please read the [Matrix.org contribution guidel
 
 # Developing
 
+This project depends on `libolm` for the end-to-end encryption. Therefore,
+you need to install `libolm2` and `libolm-dev` on Ubuntu / `libolm-devel` on
+CentOS to be able to build and run it.
+
 There's a bunch more tools this project uses when developing in order to do
 things like linting. Some of them are bundled with go (fmt and vet) but some
 are not. You should install the ones which are not:

api/api.go

@@ -12,6 +12,8 @@ import (
 	"encoding/json"
 	"errors"
 	"net/url"
+
+	"maunium.net/go/mautrix/id"
 )
 
 // ConfigureAuthRealmRequest is a request to /configureAuthRealm
@@ -32,7 +34,7 @@ type RequestAuthSessionRequest struct {
 	RealmID string
 	// The Matrix user ID requesting the auth session. If the auth is successful,
 	// this user ID will be associated with the third-party credentials obtained.
-	UserID string
+	UserID id.UserID
 	// AuthRealm specific config information. See the docs for the auth realm you're interested in.
 	Config json.RawMessage
 }
@@ -47,7 +49,7 @@ type ConfigureServiceRequest struct {
 	Type string
 	// The user ID of the configured client that this service will use to communicate with Matrix.
 	// The user MUST already be configured.
-	UserID string
+	UserID id.UserID
 	// Service-specific config information. See the docs for the service you're interested in.
 	Config json.RawMessage
 }
@@ -56,7 +58,7 @@ type ConfigureServiceRequest struct {
 // Go-NEB can drive it. It forms the HTTP body to /configureClient requests.
 type ClientConfig struct {
 	// The matrix User ID to connect with. E.g. @alice:matrix.org
-	UserID string
+	UserID id.UserID
 	// A URL with the host and port of the matrix server. E.g. https://matrix.org:8448
 	HomeserverURL string
 	// The matrix access token to authenticate the requests with.
@@ -81,7 +83,7 @@ type ClientConfig struct {
 type Session struct {
 	SessionID string
 	RealmID   string
-	UserID    string
+	UserID    id.UserID
 	Config    json.RawMessage
 }
 

api/handlers/auth.go

@@ -13,6 +13,7 @@ import (
 	"github.com/matrix-org/go-neb/types"
 	"github.com/matrix-org/util"
 	log "github.com/sirupsen/logrus"
+	"maunium.net/go/mautrix/id"
 )
 
 // RequestAuthSession represents an HTTP handler capable of processing /admin/requestAuthSession requests.
@@ -104,7 +105,7 @@ func (h *RemoveAuthSession) OnIncomingRequest(req *http.Request) util.JSONRespon
 	}
 	var body struct {
 		RealmID string
-		UserID  string
+		UserID  id.UserID
 	}
 	if err := json.NewDecoder(req.Body).Decode(&body); err != nil {
 		return util.MessageResponse(400, "Error parsing request JSON")
@@ -276,7 +277,7 @@ func (h *GetSession) OnIncomingRequest(req *http.Request) util.JSONResponse {
 	}
 	var body struct {
 		RealmID string
-		UserID  string
+		UserID  id.UserID
 	}
 	if err := json.NewDecoder(req.Body).Decode(&body); err != nil {
 		return util.MessageResponse(400, "Error parsing request JSON")

api/handlers/service.go

@@ -14,9 +14,9 @@ import (
 	"github.com/matrix-org/go-neb/metrics"
 	"github.com/matrix-org/go-neb/polling"
 	"github.com/matrix-org/go-neb/types"
-	"github.com/matrix-org/gomatrix"
 	"github.com/matrix-org/util"
 	log "github.com/sirupsen/logrus"
+	"maunium.net/go/mautrix"
 )
 
 // ConfigureService represents an HTTP handler which can process /admin/configureService requests.
@@ -225,7 +225,7 @@ func (h *GetService) OnIncomingRequest(req *http.Request) util.JSONResponse {
 	}
 }
 
-func checkClientForService(service types.Service, client *gomatrix.Client) error {
+func checkClientForService(service types.Service, client *mautrix.Client) error {
 	// If there are any commands or expansions for this Service then the service user ID
 	// MUST be a syncing client or else the Service will never get the incoming command/expansion!
 	cmds := service.Commands(client)

clients/clients.go

@@ -13,9 +13,11 @@ import (
 	"github.com/matrix-org/go-neb/matrix"
 	"github.com/matrix-org/go-neb/metrics"
 	"github.com/matrix-org/go-neb/types"
-	"github.com/matrix-org/gomatrix"
 	shellwords "github.com/mattn/go-shellwords"
 	log "github.com/sirupsen/logrus"
+	"maunium.net/go/mautrix"
+	mevt "maunium.net/go/mautrix/event"
+	"maunium.net/go/mautrix/id"
 )
 
 // A Clients is a collection of clients used for bot services.
@@ -24,7 +26,7 @@ type Clients struct {
 	httpClient *http.Client
 	dbMutex    sync.Mutex
 	mapMutex   sync.Mutex
-	clients    map[string]clientEntry
+	clients    map[id.UserID]clientEntry
 }
 
 // New makes a new collection of matrix clients
@@ -32,13 +34,13 @@ func New(db database.Storer, cli *http.Client) *Clients {
 	clients := &Clients{
 		db:         db,
 		httpClient: cli,
-		clients:    make(map[string]clientEntry), // user_id => clientEntry
+		clients:    make(map[id.UserID]clientEntry), // user_id => clientEntry
 	}
 	return clients
 }
 
 // Client gets a client for the userID
-func (c *Clients) Client(userID string) (*gomatrix.Client, error) {
+func (c *Clients) Client(userID id.UserID) (*mautrix.Client, error) {
 	entry := c.getClient(userID)
 	if entry.client != nil {
 		return entry.client, nil
@@ -71,10 +73,10 @@ func (c *Clients) Start() error {
 
 type clientEntry struct {
 	config api.ClientConfig
-	client *gomatrix.Client
+	client *mautrix.Client
 }
 
-func (c *Clients) getClient(userID string) clientEntry {
+func (c *Clients) getClient(userID id.UserID) clientEntry {
 	c.mapMutex.Lock()
 	defer c.mapMutex.Unlock()
 	return c.clients[userID]
@@ -86,7 +88,7 @@ func (c *Clients) setClient(client clientEntry) {
 	c.clients[client.config.UserID] = client
 }
 
-func (c *Clients) loadClientFromDB(userID string) (entry clientEntry, err error) {
+func (c *Clients) loadClientFromDB(userID id.UserID) (entry clientEntry, err error) {
 	c.dbMutex.Lock()
 	defer c.dbMutex.Unlock()
 
@@ -153,7 +155,7 @@ func (c *Clients) updateClientInDB(newConfig api.ClientConfig) (new clientEntry,
 	return
 }
 
-func (c *Clients) onMessageEvent(client *gomatrix.Client, event *gomatrix.Event) {
+func (c *Clients) onMessageEvent(client *mautrix.Client, event *mevt.Event) {
 	services, err := c.db.LoadServicesForUser(client.UserID)
 	if err != nil {
 		log.WithFields(log.Fields{
@@ -163,13 +165,19 @@ func (c *Clients) onMessageEvent(client *gomatrix.Client, event *gomatrix.Event)
 		}).Warn("Error loading services")
 	}
 
-	body, ok := event.Body()
-	if !ok || body == "" {
+	if err := event.Content.ParseRaw(mevt.EventMessage); err != nil {
+		return
+	}
+
+	message := event.Content.AsMessage()
+	body := message.Body
+
+	if body == "" {
 		return
 	}
 
 	// filter m.notice to prevent loops
-	if msgtype, ok := event.MessageType(); !ok || msgtype == "m.notice" {
+	if message.MsgType == mevt.MsgNotice {
 		return
 	}
 
@@ -198,7 +206,7 @@ func (c *Clients) onMessageEvent(client *gomatrix.Client, event *gomatrix.Event)
 	}
 
 	for _, content := range responses {
-		if _, err := client.SendMessageEvent(event.RoomID, "m.room.message", content); err != nil {
+		if _, err := client.SendMessageEvent(event.RoomID, mevt.EventMessage, content); err != nil {
 			log.WithFields(log.Fields{
 				log.ErrorKey: err,
 				"room_id":    event.RoomID,
@@ -213,7 +221,7 @@ func (c *Clients) onMessageEvent(client *gomatrix.Client, event *gomatrix.Event)
 // the matching command with the longest path. Returns the JSON encodable
 // content of a single matrix message event to use as a response or nil if no
 // response is appropriate.
-func runCommandForService(cmds []types.Command, event *gomatrix.Event, arguments []string) interface{} {
+func runCommandForService(cmds []types.Command, event *mevt.Event, arguments []string) interface{} {
 	var bestMatch *types.Command
 	for i, command := range cmds {
 		matches := command.Matches(arguments)
@@ -245,7 +253,10 @@ func runCommandForService(cmds []types.Command, event *gomatrix.Event, arguments
 			}).Warn("Command returned both error and content.")
 		}
 		metrics.IncrementCommand(bestMatch.Path[0], metrics.StatusFailure)
-		content = gomatrix.TextMessage{"m.notice", err.Error()}
+		content = mevt.MessageEventContent{
+			MsgType: mevt.MsgNotice,
+			Body:    err.Error(),
+		}
 	} else {
 		metrics.IncrementCommand(bestMatch.Path[0], metrics.StatusSuccess)
 	}
@@ -254,7 +265,7 @@ func runCommandForService(cmds []types.Command, event *gomatrix.Event, arguments
 }
 
 // run the expansions for a matrix event.
-func runExpansionsForService(expans []types.Expansion, event *gomatrix.Event, body string) []interface{} {
+func runExpansionsForService(expans []types.Expansion, event *mevt.Event, body string) []interface{} {
 	var responses []interface{}
 
 	for _, expansion := range expans {
@@ -275,10 +286,13 @@ func runExpansionsForService(expans []types.Expansion, event *gomatrix.Event, bo
 	return responses
 }
 
-func (c *Clients) onBotOptionsEvent(client *gomatrix.Client, event *gomatrix.Event) {
+func (c *Clients) onBotOptionsEvent(client *mautrix.Client, event *mevt.Event) {
 	// see if these options are for us. The state key is the user ID with a leading _
 	// to get around restrictions in the HS about having user IDs as state keys.
-	targetUserID := strings.TrimPrefix(*event.StateKey, "_")
+	if event.StateKey == nil {
+		return
+	}
+	targetUserID := id.UserID(strings.TrimPrefix(*event.StateKey, "_"))
 	if targetUserID != client.UserID {
 		return
 	}
@@ -287,7 +301,7 @@ func (c *Clients) onBotOptionsEvent(client *gomatrix.Client, event *gomatrix.Eve
 		UserID:      client.UserID,
 		RoomID:      event.RoomID,
 		SetByUserID: event.Sender,
-		Options:     event.Content,
+		Options:     event.Content.Raw,
 	}
 	if _, err := c.db.StoreBotOptions(opts); err != nil {
 		log.WithFields(log.Fields{
@@ -299,15 +313,14 @@ func (c *Clients) onBotOptionsEvent(client *gomatrix.Client, event *gomatrix.Eve
 	}
 }
 
-func (c *Clients) onRoomMemberEvent(client *gomatrix.Client, event *gomatrix.Event) {
-	if *event.StateKey != client.UserID {
-		return // not our member event
-	}
-	m := event.Content["membership"]
-	membership, ok := m.(string)
-	if !ok {
+func (c *Clients) onRoomMemberEvent(client *mautrix.Client, event *mevt.Event) {
+	if err := event.Content.ParseRaw(mevt.StateMember); err != nil {
 		return
 	}
+	if event.StateKey == nil || *event.StateKey != client.UserID.String() {
+		return // not our member event
+	}
+	membership := event.Content.AsMember().Membership
 	if membership == "invite" {
 		logger := log.WithFields(log.Fields{
 			"room_id":         event.RoomID,
@@ -317,10 +330,10 @@ func (c *Clients) onRoomMemberEvent(client *gomatrix.Client, event *gomatrix.Eve
 		logger.Print("Accepting invite from user")
 
 		content := struct {
-			Inviter string `json:"inviter"`
+			Inviter id.UserID `json:"inviter"`
 		}{event.Sender}
 
-		if _, err := client.JoinRoom(event.RoomID, "", content); err != nil {
+		if _, err := client.JoinRoom(event.RoomID.String(), "", content); err != nil {
 			logger.WithError(err).Print("Failed to join room")
 		} else {
 			logger.Print("Joined room")
@@ -328,15 +341,15 @@ func (c *Clients) onRoomMemberEvent(client *gomatrix.Client, event *gomatrix.Eve
 	}
 }
 
-func (c *Clients) newClient(config api.ClientConfig) (*gomatrix.Client, error) {
-	client, err := gomatrix.NewClient(config.HomeserverURL, config.UserID, config.AccessToken)
+func (c *Clients) newClient(config api.ClientConfig) (*mautrix.Client, error) {
+	client, err := mautrix.NewClient(config.HomeserverURL, config.UserID, config.AccessToken)
 	if err != nil {
 		return nil, err
 	}
 	client.Client = c.httpClient
-	syncer := client.Syncer.(*gomatrix.DefaultSyncer)
+	syncer := client.Syncer.(*mautrix.DefaultSyncer)
 	nebStore := &matrix.NEBStore{
-		InMemoryStore: *gomatrix.NewInMemoryStore(),
+		InMemoryStore: *mautrix.NewInMemoryStore(),
 		Database:      c.db,
 		ClientConfig:  config,
 	}
@@ -346,16 +359,16 @@ func (c *Clients) newClient(config api.ClientConfig) (*gomatrix.Client, error) {
 	// TODO: Check that the access token is valid for the userID by peforming
 	// a request against the server.
 
-	syncer.OnEventType("m.room.message", func(event *gomatrix.Event) {
+	syncer.OnEventType(mevt.EventMessage, func(event *mevt.Event) {
 		c.onMessageEvent(client, event)
 	})
 
-	syncer.OnEventType("m.room.bot.options", func(event *gomatrix.Event) {
+	syncer.OnEventType(mevt.Type{Type: "m.room.bot.options", Class: mevt.UnknownEventType}, func(event *mevt.Event) {
 		c.onBotOptionsEvent(client, event)
 	})
 
 	if config.AutoJoinRooms {
-		syncer.OnEventType("m.room.member", func(event *gomatrix.Event) {
+		syncer.OnEventType(mevt.StateMember, func(event *mevt.Event) {
 			c.onRoomMemberEvent(client, event)
 		})
 	}

clients/clients_test.go

@@ -8,7 +8,9 @@ import (
 
 	"github.com/matrix-org/go-neb/database"
 	"github.com/matrix-org/go-neb/types"
-	"github.com/matrix-org/gomatrix"
+	"maunium.net/go/mautrix"
+	mevt "maunium.net/go/mautrix/event"
+	"maunium.net/go/mautrix/id"
 )
 
 var commandParseTests = []struct {
@@ -28,7 +30,7 @@ type MockService struct {
 	commands []types.Command
 }
 
-func (s *MockService) Commands(cli *gomatrix.Client) []types.Command {
+func (s *MockService) Commands(cli *mautrix.Client) []types.Command {
 	return s.commands
 }
 
@@ -37,7 +39,7 @@ type MockStore struct {
 	service types.Service
 }
 
-func (d *MockStore) LoadServicesForUser(userID string) ([]types.Service, error) {
+func (d *MockStore) LoadServicesForUser(userID id.UserID) ([]types.Service, error) {
 	return []types.Service{d.service}, nil
 }
 
@@ -54,7 +56,7 @@ func TestCommandParsing(t *testing.T) {
 	cmds := []types.Command{
 		types.Command{
 			Path: []string{"test"},
-			Command: func(roomID, userID string, args []string) (interface{}, error) {
+			Command: func(roomID id.RoomID, userID id.UserID, args []string) (interface{}, error) {
 				executedCmdArgs = args
 				return nil, nil
 			},
@@ -72,19 +74,25 @@ func TestCommandParsing(t *testing.T) {
 		Transport: trans,
 	}
 	clients := New(&store, cli)
-	mxCli, _ := gomatrix.NewClient("https://someplace.somewhere", "@service:user", "token")
+	mxCli, _ := mautrix.NewClient("https://someplace.somewhere", "@service:user", "token")
 	mxCli.Client = cli
 
 	for _, input := range commandParseTests {
 		executedCmdArgs = []string{}
-		event := gomatrix.Event{
-			Type:   "m.room.message",
-			Sender: "@someone:somewhere",
-			RoomID: "!foo:bar",
-			Content: map[string]interface{}{
-				"body":    input.body,
-				"msgtype": "m.text",
-			},
+		content := mevt.Content{Raw: map[string]interface{}{
+			"body":    input.body,
+			"msgtype": "m.text",
+		}}
+		if veryRaw, err := content.MarshalJSON(); err != nil {
+			t.Errorf("Error marshalling JSON: %s", err)
+		} else {
+			content.VeryRaw = veryRaw
+		}
+		event := mevt.Event{
+			Type:    mevt.EventMessage,
+			Sender:  "@someone:somewhere",
+			RoomID:  "!foo:bar",
+			Content: content,
 		}
 		clients.onMessageEvent(mxCli, &event)
 		if !reflect.DeepEqual(executedCmdArgs, input.expectArgs) {

database/db.go

@@ -4,9 +4,11 @@ import (
 	"database/sql"
 	"encoding/json"
 	"fmt"
+	"time"
+
 	"github.com/matrix-org/go-neb/api"
 	"github.com/matrix-org/go-neb/types"
-	"time"
+	"maunium.net/go/mautrix/id"
 )
 
 // A ServiceDB stores the configuration for the services
@@ -75,7 +77,7 @@ func (d *ServiceDB) LoadMatrixClientConfigs() (configs []api.ClientConfig, err e
 
 // LoadMatrixClientConfig loads a Matrix client config from the database.
 // Returns sql.ErrNoRows if the client isn't in the database.
-func (d *ServiceDB) LoadMatrixClientConfig(userID string) (config api.ClientConfig, err error) {
+func (d *ServiceDB) LoadMatrixClientConfig(userID id.UserID) (config api.ClientConfig, err error) {
 	err = runTransaction(d.db, func(txn *sql.Tx) error {
 		config, err = selectMatrixClientConfigTxn(txn, userID)
 		return err
@@ -84,7 +86,7 @@ func (d *ServiceDB) LoadMatrixClientConfig(userID string) (config api.ClientConf
 }
 
 // UpdateNextBatch updates the next_batch token for the given user.
-func (d *ServiceDB) UpdateNextBatch(userID, nextBatch string) (err error) {
+func (d *ServiceDB) UpdateNextBatch(userID id.UserID, nextBatch string) (err error) {
 	err = runTransaction(d.db, func(txn *sql.Tx) error {
 		return updateNextBatchTxn(txn, userID, nextBatch)
 	})
@@ -92,7 +94,7 @@ func (d *ServiceDB) UpdateNextBatch(userID, nextBatch string) (err error) {
 }
 
 // LoadNextBatch loads the next_batch token for the given user.
-func (d *ServiceDB) LoadNextBatch(userID string) (nextBatch string, err error) {
+func (d *ServiceDB) LoadNextBatch(userID id.UserID) (nextBatch string, err error) {
 	err = runTransaction(d.db, func(txn *sql.Tx) error {
 		nextBatch, err = selectNextBatchTxn(txn, userID)
 		return err
@@ -120,7 +122,7 @@ func (d *ServiceDB) DeleteService(serviceID string) (err error) {
 
 // LoadServicesForUser loads all the bot services configured for a given user.
 // Returns an empty list if there aren't any services configured.
-func (d *ServiceDB) LoadServicesForUser(serviceUserID string) (services []types.Service, err error) {
+func (d *ServiceDB) LoadServicesForUser(serviceUserID id.UserID) (services []types.Service, err error) {
 	err = runTransaction(d.db, func(txn *sql.Tx) error {
 		services, err = selectServicesForUserTxn(txn, serviceUserID)
 		if err != nil {
@@ -218,7 +220,7 @@ func (d *ServiceDB) StoreAuthSession(session types.AuthSession) (old types.AuthS
 
 // RemoveAuthSession removes the auth session for the given user on the given realm.
 // No error is returned if the session did not exist in the first place.
-func (d *ServiceDB) RemoveAuthSession(realmID, userID string) error {
+func (d *ServiceDB) RemoveAuthSession(realmID string, userID id.UserID) error {
 	return runTransaction(d.db, func(txn *sql.Tx) error {
 		return deleteAuthSessionTxn(txn, realmID, userID)
 	})
@@ -227,7 +229,7 @@ func (d *ServiceDB) RemoveAuthSession(realmID, userID string) error {
 // LoadAuthSessionByUser loads an AuthSession from the database based on the given
 // realm and user ID.
 // Returns sql.ErrNoRows if the session isn't in the database.
-func (d *ServiceDB) LoadAuthSessionByUser(realmID, userID string) (session types.AuthSession, err error) {
+func (d *ServiceDB) LoadAuthSessionByUser(realmID string, userID id.UserID) (session types.AuthSession, err error) {
 	err = runTransaction(d.db, func(txn *sql.Tx) error {
 		session, err = selectAuthSessionByUserTxn(txn, realmID, userID)
 		return err
@@ -248,7 +250,7 @@ func (d *ServiceDB) LoadAuthSessionByID(realmID, sessionID string) (session type
 
 // LoadBotOptions loads bot options from the database.
 // Returns sql.ErrNoRows if the bot options isn't in the database.
-func (d *ServiceDB) LoadBotOptions(userID, roomID string) (opts types.BotOptions, err error) {
+func (d *ServiceDB) LoadBotOptions(userID id.UserID, roomID id.RoomID) (opts types.BotOptions, err error) {
 	err = runTransaction(d.db, func(txn *sql.Tx) error {
 		opts, err = selectBotOptionsTxn(txn, userID, roomID)
 		return err

database/interface.go

@@ -3,20 +3,21 @@ package database
 import (
 	"github.com/matrix-org/go-neb/api"
 	"github.com/matrix-org/go-neb/types"
+	"maunium.net/go/mautrix/id"
 )
 
 // Storer is the interface which needs to be conformed to in order to persist Go-NEB data
 type Storer interface {
 	StoreMatrixClientConfig(config api.ClientConfig) (oldConfig api.ClientConfig, err error)
 	LoadMatrixClientConfigs() (configs []api.ClientConfig, err error)
-	LoadMatrixClientConfig(userID string) (config api.ClientConfig, err error)
+	LoadMatrixClientConfig(userID id.UserID) (config api.ClientConfig, err error)
 
-	UpdateNextBatch(userID, nextBatch string) (err error)
-	LoadNextBatch(userID string) (nextBatch string, err error)
+	UpdateNextBatch(userID id.UserID, nextBatch string) (err error)
+	LoadNextBatch(userID id.UserID) (nextBatch string, err error)
 
 	LoadService(serviceID string) (service types.Service, err error)
 	DeleteService(serviceID string) (err error)
-	LoadServicesForUser(serviceUserID string) (services []types.Service, err error)
+	LoadServicesForUser(serviceUserID id.UserID) (services []types.Service, err error)
 	LoadServicesByType(serviceType string) (services []types.Service, err error)
 	StoreService(service types.Service) (oldService types.Service, err error)
 
@@ -25,11 +26,11 @@ type Storer interface {
 	StoreAuthRealm(realm types.AuthRealm) (old types.AuthRealm, err error)
 
 	StoreAuthSession(session types.AuthSession) (old types.AuthSession, err error)
-	LoadAuthSessionByUser(realmID, userID string) (session types.AuthSession, err error)
+	LoadAuthSessionByUser(realmID string, userID id.UserID) (session types.AuthSession, err error)
 	LoadAuthSessionByID(realmID, sessionID string) (session types.AuthSession, err error)
-	RemoveAuthSession(realmID, userID string) error
+	RemoveAuthSession(realmID string, userID id.UserID) error
 
-	LoadBotOptions(userID, roomID string) (opts types.BotOptions, err error)
+	LoadBotOptions(userID id.UserID, roomID id.RoomID) (opts types.BotOptions, err error)
 	StoreBotOptions(opts types.BotOptions) (oldOpts types.BotOptions, err error)
 
 	InsertFromConfig(cfg *api.ConfigFile) error
@@ -50,17 +51,17 @@ func (s *NopStorage) LoadMatrixClientConfigs() (configs []api.ClientConfig, err
 }
 
 // LoadMatrixClientConfig NOP
-func (s *NopStorage) LoadMatrixClientConfig(userID string) (config api.ClientConfig, err error) {
+func (s *NopStorage) LoadMatrixClientConfig(userID id.UserID) (config api.ClientConfig, err error) {
 	return
 }
 
 // UpdateNextBatch NOP
-func (s *NopStorage) UpdateNextBatch(userID, nextBatch string) (err error) {
+func (s *NopStorage) UpdateNextBatch(userID id.UserID, nextBatch string) (err error) {
 	return
 }
 
 // LoadNextBatch NOP
-func (s *NopStorage) LoadNextBatch(userID string) (nextBatch string, err error) {
+func (s *NopStorage) LoadNextBatch(userID id.UserID) (nextBatch string, err error) {
 	return
 }
 
@@ -75,7 +76,7 @@ func (s *NopStorage) DeleteService(serviceID string) (err error) {
 }
 
 // LoadServicesForUser NOP
-func (s *NopStorage) LoadServicesForUser(serviceUserID string) (services []types.Service, err error) {
+func (s *NopStorage) LoadServicesForUser(serviceUserID id.UserID) (services []types.Service, err error) {
 	return
 }
 
@@ -110,7 +111,7 @@ func (s *NopStorage) StoreAuthSession(session types.AuthSession) (old types.Auth
 }
 
 // LoadAuthSessionByUser NOP
-func (s *NopStorage) LoadAuthSessionByUser(realmID, userID string) (session types.AuthSession, err error) {
+func (s *NopStorage) LoadAuthSessionByUser(realmID string, userID id.UserID) (session types.AuthSession, err error) {
 	return
 }
 
@@ -120,12 +121,12 @@ func (s *NopStorage) LoadAuthSessionByID(realmID, sessionID string) (session typ
 }
 
 // RemoveAuthSession NOP
-func (s *NopStorage) RemoveAuthSession(realmID, userID string) error {
+func (s *NopStorage) RemoveAuthSession(realmID string, userID id.UserID) error {
 	return nil
 }
 
 // LoadBotOptions NOP
-func (s *NopStorage) LoadBotOptions(userID, roomID string) (opts types.BotOptions, err error) {
+func (s *NopStorage) LoadBotOptions(userID id.UserID, roomID id.RoomID) (opts types.BotOptions, err error) {
 	return
 }
 

database/schema.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/matrix-org/go-neb/api"
 	"github.com/matrix-org/go-neb/types"
+	"maunium.net/go/mautrix/id"
 )
 
 const schemaSQL = `
@@ -66,7 +67,7 @@ const selectMatrixClientConfigSQL = `
 SELECT client_json FROM matrix_clients WHERE user_id = $1
 `
 
-func selectMatrixClientConfigTxn(txn *sql.Tx, userID string) (config api.ClientConfig, err error) {
+func selectMatrixClientConfigTxn(txn *sql.Tx, userID id.UserID) (config api.ClientConfig, err error) {
 	var configJSON []byte
 	err = txn.QueryRow(selectMatrixClientConfigSQL, userID).Scan(&configJSON)
 	if err != nil {
@@ -135,7 +136,7 @@ const updateNextBatchSQL = `
 UPDATE matrix_clients SET next_batch = $1 WHERE user_id = $2
 `
 
-func updateNextBatchTxn(txn *sql.Tx, userID, nextBatch string) error {
+func updateNextBatchTxn(txn *sql.Tx, userID id.UserID, nextBatch string) error {
 	_, err := txn.Exec(updateNextBatchSQL, nextBatch, userID)
 	return err
 }
@@ -144,7 +145,7 @@ const selectNextBatchSQL = `
 SELECT next_batch FROM matrix_clients WHERE user_id = $1
 `
 
-func selectNextBatchTxn(txn *sql.Tx, userID string) (string, error) {
+func selectNextBatchTxn(txn *sql.Tx, userID id.UserID) (string, error) {
 	var nextBatch string
 	row := txn.QueryRow(selectNextBatchSQL, userID)
 	if err := row.Scan(&nextBatch); err != nil {
@@ -160,7 +161,7 @@ SELECT service_type, service_user_id, service_json FROM services
 
 func selectServiceTxn(txn *sql.Tx, serviceID string) (types.Service, error) {
 	var serviceType string
-	var serviceUserID string
+	var serviceUserID id.UserID
 	var serviceJSON []byte
 	row := txn.QueryRow(selectServiceSQL, serviceID)
 	if err := row.Scan(&serviceType, &serviceUserID, &serviceJSON); err != nil {
@@ -210,7 +211,7 @@ const selectServicesForUserSQL = `
 SELECT service_id, service_type, service_json FROM services WHERE service_user_id=$1 ORDER BY service_id
 `
 
-func selectServicesForUserTxn(txn *sql.Tx, userID string) (srvs []types.Service, err error) {
+func selectServicesForUserTxn(txn *sql.Tx, userID id.UserID) (srvs []types.Service, err error) {
 	rows, err := txn.Query(selectServicesForUserSQL, userID)
 	if err != nil {
 		return
@@ -246,7 +247,7 @@ func selectServicesByTypeTxn(txn *sql.Tx, serviceType string) (srvs []types.Serv
 	for rows.Next() {
 		var s types.Service
 		var serviceID string
-		var serviceUserID string
+		var serviceUserID id.UserID
 		var serviceJSON []byte
 		if err = rows.Scan(&serviceID, &serviceUserID, &serviceJSON); err != nil {
 			return
@@ -369,7 +370,7 @@ const deleteAuthSessionSQL = `
 DELETE FROM auth_sessions WHERE realm_id=$1 AND user_id=$2
 `
 
-func deleteAuthSessionTxn(txn *sql.Tx, realmID, userID string) error {
+func deleteAuthSessionTxn(txn *sql.Tx, realmID string, userID id.UserID) error {
 	_, err := txn.Exec(deleteAuthSessionSQL, realmID, userID)
 	return err
 }
@@ -380,7 +381,7 @@ SELECT session_id, realm_type, realm_json, session_json FROM auth_sessions
 	WHERE auth_sessions.realm_id = $1 AND auth_sessions.user_id = $2
 `
 
-func selectAuthSessionByUserTxn(txn *sql.Tx, realmID, userID string) (types.AuthSession, error) {
+func selectAuthSessionByUserTxn(txn *sql.Tx, realmID string, userID id.UserID) (types.AuthSession, error) {
 	var id string
 	var realmType string
 	var realmJSON []byte
@@ -409,12 +410,12 @@ SELECT user_id, realm_type, realm_json, session_json FROM auth_sessions
 	WHERE auth_sessions.realm_id = $1 AND auth_sessions.session_id = $2
 `
 
-func selectAuthSessionByIDTxn(txn *sql.Tx, realmID, id string) (types.AuthSession, error) {
-	var userID string
+func selectAuthSessionByIDTxn(txn *sql.Tx, realmID, sid string) (types.AuthSession, error) {
+	var userID id.UserID
 	var realmType string
 	var realmJSON []byte
 	var sessionJSON []byte
-	row := txn.QueryRow(selectAuthSessionByIDSQL, realmID, id)
+	row := txn.QueryRow(selectAuthSessionByIDSQL, realmID, sid)
 	if err := row.Scan(&userID, &realmType, &realmJSON, &sessionJSON); err != nil {
 		return nil, err
 	}
@@ -422,7 +423,7 @@ func selectAuthSessionByIDTxn(txn *sql.Tx, realmID, id string) (types.AuthSessio
 	if err != nil {
 		return nil, err
 	}
-	session := realm.AuthSession(id, userID, realmID)
+	session := realm.AuthSession(sid, userID, realmID)
 	if session == nil {
 		return nil, fmt.Errorf("Cannot create session for given realm")
 	}
@@ -454,7 +455,7 @@ const selectBotOptionsSQL = `
 SELECT bot_options_json, set_by_user_id FROM bot_options WHERE user_id = $1 AND room_id = $2
 `
 
-func selectBotOptionsTxn(txn *sql.Tx, userID, roomID string) (opts types.BotOptions, err error) {
+func selectBotOptionsTxn(txn *sql.Tx, userID id.UserID, roomID id.RoomID) (opts types.BotOptions, err error) {
 	var optionsJSON []byte
 	err = txn.QueryRow(selectBotOptionsSQL, userID, roomID).Scan(&optionsJSON, &opts.SetByUserID)
 	if err != nil {

go.mod

@@ -25,7 +25,6 @@ require (
 	github.com/kr/pretty v0.1.0 // indirect
 	github.com/lib/pq v1.3.0
 	github.com/matrix-org/dugong v0.0.0-20180820122854-51a565b5666b
-	github.com/matrix-org/gomatrix v0.0.0-20200128155335-9e7906b6766d
 	github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7
 	github.com/mattn/go-shellwords v1.0.10
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible
@@ -36,21 +35,22 @@ require (
 	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223 // indirect
 	github.com/olekukonko/tablewriter v0.0.4 // indirect
-	github.com/pkg/errors v0.8.1 // indirect
+	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v0.8.1-0.20160916180340-5636dc67ae77
 	github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335 // indirect
 	github.com/prometheus/common v0.0.0-20161002210234-85637ea67b04 // indirect
 	github.com/prometheus/procfs v0.0.0-20160411190841-abf152e5f3e9 // indirect
 	github.com/russross/blackfriday v1.5.2
+	github.com/sasha-s/go-deadlock v0.2.0
 	github.com/sirupsen/logrus v1.4.2
 	github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
-	github.com/stretchr/testify v1.4.0 // indirect
-	golang.org/x/net v0.0.0-20200301022130-244492dfa37a
+	golang.org/dl v0.0.0-20200601221412-a954fa24b3e5 // indirect
+	golang.org/x/net v0.0.0-20200505041828-1ed23360d12c
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
-	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
-	golang.org/x/sys v0.0.0-20200122134326-e047566fdf82 // indirect
 	golang.org/x/tools v0.0.0-20200311090712-aafaee8bce8c // indirect
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/yaml.v2 v2.2.8
+	maunium.net/go/gomuks v0.1.0
+	maunium.net/go/mautrix v0.4.7
 )

go.sum

@@ -1,6 +1,11 @@
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/PuerkitoBio/goquery v1.5.1 h1:PSPBGne8NIUWw+/7vFBV+kG2J/5MOjbzc7154OaKCSE=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
+github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI=
+github.com/alecthomas/chroma v0.7.2/go.mod h1:fv5SzZPFJbwp2NXJWpFIX7DZS4HgV1K4ew4Pc2OZD9s=
+github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
+github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI=
+github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 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=
@@ -17,7 +22,9 @@ 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/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/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk=
 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/dghubble/oauth1 v0.6.0 h1:m1yC01Ohc/eF38jwZ8JUjL1a+XHHXtGQgK+MxQbmSx0=
 github.com/dghubble/oauth1 v0.6.0/go.mod h1:8pFdfPkv/jr8mkChVbNVuJ0suiHe278BtWI4Tk1ujxk=
@@ -25,8 +32,11 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/die-net/lrucache v0.0.0-20190707192454-883874fe3947 h1:U/5Sq2nJQ0XDyks+8ATghtHSuquIGq7JYrqSrvtR2dg=
 github.com/die-net/lrucache v0.0.0-20190707192454-883874fe3947/go.mod h1:KsMcjmY1UCGl7ozPbdVPDOvLaFeXnptSvtNRczhxNto=
+github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
+github.com/dlclark/regexp2 v1.1.6/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/fatih/structs v1.0.0 h1:BrX964Rv5uQ3wwS+KRUAJCBBw5PQmgJfJ6v4yly5QwU=
 github.com/fatih/structs v1.0.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@@ -39,6 +49,7 @@ github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 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 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-github v2.0.1-0.20160719063544-b5e5babef39c+incompatible h1:9bbdREkf94ZqDMJ3Nsy5cJYNswJW2Xiirp+YuuuGAKM=
 github.com/google/go-github v2.0.1-0.20160719063544-b5e5babef39c+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
@@ -49,6 +60,7 @@ github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+u
 github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 h1:zLTLjkaOFEFIOxY5BWLFLwh+cL8vOBW4XJ2aqLE/Tf0=
 github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
 github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/jaytaylor/html2text v0.0.0-20200220170450-61d9dc4d7195 h1:j0UEFmS7wSjAwKEIkgKBn8PRDfjcuggzr93R9wk53nQ=
@@ -59,19 +71,27 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 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/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/kyokomi/emoji v2.2.2+incompatible/go.mod h1:mZ6aGCD7yk8j6QY6KICwnZ2pxoszVseX1DNoGtU2tBA=
 github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU=
 github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lithammer/fuzzysearch v1.1.0/go.mod h1:Bqx4wo8lTOFcJr3ckpY6HA9lEIOO0H5HrkJ5CsN56HQ=
+github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/matrix-org/dugong v0.0.0-20180820122854-51a565b5666b h1:xpcmnpfUImRC4O2SAS/dmTcJENDXvGmLUzey76V1R3Q=
 github.com/matrix-org/dugong v0.0.0-20180820122854-51a565b5666b/go.mod h1:NgPCr+UavRGH6n5jmdX8DuqFZ4JiCWIJoZiuhTRLSUg=
 github.com/matrix-org/gomatrix v0.0.0-20200128155335-9e7906b6766d h1:Vf/EQgAfg8/CBUQv9te7UJreZ9iKKouB2gb8UIRM4jQ=
 github.com/matrix-org/gomatrix v0.0.0-20200128155335-9e7906b6766d/go.mod h1:3fxX6gUjWyI/2Bt7J1OLhpCzOfO/bB3AiX0cJtEKud0=
 github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7 h1:ntrLa/8xVzeSs8vHFHK25k0C+NV74sYMJnNSg5NoSRo=
 github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7/go.mod h1:vVQlW/emklohkZnOPwD3LrZUBqdfsbiyO3p1lNV8F6U=
+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-shellwords v1.0.10 h1:Y7Xqm8piKOO3v10Thp7Z36h4FYFjt5xB//6XvOrs2Gw=
 github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
 github.com/mattn/go-sqlite3 v1.13.0 h1:LnJI81JidiW9r7pS/hXe6cFeO5EXNq7KbfvoJLRI69c=
@@ -79,6 +99,7 @@ github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJK
 github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 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/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mmcdole/gofeed v1.0.0-beta2 h1:CjQ0ADhAwNSb08zknAkGOEYqr8zfZKfrzgk9BxpWP2E=
 github.com/mmcdole/gofeed v1.0.0-beta2/go.mod h1:/BF9JneEL2/flujm8XHoxUcghdTV6vvb3xx/vKyChFU=
 github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf h1:sWGE2v+hO0Nd4yFU/S/mDBM5plIU8v/Qhfz41hkDIAI=
@@ -90,9 +111,14 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8=
 github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
+github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ=
+github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.8.1-0.20160916180340-5636dc67ae77 h1:YXoHPWLq9PIcMoZg7znMmEzqYHBszdXSemwGQRJoiSk=
 github.com/prometheus/client_golang v0.8.1-0.20160916180340-5636dc67ae77/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
@@ -127,8 +153,14 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/sasha-s/go-deadlock v0.2.0 h1:lMqc+fUb7RrFS3gQLtoQsJ7/6TV/pAIFvBsqX73DK8Y=
+github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+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 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
@@ -138,13 +170,32 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 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 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/tidwall/gjson v1.6.0 h1:9VEQWz6LLMUsUl6PueE49ir4Ka6CzLymOAZDxpFsTDc=
+github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
+github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
+github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
+github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/tidwall/pretty v1.0.1 h1:WE4RBSZ1x6McVVC8S/Md+Qse8YUv6HRObAx6ke00NY8=
+github.com/tidwall/pretty v1.0.1/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/tidwall/sjson v1.1.1 h1:7h1vk049Jnd5EH9NyzNiEuwYW4b5qgreBbqRC19AS3U=
+github.com/tidwall/sjson v1.1.1/go.mod h1:yvVuSnpEQv5cYIrO+AT6kw4QVfd5SDZoGIS7/5+fZFs=
 github.com/trivago/tgo v1.0.1 h1:bxatjJIXNIpV18bucU4Uk/LaoxvxuOlp/oowRHyncLQ=
 github.com/trivago/tgo v1.0.1/go.mod h1:w4dpD+3tzNIIiIfkWWa85w5/B77tlvdZckQ+6PkFnhc=
+github.com/zyedidia/clipboard v0.0.0-20200421031010-7c45b8673834/go.mod h1:zykFnZUXX0ErxqvYLUFEq7QDJKId8rmh2FgD0/Y8cjA=
+github.com/zyedidia/poller v1.0.1/go.mod h1:vZXJOHGDcuK08GXhF6IAY0ZFd2WcgOR5DOTp84Uk5eE=
+go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
+golang.org/dl v0.0.0-20200601221412-a954fa24b3e5 h1:LrG45X3Uq6Sb+SuDP5WXq1jUhjYbqOyqw92r+E8Q7n0=
+golang.org/dl v0.0.0-20200601221412-a954fa24b3e5/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/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-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -157,6 +208,8 @@ golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200505041828-1ed23360d12c h1:zJ0mtu4jCalhKg6Oaukv6iIkb+cOvDrajDH9DH46Q4M=
+golang.org/x/net v0.0.0-20200505041828-1ed23360d12c/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -165,13 +218,20 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/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-20181128092732-4ed8d59d0b35/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-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-20200122134326-e047566fdf82 h1:ywK/j/KkyTHcdyYSZNXGjMwgmDSfjglYZ3vStQ/gSCU=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 h1:5B6i6EAiSYyejWfvc5Rc9BbI3rzIsrrXfAQBWnYfn+w=
+golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 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/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200311090712-aafaee8bce8c h1:9WR4YuzLDuQMqEmLQrG0DiMmE2/HvX1dlrujzjmNVFg=
 golang.org/x/tools v0.0.0-20200311090712-aafaee8bce8c/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
@@ -182,10 +242,20 @@ google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO50
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 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-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2/go.mod h1:s1Sn2yZos05Qfs7NKt867Xe18emOmtsO3eAKbDaon0o=
 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.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+maunium.net/go/gomuks v0.1.0 h1:Ra0But5Cr3UfCSzd456x8MzV6jXLisZG0gW7RZY1xnk=
+maunium.net/go/gomuks v0.1.0/go.mod h1:UWB7mC4OcKINQ2+ygalRSsSvnROoiwdSxdVLrWTeco4=
+maunium.net/go/maulogger/v2 v2.1.1/go.mod h1:TYWy7wKwz/tIXTpsx8G3mZseIRiC5DoMxSZazOHy68A=
+maunium.net/go/mautrix v0.4.2/go.mod h1:8Y+NqmROJyWYvvP4yPfX9tLM59VCfgE/kcQ0SeX68ho=
+maunium.net/go/mautrix v0.4.7 h1:jpclbeGcuiHPIWZFZhQJoxgZKP9f+9OLBPtcDNMFV/o=
+maunium.net/go/mautrix v0.4.7/go.mod h1:8Y+NqmROJyWYvvP4yPfX9tLM59VCfgE/kcQ0SeX68ho=
+maunium.net/go/mauview v0.1.1/go.mod h1:3QBUiuLct9moP1LgDhCGIg0Ovxn38Bd2sGndnUOuj4o=
+maunium.net/go/tcell v0.2.0/go.mod h1:9Apcb3lNNS6C6lCqKT9UFp7BTRzHXfWE+/tgufsAMho=

goneb.go

@@ -17,20 +17,20 @@ import (
 	"github.com/matrix-org/go-neb/database"
 	_ "github.com/matrix-org/go-neb/metrics"
 	"github.com/matrix-org/go-neb/polling"
-	_ "github.com/matrix-org/go-neb/realms/github"
+	//_ "github.com/matrix-org/go-neb/realms/github"
 	_ "github.com/matrix-org/go-neb/realms/jira"
-	_ "github.com/matrix-org/go-neb/services/alertmanager"
+	//_ "github.com/matrix-org/go-neb/services/alertmanager"
 	_ "github.com/matrix-org/go-neb/services/echo"
-	_ "github.com/matrix-org/go-neb/services/giphy"
-	_ "github.com/matrix-org/go-neb/services/github"
-	_ "github.com/matrix-org/go-neb/services/google"
-	_ "github.com/matrix-org/go-neb/services/guggy"
-	_ "github.com/matrix-org/go-neb/services/imgur"
-	_ "github.com/matrix-org/go-neb/services/jira"
-	_ "github.com/matrix-org/go-neb/services/rssbot"
-	_ "github.com/matrix-org/go-neb/services/slackapi"
-	_ "github.com/matrix-org/go-neb/services/travisci"
-	_ "github.com/matrix-org/go-neb/services/wikipedia"
+	//_ "github.com/matrix-org/go-neb/services/giphy"
+	//_ "github.com/matrix-org/go-neb/services/github"
+	//_ "github.com/matrix-org/go-neb/services/google"
+	//_ "github.com/matrix-org/go-neb/services/guggy"
+	//_ "github.com/matrix-org/go-neb/services/imgur"
+	//_ "github.com/matrix-org/go-neb/services/jira"
+	//_ "github.com/matrix-org/go-neb/services/rssbot"
+	//_ "github.com/matrix-org/go-neb/services/slackapi"
+	//_ "github.com/matrix-org/go-neb/services/travisci"
+	//_ "github.com/matrix-org/go-neb/services/wikipedia"
 	"github.com/matrix-org/go-neb/types"
 	"github.com/matrix-org/util"
 	_ "github.com/mattn/go-sqlite3"

matrix/matrix.go

@@ -5,21 +5,22 @@ import (
 
 	"github.com/matrix-org/go-neb/api"
 	"github.com/matrix-org/go-neb/database"
-	"github.com/matrix-org/gomatrix"
 	log "github.com/sirupsen/logrus"
+	"maunium.net/go/mautrix"
+	"maunium.net/go/mautrix/id"
 )
 
-// NEBStore implements the gomatrix.Storer interface.
+// NEBStore implements the mautrix.Storer interface.
 //
 // It persists the next batch token in the database, and includes a ClientConfig for the client.
 type NEBStore struct {
-	gomatrix.InMemoryStore
+	mautrix.InMemoryStore
 	Database     database.Storer
 	ClientConfig api.ClientConfig
 }
 
 // SaveNextBatch saves to the database.
-func (s *NEBStore) SaveNextBatch(userID, nextBatch string) {
+func (s *NEBStore) SaveNextBatch(userID id.UserID, nextBatch string) {
 	if err := s.Database.UpdateNextBatch(userID, nextBatch); err != nil {
 		log.WithFields(log.Fields{
 			log.ErrorKey: err,
@@ -30,7 +31,7 @@ func (s *NEBStore) SaveNextBatch(userID, nextBatch string) {
 }
 
 // LoadNextBatch loads from the database.
-func (s *NEBStore) LoadNextBatch(userID string) string {
+func (s *NEBStore) LoadNextBatch(userID id.UserID) string {
 	token, err := s.Database.LoadNextBatch(userID)
 	if err != nil {
 		log.WithFields(log.Fields{

realms/jira/jira.go

@@ -19,6 +19,7 @@ import (
 	"github.com/matrix-org/go-neb/types"
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
+	"maunium.net/go/mautrix/id"
 )
 
 // RealmType of the JIRA realm
@@ -83,7 +84,7 @@ type Realm struct {
 // The endpoint is dictated by the realm ID.
 type Session struct {
 	id      string // request token
-	userID  string
+	userID  id.UserID
 	realmID string
 
 	// Configuration fields
@@ -121,7 +122,7 @@ func (s *Session) Info() interface{} {
 }
 
 // UserID returns the ID of the user performing the authentication.
-func (s *Session) UserID() string {
+func (s *Session) UserID() id.UserID {
 	return s.userID
 }
 
@@ -203,7 +204,7 @@ func (r *Realm) Register() error {
 //   {
 //       "URL": "https://jira.somewhere.com/plugins/servlet/oauth/authorize?oauth_token=7yeuierbgweguiegrTbOT"
 //   }
-func (r *Realm) RequestAuthSession(userID string, req json.RawMessage) interface{} {
+func (r *Realm) RequestAuthSession(userID id.UserID, req json.RawMessage) interface{} {
 	logger := log.WithField("jira_url", r.JIRAEndpoint)
 
 	// check if they supplied a redirect URL
@@ -298,7 +299,7 @@ func (r *Realm) OnReceiveRedirect(w http.ResponseWriter, req *http.Request) {
 }
 
 // AuthSession returns a JIRASession with the given parameters
-func (r *Realm) AuthSession(id, userID, realmID string) types.AuthSession {
+func (r *Realm) AuthSession(id string, userID id.UserID, realmID string) types.AuthSession {
 	return &Session{
 		id:      id,
 		userID:  userID,
@@ -310,7 +311,7 @@ func (r *Realm) AuthSession(id, userID, realmID string) types.AuthSession {
 // An authenticated client for userID will be used if one exists, else an
 // unauthenticated client will be used, which may not be able to see the complete list
 // of projects.
-func (r *Realm) ProjectKeyExists(userID, projectKey string) (bool, error) {
+func (r *Realm) ProjectKeyExists(userID id.UserID, projectKey string) (bool, error) {
 	cli, err := r.JIRAClient(userID, true)
 	if err != nil {
 		return false, err
@@ -344,7 +345,7 @@ func (r *Realm) ProjectKeyExists(userID, projectKey string) (bool, error) {
 
 // JIRAClient returns an authenticated jira.Client for the given userID. Returns an unauthenticated
 // client if allowUnauth is true and no authenticated session is found, else returns an error.
-func (r *Realm) JIRAClient(userID string, allowUnauth bool) (*jira.Client, error) {
+func (r *Realm) JIRAClient(userID id.UserID, allowUnauth bool) (*jira.Client, error) {
 	// Check if user has an auth session.
 	session, err := database.GetServiceDB().LoadAuthSessionByUser(r.id, userID)
 	if err != nil {
@@ -367,7 +368,7 @@ func (r *Realm) JIRAClient(userID string, allowUnauth bool) (*jira.Client, error
 			// make an unauthenticated client
 			return jira.NewClient(nil, r.JIRAEndpoint)
 		}
-		return nil, errors.New("No authenticated session found for " + userID)
+		return nil, errors.New("No authenticated session found for " + userID.String())
 	}
 	// make an authenticated client
 	auth := r.oauth1Config(r.JIRAEndpoint)

services/echo/echo.go

@@ -5,7 +5,9 @@ import (
 	"strings"
 
 	"github.com/matrix-org/go-neb/types"
-	"github.com/matrix-org/gomatrix"
+	"maunium.net/go/mautrix"
+	mevt "maunium.net/go/mautrix/event"
+	"maunium.net/go/mautrix/id"
 )
 
 // ServiceType of the Echo service
@@ -19,19 +21,22 @@ type Service struct {
 // Commands supported:
 //    !echo some message
 // Responds with a notice of "some message".
-func (e *Service) Commands(cli *gomatrix.Client) []types.Command {
+func (e *Service) Commands(cli *mautrix.Client) []types.Command {
 	return []types.Command{
 		types.Command{
 			Path: []string{"echo"},
-			Command: func(roomID, userID string, args []string) (interface{}, error) {
-				return &gomatrix.TextMessage{"m.notice", strings.Join(args, " ")}, nil
+			Command: func(roomID id.RoomID, userID id.UserID, args []string) (interface{}, error) {
+				return &mevt.MessageEventContent{
+					MsgType: mevt.MsgNotice,
+					Body:    strings.Join(args, " "),
+				}, nil
 			},
 		},
 	}
 }
 
 func init() {
-	types.RegisterService(func(serviceID, serviceUserID, webhookEndpointURL string) types.Service {
+	types.RegisterService(func(serviceID string, serviceUserID id.UserID, webhookEndpointURL string) types.Service {
 		return &Service{
 			DefaultService: types.NewDefaultService(serviceID, serviceUserID, ServiceType),
 		}

testutil_test.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
+
+	"maunium.net/go/mautrix/id"
 )
 
 // newResponse creates a new HTTP response with the given data.
@@ -46,8 +48,8 @@ func (rt *matrixTripper) Handle(method, path string, handler func(req *http.Requ
 	rt.handlers[key] = handler
 }
 
-func (rt *matrixTripper) HandlePOSTFilter(userID string) {
-	rt.Handle("POST", "/_matrix/client/r0/user/"+userID+"/filter",
+func (rt *matrixTripper) HandlePOSTFilter(userID id.UserID) {
+	rt.Handle("POST", "/_matrix/client/r0/user/"+userID.String()+"/filter",
 		func(req *http.Request) (*http.Response, error) {
 			return newResponse(200, `{
 				"filter_id":"abcdef"

types/actions.go

@@ -3,6 +3,8 @@ package types
 import (
 	"regexp"
 	"strings"
+
+	"maunium.net/go/mautrix/id"
 )
 
 // A Command is something that a user invokes by sending a message starting with '!'
@@ -13,7 +15,7 @@ type Command struct {
 	Path      []string
 	Arguments []string
 	Help      string
-	Command   func(roomID, userID string, arguments []string) (content interface{}, err error)
+	Command   func(roomID id.RoomID, userID id.UserID, arguments []string) (content interface{}, err error)
 }
 
 // An Expansion is something that actives when the user sends any message
@@ -22,7 +24,7 @@ type Command struct {
 // the appropriate RFC.
 type Expansion struct {
 	Regexp *regexp.Regexp
-	Expand func(roomID, userID string, matchingGroups []string) interface{}
+	Expand func(roomID id.RoomID, userID id.UserID, matchingGroups []string) interface{}
 }
 
 // Matches if the arguments start with the path of the command.

types/auth.go

@@ -5,6 +5,8 @@ import (
 	"encoding/json"
 	"errors"
 	"net/http"
+
+	"maunium.net/go/mautrix/id"
 )
 
 // AuthRealm represents a place where a user can authenticate themselves.
@@ -15,8 +17,8 @@ type AuthRealm interface {
 	Init() error
 	Register() error
 	OnReceiveRedirect(w http.ResponseWriter, req *http.Request)
-	AuthSession(id, userID, realmID string) AuthSession
-	RequestAuthSession(userID string, config json.RawMessage) interface{}
+	AuthSession(id string, userID id.UserID, realmID string) AuthSession
+	RequestAuthSession(userID id.UserID, config json.RawMessage) interface{}
 }
 
 var realmsByType = map[string]func(string, string) AuthRealm{}
@@ -49,7 +51,7 @@ func CreateAuthRealm(realmID, realmType string, realmJSON []byte) (AuthRealm, er
 // an auth realm.
 type AuthSession interface {
 	ID() string
-	UserID() string
+	UserID() id.UserID
 	RealmID() string
 	Authenticated() bool
 	Info() interface{}

types/service.go

@@ -8,14 +8,15 @@ import (
 	"strings"
 	"time"
 
-	"github.com/matrix-org/gomatrix"
+	"maunium.net/go/mautrix"
+	"maunium.net/go/mautrix/id"
 )
 
 // BotOptions for a given bot user in a given room
 type BotOptions struct {
-	RoomID      string
-	UserID      string
-	SetByUserID string
+	RoomID      id.RoomID
+	UserID      id.UserID
+	SetByUserID id.UserID
 	Options     map[string]interface{}
 }
 
@@ -23,25 +24,25 @@ type BotOptions struct {
 type Poller interface {
 	// OnPoll is called when the poller should poll. Return the timestamp when you want to be polled again.
 	// Return 0 to never be polled again.
-	OnPoll(client *gomatrix.Client) time.Time
+	OnPoll(client *mautrix.Client) time.Time
 }
 
 // A Service is the configuration for a bot service.
 type Service interface {
 	// Return the user ID of this service.
-	ServiceUserID() string
+	ServiceUserID() id.UserID
 	// Return an opaque ID used to identify this service.
 	ServiceID() string
 	// Return the type of service. This string MUST NOT change.
 	ServiceType() string
-	Commands(cli *gomatrix.Client) []Command
-	Expansions(cli *gomatrix.Client) []Expansion
-	OnReceiveWebhook(w http.ResponseWriter, req *http.Request, cli *gomatrix.Client)
+	Commands(cli *mautrix.Client) []Command
+	Expansions(cli *mautrix.Client) []Expansion
+	OnReceiveWebhook(w http.ResponseWriter, req *http.Request, cli *mautrix.Client)
 	// A lifecycle function which is invoked when the service is being registered. The old service, if one exists, is provided,
 	// along with a Client instance for ServiceUserID(). If this function returns an error, the service will not be registered
 	// or persisted to the database, and the user's request will fail. This can be useful if you depend on external factors
 	// such as registering webhooks.
-	Register(oldService Service, client *gomatrix.Client) error
+	Register(oldService Service, client *mautrix.Client) error
 	// A lifecycle function which is invoked after the service has been successfully registered and persisted to the database.
 	// This function is invoked within the critical section for configuring services, guaranteeing that there will not be
 	// concurrent modifications to this service whilst this function executes. This lifecycle hook should be used to clean
@@ -52,12 +53,12 @@ type Service interface {
 // DefaultService NO-OPs the implementation of optional Service interface methods. Feel free to override them.
 type DefaultService struct {
 	id            string
-	serviceUserID string
+	serviceUserID id.UserID
 	serviceType   string
 }
 
 // NewDefaultService creates a new service with implementations for ServiceID(), ServiceType() and ServiceUserID()
-func NewDefaultService(serviceID, serviceUserID, serviceType string) DefaultService {
+func NewDefaultService(serviceID string, serviceUserID id.UserID, serviceType string) DefaultService {
 	return DefaultService{serviceID, serviceUserID, serviceType}
 }
 
@@ -70,7 +71,7 @@ func (s *DefaultService) ServiceID() string {
 // ServiceUserID returns the user ID that the service sends events as. In order for this to return the
 // service user ID, DefaultService MUST have been initialised by NewDefaultService, the zero-initialiser
 // is NOT enough.
-func (s *DefaultService) ServiceUserID() string {
+func (s *DefaultService) ServiceUserID() id.UserID {
 	return s.serviceUserID
 }
 
@@ -82,23 +83,23 @@ func (s *DefaultService) ServiceType() string {
 }
 
 // Commands returns no commands.
-func (s *DefaultService) Commands(cli *gomatrix.Client) []Command {
+func (s *DefaultService) Commands(cli *mautrix.Client) []Command {
 	return []Command{}
 }
 
 // Expansions returns no expansions.
-func (s *DefaultService) Expansions(cli *gomatrix.Client) []Expansion {
+func (s *DefaultService) Expansions(cli *mautrix.Client) []Expansion {
 	return []Expansion{}
 }
 
 // Register does nothing and returns no error.
-func (s *DefaultService) Register(oldService Service, client *gomatrix.Client) error { return nil }
+func (s *DefaultService) Register(oldService Service, client *mautrix.Client) error { return nil }
 
 // PostRegister does nothing.
 func (s *DefaultService) PostRegister(oldService Service) {}
 
 // OnReceiveWebhook does nothing but 200 OK the request.
-func (s *DefaultService) OnReceiveWebhook(w http.ResponseWriter, req *http.Request, cli *gomatrix.Client) {
+func (s *DefaultService) OnReceiveWebhook(w http.ResponseWriter, req *http.Request, cli *mautrix.Client) {
 	w.WriteHeader(200) // Do nothing
 }
 
@@ -120,11 +121,11 @@ func BaseURL(u string) error {
 	return nil
 }
 
-var servicesByType = map[string]func(string, string, string) Service{}
+var servicesByType = map[string]func(string, id.UserID, string) Service{}
 var serviceTypesWhichPoll = map[string]bool{}
 
 // RegisterService registers a factory for creating Service instances.
-func RegisterService(factory func(string, string, string) Service) {
+func RegisterService(factory func(string, id.UserID, string) Service) {
 	s := factory("", "", "")
 	servicesByType[s.ServiceType()] = factory
 
@@ -143,7 +144,7 @@ func PollingServiceTypes() (types []string) {
 
 // CreateService creates a Service of the given type and serviceID.
 // Returns an error if the Service couldn't be created.
-func CreateService(serviceID, serviceType, serviceUserID string, serviceJSON []byte) (Service, error) {
+func CreateService(serviceID, serviceType string, serviceUserID id.UserID, serviceJSON []byte) (Service, error) {
 	f := servicesByType[serviceType]
 	if f == nil {
 		return nil, errors.New("Unknown service type: " + serviceType)