cws
/
catbase
mirror of https://github.com/velour/catbase.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixing admin rights & user entries

This commit is contained in:
Chris Sexton 2013-09-02 13:34:20 -04:00
parent cfbe0dc4bc
commit d35fba2f87
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
bot/users.go
View File

@ -2,6 +2,7 @@ package bot
import ( import (
// "labix.org/v2/mgo" // "labix.org/v2/mgo"
"labix.org/v2/mgo"
"labix.org/v2/mgo/bson" "labix.org/v2/mgo/bson"
"log" "log"
) )
@ -20,31 +21,39 @@ type User struct {
Admin bool Admin bool
bot *Bot //bot *Bot
} }
func NewUser(nick string) *User { func (b *Bot) NewUser(nick string) *User {
return &User{ return &User{
Name: nick, Name: nick,
Admin: false, Admin: b.checkAdmin(nick),
} }
} }
func (b *Bot) GetUser(nick string) *User { func (b *Bot) GetUser(nick string) *User {
coll := b.Db.C("users") coll := b.Db.C("users")
query := coll.Find(bson.M{"nick": nick}) query := coll.Find(bson.M{"name": nick})
var user *User var user *User
if count, err := query.Count(); err != nil { count, err := query.Count()
log.Printf("Searching for %s. Found %d entries.\n", nick, count)
if err != nil {
log.Printf("Error fetching user, %s: %s\n", nick, err) log.Printf("Error fetching user, %s: %s\n", nick, err)
user = NewUser(nick) user = b.NewUser(nick)
coll.Insert(NewUser(nick)) coll.Insert(*user)
} else if count == 1 { } else if count == 1 {
query.One(user) err = query.One(&user)
if err != nil {
panic(err)
}
log.Printf("Found user: %s\n", nick)
} else if count == 0 { } else if count == 0 {
// create the user // create the user
user = NewUser(nick) log.Printf("Creating new user: %s\n", nick)
coll.Insert(NewUser(nick)) user = b.NewUser(nick)
coll.Insert(user)
} else { } else {
log.Printf("Error: %s appears to have more than one user?\n", nick) log.Printf("Error: %s appears to have more than one user?\n", nick)
query.One(user) query.One(user)
@ -62,8 +71,6 @@ func (b *Bot) GetUser(nick string) *User {
} }
} }
user.bot = b
found := false found := false
for _, u := range b.Users { for _, u := range b.Users {
if u.Name == user.Name { if u.Name == user.Name {
@ -78,26 +85,24 @@ func (b *Bot) GetUser(nick string) *User {
} }
// Modify user entry to be a link to other, return other // Modify user entry to be a link to other, return other
func (u *User) LinkUser(other string) *User { func (u *User) LinkUser(coll *mgo.Collection, other *User) *User {
coll := u.bot.Db.C("users") user := u
user := u.bot.GetUser(u.Name)
otherUser := u.bot.GetUser(other)
otherUser.Alts = append(otherUser.Alts, user.Alts...) other.Alts = append(other.Alts, user.Alts...)
user.Alts = []string{} user.Alts = []string{}
user.Parent = other user.Parent = other.Name
err := coll.Update(bson.M{"Name": u.Name}, u) err := coll.Update(bson.M{"name": u.Name}, u)
if err != nil { if err != nil {
log.Printf("Error updating user: %s\n", u.Name) log.Printf("Error updating user: %s\n", u.Name)
} }
err = coll.Update(bson.M{"Name": other}, otherUser) err = coll.Update(bson.M{"name": other.Name}, other)
if err != nil { if err != nil {
log.Printf("Error updating other user: %s\n", other) log.Printf("Error updating other user: %s\n", other.Name)
} }
return otherUser return other
} }
func (b *Bot) checkAdmin(nick string) bool { func (b *Bot) checkAdmin(nick string) bool {