Rename matrix/room/ to matrix/rooms/

2018-03-22 23:46:43 +02:00 · 2018-03-22 23:46:43 +02:00 · 373b25c01c
commit 373b25c01c
parent 20a1a31fa8
11 changed files with 10 additions and 13 deletions
--- a/config/session.go
+++ b/config/session.go
@ -23,7 +23,7 @@ import (

 	"maunium.net/go/gomatrix"
 	"maunium.net/go/gomuks/matrix/pushrules"
-	"maunium.net/go/gomuks/matrix/room"
+	"maunium.net/go/gomuks/matrix/rooms"
 	"maunium.net/go/gomuks/ui/debug"
 )

--- a/interface/matrix.go
+++ b/interface/matrix.go
@ -18,7 +18,7 @@ package ifc

 import (
 	"maunium.net/go/gomatrix"
-	"maunium.net/go/gomuks/matrix/room"
+	"maunium.net/go/gomuks/matrix/rooms"
 )

 type MatrixContainer interface {
--- a/matrix/matrix.go
+++ b/matrix/matrix.go
@ -26,7 +26,7 @@ import (
 	"maunium.net/go/gomuks/config"
 	"maunium.net/go/gomuks/interface"
 	"maunium.net/go/gomuks/matrix/pushrules"
-	"maunium.net/go/gomuks/matrix/room"
+	"maunium.net/go/gomuks/matrix/rooms"
 	"maunium.net/go/gomuks/notification"
 	"maunium.net/go/gomuks/ui/debug"
 	"maunium.net/go/gomuks/ui/widget"
--- a/matrix/pushrules/condition.go
+++ b/matrix/pushrules/condition.go
@ -23,7 +23,7 @@ import (

 	"github.com/zyedidia/glob"
 	"maunium.net/go/gomatrix"
-	"maunium.net/go/gomuks/matrix/room"
+	"maunium.net/go/gomuks/matrix/rooms"
 )

 // PushCondKind is the type of a push condition.
--- a/matrix/pushrules/pushrules.go
+++ b/matrix/pushrules/pushrules.go
@ -1,12 +1,10 @@
 package pushrules

 import (
+	"encoding/json"
+	"net/url"

-"encoding/json"
-"net/url"
-
-"maunium.net/go/gomatrix"
-
+	"maunium.net/go/gomatrix"
 )

 // GetPushRules returns the push notification rules for the global scope.
@ -39,4 +37,3 @@ func EventToPushRules(event *gomatrix.Event) (*PushRuleset, error) {

 	return ruleset, nil
 }
-
--- a/matrix/pushrules/rule.go
+++ b/matrix/pushrules/rule.go
@ -19,7 +19,7 @@ package pushrules
 import (
 	"github.com/zyedidia/glob"
 	"maunium.net/go/gomatrix"
-	"maunium.net/go/gomuks/matrix/room"
+	"maunium.net/go/gomuks/matrix/rooms"
 )

 type PushRuleArray []*PushRule
--- a/matrix/pushrules/ruleset.go
+++ b/matrix/pushrules/ruleset.go
@ -20,7 +20,7 @@ import (
 	"encoding/json"

 	"maunium.net/go/gomatrix"
-	"maunium.net/go/gomuks/matrix/room"
+	"maunium.net/go/gomuks/matrix/rooms"
 )

 type PushRuleset struct {
--- a/matrix/rooms/doc.go
+++ b/matrix/rooms/doc.go
--- a/matrix/rooms/member.go
+++ b/matrix/rooms/member.go
--- a/matrix/rooms/room.go
+++ b/matrix/rooms/room.go
--- a/ui/widget/room-view.go
+++ b/ui/widget/room-view.go
@ -24,7 +24,7 @@ import (
 	"time"

 	"github.com/gdamore/tcell"
-	"maunium.net/go/gomuks/matrix/room"
+	"maunium.net/go/gomuks/matrix/rooms"
 	"maunium.net/go/gomuks/ui/types"
 	"maunium.net/go/tview"
 )