fix(login): manually set the width for the textinput fields

TODO.md

@@ -1,11 +0,0 @@
-# progress
-it works nicely when there isn't spamming going on.
-
-if spamming:
-when pressing g while a message is being received the calculation messes up and the first shown message is actually the 2nd or 3rd
-when pressing G while a message is being received a message or two will be missing, im suspecting this happens because of the ToInsert gets written to the db but we already fetched from the db so ToInsert is empty even tho we haven't appened it yet. (same thing happens when going down with d)
--- potential fixes
- - save stuff to db message by message (this is slow as shit, but maybe goroutines could do something here ???)
- - same way of throttling the message receiving when a key is pressed such as g, G, d or etc..
- - maybe there's a way to optimize the readfromdb cmd, maybe the pointer stuff is slowing it down. idk
- - last resort is making this whole feature an option for people that know they have slow chats and want to keep the program open for days (idk)

cmds/cmds.go

@@ -22,7 +22,6 @@ import (
 
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/illusionman1212/gorc/irc"
-	"github.com/illusionman1212/gorc/irc/commands"
 )
 
 type ConnectMsg struct{}
@@ -33,7 +32,7 @@ func Connect() tea.Msg {
 
 func Quit(client *irc.Client) tea.Cmd {
 	return func() tea.Msg {
-		if client.TcpConn != nil {
+		if client.TCPConn != nil {
 			client.SendCommand("QUIT")
 		}
 
@@ -41,15 +40,6 @@ func Quit(client *irc.Client) tea.Cmd {
 	}
 }
 
-type TickMsg struct{}
-
-func Tick(client *irc.Client) tea.Cmd {
-	return tea.Tick(time.Second/60, func(time.Time) tea.Msg {
-		client.SendCommand(commands.PRIVMSG, "#hell", fmt.Sprintf("%d", client.Ticks))
-		return TickMsg{}
-	})
-}
-
 type SendPrivMsgMsg struct {
 	Msg       string
 	Timestamp string
@@ -84,132 +74,3 @@ type UpdateTabBarMsg struct{}
 func UpdateTabBar() tea.Msg {
 	return UpdateTabBarMsg{}
 }
-
-type ReadHistoryFromDBMsg struct {
-	LinesRead uint64
-	Direction string
-}
-
-func ReadHistoryFromDB(client *irc.Client, linesToRead int, direction string) tea.Cmd {
-	hash := client.Channels[client.ActiveChannelIndex].Hash
-	scrollBackBufFirstLine := client.Channels[client.ActiveChannelIndex].ScrollBackBufFirstLine
-
-	messages := make([]string, 0)
-
-	switch direction {
-	case "top":
-		client.DB.
-			Table("histories").
-			Select("message").
-			Where("hash = ?", hash).
-			Limit(linesToRead).
-			Scan(&messages).
-			Order("line ASC")
-
-		// set the new messages
-		copy(client.Channels[client.ActiveChannelIndex].ScrollBackBuf, messages)
-		// adjust the scrollback buf first line
-		client.Channels[client.ActiveChannelIndex].ScrollBackBufFirstLine = 1
-
-		return func() tea.Msg {
-			return ReadHistoryFromDBMsg{
-				LinesRead: 0,
-				Direction: "top",
-			}
-		}
-	case "up":
-		limit := linesToRead
-		linesToGet := 0
-
-		if linesToRead > int(scrollBackBufFirstLine) {
-			limit = int(scrollBackBufFirstLine) - 1
-			linesToGet = int(scrollBackBufFirstLine) - limit
-		} else {
-			linesToGet = int(scrollBackBufFirstLine) - linesToRead
-		}
-
-		client.DB.
-			Table("histories").
-			Select("message").
-			Where("hash = ? AND line >= ?", hash, linesToGet).
-			Limit(limit).
-			Scan(&messages).
-			Order("line ASC")
-
-		if len(messages) != 0 {
-			// prepend to the scroll back buf
-			client.Channels[client.ActiveChannelIndex].ScrollBackBuf = append(messages, client.Channels[client.ActiveChannelIndex].ScrollBackBuf...)
-			client.Channels[client.ActiveChannelIndex].ScrollBackBuf = client.Channels[client.ActiveChannelIndex].ScrollBackBuf[:irc.SCROLLBACK_MAX]
-			// adjust the scrollback buf first line
-			client.Channels[client.ActiveChannelIndex].ScrollBackBufFirstLine -= uint64(limit)
-
-			return func() tea.Msg {
-				return ReadHistoryFromDBMsg{
-					LinesRead: uint64(limit),
-					Direction: "up",
-				}
-			}
-		}
-	case "down":
-		client.DB.
-			Table("histories").
-			Select("message").
-			Where("hash = ? AND line >= ?", hash, client.Channels[client.ActiveChannelIndex].ScrollBackBufFirstLine+irc.SCROLLBACK_MAX).
-			Limit(linesToRead).
-			Scan(&messages).
-			Order("line ASC")
-		linesGot := len(messages)
-		if len(messages) != 0 {
-			extraMessagesLen := 0
-			// append to the scroll back buf
-			client.Channels[client.ActiveChannelIndex].ScrollBackBuf = append(client.Channels[client.ActiveChannelIndex].ScrollBackBuf, messages...)
-			// if we reached the end of the messages in the db. try appending the messages in the ToInsert buffer
-			if linesGot < linesToRead {
-				for _, history := range client.Channels[client.ActiveChannelIndex].ToInsert {
-					client.Channels[client.ActiveChannelIndex].ScrollBackBuf = append(client.Channels[client.ActiveChannelIndex].ScrollBackBuf, history.Message)
-				}
-				extraMessagesLen = len(client.Channels[client.ActiveChannelIndex].ToInsert)
-			}
-			client.Channels[client.ActiveChannelIndex].ScrollBackBuf = client.Channels[client.ActiveChannelIndex].ScrollBackBuf[len(client.Channels[client.ActiveChannelIndex].ScrollBackBuf)-irc.SCROLLBACK_MAX:]
-			// adjust the scrollback buf first line
-			client.Channels[client.ActiveChannelIndex].ScrollBackBufFirstLine += uint64(linesGot) + uint64(extraMessagesLen)
-
-			return func() tea.Msg {
-				return ReadHistoryFromDBMsg{
-					LinesRead: uint64(linesGot) + uint64(extraMessagesLen),
-					Direction: "down",
-				}
-			}
-		}
-	case "bottom":
-		client.DB.Raw("SELECT t.message FROM (SELECT line, message FROM histories WHERE hash = ? ORDER BY line DESC LIMIT ?) t ORDER BY t.line ASC;", hash, linesToRead).
-			Scan(&messages)
-
-		toInsert := make([]string, 0)
-
-		for _, history := range client.Channels[client.ActiveChannelIndex].ToInsert {
-			toInsert = append(toInsert, history.Message)
-		}
-
-		// set the new messages
-		copy(client.Channels[client.ActiveChannelIndex].ScrollBackBuf, messages)
-		client.Channels[client.ActiveChannelIndex].ScrollBackBuf = append(client.Channels[client.ActiveChannelIndex].ScrollBackBuf, toInsert...)
-		client.Channels[client.ActiveChannelIndex].ScrollBackBuf = client.Channels[client.ActiveChannelIndex].ScrollBackBuf[len(toInsert):]
-		// adjust the scrollback buf first line
-		client.Channels[client.ActiveChannelIndex].ScrollBackBufFirstLine = client.Channels[client.ActiveChannelIndex].TotalLines - irc.SCROLLBACK_MAX + uint64(len(toInsert))
-
-		return func() tea.Msg {
-			return ReadHistoryFromDBMsg{
-				LinesRead: 0,
-				Direction: "bottom",
-			}
-		}
-	}
-
-	return func() tea.Msg {
-		return ReadHistoryFromDBMsg{
-			LinesRead: 0,
-			Direction: "unknown",
-		}
-	}
-}

db/db.go

@@ -1,25 +0,0 @@
-package db
-
-import (
-	"gorm.io/driver/sqlite"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-)
-
-type History struct {
-	Hash    string `gorm:"index"`
-	Line    uint64 `gorm:"index" gorm:"unique"`
-	Message string
-}
-
-func ConnectToDB() (*gorm.DB, error) {
-	db, err := gorm.Open(sqlite.Open("gorc.db"), &gorm.Config{
-		Logger:            logger.Default.LogMode(logger.Silent),
-		AllowGlobalUpdate: true,
-	})
-
-	db.AutoMigrate(&History{})
-	db.Delete(&History{})
-
-	return db, err
-}

go.mod

@@ -1,19 +1,33 @@
 module github.com/illusionman1212/gorc
 
-go 1.16
+go 1.23.0
 
-replace github.com/charmbracelet/bubbles => /home/illusion/Desktop/repos/bubbles
+toolchain go1.24.6
 
 require (
-	github.com/charmbracelet/bubbles v0.10.2
+	github.com/charmbracelet/bubbles v0.21.0
-	github.com/charmbracelet/bubbletea v0.19.3
+	github.com/charmbracelet/bubbletea v1.3.6
-	github.com/charmbracelet/lipgloss v0.4.0
+	github.com/charmbracelet/lipgloss v1.1.0
-	github.com/containerd/console v1.0.3 // indirect
+)
-	github.com/mattn/go-isatty v0.0.14 // indirect
+
-	github.com/mattn/go-sqlite3 v1.14.13 // indirect
+require (
-	github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 // indirect
+	github.com/atotto/clipboard v0.1.4 // indirect
-	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
+	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
-	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+	github.com/charmbracelet/colorprofile v0.3.1 // indirect
-	gorm.io/driver/sqlite v1.3.4
+	github.com/charmbracelet/x/ansi v0.10.1 // indirect
-	gorm.io/gorm v1.23.6 // indirect
+	github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
+	github.com/charmbracelet/x/term v0.2.1 // indirect
+	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
+	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-localereader v0.0.1 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
+	github.com/muesli/cancelreader v0.2.2 // indirect
+	github.com/muesli/termenv v0.16.0 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
+	golang.org/x/sync v0.16.0 // indirect
+	golang.org/x/sys v0.35.0 // indirect
+	golang.org/x/text v0.28.0 // indirect
 )

go.sum

@@ -1,66 +1,49 @@
 github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
 github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
-github.com/charmbracelet/bubbletea v0.19.3 h1:OKeO/Y13rQQqt4snX+lePB0QrnW80UdrMNolnCcmoAw=
+github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
-github.com/charmbracelet/bubbletea v0.19.3/go.mod h1:VuXF2pToRxDUHcBUcPmCRUHRvFATM4Ckb/ql1rBl3KA=
+github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
-github.com/charmbracelet/harmonica v0.1.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
+github.com/charmbracelet/bubbles v0.21.0 h1:9TdC97SdRVg/1aaXNVWfFH3nnLAwOXr8Fn6u6mfQdFs=
-github.com/charmbracelet/lipgloss v0.4.0 h1:768h64EFkGUr8V5yAKV7/Ta0NiVceiPaV+PphaW1K9g=
+github.com/charmbracelet/bubbles v0.21.0/go.mod h1:HF+v6QUR4HkEpz62dx7ym2xc71/KBHg+zKwJtMw+qtg=
-github.com/charmbracelet/lipgloss v0.4.0/go.mod h1:vmdkHvce7UzX6xkyf4cca8WlwdQ5RQr8fzta+xl7BOM=
+github.com/charmbracelet/bubbletea v1.3.6 h1:VkHIxPJQeDt0aFJIsVxw8BQdh/F/L2KKZGsK6et5taU=
-github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ=
+github.com/charmbracelet/bubbletea v1.3.6/go.mod h1:oQD9VCRQFF8KplacJLo28/jofOI2ToOfGYeFgBBxHOc=
-github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
+github.com/charmbracelet/colorprofile v0.3.1 h1:k8dTHMd7fgw4bnFd7jXTLZrSU/CQrKnL3m+AxCzDz40=
-github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
+github.com/charmbracelet/colorprofile v0.3.1/go.mod h1:/GkGusxNs8VB/RSOh3fu0TJmQ4ICMMPApIIVn0KszZ0=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
-github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
+github.com/charmbracelet/x/ansi v0.10.1 h1:rL3Koar5XvX0pHGfovN03f5cxLbCF2YvLeyz7D2jVDQ=
-github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/charmbracelet/x/ansi v0.10.1/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=
-github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/charmbracelet/x/cellbuf v0.0.13 h1:/KBBKHuVRbq1lYx5BzEHBAFBP8VcQzJejZ/IA3iR28k=
-github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
+github.com/charmbracelet/x/cellbuf v0.0.13/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs=
-github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
-github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
+github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
+github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
-github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
+github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
-github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
+github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
-github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
+github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
-github.com/mattn/go-sqlite3 v1.14.12 h1:TJ1bhYJPV44phC+IMu1u2K/i5RriLTPe+yc68XDJ1Z0=
+github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
-github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
-github.com/mattn/go-sqlite3 v1.14.13 h1:1tj15ngiFfcZzii7yd82foL+ks+ouQcj8j/TPq3fk1I=
+github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
-github.com/mattn/go-sqlite3 v1.14.13/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
-github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho=
+github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
-github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 h1:kMlmsLSbjkikxQJ1IPwaM+7LJ9ltFu/fi8CRzvSnQmA=
-github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho=
-github.com/muesli/reflow v0.2.1-0.20210115123740-9e1d0d53df68/go.mod h1:Xk+z4oIWdQqJzsxyjgl3P22oYZnHdZ8FFTHAQQt5BMQ=
-github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
-github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
-github.com/muesli/termenv v0.9.0 h1:wnbOaGz+LUR3jNT0zOzinPnyDaCZUQRZj9GxK8eRVl8=
-github.com/muesli/termenv v0.9.0/go.mod h1:R/LzAKf+suGs4IsO95y7+7DpFHO0KABgnZqtlyx2mBw=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
-golang.org/x/term v0.0.0-20210422114643-f5beecf764ed/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
+golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/sqlite v1.3.4 h1:NnFOPVfzi4CPsJPH4wXr6rMkPb4ElHEqKMvrsx9c9Fk=
-gorm.io/driver/sqlite v1.3.4/go.mod h1:B+8GyC9K7VgzJAcrcXMRPdnMcck+8FgJynEehEPM16U=
-gorm.io/gorm v1.23.4 h1:1BKWM67O6CflSLcwGQR7ccfmC4ebOxQrTfOQGRE9wjg=
-gorm.io/gorm v1.23.4/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
-gorm.io/gorm v1.23.6 h1:KFLdNgri4ExFFGTRGGFWON2P1ZN28+9SJRN8voOoYe0=
-gorm.io/gorm v1.23.6/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=

irc/client.go

@@ -26,10 +26,8 @@ import (
 
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/illusionman1212/gorc/db"
 	"github.com/illusionman1212/gorc/irc/commands"
 	"github.com/illusionman1212/gorc/ui"
-	"gorm.io/gorm"
 )
 
 type User struct {
@@ -44,26 +42,8 @@ type Channel struct {
 	// Channel topic
 	Topic string
 
-	// Scrollback buffer for the channel message history
+	// Channel messages history
-	ScrollBackBuf []string
+	History string
-
-	// Whethere the viewport is at the bottom or not
-	AtBottom bool
-
-	// Total amount of lines that have been received from the tcp conn
-	// and written to the history db
-	TotalLines uint64
-
-	// Buffer of messages that need to be inserted into the db
-	ToInsert []db.History
-
-	// Position/Index of first line in the scrollback buffer as mapped
-	// to TotalLines.
-	// Last line is ScrollBackBufFirstLine + SCROLLBACK_MAX - 1
-	ScrollBackBufFirstLine uint64
-
-	// Unique sha1 hash for the channel made from server hostname and channel name
-	Hash string
 
 	// Users in this channel
 	// The map key is the user's nickname
@@ -74,7 +54,7 @@ type Channel struct {
 
 type Client struct {
 	// tcp connection
-	TcpConn net.Conn
+	TCPConn net.Conn
 
 	// Host that client is connected to
 	Host string
@@ -97,19 +77,18 @@ type Client struct {
 	// Reference to the bubbletea program
 	Tea *tea.Program
 
-	// TODO: remove this
-	Ticks int
-
-	// DB reference
-	DB *gorm.DB
-
 	// Index of the first visible tab in the tab bar
 	FirstTabIndexInTabBar int
 
 	// Index of the last visible tab in the tab bar
 	LastTabIndexInTabBar int
+
+	// The acknowledged capabilities
+	EnabledCapabilities Capabilities
 }
 
+type Capabilities map[string]string
+
 type MsgFmtOpts struct {
 	WithTimestamp bool
 	AsServerMsg   bool
@@ -119,15 +98,12 @@ type MsgFmtOpts struct {
 
 var notImpl = lipgloss.NewStyle().Foreground(ui.ErrorColor).Render("[NOT IMPL]")
 var serverMsgStyle = lipgloss.NewStyle().Foreground(ui.ServerMsgColor)
-var timestampStyle = serverMsgStyle.Copy()
+var timestampStyle = serverMsgStyle
 var dateStyle = lipgloss.NewStyle().Foreground(ui.DateColor)
 
-const (
+const CRLF = "\r\n"
-	CRLF           = "\r\n"
-	SCROLLBACK_MAX = 400
-)
 
-func (c *Channel) AppendMsg(host string, database *gorm.DB, timestamp string, fullMsg string, opts MsgFmtOpts) {
+func (c *Channel) AppendMsg(timestamp string, fullMsg string, opts MsgFmtOpts) {
 	prefixes := ""
 	style := ui.DefaultStyle
 
@@ -148,35 +124,10 @@ func (c *Channel) AppendMsg(host string, database *gorm.DB, timestamp string, fu
 		style = dateStyle
 	}
 
-	finalMsg := prefixes + style.Render(fullMsg)
+	c.History += prefixes + style.Render(fullMsg) + CRLF
-
-	c.TotalLines++
-
-	history := db.History{Hash: c.Hash, Line: c.TotalLines, Message: finalMsg}
-	c.ToInsert = append(c.ToInsert, history)
-
-	if c.TotalLines%10 == 0 {
-		database.Create(c.ToInsert)
-		c.ToInsert = nil
-	}
-
-	if len(c.ScrollBackBuf) < SCROLLBACK_MAX {
-		c.ScrollBackBuf = append(c.ScrollBackBuf, prefixes+style.Render(fullMsg))
-		// We haven't reached the bottom yet so the first line is still 1
-		c.ScrollBackBufFirstLine = 1
-	} else if c.AtBottom && len(c.ScrollBackBuf) >= SCROLLBACK_MAX {
-		// TODO: when pressing 'g' in viewport, we need to set this to 1
-		// TODO: when pressing 'G' in viewport, we need to set this to TotalLines - 1000 + 1
-		// TODO: when going up in viewport, we need to decrement the amount of lines by how many lines we need to prepend to the scrollbackbuf
-		// TODO: when going down in viewport, we need to increment the amount of lines by how many lines we need to append to the scrollbackbuf
-		// If we're at bottom and we're appending a line, then we increment the first line
-		c.ScrollBackBufFirstLine++
-		c.ScrollBackBuf = append(c.ScrollBackBuf, prefixes+style.Render(fullMsg))
-		c.ScrollBackBuf = c.ScrollBackBuf[1:]
-	}
 }
 
-func (s *Client) Initialize(host string, port string, tlsEnabled bool) {
+func (c *Client) Initialize(host string, port string, tlsEnabled bool) {
 	addr := fmt.Sprintf("%s:%s", host, port)
 
 	if tlsEnabled {
@@ -187,12 +138,12 @@ func (s *Client) Initialize(host string, port string, tlsEnabled bool) {
 			log.Fatal(err)
 		}
 
-		s.TcpConn = conn
+		c.TCPConn = conn
-		s.Host = host
+		c.Host = host
-		s.Port = port
+		c.Port = port
-		s.ActiveChannel = host
+		c.ActiveChannel = host
-		s.Channels = make([]Channel, 0)
+		c.Channels = make([]Channel, 0)
-		s.Ticks = 1
+		c.EnabledCapabilities = make(Capabilities, 0)
 		return
 	}
 
@@ -206,12 +157,12 @@ func (s *Client) Initialize(host string, port string, tlsEnabled bool) {
 		log.Fatal(err)
 	}
 
-	s.TcpConn = conn
+	c.TCPConn = conn
-	s.Host = host
+	c.Host = host
-	s.Port = port
+	c.Port = port
-	s.ActiveChannel = host
+	c.ActiveChannel = host
-	s.Channels = make([]Channel, 0)
+	c.Channels = make([]Channel, 0)
-	s.Ticks = 1
+	c.EnabledCapabilities = make(Capabilities, 0)
 }
 
 func (c *Client) Register(nick string, password string, channel string) {
@@ -220,17 +171,14 @@ func (c *Client) Register(nick string, password string, channel string) {
 		Users: make(map[string]User),
 	})
 
-	c.SendCommand(commands.CAP, "LS")
+	c.SendCommand(commands.CAP, "LS", "302")
 	if password != "" {
 		c.SendCommand(commands.PASS, password)
 	}
-	// TODO: check if nickname has spaces and remove them
 	c.SendCommand(commands.NICK, nick)
 	// set user-wanted nickname
 	c.Nickname = nick
 	c.SendCommand(commands.USER, nick, "0", "*", nick)
-	// TODO: CAP REQ :whatever capability the client recognizes and supports
-	c.SendCommand(commands.CAP, "END")
 	// joining a channel when registering is optional
 	if channel != "" {
 		c.SendCommand(commands.JOIN, channel)
@@ -244,13 +192,13 @@ func (c *Client) SetDay() {
 
 	now := time.Now()
 	msg := fmt.Sprintf("————— %s %d —————", now.Month().String(), now.Day())
-	c.Channels[0].AppendMsg(c.Host, c.DB, "", msg, msgOpts)
+	c.Channels[0].AppendMsg("", msg, msgOpts)
 
 	// TODO: append new day to each channel whenever the day changes
 }
 
 func (c Client) SendCommand(cmd string, params ...string) {
-	if c.TcpConn == nil {
+	if c.TCPConn == nil {
 		// TODO: properly handle the error instead of Fatal-ing
 		log.Fatal("Attempted to write data to nil connection")
 	}
@@ -281,5 +229,5 @@ func (c Client) SendCommand(cmd string, params ...string) {
 		}
 	}
 
-	c.TcpConn.Write([]byte(cmd + paramsString + CRLF))
+	c.TCPConn.Write([]byte(cmd + paramsString + CRLF))
 }

irc/commands/commands.go

@@ -116,6 +116,7 @@ const (
 	RPL_MYINFO          = "004" // RFC2812 - Implemented
 	RPL_ISUPPORT        = "005" // ??????? - Not Implemented (TODO:)
 	RPL_BOUNCE          = "010" // ??????? - Not Implemented (TODO:)
+	RPL_REMOTEISUPPORT  = "105" // ??????? - Not Implemented (TODO:) // Exact same as RPL_ISUPPORT but for remote servers
 	RPL_TRACELINK       = "200" // RFC1459 - Not Implemented (TODO:)
 	RPL_TRACECONNECTING = "201" // RFC1459 - Not Implemented (TODO:)
 	RPL_TRACEHANDSHAKE  = "202" // RFC1459 - Not Implemented (TODO:)
@@ -240,7 +241,7 @@ const (
 	ERR_NOTOPLEVEL        = "413" // RFC1459 - Not Implemented (TODO:)
 	ERR_WILDTOPLEVEL      = "414" // RFC1459 - Not Implemented (TODO:)
 	ERR_BADMASK           = "415" // RFC2812 - Not Implemented (TODO:)
-	ERR_UNKNOWNCOMMAND    = "421" // RFC1459 - Not Implemented (TODO:)
+	ERR_UNKNOWNCOMMAND    = "421" // RFC1459 - Implemented
 	ERR_NOMOTD            = "422" // RFC1459 - Not Implemented (TODO:)
 	ERR_NOADMININFO       = "423" // RFC1459 - Not Implemented (TODO:)
 	ERR_FILEERROR         = "424" // RFC1459 - Not Implemented (TODO:)
@@ -312,7 +313,7 @@ var Features = map[string]bool{
 	"CHANLIMIT":   true,
 	"CHANMODES":   true,
 	"CHANNELLEN":  true,
-	"CHANTYPES":   true,
+	"CHANTYPES":   true, // Channel Types. Default is #. Available are #&
 	"CHARSET":     true, // Deprecated but might still be used
 	"CLIENTVER":   true, // Deprecated but might still be used
 	"CNOTICE":     true,
@@ -364,7 +365,42 @@ var Features = map[string]bool{
 	"WHOX":        true,
 }
 
-// Messages MUST end in CRLF and SHOULD be encoded and decoded using UTF-8 (with fallbacks such as Latin-1).
+var Capabilities = map[string]bool{
-// Names are casemapped, read the casemapping from the RPL_ISUPPORT the server sends when registration is completed.
+	// Twitch-specific capabilities
+	"twitch.tv/membership": false,
+	"twitch.tv/commands":   false,
+	"twitch.tv/tags":       false,
 
-// When receiving a numeric reply, client MUST be able to handle any number of parameters on a numeric reply.
+	// Solanum-specific capabilities
+	"solanum.chat/identify-msg": false,
+	"solanum.chat/oper":         false,
+	"solanum.chat/realhost":     false,
+
+	// IRCv3 capabilities
+	"account-notify":       false,
+	"account-registration": false, // Draft
+	"account-tag":          false,
+	"away-notify":          false,
+	"batch":                false,
+	"cap-notify":           true,
+	"channel-rename":       false, // Draft
+	"chathistory":          false, // Draft
+	"chghost":              false,
+	"echo-message":         false,
+	"event-playback":       false, // Draft
+	"extended-join":        false,
+	"extended-monitor":     false,
+	"invite-notify":        false,
+	"labeled-response":     false,
+	"message-tags":         false,
+	"metadata":             false,
+	"monitor":              false,
+	"multi-prefix":         false,
+	"multiline":            false, // Draft
+	"read-marker":          false, // Draft
+	"sasl":                 false,
+	"server-time":          true,
+	"setname":              false,
+	"tls":                  false, // Deprecated
+	"userhost-in-names":    false,
+}

irc/handler/handler.go

@@ -18,7 +18,6 @@ package handler
 
 import (
 	"bufio"
-	"crypto/sha1"
 	"fmt"
 	"io"
 	"log"
@@ -26,6 +25,8 @@ import (
 	"strings"
 	"time"
 
+	"slices"
+
 	"github.com/illusionman1212/gorc/cmds"
 	"github.com/illusionman1212/gorc/irc"
 	"github.com/illusionman1212/gorc/irc/commands"
@@ -34,7 +35,7 @@ import (
 
 func ReadLoop(client *irc.Client) {
 	// 512 bytes as a base + 8192 additional bytes for tags
-	r := bufio.NewReaderSize(client.TcpConn, 8192+512)
+	r := bufio.NewReaderSize(client.TCPConn, 8192+512)
 
 	for {
 		msg, err := r.ReadString('\n')
@@ -42,7 +43,7 @@ func ReadLoop(client *irc.Client) {
 			if err != io.EOF {
 				log.Println(err)
 			}
-			client.TcpConn.Close()
+			client.TCPConn.Close()
 			return
 		}
 
@@ -70,7 +71,7 @@ func handlePrivMsg(msg parser.IRCMessage, client *irc.Client) {
 
 	for i, c := range client.Channels {
 		if c.Name == channel {
-			client.Channels[i].AppendMsg(client.Host, client.DB, msg.Timestamp, privMsg, msgOpts)
+			client.Channels[i].AppendMsg(msg.Timestamp, privMsg, msgOpts)
 		}
 	}
 }
@@ -87,24 +88,13 @@ func handleJoin(msg parser.IRCMessage, client *irc.Client) {
 	}
 
 	if nick == client.Nickname {
-		for _, regChannel := range client.Channels {
-			if regChannel.Name == channel {
-				client.Tea.Send(cmds.SwitchChannels())
-				return
-			}
-		}
-		hash := sha1.New()
-		hash.Write([]byte(client.Host + " " + channel))
-		hashStr := fmt.Sprintf("%x", hash.Sum(nil))
-
 		client.Channels = append(client.Channels, irc.Channel{
 			Name:  channel,
 			Users: make(map[string]irc.User),
-			Hash:  hashStr,
 		})
 		client.ActiveChannelIndex = len(client.Channels) - 1
 		client.ActiveChannel = channel
-		client.Channels[client.ActiveChannelIndex].AppendMsg(client.Host, client.DB, msg.Timestamp, joinMsg, msgOpts)
+		client.Channels[client.ActiveChannelIndex].AppendMsg(msg.Timestamp, joinMsg, msgOpts)
 		if _, exists := client.Channels[client.ActiveChannelIndex].Users[nick]; !exists {
 			client.Channels[client.ActiveChannelIndex].Users[nick] = irc.User{}
 		}
@@ -112,7 +102,7 @@ func handleJoin(msg parser.IRCMessage, client *irc.Client) {
 	} else {
 		for i, c := range client.Channels {
 			if c.Name == channel {
-				client.Channels[i].AppendMsg(client.Host, client.DB, msg.Timestamp, joinMsg, msgOpts)
+				client.Channels[i].AppendMsg(msg.Timestamp, joinMsg, msgOpts)
 				if _, exists := client.Channels[i].Users[nick]; !exists {
 					client.Channels[i].Users[nick] = irc.User{}
 				}
@@ -140,7 +130,7 @@ func handleQuit(msg parser.IRCMessage, client *irc.Client) {
 		if i == 0 {
 			continue
 		}
-		client.Channels[i].AppendMsg(client.Host, client.DB, msg.Timestamp, quitMsg, msgOpts)
+		client.Channels[i].AppendMsg(msg.Timestamp, quitMsg, msgOpts)
 		delete(client.Channels[i].Users, nick)
 	}
 
@@ -165,14 +155,14 @@ func handlePart(msg parser.IRCMessage, client *irc.Client) {
 	for i, c := range client.Channels {
 		if c.Name == channel {
 			if nick == client.Nickname {
-				client.Channels = append(client.Channels[:i], client.Channels[i+1:]...)
+				client.Channels = slices.Delete(client.Channels, i, i+1)
 				if client.ActiveChannelIndex >= i {
 					client.ActiveChannelIndex--
 					client.ActiveChannel = client.Channels[client.ActiveChannelIndex].Name
 				}
 				client.LastTabIndexInTabBar--
 			} else {
-				client.Channels[i].AppendMsg(client.Host, client.DB, msg.Timestamp, partMsg, msgOpts)
+				client.Channels[i].AppendMsg(msg.Timestamp, partMsg, msgOpts)
 				delete(client.Channels[i].Users, nick)
 			}
 		}
@@ -181,6 +171,87 @@ func handlePart(msg parser.IRCMessage, client *irc.Client) {
 	client.Tea.Send(cmds.SwitchChannels())
 }
 
+func handleCAP(msg parser.IRCMessage, client *irc.Client) {
+	switch msg.Parameters[1] {
+	case "LIST":
+		fallthrough
+	case "NEW":
+		fallthrough
+	case "LS":
+		caps := strings.Split(msg.Parameters[2], " ")
+		recognizedCaps := make([]irc.Capabilities, 0)
+		capabilities := make(irc.Capabilities, 0)
+		length := 0
+
+		for _, capability := range caps {
+			// NOTE: not sure if I should store the cap value the server advertises or use my own
+			parts := strings.Split(capability, "=")
+			key := parts[0]
+			value := ""
+			if len(parts) > 1 {
+				value = parts[1]
+			}
+
+			if commands.Capabilities[key] {
+				// When the final parameter approaches 510 bytes,
+				// we send multiple REQ commands
+				// (https://ircv3.net/specs/extensions/capability-negotiation.html#the-cap-req-subcommand)
+				if length+len(capability) >= 500 {
+					recognizedCaps = append(recognizedCaps, capabilities)
+					capabilities = make(irc.Capabilities, 0)
+					length = 0
+				}
+
+				capabilities[key] = value
+				length += len(capability)
+			} else {
+				log.Println("Unknown capability:", capability)
+			}
+		}
+		recognizedCaps = append(recognizedCaps, capabilities)
+
+		for _, capsList := range recognizedCaps {
+			list := make([]string, 0)
+			for key, value := range capsList {
+				if len(value) > 0 {
+					list = append(list, key+"="+value)
+				} else {
+					list = append(list, key)
+				}
+			}
+			client.SendCommand(commands.CAP, "REQ", strings.Join(list, " "))
+		}
+		client.SendCommand(commands.CAP, "END")
+	case "ACK":
+		caps := strings.Split(msg.Parameters[2], " ")
+		for _, capability := range caps {
+			if capability[0] == '-' {
+				delete(client.EnabledCapabilities, capability[1:])
+			} else {
+				parts := strings.Split(capability, "=")
+				key := parts[0]
+				value := ""
+				if len(parts) > 1 {
+					value = parts[1]
+				}
+				client.EnabledCapabilities[key] = value
+			}
+		}
+	case "NAK":
+		caps := strings.Split(msg.Parameters[2], " ")
+		msgOpts := irc.MsgFmtOpts{
+			WithTimestamp: true,
+			AsServerMsg:   true,
+		}
+		client.Channels[0].AppendMsg(msg.Timestamp, "Unrecognized capabilities: "+strings.Join(caps, " "), msgOpts)
+	case "DEL":
+		caps := strings.Split(msg.Parameters[2], " ")
+		for _, capability := range caps {
+			delete(client.EnabledCapabilities, capability)
+		}
+	}
+}
+
 func handleWELCOME(msg parser.IRCMessage, client *irc.Client) {
 	nick := msg.Parameters[0]
 	welcomeMsg := msg.Parameters[1]
@@ -192,7 +263,7 @@ func handleWELCOME(msg parser.IRCMessage, client *irc.Client) {
 
 	// set server-registered nickname
 	client.Nickname = nick
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, welcomeMsg, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, welcomeMsg, msgOpts)
 }
 
 func handleYOURHOST(msg parser.IRCMessage, client *irc.Client) {
@@ -203,7 +274,7 @@ func handleYOURHOST(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, host, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, host, msgOpts)
 }
 
 func handleCREATED(msg parser.IRCMessage, client *irc.Client) {
@@ -214,7 +285,7 @@ func handleCREATED(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, created, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, created, msgOpts)
 }
 
 func handleMYINFO(msg parser.IRCMessage, client *irc.Client) {
@@ -225,7 +296,7 @@ func handleMYINFO(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, info, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, info, msgOpts)
 }
 
 func handleLUSERCLIENT(msg parser.IRCMessage, client *irc.Client) {
@@ -236,7 +307,7 @@ func handleLUSERCLIENT(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func handleLUSEROP(msg parser.IRCMessage, client *irc.Client) {
@@ -247,7 +318,7 @@ func handleLUSEROP(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func handleLUSERUNKNOWN(msg parser.IRCMessage, client *irc.Client) {
@@ -258,7 +329,7 @@ func handleLUSERUNKNOWN(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func handleLUSERCHANNELS(msg parser.IRCMessage, client *irc.Client) {
@@ -269,7 +340,7 @@ func handleLUSERCHANNELS(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func handleLUSERME(msg parser.IRCMessage, client *irc.Client) {
@@ -280,7 +351,7 @@ func handleLUSERME(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func handleLOCALUSERS(msg parser.IRCMessage, client *irc.Client) {
@@ -291,7 +362,7 @@ func handleLOCALUSERS(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func handleGLOBALUSERS(msg parser.IRCMessage, client *irc.Client) {
@@ -302,7 +373,7 @@ func handleGLOBALUSERS(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func handleWHOISUSER(msg parser.IRCMessage, client *irc.Client) {
@@ -324,8 +395,8 @@ func handleWHOISUSER(msg parser.IRCMessage, client *irc.Client) {
 		realName,
 	)
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, "WHOIS Information", msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, "WHOIS Information", msgOpts)
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func handleWHOISSERVER(msg parser.IRCMessage, client *irc.Client) {
@@ -343,7 +414,7 @@ func handleWHOISSERVER(msg parser.IRCMessage, client *irc.Client) {
 		serverInfo,
 	)
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func handleWHOISIDLE(msg parser.IRCMessage, client *irc.Client) {
@@ -367,7 +438,7 @@ func handleWHOISIDLE(msg parser.IRCMessage, client *irc.Client) {
 		idleSeconds,
 		since.Format(time.ANSIC),
 	)
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func handleENDOFWHOIS(msg parser.IRCMessage, client *irc.Client) {
@@ -378,7 +449,7 @@ func handleENDOFWHOIS(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func handleWHOISCHANNELS(msg parser.IRCMessage, client *irc.Client) {
@@ -391,7 +462,7 @@ func handleWHOISCHANNELS(msg parser.IRCMessage, client *irc.Client) {
 
 	message := fmt.Sprintf("channels: %s", chans)
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func handleNAMREPLY(msg parser.IRCMessage, client *irc.Client) {
@@ -432,7 +503,7 @@ func handleMOTDStart(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func handleMOTD(msg parser.IRCMessage, client *irc.Client) {
@@ -443,7 +514,7 @@ func handleMOTD(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, messageLine, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, messageLine, msgOpts)
 }
 
 func handleWHOISHOST(msg parser.IRCMessage, client *irc.Client) {
@@ -454,7 +525,7 @@ func handleWHOISHOST(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func handleWHOISMODES(msg parser.IRCMessage, client *irc.Client) {
@@ -465,7 +536,7 @@ func handleWHOISMODES(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func handleNOSUCHSERVER(msg parser.IRCMessage, client *irc.Client) {
@@ -476,7 +547,18 @@ func handleNOSUCHSERVER(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
+}
+
+func handleUNKNOWNCOMMAND(msg parser.IRCMessage, client *irc.Client) {
+	message := msg.Parameters[1] + " " + msg.Parameters[2]
+
+	msgOpts := irc.MsgFmtOpts{
+		WithTimestamp: true,
+		AsServerMsg:   true,
+	}
+
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func handleNONICKNAMEGIVEN(msg parser.IRCMessage, client *irc.Client) {
@@ -487,7 +569,7 @@ func handleNONICKNAMEGIVEN(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func handleNEEDMOREPARAMS(msg parser.IRCMessage, client *irc.Client) {
@@ -498,7 +580,7 @@ func handleNEEDMOREPARAMS(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func handleALREADYREGISTERED(msg parser.IRCMessage, client *irc.Client) {
@@ -509,7 +591,7 @@ func handleALREADYREGISTERED(msg parser.IRCMessage, client *irc.Client) {
 		AsServerMsg:   true,
 	}
 
-	client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, message, msgOpts)
+	client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)
 }
 
 func HandleCommand(msg parser.IRCMessage, client *irc.Client) {
@@ -525,6 +607,8 @@ func HandleCommand(msg parser.IRCMessage, client *irc.Client) {
 		handleQuit(msg, client)
 	case commands.PART:
 		handlePart(msg, client)
+	case commands.CAP:
+		handleCAP(msg, client)
 	case commands.RPL_WELCOME:
 		handleWELCOME(msg, client)
 	case commands.RPL_YOURHOST:
@@ -581,6 +665,8 @@ func HandleCommand(msg parser.IRCMessage, client *irc.Client) {
 		handleWHOISMODES(msg, client)
 	case commands.ERR_NOSUCHSERVER:
 		handleNOSUCHSERVER(msg, client)
+	case commands.ERR_UNKNOWNCOMMAND:
+		handleUNKNOWNCOMMAND(msg, client)
 	case commands.ERR_NONICKNAMEGIVEN:
 		handleNONICKNAMEGIVEN(msg, client)
 	case commands.ERR_NEEDMOREPARAMS:
@@ -601,7 +687,7 @@ func HandleCommand(msg parser.IRCMessage, client *irc.Client) {
 			NotImpl:       true,
 		}
 
-		client.Channels[0].AppendMsg(client.Host, client.DB, msg.Timestamp, fullMsg, msgOpts)
+		client.Channels[0].AppendMsg(msg.Timestamp, fullMsg, msgOpts)
 	}
 
 	// send a receivedIRCmsg tea message so the ui can update

irc/handler/slash.go

@@ -17,7 +17,6 @@
 package handler
 
 import (
-	"log"
 	"strings"
 
 	tea "github.com/charmbracelet/bubbletea"
@@ -26,6 +25,24 @@ import (
 	"github.com/illusionman1212/gorc/irc/commands"
 )
 
+func handleSlashJoin(params []string, client *irc.Client) tea.Cmd {
+	channel := ""
+	if len(params) > 0 {
+		channel = params[0]
+	}
+
+	for i, c := range client.Channels {
+		if c.Name == channel {
+			client.ActiveChannelIndex = i
+			client.ActiveChannel = channel
+			return cmds.SwitchChannels
+		}
+	}
+	client.SendCommand(commands.JOIN, params...)
+
+	return cmds.SwitchChannels
+}
+
 func HandleSlashCommand(msg string, client *irc.Client) tea.Cmd {
 	substrs := strings.Fields(msg[1:])
 	command := strings.ToUpper(substrs[0])
@@ -36,14 +53,10 @@ func HandleSlashCommand(msg string, client *irc.Client) tea.Cmd {
 
 	switch command {
 	case commands.JOIN:
-		client.SendCommand(commands.JOIN, params...)
+		return handleSlashJoin(params, client)
-		return cmds.SwitchChannels
 	case commands.QUIT:
 		client.SendCommand(command, params...)
 		return cmds.Quit(client)
-	case "TEST":
-		log.Println("running the spammer")
-		return cmds.Tick(client)
 	default:
 		client.SendCommand(command, params...)
 		return nil

irc/parser/parser.go

@@ -18,6 +18,7 @@ package parser
 
 import (
 	"fmt"
+	"log"
 	"regexp"
 	"strings"
 	"time"
@@ -34,9 +35,44 @@ type IRCMessage struct {
 type Tags map[string]string
 
 func (m *IRCMessage) setTimestamp() {
-	// TODO: get timestamp from time tag
+	if serverTime, ok := m.Tags["time"]; ok {
-	now := time.Now()
+		t, err := time.Parse("2006-01-02T15:04:05.000Z", serverTime)
-	m.Timestamp = fmt.Sprintf("[%02d:%02d:%02d.%03d]", now.Hour(), now.Minute(), now.Second(), now.Nanosecond()/1000000)
+		if err != nil {
+			// TODO: properly handle error
+			log.Fatalln(err)
+		}
+		m.Timestamp = fmt.Sprintf("[%02d:%02d]", t.Local().Hour(), t.Local().Minute())
+	} else {
+		now := time.Now()
+		m.Timestamp = fmt.Sprintf("[%02d:%02d]", now.Hour(), now.Minute())
+	}
+}
+
+func escapeCharacters(char rune) string {
+	switch char {
+	case 's':
+		return " "
+	case 'n':
+		return "\n"
+	case 'r':
+		return "\r"
+	case 'b':
+		return "\b"
+	case 't':
+		return "\t"
+	case 'f':
+		return "\f"
+	case ':':
+		return ";"
+	case '\\':
+		fallthrough
+	case '\'':
+		fallthrough
+	case '"':
+		fallthrough
+	default:
+		return string(char)
+	}
 }
 
 func parseTags(rawTags string) Tags {
@@ -51,7 +87,24 @@ func parseTags(rawTags string) Tags {
 
 		// we need to make sure a "value" exists before accessing str[1]
 		if len(str) > 1 {
-			value = str[1]
+			rawValue := str[1]
+			for idx := 0; idx < len(rawValue); {
+				// if we have a backslash at the end of the string
+				// we need to ignore it
+				if idx == len(rawValue)-1 && rawValue[idx] == '\\' {
+					idx += 2
+					continue
+				}
+
+				if rawValue[idx] == '\\' {
+					value += escapeCharacters(rune(rawValue[idx+1]))
+					idx += 2
+					continue
+				}
+
+				value += string(rawValue[idx])
+				idx++
+			}
 		}
 
 		tags[key] = value
@@ -62,9 +115,9 @@ func parseTags(rawTags string) Tags {
 
 func ParseIRCMessage(line string) (IRCMessage, bool) {
 	ircMessage := IRCMessage{}
-	multipleSpacesRegex := regexp.MustCompile("[^\\S\\t]+")
+	multipleSpacesRegex := regexp.MustCompile(`[^\S\t]+`)
-	trailingParamRegex := regexp.MustCompile("[^\\S\\t]+:")
+	trailingParamRegex := regexp.MustCompile(`[^\S\t]+:`)
-	whitespaceRegex := regexp.MustCompile("^[^\\S\\t]+$")
+	whitespaceRegex := regexp.MustCompile(`^[^\S\t]+$`)
 
 	if len(line) <= 0 {
 		// TODO: do something here ???

irc/parser/parser_test.go

@@ -341,7 +341,6 @@ func TestParser(t *testing.T) {
 		}
 	})
 
-	// TODO: fails
 	t.Run("Test escaped tags", func(t *testing.T) {
 		testMessage := "@a=b\\\\and\\nk;c=72\\s45;d=gh\\:764 foo"
 		ircMessage, valid := ParseIRCMessage(testMessage)
@@ -401,7 +400,6 @@ func TestParser(t *testing.T) {
 		}
 	})
 
-	// TODO: FAIL
 	t.Run("Test single param with preceeding :", func(t *testing.T) {
 		testMessage := ":src JOIN :#chan"
 		ircMessage, valid := ParseIRCMessage(testMessage)
@@ -652,7 +650,6 @@ func TestParser(t *testing.T) {
 		}
 	})
 
-	// TODO: FAIL
 	t.Run("Test yaml encoding with slashes", func(t *testing.T) {
 		testMessage := "@foo=\\\\\\\\\\:\\\\s\\s\\r\\n COMMAND"
 		ircMessage, valid := ParseIRCMessage(testMessage)
@@ -749,7 +746,6 @@ func TestParser(t *testing.T) {
 		}
 	})
 
-	// TODO: FAIL
 	t.Run("Test tags. they should be parsed char-at-a-time", func(t *testing.T) {
 		testMessage := "@tag1=value\\\\ntest COMMAND"
 		ircMessage, valid := ParseIRCMessage(testMessage)
@@ -771,7 +767,6 @@ func TestParser(t *testing.T) {
 		}
 	})
 
-	// TODO: FAIl
 	t.Run("Test tag escape for char that doesn't need it", func(t *testing.T) {
 		testMessage := "@tag1=value\\1 COMMAND"
 		ircMessage, valid := ParseIRCMessage(testMessage)
@@ -789,7 +784,6 @@ func TestParser(t *testing.T) {
 		}
 	})
 
-	// TODO: FAIL
 	t.Run("Test slash at end of tag", func(t *testing.T) {
 		testMessage := "@tag1=value1\\ COMMAND"
 		ircMessage, valid := ParseIRCMessage(testMessage)

main.go

@@ -20,7 +20,6 @@ import (
 	"log"
 
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/illusionman1212/gorc/db"
 	"github.com/illusionman1212/gorc/ui/app"
 )
 
@@ -33,22 +32,15 @@ func main() {
 		tea.WithMouseCellMotion(),
 	)
 
-	db, err := db.ConnectToDB()
-	if err != nil {
-		log.Fatal(err)
-	}
-
 	gorc.Client.Tea = p
-	gorc.Client.DB = db
 
 	f, err := tea.LogToFile("gorc.log", "gorc")
-	defer f.Close()
-
 	if err != nil {
 		log.Fatal(err)
 	}
+	defer f.Close()
 
-	err = p.Start()
+	_, err = p.Run()
 
 	if err != nil {
 		log.Fatal(err)

ui/app/app.go

@@ -45,7 +45,7 @@ type State struct {
 	Client *irc.Client
 }
 
-func initialUiState(client *irc.Client) UI {
+func initialUIState(client *irc.Client) UI {
 	return UI{
 		Login:      login.NewLogin(),
 		MainScreen: mainscreen.NewMainScreen(client),
@@ -57,7 +57,7 @@ func InitialState() *State {
 
 	return &State{
 		Client: client,
-		UI:     initialUiState(client),
+		UI:     initialUIState(client),
 	}
 }
 
@@ -125,5 +125,5 @@ func (s State) View() string {
 		return s.UI.MainScreen.View()
 	}
 
-	return "Error: this screen shouldn't ever show"
+	panic("Invalid screen")
 }

ui/login/login.go

@@ -17,7 +17,6 @@
 package login
 
 import (
-	"fmt"
 	"strings"
 
 	"github.com/charmbracelet/bubbles/textinput"
@@ -44,15 +43,15 @@ func NewLogin() State {
 		Inputs:                    make([]textinput.Model, 5),
 		ConnectButtonBlurredStyle: BlurredDisabledButton,
 		ConnectButtonFocusedStyle: FocusedDisabledButton,
-		DialogStyle:               DialogStyle.Copy(),
+		DialogStyle:               DialogStyle,
-		WelcomeMsgStyle:           WelcomeMsgStyle.Copy(),
+		WelcomeMsgStyle:           WelcomeMsgStyle,
-		Style:                     ui.MainStyle.Copy(),
+		Style:                     ui.MainStyle,
 	}
 
 	var t textinput.Model
 	for i := range state.Inputs {
 		t = textinput.New()
-		t.CursorStyle = CursorStyle
+		t.Cursor.Style = CursorStyle
 		t.Prompt = ""
 
 		switch i {
@@ -60,19 +59,27 @@ func NewLogin() State {
 			t.Placeholder = "Host"
 			t.Focus()
 			t.CharLimit = 40
+			t.Width = len(t.Placeholder)
 			t.TextStyle = FocusedStyle
+			t.Validate = NoSpacesValidation
 		case 1:
 			t.Placeholder = "Port"
 			t.CharLimit = 5
+			t.Width = len(t.Placeholder)
+			t.Validate = ValidatePort
 		case 2:
 			t.Placeholder = "Channel"
 			t.CharLimit = 32
+			t.Width = len(t.Placeholder)
 		case 3:
 			t.Placeholder = "Nickname"
 			t.CharLimit = 32
+			t.Width = len(t.Placeholder)
+			t.Validate = NoSpacesValidation
 		case 4:
 			t.Placeholder = "Password"
-			t.CharLimit = 32
+			t.CharLimit = 64
+			t.Width = len(t.Placeholder)
 			t.EchoMode = textinput.EchoPassword
 			t.EchoCharacter = '•'
 		}
@@ -141,6 +148,7 @@ func (s *State) updateInputs(msg tea.Msg) tea.Cmd {
 
 	for i := range s.Inputs {
 		s.Inputs[i], cmds[i] = s.Inputs[i].Update(msg)
+		s.Inputs[i].Width = max(len(s.Inputs[i].Placeholder), len(s.Inputs[i].Value()))
 	}
 
 	if s.Inputs[0].Value() != "" && s.Inputs[1].Value() != "" && s.Inputs[3].Value() != "" {
@@ -157,45 +165,43 @@ func (s *State) updateInputs(msg tea.Msg) tea.Cmd {
 }
 
 func (s *State) SetSize(width, height int) {
-	s.DialogStyle = s.DialogStyle.Copy().Width(width - s.DialogStyle.GetHorizontalFrameSize())
+	s.DialogStyle = s.DialogStyle.Width(width - s.DialogStyle.GetHorizontalFrameSize())
-	s.DialogStyle = s.DialogStyle.Copy().Height(height*5/10 - s.DialogStyle.GetVerticalFrameSize())
+	s.DialogStyle = s.DialogStyle.Height(height*5/10 - s.DialogStyle.GetVerticalFrameSize())
 
-	s.WelcomeMsgStyle = s.WelcomeMsgStyle.Copy().Width(width)
+	s.WelcomeMsgStyle = s.WelcomeMsgStyle.Width(width)
-	s.WelcomeMsgStyle = s.WelcomeMsgStyle.Copy().Height(height * 5 / 10)
+	s.WelcomeMsgStyle = s.WelcomeMsgStyle.Height(height * 5 / 10)
 }
 
 func (s State) View() string {
 	var sb strings.Builder
-
+	for i, input := range s.Inputs {
-	for i := range s.Inputs {
+		sb.WriteString(input.View())
-		sb.WriteString(s.Inputs[i].View())
+		if i < len(s.Inputs) {
-		if i < len(s.Inputs)-1 {
 			sb.WriteRune('\n')
 		}
 	}
 
-	checkbox := &BlurredCheckbox
+	checkbox := BlurredCheckbox
 	// if the checkbox is focused
 	if s.FocusIndex == len(s.Inputs) {
-		checkbox = &FocusedCheckbox
+		checkbox = FocusedCheckbox
 		// if tls is enabled
 		if s.TLS {
-			checkbox = &FocusedCheckboxChecked
+			checkbox = FocusedCheckboxChecked
 		}
 	}
 
 	// if the checkbox is not focused and tls is enabled
 	if s.FocusIndex != len(s.Inputs) && s.TLS {
-		checkbox = &BlurredCheckboxChecked
+		checkbox = BlurredCheckboxChecked
 	}
 
-	fmt.Fprintf(&sb, "\n%s\n", *checkbox)
+	button := s.ConnectButtonBlurredStyle
-
-	button := &s.ConnectButtonBlurredStyle
 	if s.FocusIndex == len(s.Inputs)+1 {
-		button = &s.ConnectButtonFocusedStyle
+		button = s.ConnectButtonFocusedStyle
 	}
-	fmt.Fprintf(&sb, "\n%s\n", *button)
+
+	sb.WriteString(lipgloss.JoinVertical(lipgloss.Center, checkbox, button))
 
 	screen := lipgloss.JoinVertical(lipgloss.Center, s.WelcomeMsgStyle.Render(WelcomeMsg), s.DialogStyle.Render(sb.String()))
 

ui/login/styles.go

@@ -72,28 +72,28 @@ var (
 	FocusedCheckbox = lipgloss.NewStyle().
 			Foreground(ui.AccentColor).
 			MarginTop(1).
-			Render("TLS Enabled [✕]")
+			Render("TLS Enabled [☓]")
 
 	BlurredCheckbox = lipgloss.NewStyle().
 			Foreground(ui.PrimaryColor).
 			MarginTop(1).
-			Render("TLS Enabled [✕]")
+			Render("TLS Enabled [☓]")
 
 	FocusedCheckboxChecked = lipgloss.NewStyle().
 				Foreground(ui.AccentColor).
 				MarginTop(1).
-				Render("TLS Enabled [🗸]")
+				Render("TLS Enabled [✔]")
 
 	BlurredCheckboxChecked = lipgloss.NewStyle().
 				Foreground(ui.PrimaryColor).
 				MarginTop(1).
-				Render("TLS Enabled [🗸]")
+				Render("TLS Enabled [✔]")
 
 	DialogStyle = lipgloss.NewStyle().
-			Align(lipgloss.Center)
+			AlignHorizontal(lipgloss.Center)
 
 	WelcomeMsgStyle = lipgloss.NewStyle().
-			Align(lipgloss.Center).
+			AlignHorizontal(lipgloss.Center).
 			Foreground(ui.PrimaryColor)
 
 	CursorStyle = lipgloss.NewStyle().

ui/login/validators.go

@@ -0,0 +1,44 @@
+// gorc project
+// Copyright (C) 2023 IllusionMan1212
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, see https://www.gnu.org/licenses.
+
+package login
+
+import (
+	"errors"
+	"strconv"
+	"strings"
+)
+
+func NoSpacesValidation(input string) error {
+	if strings.Contains(input, " ") {
+		return errors.New("field cannot contain spaces")
+	}
+
+	return nil
+}
+
+func ValidatePort(input string) error {
+	pNum, err := strconv.ParseUint(input, 10, 16)
+	if err != nil {
+		return err
+	}
+
+	if pNum < 1 || pNum > 65535 {
+		return errors.New("invalid port number")
+	}
+
+	return nil
+}

ui/mainscreen/input.go

@@ -37,7 +37,7 @@ func NewInputBox() InputState {
 
 	return InputState{
 		Input: input,
-		Style: InputboxStyle.Copy(),
+		Style: InputboxStyle,
 	}
 }
 
@@ -65,12 +65,12 @@ func (s InputState) Update(msg tea.Msg) (InputState, tea.Cmd) {
 
 func (s *InputState) Focus() {
 	s.Input.Focus()
-	s.Style = s.Style.Copy().BorderForeground(ui.AccentColor)
+	s.Style = s.Style.BorderForeground(ui.AccentColor)
 }
 
 func (s *InputState) Blur() {
 	s.Input.Blur()
-	s.Style = s.Style.Copy().BorderForeground(ui.PrimaryColor)
+	s.Style = s.Style.BorderForeground(ui.PrimaryColor)
 }
 
 func (s *InputState) SetSize(width int) {

ui/mainscreen/mainscreen.go

@@ -57,9 +57,7 @@ type State struct {
 
 func NewMainScreen(client *irc.Client) State {
 	newViewport := viewport.New(0, 0)
-	newViewport.Wrap = viewport.Wrap
+	newViewport.Style = MessagesStyle
-	newViewport.Style = MessagesStyle.Copy()
-	newViewport.MouseWheelEnabled = false
 
 	return State{
 		Client:                client,
@@ -78,25 +76,9 @@ func (s State) Update(msg tea.Msg) (State, tea.Cmd) {
 	switch msg := msg.(type) {
 	case cmds.ReceivedIRCMsgMsg:
 		wasAtBottom := s.Viewport.AtBottom()
-		s.Viewport.SetContent(strings.Join(s.Client.Channels[s.Client.ActiveChannelIndex].ScrollBackBuf, "\n"))
+		s.Viewport.SetContent(s.Client.Channels[s.Client.ActiveChannelIndex].History)
 
 		if wasAtBottom {
-			s.Client.Channels[s.Client.ActiveChannelIndex].AtBottom = true
-			s.Viewport.GotoBottom()
-		} else {
-			s.Client.Channels[s.Client.ActiveChannelIndex].AtBottom = false
-		}
-		return s, nil
-	case cmds.ReadHistoryFromDBMsg:
-		s.Viewport.SetContent(strings.Join(s.Client.Channels[s.Client.ActiveChannelIndex].ScrollBackBuf, "\n"))
-		switch msg.Direction {
-		case "top":
-			s.Viewport.GotoTop()
-		case "up":
-			s.Viewport.SetYOffset(s.Viewport.YOffset + int(msg.LinesRead))
-		case "down":
-			s.Viewport.SetYOffset(s.Viewport.YOffset - int(msg.LinesRead))
-		case "bottom":
 			s.Viewport.GotoBottom()
 		}
 		return s, nil
@@ -111,17 +93,17 @@ func (s State) Update(msg tea.Msg) (State, tea.Cmd) {
 					WithTimestamp: true,
 				}
 
-				s.Client.Channels[s.Client.ActiveChannelIndex].AppendMsg(s.Client.Host, s.Client.DB, msg.Timestamp, fullMsg, msgOpts)
+				s.Client.Channels[s.Client.ActiveChannelIndex].AppendMsg(msg.Timestamp, fullMsg, msgOpts)
 				// TODO: make sure to only append the message to the history if server sends back no errors
 				s.Client.SendCommand(commands.PRIVMSG, s.Client.ActiveChannel, msg.Msg)
-				s.Viewport.SetContent(strings.Join(s.Client.Channels[s.Client.ActiveChannelIndex].ScrollBackBuf, "\n"))
+				s.Viewport.SetContent(s.Client.Channels[s.Client.ActiveChannelIndex].History)
 				s.Viewport.GotoBottom()
 			}
 		}
 
 		return s, nil
 	case cmds.SwitchChannelsMsg:
-		s.Viewport.SetContent(strings.Join(s.Client.Channels[s.Client.ActiveChannelIndex].ScrollBackBuf, "\n"))
+		s.Viewport.SetContent(s.Client.Channels[s.Client.ActiveChannelIndex].History)
 		s.Viewport.GotoBottom()
 
 		*s.SidePanel, cmd = s.SidePanel.Update(msg)
@@ -130,9 +112,6 @@ func (s State) Update(msg tea.Msg) (State, tea.Cmd) {
 		s.Client.LastTabIndexInTabBar = len(s.Client.Channels) - 1
 		s.TabRenderingDirection = Left
 		return s, nil
-	case cmds.TickMsg:
-		s.Client.Ticks++
-		return s, cmds.Tick(s.Client)
 	case tea.KeyMsg:
 		key := msg.String()
 		switch key {
@@ -200,37 +179,11 @@ func (s State) Update(msg tea.Msg) (State, tea.Cmd) {
 			return s, cmds.SwitchChannels
 		case "g":
 			if s.FocusIndex == Viewport {
-				s.Client.Channels[s.Client.ActiveChannelIndex].AtBottom = false
+				s.Viewport.GotoTop()
-				if !s.Viewport.AtTop() {
-					cmdsToProcess = append(cmdsToProcess, cmds.ReadHistoryFromDB(s.Client, irc.SCROLLBACK_MAX, "top"))
-				}
 			}
 		case "G":
 			if s.FocusIndex == Viewport {
-				if !s.Viewport.AtBottom() {
+				s.Viewport.GotoBottom()
-					cmdsToProcess = append(cmdsToProcess, cmds.ReadHistoryFromDB(s.Client, irc.SCROLLBACK_MAX, "bottom"))
-				}
-				s.Client.Channels[s.Client.ActiveChannelIndex].AtBottom = true
-			}
-		case "j", "k", "d", "u", "f", "b", "up", "down":
-			// TODO: what???
-			// if s.Viewport.AtBottom() {
-			// 	break
-			// }
-
-			if key == "j" || key == "d" || key == "f" || key == "down" {
-				if s.Viewport.ScrollPercent() > 0.5 {
-					excess := s.Viewport.ScrollPercent() - 0.5 + 0.1
-					linesToRead := int(math.Floor(excess * float64(irc.SCROLLBACK_MAX)))
-					cmdsToProcess = append(cmdsToProcess, cmds.ReadHistoryFromDB(s.Client, linesToRead, "down"))
-				}
-			} else {
-				s.Client.Channels[s.Client.ActiveChannelIndex].AtBottom = false
-				if s.Viewport.ScrollPercent() < 0.5 && s.Viewport.ScrollPercent() > 0.0 {
-					excess := 0.5 - s.Viewport.ScrollPercent() + 0.1
-					linesToRead := int(math.Floor(excess * float64(irc.SCROLLBACK_MAX)))
-					cmdsToProcess = append(cmdsToProcess, cmds.ReadHistoryFromDB(s.Client, linesToRead, "up"))
-				}
 			}
 		}
 	}
@@ -251,35 +204,35 @@ func (s State) Update(msg tea.Msg) (State, tea.Cmd) {
 }
 
 func (s *State) Focus() {
-	s.Viewport.Style = s.Viewport.Style.Copy().BorderForeground(ui.AccentColor)
+	s.Viewport.Style = s.Viewport.Style.BorderForeground(ui.AccentColor)
 
-	tab = tab.Copy().BorderForeground(ui.AccentColor)
+	tab = tab.BorderForeground(ui.AccentColor)
-	leftArrowDim = leftArrowDim.Copy().BorderForeground(ui.AccentColor)
+	leftArrowDim = leftArrowDim.BorderForeground(ui.AccentColor)
-	rightArrowDim = rightArrowDim.Copy().BorderForeground(ui.AccentColor)
+	rightArrowDim = rightArrowDim.BorderForeground(ui.AccentColor)
-	leftArrowLit = leftArrowLit.Copy().BorderForeground(ui.AccentColor)
+	leftArrowLit = leftArrowLit.BorderForeground(ui.AccentColor)
-	rightArrowLit = rightArrowLit.Copy().BorderForeground(ui.AccentColor)
+	rightArrowLit = rightArrowLit.BorderForeground(ui.AccentColor)
-	tabLine = tabLine.Copy().Foreground(ui.AccentColor)
+	tabLine = tabLine.Foreground(ui.AccentColor)
 }
 func (s *State) Blur() {
-	s.Viewport.Style = s.Viewport.Style.Copy().BorderForeground(ui.PrimaryColor)
+	s.Viewport.Style = s.Viewport.Style.BorderForeground(ui.PrimaryColor)
 
-	tab = tab.Copy().BorderForeground(ui.PrimaryColor)
+	tab = tab.BorderForeground(ui.PrimaryColor)
-	leftArrowDim = leftArrowDim.Copy().BorderForeground(ui.PrimaryColor)
+	leftArrowDim = leftArrowDim.BorderForeground(ui.PrimaryColor)
-	rightArrowDim = rightArrowDim.Copy().BorderForeground(ui.PrimaryColor)
+	rightArrowDim = rightArrowDim.BorderForeground(ui.PrimaryColor)
-	leftArrowLit = leftArrowLit.Copy().BorderForeground(ui.PrimaryColor)
+	leftArrowLit = leftArrowLit.BorderForeground(ui.PrimaryColor)
-	rightArrowLit = rightArrowLit.Copy().BorderForeground(ui.PrimaryColor)
+	rightArrowLit = rightArrowLit.BorderForeground(ui.PrimaryColor)
-	tabLine = tabLine.Copy().Foreground(ui.PrimaryColor)
+	tabLine = tabLine.Foreground(ui.PrimaryColor)
 }
 
 func (s *State) SetSize(width, height int) {
 	s.InputBox.SetSize(width)
-	s.SidePanel.SetSize(width, height, s.InputBox.Style.GetVerticalFrameSize())
+	s.SidePanel.SetSize(width, height, s.InputBox.Style.GetVerticalPadding())
 
 	// We floor because width is an int and some fractions are lost when casting
 	// and also because we ceil the sidepanel's width
 	// -3 for the tab bar height
-	newWidth := int(math.Floor(float64(width)*8/10) - float64(s.Viewport.Style.GetHorizontalFrameSize()))
+	newWidth := int(math.Floor(float64(width) * 8 / 10))
-	newHeight := height - s.InputBox.Style.GetVerticalFrameSize() - s.Viewport.Style.GetVerticalFrameSize() - 3
+	newHeight := height - s.InputBox.Style.GetVerticalFrameSize() - 3 - 1
 
 	s.Viewport.Width = newWidth
 	s.Viewport.Height = newHeight
@@ -290,7 +243,7 @@ func (s *State) SetSize(width, height int) {
 	// we need this to render an empty viewport
 	history := ""
 	if len(s.Client.Channels) != 0 {
-		history = strings.Join(s.Client.Channels[s.Client.ActiveChannelIndex].ScrollBackBuf, "\n")
+		history = s.Client.Channels[s.Client.ActiveChannelIndex].History
 	}
 
 	// we need to re-set the content because words wrap differently on different sizes

ui/mainscreen/sidepanel.go

@@ -39,7 +39,7 @@ func (s *SidePanelState) getHeader() string {
 	if len(s.Client.Channels) != 0 {
 		usersCount = len(s.Client.Channels[s.Client.ActiveChannelIndex].Users)
 	}
-	separator := strings.Repeat("—", s.Viewport.Width) + "\n"
+	separator := strings.Repeat("—", s.Viewport.Width-s.Viewport.Style.GetHorizontalFrameSize()) + "\n"
 	header := fmt.Sprintf("Users in this channel (%d)\n", usersCount) + separator
 
 	return header
@@ -60,8 +60,7 @@ func (s *SidePanelState) getLatestNicks() []string {
 
 func NewSidePanel(client *irc.Client) *SidePanelState {
 	newViewport := viewport.New(0, 0)
-	newViewport.Style = SidePanelStyle.Copy()
+	newViewport.Style = SidePanelStyle
-	newViewport.Wrap = viewport.Wrap
 
 	return &SidePanelState{
 		Client:   client,
@@ -119,7 +118,7 @@ func (s *SidePanelState) UpdateNicks() {
 func (s *SidePanelState) SetSize(width, height, inputboxHeight int) {
 	// We ceil here because width is an int and some fractions are lost
 	// -1 is for some extra invisible margin or padding between the sidepanel and the inputbox
-	newWidth := int(math.Ceil(math.Ceil((float64(width) * 2 / 10)) - float64(s.Viewport.Style.GetHorizontalFrameSize())))
+	newWidth := int(math.Ceil((float64(width) * 2 / 10)))
 	newHeight := height - inputboxHeight - s.Viewport.Style.GetVerticalFrameSize() - 1
 
 	s.Viewport.Style = s.Viewport.Style.Width(newWidth)

ui/mainscreen/styles.go

@@ -22,16 +22,16 @@ import (
 )
 
 var (
-	InputboxStyle = ui.DefaultStyle.Copy().
+	InputboxStyle = ui.DefaultStyle.
 			Border(lipgloss.NormalBorder(), true).
 			Padding(0, 1).
 			Width(ui.MainStyle.GetWidth()).
 			BorderForeground(ui.AccentColor)
-	MessagesStyle = ui.DefaultStyle.Copy().
+	MessagesStyle = ui.DefaultStyle.
 			Border(lipgloss.NormalBorder(), false, true, true, true).
 			Width(ui.MainStyle.GetWidth() * 8 / 10).
 			BorderForeground(ui.PrimaryColor)
-	SidePanelStyle = ui.DefaultStyle.Copy().
+	SidePanelStyle = ui.DefaultStyle.
 			Border(lipgloss.NormalBorder(), true).
 			Width(ui.MainStyle.GetWidth() * 2 / 10).
 			BorderForeground(ui.PrimaryColor)
@@ -85,26 +85,26 @@ var (
 		Foreground(ui.PrimaryColor).
 		Padding(0, 1)
 
-	activeTab = tab.Copy().
+	activeTab = tab.
 			Border(activeTabBorder, true).
 			BorderForeground(ui.AccentColor).
 			Foreground(ui.AccentColor).
 			Italic(true).
 			Bold(true)
 
-	leftArrowDim = tab.Copy().
+	leftArrowDim = tab.
 			Border(leftArrowBorder, true).
 			BorderForeground(ui.PrimaryColor).
 			Foreground(ui.DisabledColor)
-	rightArrowDim = tab.Copy().
+	rightArrowDim = tab.
 			Border(rightArrowBorder, true).
 			BorderForeground(ui.PrimaryColor).
 			Foreground(ui.DisabledColor)
 
-	leftArrowLit = tab.Copy().
+	leftArrowLit = tab.
 			Border(leftArrowBorder, true).
 			Foreground(ui.PrimaryColor)
-	rightArrowLit = tab.Copy().
+	rightArrowLit = tab.
 			Border(rightArrowBorder, true).
 			Foreground(ui.PrimaryColor)