go fmt

client.go

@@ -109,7 +109,6 @@ func (c *Client) handleLoginPhase(message string) {
 				c.write("Bad username or password.\n")
 				break
 			}
-			
 
 			c.playerID = player.ID
 			c.authenticated = true
@@ -134,17 +133,17 @@ func (c *Client) handleLoginPhase(message string) {
 				c.write("That name is already taken.\n")
 				break
 			}
-			
+
 			playerID, _ := c.db.CreatePlayer(strings.TrimSpace(fields[1]), strings.TrimSpace(fields[2]), nil)
-			
+
 			_, found = c.db.Fetch(playerID)
 			if !found {
 				c.write("I can't even.\n")
 				break
 			}
-			
+
 			c.write("You have been created. Now you can connect!\n")
-			
+
 		} else {
 			c.write("What?\n")
 		}

cmd/funmow/main.go

@@ -1,16 +1,16 @@
 package main
 
 import (
+	"flag"
 	"github.com/naleek/funmow"
 	"log"
 	"net"
-	"flag"
 )
 
 const (
-	FunMOWVersion   = "0.2"
-	FunMOWDefaultDB = "funmow.db"
-	FunMOWDefaultListen    = ":4201"
+	FunMOWVersion       = "0.2"
+	FunMOWDefaultDB     = "funmow.db"
+	FunMOWDefaultListen = ":4201"
 )
 
 func main() {
@@ -32,8 +32,6 @@ func main() {
 		return
 	}
 
-
-
 	log.Print("Starting FunMOW Version ", FunMOWVersion)
 
 	log.Print("Using database ", FunMOWDefaultDB)
@@ -73,7 +71,7 @@ func seedDB(db *funmow.DB) {
 
 	f := funmow.NewObjectFactory(db)
 
-	keelan, _ := db.CreatePlayer("keelan", "123", map[string]bool{"wizard":true})
+	keelan, _ := db.CreatePlayer("keelan", "123", map[string]bool{"wizard": true})
 	dan, _ := db.CreatePlayer("dan", "123", nil)
 
 	outside := f.NewObject()

db.go

@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"encoding/binary"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"github.com/boltdb/bolt"
-	"strconv"
-	"errors"
 	"regexp"
+	"strconv"
 )
 
 const (
@@ -19,7 +19,7 @@ type DBRef int
 
 func NewDBRefFromHashRef(v string) (DBRef, bool) {
 	var destInt int
-	
+
 	if matched, _ := regexp.MatchString(`^\pZ*#[0-9]+\pZ*?`, v); !matched {
 		return 0, false
 	}
@@ -242,13 +242,15 @@ func (s *DB) Delete(objectID DBRef) error {
 func (s *DB) SetPlayer(name string, player PlayerMeta) error {
 
 	err := s.db.Update(func(tx *bolt.Tx) error {
-		
+
 		buf, err := json.Marshal(player)
 
-		if err != nil { return err }
-	
+		if err != nil {
+			return err
+		}
+
 		b := tx.Bucket([]byte("player"))
-		
+
 		return b.Put([]byte(name), buf)
 	})
 
@@ -259,11 +261,13 @@ func (s *DB) SetPlayer(name string, player PlayerMeta) error {
 func (s *DB) GetPlayer(name string) (PlayerMeta, bool) {
 	var player PlayerMeta
 	found := false
-	
+
 	s.db.View(func(tx *bolt.Tx) error {
 		b := tx.Bucket([]byte("player"))
 		v := b.Get([]byte(name))
-		if v == nil { return nil }
+		if v == nil {
+			return nil
+		}
 		err := json.Unmarshal(v, &player)
 		if err == nil {
 			found = true
@@ -292,12 +296,13 @@ func (s *DB) RenamePlayer(oldName string, newName string) error {
 			return errors.New("Can't find player")
 		}
 		err := playerBucket.Delete([]byte(oldName))
-		if err != nil { return err }
+		if err != nil {
+			return err
+		}
 		return playerBucket.Put([]byte(newName), buf)
 	})
 }
 
-
 func (s *DB) CreatePlayer(name string, password string, flags map[string]bool) (DBRef, error) {
 
 	var playerID DBRef

execution_context.go

@@ -38,8 +38,6 @@ func NewExecutionContext(actorID DBRef, e *EventDistributor, w *DB, outbound cha
 	if !found {
 		return nil
 	}
-	
-	
 
 	c.actor = actor
 	c.outbound = outbound
@@ -121,8 +119,7 @@ func (c *ExecutionContext) HandleEvent(m PlayerEvent) {
 	if found {
 		c.context, _ = c.db.Fetch(contextID)
 	}
-	
-	
+
 	switch m.messageType {
 	case EventTypeLogin:
 		if c.actor.Type == "player" {
@@ -250,8 +247,7 @@ func (c *ExecutionContext) evaluateCommand(m PlayerEvent) {
 		c.destroyCmd(strings.TrimPrefix(message, "@destroy "))
 	case strings.HasPrefix(message, "@force "):
 		c.forceCmd(message)
-	
-		
+
 	default:
 		if !c.goCmd(message) {
 			c.output("What?\n")
@@ -264,7 +260,7 @@ func (c *ExecutionContext) lookCmd(target string) {
 
 	if len(target) > 0 {
 		object, found := c.MatchFirst(c.context.ID, target, false, false)
-		if (!found) {
+		if !found {
 			c.output("I don't see that here.")
 			return
 		}
@@ -273,11 +269,11 @@ func (c *ExecutionContext) lookCmd(target string) {
 		c.output("%s\n%s", c.context.DetailedName(), c.context.Description)
 		contents := c.context.GetContents(c.actor.ID)
 		if len(contents) > 0 {
-			c.output("Contents:\n"+strings.Join(contents,"\n"))
+			c.output("Contents:\n" + strings.Join(contents, "\n"))
 		}
 		exits := c.context.GetExits()
 		if len(exits) > 0 {
-			c.output("Obvious Exits:\n"+strings.Join(exits," "))
+			c.output("Obvious Exits:\n" + strings.Join(exits, " "))
 		}
 	}
 
@@ -295,11 +291,11 @@ func (c *ExecutionContext) objectName(id DBRef) string {
 func (c *ExecutionContext) examineCmd(objectName string) {
 
 	object, found := c.MatchFirst(c.context.ID, objectName, true, true)
-	if (!found) {
+	if !found {
 		c.output("I don't see that here.")
 		return
 	}
-	
+
 	c.output("%s", object.DetailedName())
 	c.output("ID: %d", object.ID)
 	c.output("Type: %s", object.Type)
@@ -313,31 +309,27 @@ func (c *ExecutionContext) examineCmd(objectName string) {
 	if len(contents) > 0 {
 		c.output("Contents:\n %s", strings.Join(contents, "\n "))
 	}
-	
+
 	exits := object.GetExits()
 	if len(exits) > 0 {
 		c.output("Exits:\n %s", strings.Join(exits, "\n "))
 	}
-	
-	
-   
-    flags := make([]string, 0, len(object.Flags))
-    for k, v := range object.Flags {
-        if v {
-        	flags = append(flags, k)
-        }
-    }
-    c.output("Flags:\n%s", strings.Join(flags, ", "))
-    
-    properties := make([]string, 0, len(object.Properties))
-    for k, v := range object.Properties {
-        properties = append(properties, fmt.Sprintf("%s: \"%s\"", k, v))
-    }
-    c.output("Properties:\n%s", strings.Join(properties, ", "))
 
-}
+	flags := make([]string, 0, len(object.Flags))
+	for k, v := range object.Flags {
+		if v {
+			flags = append(flags, k)
+		}
+	}
+	c.output("Flags:\n%s", strings.Join(flags, ", "))
 
+	properties := make([]string, 0, len(object.Properties))
+	for k, v := range object.Properties {
+		properties = append(properties, fmt.Sprintf("%s: \"%s\"", k, v))
+	}
+	c.output("Properties:\n%s", strings.Join(properties, ", "))
 
+}
 
 func (c *ExecutionContext) forceCmd(input string) {
 
@@ -352,7 +344,7 @@ func (c *ExecutionContext) forceCmd(input string) {
 	wizard := c.actor.GetFlag("wizard")
 
 	object, found := c.MatchFirst(c.context.ID, objectName, true, false)
-	if (!found) {
+	if !found {
 		c.output("I don't see that here.")
 		return
 	}
@@ -363,11 +355,11 @@ func (c *ExecutionContext) forceCmd(input string) {
 	if object.Type == "player" && !wizard {
 		c.output("It's not nice to force others to do your bidding.")
 		return
-	} 
+	}
 	if object.Owner != c.actor.ID && !wizard {
 		c.output("It's not nice to touch other people's things.")
 		return
-	} 
+	}
 	c.outbound <- PlayerEvent{src: c.actor.ID, dst: object.ID, message: command, messageType: EventTypeForce}
 
 }
@@ -398,13 +390,13 @@ func (c *ExecutionContext) inventoryCmd() {
 }
 
 func (c *ExecutionContext) getCmd(objectName string) {
-	
+
 	object, found := c.MatchFirst(c.context.ID, objectName, false, false)
-	if (!found) {
+	if !found {
 		c.output("I don't see that here.")
 		return
 	}
-	
+
 	if object.ID == c.actor.ID {
 		c.output("You can't pick yourself up.")
 		return
@@ -422,7 +414,6 @@ func (c *ExecutionContext) getCmd(objectName string) {
 	c.pemit(object.ID, "%s picked you up.", c.actor.Name)
 	c.oemit(c.context.ID, "%s picks up %s.", c.actor.Name, object.Name)
 
-
 }
 
 func (c *ExecutionContext) putCmd(input string) {
@@ -433,10 +424,9 @@ func (c *ExecutionContext) giveCmd(input string) {
 	c.xferCmd(input, "give", "to")
 }
 
-
 func (c *ExecutionContext) xferCmd(input string, verb string, preposition string) {
 
-	r, _ := regexp.Compile(`^`+verb+`\pZ+([^=]*[^=\pZ]{1})\pZ*`+preposition+`\pZ*(.*)\pZ*$`)
+	r, _ := regexp.Compile(`^` + verb + `\pZ+([^=]*[^=\pZ]{1})\pZ*` + preposition + `\pZ*(.*)\pZ*$`)
 
 	params := r.FindStringSubmatch(input)
 	if params == nil {
@@ -446,13 +436,13 @@ func (c *ExecutionContext) xferCmd(input string, verb string, preposition string
 	objectName, receiverName := params[1], params[2]
 
 	object, found := c.MatchFirst(c.actor.ID, objectName, false, false)
-	if (!found) {
-		c.output("You can't "+verb+" what you don't have.")
+	if !found {
+		c.output("You can't " + verb + " what you don't have.")
 		return
 	}
 	receiver, found := c.MatchFirst(c.context.ID, receiverName, false, false)
-	if (!found) {
-		c.output("I cant find who or what you want to "+verb+" this "+preposition+".")
+	if !found {
+		c.output("I cant find who or what you want to " + verb + " this " + preposition + ".")
 		return
 	}
 
@@ -460,16 +450,16 @@ func (c *ExecutionContext) xferCmd(input string, verb string, preposition string
 	if err != nil {
 		return
 	}
-	
+
 	c.output("You "+verb+" %s "+preposition+" %s.", object.Name, receiver.Name)
 	c.pemit(object.ID, "%s "+verb+"s you "+preposition+" %s.", c.actor.Name, receiver.Name)
-	
-	if (verb == "give") {
+
+	if verb == "give" {
 		c.pemit(receiver.ID, "%s gives you %s.", c.actor.Name, object.Name)
 	} else {
 		c.pemit(receiver.ID, "%s puts %s into you.", c.actor.Name, object.Name)
 	}
-	
+
 }
 
 func (c *ExecutionContext) MatchFirst(context DBRef, matchName string, globalDBRefMatch bool, playerNameMatch bool) (Object, bool) {
@@ -479,8 +469,8 @@ func (c *ExecutionContext) MatchFirst(context DBRef, matchName string, globalDBR
 	}
 	if matchName == "me" {
 		return c.actor, true
-	}	
-		
+	}
+
 	if globalDBRefMatch {
 		ref, valid := NewDBRefFromHashRef(matchName)
 		if valid {
@@ -490,7 +480,7 @@ func (c *ExecutionContext) MatchFirst(context DBRef, matchName string, globalDBR
 			}
 		}
 	}
-	
+
 	if playerNameMatch {
 		playerMeta, foundMeta := c.db.GetPlayer(matchName)
 		if foundMeta {
@@ -513,17 +503,17 @@ func (c *ExecutionContext) MatchFirst(context DBRef, matchName string, globalDBR
 		}
 	}
 	return Object{}, false
-	
+
 }
 
 func (c *ExecutionContext) dropCmd(objectName string) {
 
 	object, found := c.MatchFirst(c.actor.ID, objectName, false, false)
-	if (!found) {
+	if !found {
 		c.output("You're not carrying that.")
 		return
 	}
-	
+
 	err := c.context.Contains(&object)
 	if err != nil {
 		return
@@ -538,11 +528,11 @@ func (c *ExecutionContext) dropCmd(objectName string) {
 func (c *ExecutionContext) enterCmd(objectName string) {
 
 	object, found := c.MatchFirst(c.context.ID, objectName, false, false)
-	if (!found) {
+	if !found {
 		c.output("I don't see that here.")
 		return
 	}
-	
+
 	if object.Type == "player" {
 		c.output("Maybe you should seek consent prior to entering another player.")
 		return
@@ -555,7 +545,7 @@ func (c *ExecutionContext) enterCmd(objectName string) {
 		c.output("Entering yourself would be a bad idea.")
 		return
 	}
-	
+
 	err := object.Contains(&c.actor)
 	if err != nil {
 		return
@@ -563,7 +553,7 @@ func (c *ExecutionContext) enterCmd(objectName string) {
 	c.output("You climb into %s.", object.Name)
 	c.oemit(c.context.ID, "%s climbs into %s.", c.actor.Name, object.Name)
 	c.oemit(object.ID, "%s squeezes into %s with you.", c.actor.Name, object.Name)
-	
+
 }
 
 func (c *ExecutionContext) leaveCmd() {
@@ -575,10 +565,14 @@ func (c *ExecutionContext) leaveCmd() {
 	}
 
 	container, found := c.db.Fetch(outerObjectID)
-	if !found { return }
+	if !found {
+		return
+	}
 
 	err := container.Contains(&c.actor)
-	if err != nil { return }
+	if err != nil {
+		return
+	}
 
 	c.output("You climb out of %s.", c.context.Name)
 	c.oemit(c.context.ID, "%s climbs out of %s.", c.actor.Name, c.context.Name)
@@ -710,7 +704,6 @@ func (c *ExecutionContext) digCmd(input string) {
 
 }
 
-
 func (c *ExecutionContext) nameCmd(input string) {
 
 	r, _ := regexp.Compile(`^@name\pZ+([^=]*[^=\pZ]{1})\pZ*=\pZ*(.*)\pZ*$`)
@@ -751,8 +744,6 @@ func (c *ExecutionContext) nameCmd(input string) {
 
 }
 
-
-
 func (c *ExecutionContext) setCmd(input string) {
 	r, _ := regexp.Compile(`^@set\pZ+([^=]*[^=\pZ]{1})\pZ*=\pZ*(!)?(.*)\pZ*$`)
 	params := r.FindStringSubmatch(input)
@@ -760,20 +751,19 @@ func (c *ExecutionContext) setCmd(input string) {
 		return
 	}
 
-	objectName, value, flag := params[1], params[2]!="!", params[3]
+	objectName, value, flag := params[1], params[2] != "!", params[3]
 
 	object, found := c.MatchFirst(c.context.ID, objectName, true, true)
-	if (!found) {
+	if !found {
 		c.output("I don't know what that is")
 		return
 	}
-	
-		
+
 	object.SetFlag(flag, value)
 	object.Commit()
-	
+
 	c.output("It is so.")
-	
+
 }
 
 func (c *ExecutionContext) descCmd(input string) {
@@ -803,19 +793,19 @@ func (c *ExecutionContext) telCmd(destStr string) {
 
 	var dest Object
 	var found bool
-	
+
 	dest, found = c.MatchFirst(c.context.ID, destStr, true, false)
-	
+
 	if !found {
 		c.output("Invalid destination.")
 		return
 	}
-	
+
 	if dest.Type == "exit" {
 		c.output("As fun is it sounds, you're not going to teleport into an exit.")
 		return
 	}
-	
+
 	if dest.Type == "player" {
 		c.output("Teleporting into players is very impolite.")
 		return
@@ -824,7 +814,7 @@ func (c *ExecutionContext) telCmd(destStr string) {
 	if dest.Owner != c.actor.ID && !dest.GetFlag("jump_ok") {
 		c.output("You're not allowed to do that.")
 	}
-	
+
 	c.output("You feel an intense wooshing sensation.")
 	c.oemit(c.context.ID, "%s teleports out of the room.", c.actor.Name)
 	c.oemit(dest.ID, "%s teleports in to the room.", c.actor.Name)
@@ -833,7 +823,6 @@ func (c *ExecutionContext) telCmd(destStr string) {
 	if err != nil {
 		return
 	}
-	
 
 	c.actor.Refresh()
 	c.lookCmd("")
@@ -856,11 +845,11 @@ func (c *ExecutionContext) dumpCmd(refStr string) {
 func (c *ExecutionContext) destroyCmd(target string) {
 
 	object, found := c.MatchFirst(c.actor.ID, target, true, false)
-	if (!found) {
+	if !found {
 		c.output("I don't see that here.")
 		return
 	}
-	
+
 	if object.ID == c.actor.ID {
 		c.output("There are alternatives to suicide.")
 		return

object.go

@@ -13,23 +13,21 @@ const (
 )
 
 type PlayerMeta struct {
-	ID          DBRef  `json:"id"`
-	Password    string `json:"password"`
+	ID       DBRef  `json:"id"`
+	Password string `json:"password"`
 }
 
 type Object struct {
-
 	ID          DBRef             `json:"id"`
 	Type        string            `json:"type"`
 	Owner       DBRef             `json:"owner"`
 	Next        DBRef             `json:"next"`
 	Name        string            `json:"name"`
 	Description string            `json:"description"`
-	Flags		map[string]bool   `json:"flags"`
+	Flags       map[string]bool   `json:"flags"`
 	Properties  map[string]string `json:"properties"`
-	
-	db    *DB
-	
+
+	db *DB
 }
 
 type ObjectFactory struct {
@@ -147,11 +145,19 @@ func (o *Object) GetContents(exclude DBRef) []string {
 	r := make([]string, 0)
 	children := o.db.GetChildren(o.ID)
 	for childID, linkType := range children {
-		if childID == exclude { continue }
-		if !(linkType == "player" || linkType == "thing") { continue }
+		if childID == exclude {
+			continue
+		}
+		if !(linkType == "player" || linkType == "thing") {
+			continue
+		}
 		o, found := o.db.Fetch(childID)
-		if !found { continue }
-		if linkType == "player" && !o.GetFlag("online") { continue }
+		if !found {
+			continue
+		}
+		if linkType == "player" && !o.GetFlag("online") {
+			continue
+		}
 		r = append(r, o.DetailedName())
 	}
 	sort.Strings(r)
@@ -162,13 +168,17 @@ func (o *Object) GetExits() []string {
 	r := make([]string, 0)
 	children := o.db.GetChildren(o.ID)
 	for exitID, linkType := range children {
-		if linkType != "exit" { continue }
+		if linkType != "exit" {
+			continue
+		}
 		exit, found := o.db.Fetch(exitID)
-		if !found { continue }
+		if !found {
+			continue
+		}
 		aliases := strings.Split(exit.Name, ";")
 		r = append(r, aliases[0])
 	}
-	
+
 	sort.Strings(r)
 	return r
 }
@@ -177,15 +187,19 @@ func (o *Object) SetFlag(flag string, value bool) {
 	if o.Flags == nil {
 		o.Flags = make(map[string]bool)
 	}
-	o.Flags[flag]=value
+	o.Flags[flag] = value
 }
 
 func (o *Object) GetFlag(flag string) bool {
-	
-	if o.Flags == nil { return false }
+
+	if o.Flags == nil {
+		return false
+	}
 	value, ok := o.Flags[flag]
-	if !ok { return false }
-	
+	if !ok {
+		return false
+	}
+
 	return value
 }
 
@@ -193,21 +207,22 @@ func (o *Object) SetProp(key string, value string) {
 	if o.Properties == nil {
 		o.Properties = make(map[string]string)
 	}
-	o.Properties[key]=value
+	o.Properties[key] = value
 }
 
 func (o *Object) GetProp(key string) string {
-	
-	if o.Properties == nil { return "" }
+
+	if o.Properties == nil {
+		return ""
+	}
 	value, ok := o.Properties[key]
-	if !ok { return "" }
-	
+	if !ok {
+		return ""
+	}
+
 	return value
 }
 
-
-
-
 type ObjectList []Object
 
 func (l ObjectList) First() Object {