diff --git a/channel.go b/channel.go index b5c9ea5..8b7760a 100644 --- a/channel.go +++ b/channel.go @@ -56,9 +56,6 @@ func (ch *Channel) JoinServer(container cchat.MessagesContainer) error { ch.lastID++ return id } - var readID = func() uint32 { - return atomic.LoadUint32(&ch.lastID) - } var randomMsg = func() Message { msg := randomMessage(nextID()) lastAuthor = msg.author @@ -90,9 +87,9 @@ func (ch *Channel) JoinServer(container cchat.MessagesContainer) error { case <-ticker.C: container.CreateMessage(randomMsg()) case <-editTick.C: - container.UpdateMessage(newRandomMessage(readID(), lastAuthor)) + container.UpdateMessage(newRandomMessage(ch.lastID, lastAuthor)) case <-deleteTick.C: - container.DeleteMessage(newEmptyMessage(readID(), lastAuthor)) + container.DeleteMessage(newEmptyMessage(ch.lastID, lastAuthor)) case <-ch.done: return } diff --git a/segments/color.go b/segments/color.go index 7ad11db..7b3086c 100644 --- a/segments/color.go +++ b/segments/color.go @@ -31,7 +31,7 @@ func NewRandomColored(str string) Colored { } func (color Colored) Bounds() (start, end int) { - return 0, color.strlen - 1 + return 0, color.strlen } func (color Colored) Color() uint32 {