From 6e50a7c3803b074dc5062257ec478ca1683b25b2 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 9 May 2020 14:31:06 +0300 Subject: [PATCH] Switch appservice module location --- commands.go | 2 +- config/config.go | 2 +- config/registration.go | 2 +- custompuppet.go | 6 +++--- database/statestore.go | 2 +- go.mod | 3 +-- go.sum | 8 ++------ main.go | 4 ++-- matrix.go | 3 ++- portal.go | 2 +- puppet.go | 2 +- 11 files changed, 16 insertions(+), 20 deletions(-) diff --git a/commands.go b/commands.go index c1f3000..79d6b7b 100644 --- a/commands.go +++ b/commands.go @@ -26,7 +26,7 @@ import ( "maunium.net/go/maulogger/v2" "maunium.net/go/mautrix" - "maunium.net/go/mautrix-appservice" + "maunium.net/go/mautrix/appservice" "maunium.net/go/mautrix/event" "maunium.net/go/mautrix/format" "maunium.net/go/mautrix/id" diff --git a/config/config.go b/config/config.go index e8a4f0a..d076e01 100644 --- a/config/config.go +++ b/config/config.go @@ -21,7 +21,7 @@ import ( "gopkg.in/yaml.v2" - "maunium.net/go/mautrix-appservice" + "maunium.net/go/mautrix/appservice" ) type Config struct { diff --git a/config/registration.go b/config/registration.go index fd79f17..0524200 100644 --- a/config/registration.go +++ b/config/registration.go @@ -20,7 +20,7 @@ import ( "fmt" "regexp" - "maunium.net/go/mautrix-appservice" + "maunium.net/go/mautrix/appservice" ) func (config *Config) NewRegistration() (*appservice.Registration, error) { diff --git a/custompuppet.go b/custompuppet.go index 1f2c520..8a50383 100644 --- a/custompuppet.go +++ b/custompuppet.go @@ -27,7 +27,7 @@ import ( "github.com/Rhymen/go-whatsapp" "maunium.net/go/mautrix" - appservice "maunium.net/go/mautrix-appservice" + "maunium.net/go/mautrix/appservice" "maunium.net/go/mautrix/event" "maunium.net/go/mautrix/id" ) @@ -270,6 +270,6 @@ func (puppet *Puppet) GetFilterJSON(_ id.UserID) *mautrix.Filter { func (puppet *Puppet) SaveFilterID(_ id.UserID, _ string) {} func (puppet *Puppet) SaveNextBatch(_ id.UserID, nbt string) { puppet.NextBatch = nbt; puppet.Update() } func (puppet *Puppet) SaveRoom(room *mautrix.Room) {} -func (puppet *Puppet) LoadFilterID(_ id.UserID) string { return "" } -func (puppet *Puppet) LoadNextBatch(_ id.UserID) string { return puppet.NextBatch } +func (puppet *Puppet) LoadFilterID(_ id.UserID) string { return "" } +func (puppet *Puppet) LoadNextBatch(_ id.UserID) string { return puppet.NextBatch } func (puppet *Puppet) LoadRoom(roomID id.RoomID) *mautrix.Room { return nil } diff --git a/database/statestore.go b/database/statestore.go index ac1f0f5..178d4c1 100644 --- a/database/statestore.go +++ b/database/statestore.go @@ -24,7 +24,7 @@ import ( log "maunium.net/go/maulogger/v2" - "maunium.net/go/mautrix-appservice" + "maunium.net/go/mautrix/appservice" "maunium.net/go/mautrix/event" "maunium.net/go/mautrix/id" ) diff --git a/go.mod b/go.mod index d324625..4534d58 100644 --- a/go.mod +++ b/go.mod @@ -15,8 +15,7 @@ require ( gopkg.in/yaml.v2 v2.2.8 maunium.net/go/mauflag v1.0.0 maunium.net/go/maulogger/v2 v2.1.1 - maunium.net/go/mautrix v0.3.7 - maunium.net/go/mautrix-appservice v0.2.1 + maunium.net/go/mautrix v0.4.0 ) replace github.com/Rhymen/go-whatsapp => github.com/tulir/go-whatsapp v0.2.6 diff --git a/go.sum b/go.sum index 956cfc1..cba311b 100644 --- a/go.sum +++ b/go.sum @@ -84,9 +84,5 @@ maunium.net/go/mautrix v0.3.6 h1:bXUo8WFdv7sUpvr7jgJ6TVMEQgVHtw1z1T3eUcLpPCA= maunium.net/go/mautrix v0.3.6/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y= maunium.net/go/mautrix v0.3.7 h1:N0czrZeAwjvBrw2a/B2G6U3EwIYaWpt7OuSslGp8DRc= maunium.net/go/mautrix v0.3.7/go.mod h1:SkGZzch8CvU2qKtNpYxtzZ0sQxfVEJ3IsVVLSUBUx9Y= -maunium.net/go/mautrix-appservice v0.1.0-alpha.6 h1:dNE+RykOC0UhSyRNbMHXEk3BzSOp3dj8aQwKuNMELWM= -maunium.net/go/mautrix-appservice v0.1.0-alpha.6/go.mod h1:Dfiwiuicvn8s2VKrBDrZ9eCjlKUMbuCi91TE6xeEHRM= -maunium.net/go/mautrix-appservice v0.2.0 h1:HmEpBSdGK7/8/xqOhxNP6viSQPkgjFVTfMI33moz51A= -maunium.net/go/mautrix-appservice v0.2.0/go.mod h1:55u7GKZBfxIs6tfAQTpvLvKLUjaJvll5HLcmx5Set1A= -maunium.net/go/mautrix-appservice v0.2.1 h1:G3gSem2CktOhjelNCk6HbzR2VsD0YzRX4luoen7atfE= -maunium.net/go/mautrix-appservice v0.2.1/go.mod h1:gLatDUjKqfv8s7WyEmT+k1fd1FvwVBts2wwhzShFNqQ= +maunium.net/go/mautrix v0.4.0 h1:IYfmxCoxR/6UMi92IncsSZeKQbZm8Xa35XIRX814KJ4= +maunium.net/go/mautrix v0.4.0/go.mod h1:8Y+NqmROJyWYvvP4yPfX9tLM59VCfgE/kcQ0SeX68ho= diff --git a/main.go b/main.go index 5da6685..ddcd4b3 100644 --- a/main.go +++ b/main.go @@ -26,10 +26,10 @@ import ( flag "maunium.net/go/mauflag" log "maunium.net/go/maulogger/v2" - "maunium.net/go/mautrix/event" "maunium.net/go/mautrix" - "maunium.net/go/mautrix-appservice" + "maunium.net/go/mautrix/appservice" + "maunium.net/go/mautrix/event" "maunium.net/go/mautrix/id" "maunium.net/go/mautrix-whatsapp/config" diff --git a/matrix.go b/matrix.go index 12e1114..d064f49 100644 --- a/matrix.go +++ b/matrix.go @@ -21,7 +21,8 @@ import ( "strings" "maunium.net/go/maulogger/v2" - "maunium.net/go/mautrix-appservice" + + "maunium.net/go/mautrix/appservice" "maunium.net/go/mautrix/event" "maunium.net/go/mautrix/format" "maunium.net/go/mautrix/id" diff --git a/portal.go b/portal.go index 9c52fd9..ffac2c8 100644 --- a/portal.go +++ b/portal.go @@ -41,7 +41,7 @@ import ( waProto "github.com/Rhymen/go-whatsapp/binary/proto" "maunium.net/go/mautrix" - "maunium.net/go/mautrix-appservice" + "maunium.net/go/mautrix/appservice" "maunium.net/go/mautrix/event" "maunium.net/go/mautrix/format" "maunium.net/go/mautrix/id" diff --git a/puppet.go b/puppet.go index 6b56a50..4831c3d 100644 --- a/puppet.go +++ b/puppet.go @@ -26,7 +26,7 @@ import ( log "maunium.net/go/maulogger/v2" - "maunium.net/go/mautrix-appservice" + "maunium.net/go/mautrix/appservice" "maunium.net/go/mautrix/id" "maunium.net/go/mautrix-whatsapp/database"