From 13b51baac534fe11a1374ce19d53764c5e4197fd Mon Sep 17 00:00:00 2001 From: Jade Philipoom Date: Mon, 20 Apr 2015 15:51:49 -0400 Subject: [PATCH 1/2] more precise timestamps to allow >1 message per second --- client/persistence/persistence.go | 2 +- client/readloop.go | 9 ++++----- proto/proto_util.go | 1 + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/persistence/persistence.go b/client/persistence/persistence.go index be23aa8..dc0db13 100644 --- a/client/persistence/persistence.go +++ b/client/persistence/persistence.go @@ -53,7 +53,7 @@ func ConversationName(metadata *proto.ConversationMetadata) string { func MessageName(date time.Time, sender string) string { //messageName := "date-sender" - dateStr := date.UTC().Format(time.RFC3339) + dateStr := date.UTC().Format(time.RFC3339Nano) return fmt.Sprintf("%s-%s", dateStr, sender) } diff --git a/client/readloop.go b/client/readloop.go index 2cc450a..c8ae108 100644 --- a/client/readloop.go +++ b/client/readloop.go @@ -7,10 +7,9 @@ import ( "github.com/andres-erbsen/chatterbox/transport" ) - type EnvelopeWithId struct { Envelope []byte - Id *[32]byte + Id *[32]byte } type ConnectionToServer struct { @@ -41,9 +40,9 @@ func (c *ConnectionToServer) ReceiveMessages() error { } } if msg.Envelope != nil { - envwithid := &EnvelopeWithId { - Envelope : msg.Envelope, - Id : (*[32]byte) (msg.MessageId), + envwithid := &EnvelopeWithId{ + Envelope: msg.Envelope, + Id: (*[32]byte)(msg.MessageId), } go func() { c.ReadEnvelope <- envwithid }() // TODO: bounded buffer? } else { diff --git a/proto/proto_util.go b/proto/proto_util.go index 0d2fe26..b60b700 100644 --- a/proto/proto_util.go +++ b/proto/proto_util.go @@ -11,6 +11,7 @@ func ToProtoByte32List(list []*[32]byte) []Byte32 { return newList } +//returns a slice of COPIES of the original message list func To32ByteList(list []Byte32) []*[32]byte { newList := make([]*[32]byte, 0, 0) for _, element := range list { From b6e70a9c74957eafe4be3b364d33d90dfcde8e50 Mon Sep 17 00:00:00 2001 From: Jade Philipoom Date: Fri, 1 May 2015 23:59:34 -0400 Subject: [PATCH 2/2] Fixed display of timestamp tail before names in GUI. --- client/persistence/persistence.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/persistence/persistence.go b/client/persistence/persistence.go index dc0db13..607856b 100644 --- a/client/persistence/persistence.go +++ b/client/persistence/persistence.go @@ -181,10 +181,10 @@ type Message struct { func ReadMessageFromFile(path string) (*Message, error) { base := filepath.Base(path) - if len(base) < len("2015-02-16T07:09:55Z-") { + if len(base) < len("2006-01-02T15:04:05.999999999Z-") { return nil, fmt.Errorf("badly formatted message filename : " + path) } - sender := base[len("2015-02-16T07:09:55Z-"):] + sender := base[len("2006-01-02T15:04:05.999999999Z-"):] contents, err := ioutil.ReadFile(path) if err != nil { return nil, fmt.Errorf("badly formatted message filename : " + path)