upd: moved message handler to Channel structHEADmaster

3 files changed, 118 insertions, 123 deletions

diff --git a/cmd/statsbot/main.go b/cmd/statsbot/main.go
index 69fc7a5..d756684 100644
--- a/cmd/statsbot/main.go
+++ b/cmd/statsbot/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"log"
+	"slices"
 
 	"github.com/gempir/go-twitch-irc"
 
@@ -26,7 +27,13 @@ func main() {
 	})
 
 	client.OnNewMessage(func(channel string, user twitch.User, message twitch.Message) {
-		go stats.HandleMessageEvent(channel, user, message, db)
+		i := slices.IndexFunc(channels, func(c stats.Channel) bool {
+			return c.Name() == channel
+		})
+
+		if i >= 0 {
+			go channels[i].HandleMessageEvent(user, message)
+		}
 	})
 
 	go stats.JoinChannels(&channels, client, db)
diff --git a/internal/channel.go b/internal/channel.go
index da051ac..c07c4f1 100644
--- a/internal/channel.go
+++ b/internal/channel.go
@@ -1,14 +1,17 @@
 package stats
 
 import (
+	"database/sql"
 	"log"
 	"slices"
+	"strings"
 	"time"
 
 	"github.com/gempir/go-twitch-irc"
 )
 
 type Channel struct {
+	dbid   int
 	id     string
 	name   string
 	emotes map[string][]Emote
@@ -16,7 +19,18 @@ type Channel struct {
 }
 
 func NewChannel(id string, name string, db *DatabaseConnection) Channel {
+	// channel
+	var dbid int
+
+	if err := db.QueryRow(
+		"SELECT id FROM channels WHERE alias_id = ?",
+		id,
+	).Scan(&dbid); err != nil {
+		log.Panicf("Failed to get channel: %v\n", err)
+	}
+
 	c := Channel{
+		dbid:   dbid,
 		id:     id,
 		name:   name,
 		emotes: make(map[string][]Emote),
@@ -45,6 +59,102 @@ func (c *Channel) updateEmotes() (err error) {
 }
 
 func (c *Channel) HandleMessageEvent(sender twitch.User, message twitch.Message) {
+	err := c.db.Ping()
+	if err != nil {
+		log.Panicf("Failed to ping a database connection: %v\n", err)
+	}
+
+	// user
+	var userId int64
+	var userName string
+	err = c.db.QueryRow(
+		"SELECT id, alias_name FROM users WHERE alias_id = ?",
+		sender.UserID,
+	).Scan(&userId, &userName)
+	if err == sql.ErrNoRows {
+		res, err := c.db.Exec("INSERT INTO users(alias_id, alias_name) VALUES (?, ?)", sender.UserID, sender.Username)
+		if err != nil {
+			log.Panicf("Error creating a new user: %v\n", err)
+		}
+
+		userId, _ = res.LastInsertId()
+		userName = sender.Username
+	} else if err != nil {
+		log.Panicf("Error getting user: %v\n", err)
+	}
+
+	if userName != sender.Username {
+		_, err = c.db.Exec("UPDATE users SET alias_name = ? WHERE id = ?", sender.Username, userId)
+		if err != nil {
+			log.Panicf("Failed to update username: %v\n", err)
+		}
+	}
+
+	parts := strings.Split(message.Text, " ")
+	for _, part := range parts {
+		part = strings.TrimSpace(part)
+		if len(part) == 0 {
+			continue
+		}
+
+		// word
+		var wordId int64
+		err = c.db.QueryRow(
+			"SELECT id FROM words WHERE name = ?",
+			part,
+		).Scan(&wordId)
+		if err == sql.ErrNoRows {
+			res, err := c.db.Exec("INSERT INTO words(name) VALUES (?)", part)
+			if err != nil {
+				log.Panicf("Error creating a new word: %v\n", err)
+			}
+
+			wordId, _ = res.LastInsertId()
+		} else if err != nil {
+			log.Panicf("Error getting word: %v\n", err)
+		}
+
+		// channel word
+		var cwordId int64
+		var usageCount int
+		err = c.db.QueryRow(
+			"SELECT id, usage_count FROM channel_words WHERE word_id = ? AND user_id = ? AND channel_id = ?",
+			wordId, userId, c.dbid,
+		).Scan(&cwordId, &usageCount)
+		if err == sql.ErrNoRows {
+			res, err := c.db.Exec("INSERT INTO channel_words(word_id, user_id, channel_id) VALUES (?, ?, ?)",
+				wordId,
+				userId,
+				c.dbid,
+			)
+			if err != nil {
+				log.Panicf("Error creating a new channel word: %v\n", err)
+			}
+
+			cwordId, _ = res.LastInsertId()
+			usageCount = 0
+		} else if err != nil {
+			log.Panicf("Error getting channel word: %v\n", err)
+		}
+
+		_, err := c.db.Exec(
+			`INSERT INTO channel_words(word_id, user_id, channel_id)
+			VALUES (?, ?, ?)
+			ON DUPLICATE KEY UPDATE
+				usage_count = usage_count + 1,
+				last_used_at = UTC_TIMESTAMP()`,
+			wordId,
+			userId,
+			c.dbid,
+		)
+		if err != nil {
+			log.Panicf("Error creating a new channel word: %vn", err)
+		}
+	}
+}
+
+func (c *Channel) Name() string {
+	return c.name
 }
 
 func JoinChannels(channels *[]Channel, client *twitch.Client, db *DatabaseConnection) {
diff --git a/internal/handlers.go b/internal/handlers.go
deleted file mode 100644
index b43b58f..0000000
--- a/internal/handlers.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package stats
-
-import (
-	"database/sql"
-	"log"
-	"strings"
-
-	"github.com/gempir/go-twitch-irc"
-)
-
-func HandleMessageEvent(channel string, user twitch.User, message twitch.Message, db *DatabaseConnection) {
-	err := db.Ping()
-	if err != nil {
-		log.Panicf("Failed to ping a database connection: %v\n", err)
-	}
-
-	// channel
-	var channelId int
-	var channelName string
-	err = db.QueryRow(
-		"SELECT id, alias_name FROM channels WHERE alias_id = ?",
-		message.Tags["room-id"],
-	).Scan(&channelId, &channelName)
-	if err != nil {
-		log.Panicf("Failed to get channel: %v\n", err)
-	}
-
-	if channelName != channel {
-		_, err = db.Exec("UPDATE channels SET alias_name = ? WHERE id = ?", channel, channelId)
-		if err != nil {
-			log.Panicf("Failed to update channel name: %v\n", err)
-		}
-	}
-
-	// user
-	var userId int64
-	var userName string
-	err = db.QueryRow(
-		"SELECT id, alias_name FROM users WHERE alias_id = ?",
-		user.UserID,
-	).Scan(&userId, &userName)
-	if err == sql.ErrNoRows {
-		res, err := db.Exec("INSERT INTO users(alias_id, alias_name) VALUES (?, ?)", user.UserID, user.Username)
-		if err != nil {
-			log.Panicf("Error creating a new user: %v\n", err)
-		}
-
-		userId, _ = res.LastInsertId()
-		userName = user.Username
-	} else if err != nil {
-		log.Panicf("Error getting user: %v\n", err)
-	}
-
-	if userName != user.Username {
-		_, err = db.Exec("UPDATE channels SET alias_name = ? WHERE id = ?", user.Username, userId)
-		if err != nil {
-			log.Panicf("Failed to update channel name: %v\n", err)
-		}
-	}
-
-	parts := strings.Split(message.Text, " ")
-	for _, part := range parts {
-		part = strings.TrimSpace(part)
-		if len(part) == 0 {
-			continue
-		}
-
-		// word
-		var wordId int64
-		err = db.QueryRow(
-			"SELECT id FROM words WHERE name = ?",
-			part,
-		).Scan(&wordId)
-		if err == sql.ErrNoRows {
-			res, err := db.Exec("INSERT INTO words(name) VALUES (?)", part)
-			if err != nil {
-				log.Panicf("Error creating a new word: %v\n", err)
-			}
-
-			wordId, _ = res.LastInsertId()
-		} else if err != nil {
-			log.Panicf("Error getting word: %v\n", err)
-		}
-
-		// channel word
-		var cwordId int64
-		var usageCount int
-		err = db.QueryRow(
-			"SELECT id, usage_count FROM channel_words WHERE word_id = ? AND user_id = ? AND channel_id = ?",
-			wordId, userId, channelId,
-		).Scan(&cwordId, &usageCount)
-		if err == sql.ErrNoRows {
-			res, err := db.Exec("INSERT INTO channel_words(word_id, user_id, channel_id) VALUES (?, ?, ?)",
-				wordId,
-				userId,
-				channelId,
-			)
-			if err != nil {
-				log.Panicf("Error creating a new channel word: %v\n", err)
-			}
-
-			cwordId, _ = res.LastInsertId()
-			usageCount = 0
-		} else if err != nil {
-			log.Panicf("Error getting channel word: %v\n", err)
-		}
-
-		_, err := db.Exec(
-			`INSERT INTO channel_words(word_id, user_id, channel_id)
-			VALUES (?, ?, ?)
-			ON DUPLICATE KEY UPDATE
-				usage_count = usage_count + 1,
-				last_used_at = UTC_TIMESTAMP()`,
-			wordId,
-			userId,
-			channelId,
-		)
-		if err != nil {
-			log.Panicf("Error creating a new channel word: %vn", err)
-		}
-	}
-}