Rename matrix/room/ to matrix/rooms/

11 files changed, 10 insertions, 13 deletions

diff --git a/config/session.go b/config/session.go
index 2d4b885..337a14b 100644
--- 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"
 )
 
diff --git a/interface/matrix.go b/interface/matrix.go
index 4202ebf..f811dff 100644
--- 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 {
diff --git a/matrix/matrix.go b/matrix/matrix.go
index 19bc226..9423f63 100644
--- 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"
diff --git a/matrix/pushrules/condition.go b/matrix/pushrules/condition.go
index ecbf5b2..e9b11af 100644
--- 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.
diff --git a/matrix/pushrules/pushrules.go b/matrix/pushrules/pushrules.go
index bfcb4ef..876713b 100644
--- 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
 }
-
diff --git a/matrix/pushrules/rule.go b/matrix/pushrules/rule.go
index 067bc95..933d493 100644
--- 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
diff --git a/matrix/pushrules/ruleset.go b/matrix/pushrules/ruleset.go
index 6708b70..a8d212d 100644
--- 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 {
diff --git a/matrix/room/doc.go b/matrix/rooms/doc.go
index 2a4ff4b..2a4ff4b 100644
--- a/matrix/room/doc.go
+++ b/matrix/rooms/doc.go
diff --git a/matrix/room/member.go b/matrix/rooms/member.go
index 4af20a6..4af20a6 100644
--- a/matrix/room/member.go
+++ b/matrix/rooms/member.go
diff --git a/matrix/room/room.go b/matrix/rooms/room.go
index 4166fd7..4166fd7 100644
--- a/matrix/room/room.go
+++ b/matrix/rooms/room.go
diff --git a/ui/widget/room-view.go b/ui/widget/room-view.go
index 7e01fd4..83073c2 100644
--- 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"
 )