瀏覽代碼

Switch appservice module location

Tulir Asokan 5 年之前
父節點
當前提交
6e50a7c380
共有 11 個文件被更改,包括 16 次插入20 次删除
  1. 1 1
      commands.go
  2. 1 1
      config/config.go
  3. 1 1
      config/registration.go
  4. 3 3
      custompuppet.go
  5. 1 1
      database/statestore.go
  6. 1 2
      go.mod
  7. 2 6
      go.sum
  8. 2 2
      main.go
  9. 2 1
      matrix.go
  10. 1 1
      portal.go
  11. 1 1
      puppet.go

+ 1 - 1
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"

+ 1 - 1
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 {

+ 1 - 1
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) {

+ 3 - 3
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 }

+ 1 - 1
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"
 )

+ 1 - 2
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

+ 2 - 6
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=

+ 2 - 2
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"

+ 2 - 1
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"

+ 1 - 1
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"

+ 1 - 1
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"