Small changes

internal/events/eventtypes.go

@@ -72,7 +72,7 @@ type WebClientCommand struct {
 	Text         string
 }
 
-func (b WebClientCommand) Type() string { return `WebClientCommand` }
+func (w WebClientCommand) Type() string { return `WebClientCommand` }
 
 // GMCP Commands from clients to server
 type GMCPIn struct {
@@ -81,15 +81,15 @@ type GMCPIn struct {
 	Json         []byte
 }
 
-func (b GMCPIn) Type() string { return `GMCPIn` }
+func (g GMCPIn) Type() string { return `GMCPIn` }
 
 // GMCP Commands from server to client
 type GMCPOut struct {
 	UserId  int
 	Payload any
 }
 
-func (b GMCPOut) Type() string { return `GMCPOut` }
+func (g GMCPOut) Type() string { return `GMCPOut` }
 
 // Messages that are intended to reach all users on the system
 type System struct {
@@ -127,15 +127,15 @@ type NewRound struct {
 	Config      configs.Config
 }
 
-func (r NewRound) Type() string { return `NewRound` }
+func (n NewRound) Type() string { return `NewRound` }
 
 type NewTurn struct {
 	TurnNumber uint64
 	TimeNow    time.Time
 	Config     configs.Config
 }
 
-func (r NewTurn) Type() string { return `NewTurn` }
+func (n NewTurn) Type() string { return `NewTurn` }
 
 type ItemOwnership struct {
 	UserId        int
@@ -144,11 +144,11 @@ type ItemOwnership struct {
 	Gained        bool
 }
 
-func (r ItemOwnership) Type() string { return `ItemOwnership` }
+func (i ItemOwnership) Type() string { return `ItemOwnership` }
 
 type ScriptedEvent struct {
 	Name string
 	Data map[string]any
 }
 
-func (r ScriptedEvent) Type() string { return `ScriptedEvent` }
+func (s ScriptedEvent) Type() string { return `ScriptedEvent` }

world.go

@@ -636,7 +636,7 @@ func (w *World) MainWorker(shutdown chan bool, wg *sync.WaitGroup) {
 
 	roomUpdateTimer := time.NewTimer(roomMaintenancePeriod)
 	ansiAliasTimer := time.NewTimer(ansiAliasReloadPeriod)
-	messageTimer := time.NewTimer(time.Millisecond)
+	eventLoopTimer := time.NewTimer(time.Millisecond)
 	turnTimer := time.NewTimer(time.Duration(c.TurnMs) * time.Millisecond)
 	statsTimer := time.NewTimer(time.Duration(10) * time.Second)
 
@@ -664,6 +664,7 @@ loop:
 			break loop
 		case <-statsTimer.C:
 
+			// TODO: Move this to events
 			util.LockMud()
 			w.UpdateStats()
 			util.UnlockMud()
@@ -673,6 +674,7 @@ loop:
 		case <-roomUpdateTimer.C:
 			slog.Debug(`MainWorker`, `action`, `rooms.RoomMaintenance()`)
 
+			// TODO: Move this to events
 			util.LockMud()
 			rooms.RoomMaintenance()
 			util.UnlockMud()
@@ -681,15 +683,16 @@ loop:
 
 		case <-ansiAliasTimer.C:
 
+			// TODO: Move this to events
 			util.LockMud()
 			templates.LoadAliases()
 			util.UnlockMud()
 
 			ansiAliasTimer.Reset(ansiAliasReloadPeriod)
 
-		case <-messageTimer.C:
+		case <-eventLoopTimer.C:
 
-			messageTimer.Reset(time.Millisecond)
+			eventLoopTimer.Reset(time.Millisecond)
 
 			util.LockMud()
 			w.EventLoop()