A lot of delete and failed scream tests.

models/channels/add.go

@@ -1,33 +0,0 @@
-package channels
-
-import (
-	"errors"
-	"strings"
-
-	"git.aiterp.net/rpdata/api/models"
-)
-
-// ErrInvalidName is an error for an invalid channel name.
-var ErrInvalidName = errors.New("Invalid channel name")
-
-// Add creates a new channel.
-func Add(name string, logged, hub bool, event, location string) (models.Channel, error) {
-	if len(name) < 3 && !strings.HasPrefix(name, "#") {
-		return models.Channel{}, ErrInvalidName
-	}
-
-	channel := models.Channel{
-		Name:         name,
-		Logged:       logged,
-		Hub:          hub,
-		EventName:    event,
-		LocationName: location,
-	}
-
-	err := collection.Insert(channel)
-	if err != nil {
-		return models.Channel{}, err
-	}
-
-	return channel, nil
-}

models/channels/db.go

@@ -1,19 +0,0 @@
-package channels
-
-import (
-	"git.aiterp.net/rpdata/api/internal/store"
-	"github.com/globalsign/mgo"
-)
-
-var collection *mgo.Collection
-
-func init() {
-	store.HandleInit(func(db *mgo.Database) {
-		collection = db.C("common.channels")
-
-		collection.EnsureIndexKey("logged")
-		collection.EnsureIndexKey("hub")
-		collection.EnsureIndexKey("event")
-		collection.EnsureIndexKey("location")
-	})
-}

models/channels/edit.go

@@ -1,39 +0,0 @@
-package channels
-
-import (
-	"git.aiterp.net/rpdata/api/models"
-	"github.com/globalsign/mgo/bson"
-)
-
-// Edit edits a channels
-func Edit(channel models.Channel, logged, hub *bool, eventName, locationName *string) (models.Channel, error) {
-	mutation := bson.M{}
-
-	if logged != nil && *logged != channel.Logged {
-		mutation["logged"] = *logged
-		channel.Logged = *logged
-	}
-	if hub != nil && *hub != channel.Hub {
-		mutation["hub"] = *hub
-		channel.Hub = *hub
-	}
-	if eventName != nil && *eventName != channel.EventName {
-		mutation["eventName"] = *eventName
-		channel.EventName = *eventName
-	}
-	if locationName != nil && *locationName != channel.LocationName {
-		mutation["locationName"] = *locationName
-		channel.LocationName = *locationName
-	}
-
-	if len(mutation) == 0 {
-		return channel, nil
-	}
-
-	err := collection.UpdateId(channel.Name, bson.M{"$set": mutation})
-	if err != nil {
-		return models.Channel{}, err
-	}
-
-	return channel, nil
-}

models/channels/ensure.go

@@ -1,33 +0,0 @@
-package channels
-
-import (
-	"strings"
-
-	"github.com/globalsign/mgo"
-
-	"git.aiterp.net/rpdata/api/models"
-)
-
-// Ensure adds a channel if it doesn't exist. If logged is set and the found channel isn't logged,
-// that is changed.
-func Ensure(name string, logged bool) (models.Channel, error) {
-	if len(name) < 3 && !strings.HasPrefix(name, "#") {
-		return models.Channel{}, ErrInvalidName
-	}
-
-	channel, err := FindName(name)
-	if err == mgo.ErrNotFound {
-		return Add(name, logged, false, "", "")
-	} else if err != nil {
-		return models.Channel{}, err
-	}
-
-	if logged && !channel.Logged {
-		channel, err = Edit(channel, &logged, nil, nil, nil)
-		if err != nil {
-			return models.Channel{}, err
-		}
-	}
-
-	return channel, nil
-}

models/channels/find.go

@@ -1,11 +0,0 @@
-package channels
-
-import "git.aiterp.net/rpdata/api/models"
-
-// FindName finds a channel by its id (its name).
-func FindName(name string) (models.Channel, error) {
-	channel := models.Channel{}
-	err := collection.FindId(name).One(&channel)
-
-	return channel, err
-}

models/channels/list.go

@@ -1,46 +0,0 @@
-package channels
-
-import (
-	"git.aiterp.net/rpdata/api/models"
-	"github.com/globalsign/mgo/bson"
-)
-
-// Filter for searching
-type Filter struct {
-	Logged       *bool  `json:"logged"`
-	EventName    string `json:"eventName"`
-	LocationName string `json:"locationName"`
-}
-
-// List finds channels, if logged is true it will be limited to logged
-// channels
-func List(filter *Filter) ([]models.Channel, error) {
-	query := bson.M{}
-
-	if filter != nil {
-		if filter.Logged != nil {
-			query["logged"] = *filter.Logged
-		}
-		if filter.EventName != "" {
-			query["eventName"] = filter.EventName
-		}
-		if filter.LocationName != "" {
-			query["locationName"] = filter.LocationName
-		}
-	}
-
-	channels := make([]models.Channel, 0, 128)
-	err := collection.Find(query).Sort("_id").All(&channels)
-
-	return channels, err
-}
-
-// ListNames finds channels by the names provided
-func ListNames(names ...string) ([]models.Channel, error) {
-	query := bson.M{"_id": bson.M{"$in": names}}
-
-	channels := make([]models.Channel, 0, 32)
-	err := collection.Find(query).All(&channels)
-
-	return channels, err
-}

models/key.go

@@ -0,0 +1,22 @@
+package models
+
+// A Key contains a JWT secret and the limitations of it. There are two types of
+// keys, single-user keys and wildcard keys. The former is used to authenticate
+// a single user (e.g. the logbot) through an API while the latter is only for
+// services that can be trusted to perform its own authentication (a frontend).
+type Key struct {
+	ID     string `bson:"_id"`
+	Name   string `bson:"name"`
+	User   string `bson:"user"`
+	Secret string `bson:"secret"`
+}
+
+// ValidForUser returns true if the key's user is the same as
+// the user, or it's a wildcard key.
+func (key *Key) ValidForUser(user string) bool {
+	return key.User == user || key.User == "*"
+}
+
+type KeyFilter struct {
+	UserID *string
+}