Make coomon.Filter synonym of filter request

internal/backend.go

@@ -2,9 +2,9 @@ package internal
 
 import (
 	"github.com/signaller-matrix/signaller/internal/models"
+	"github.com/signaller-matrix/signaller/internal/models/common"
 	"github.com/signaller-matrix/signaller/internal/models/createroom"
 	"github.com/signaller-matrix/signaller/internal/models/devices"
-	"github.com/signaller-matrix/signaller/internal/models/filter"
 	"github.com/signaller-matrix/signaller/internal/models/rooms"
 	"github.com/signaller-matrix/signaller/internal/models/sync"
 )
@@ -51,6 +51,6 @@ type User interface {
 	LogoutAll()
 	JoinRoom(Room) models.ApiError
 	Invite(Room, User) models.ApiError
-	AddFilter(filterID string, filterReq filter.Request)
+	AddFilter(filterID string, filter common.Filter)
-	GetFilterByID(filterID string) *filter.Request
+	GetFilterByID(filterID string) *common.Filter
 }

internal/backends/memory/backend.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/signaller-matrix/signaller/internal"
 	"github.com/signaller-matrix/signaller/internal/models"
+	"github.com/signaller-matrix/signaller/internal/models/common"
 	"github.com/signaller-matrix/signaller/internal/models/createroom"
-	"github.com/signaller-matrix/signaller/internal/models/filter"
 	mSync "github.com/signaller-matrix/signaller/internal/models/sync"
 )
 
@@ -54,7 +54,7 @@ func (backend *Backend) Register(username, password, device string) (user intern
 		password: password,
 		Tokens:   make(map[string]Token),
 		backend:  backend,
-		filters:  make(map[string]filter.Request)}
+		filters:  make(map[string]common.Filter)}
 
 	backend.data[username] = user
 

internal/backends/memory/user.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/signaller-matrix/signaller/internal"
 	"github.com/signaller-matrix/signaller/internal/models"
+	"github.com/signaller-matrix/signaller/internal/models/common"
 	"github.com/signaller-matrix/signaller/internal/models/createroom"
 	"github.com/signaller-matrix/signaller/internal/models/devices"
-	"github.com/signaller-matrix/signaller/internal/models/filter"
 	"github.com/signaller-matrix/signaller/internal/models/rooms"
 )
 
@@ -16,7 +16,7 @@ type User struct {
 	name     string
 	password string
 	Tokens   map[string]Token
-	filters  map[string]filter.Request
+	filters  map[string]common.Filter
 
 	backend *Backend
 
@@ -278,14 +278,14 @@ func (user *User) JoinRoom(room internal.Room) models.ApiError {
 	return nil
 }
 
-func (user *User) AddFilter(filterID string, filterReq filter.Request) {
+func (user *User) AddFilter(filterID string, filter common.Filter) {
 	user.mutex.Lock()
 	defer user.mutex.Unlock()
 
-	user.filters[filterID] = filterReq
+	user.filters[filterID] = filter
 }
 
-func (user *User) GetFilterByID(filterID string) *filter.Request {
+func (user *User) GetFilterByID(filterID string) *common.Filter {
 	user.mutex.RLock()
 	defer user.mutex.RUnlock()
 

internal/handlers.go

@@ -351,7 +351,7 @@ func AddFilterHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	filterID := RandomString(12)
-	user.AddFilter(filterID, request)
+	user.AddFilter(filterID, common.Filter(request))
 
 	response := filter.Response{FilterID: filterID}
 

internal/models/common/filter.go

@@ -0,0 +1,5 @@
+package common
+
+import "github.com/signaller-matrix/signaller/internal/models/filter"
+
+type Filter filter.Request