X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/72dd37f1abb2b550aaaac48eac677403d5664797..a2ef262a164fc735b9b8471ac0c8001eea2b9bf6:/hotline/news.go diff --git a/hotline/news.go b/hotline/news.go index 7a5c30c..6e89388 100644 --- a/hotline/news.go +++ b/hotline/news.go @@ -1,27 +1,35 @@ package hotline import ( - "bytes" - "crypto/rand" "encoding/binary" + "io" + "slices" "sort" - "time" ) +const defaultNewsDateFormat = "Jan02 15:04" // Jun23 20:49 + +const defaultNewsTemplate = `From %s (%s): + +%s + +__________________________________________________________` + +// ThreadedNews is the top level struct containing all threaded news categories, bundles, and articles type ThreadedNews struct { Categories map[string]NewsCategoryListData15 `yaml:"Categories"` } type NewsCategoryListData15 struct { - Type []byte `yaml:"Type"` //Size 2 ; Bundle (2) or category (3) - Count []byte // Article or SubCategory count Size 2 - NameSize byte - Name string `yaml:"Name"` // + Type [2]byte `yaml:"Type,flow"` // Bundle (2) or category (3) + Name string `yaml:"Name"` Articles map[uint32]*NewsArtData `yaml:"Articles"` // Optional, if Type is Category SubCats map[string]NewsCategoryListData15 `yaml:"SubCats"` - GUID []byte // Size 16 - AddSN []byte // Size 4 - DeleteSN []byte // Size 4 + GUID [16]byte `yaml:"-"` // What does this do? Undocumented and seeming unused. + AddSN [4]byte `yaml:"-"` // What does this do? Undocumented and seeming unused. + DeleteSN [4]byte `yaml:"-"` // What does this do? Undocumented and seeming unused. + + readOffset int // Internal offset to track read progress } func (newscat *NewsCategoryListData15) GetNewsArtListData() NewsArtListData { @@ -29,49 +37,51 @@ func (newscat *NewsCategoryListData15) GetNewsArtListData() NewsArtListData { var newsArtsPayload []byte for i, art := range newscat.Articles { - ID := make([]byte, 4) - binary.BigEndian.PutUint32(ID, i) + id := make([]byte, 4) + binary.BigEndian.PutUint32(id, i) newArt := NewsArtList{ - ID: ID, + ID: [4]byte(id), TimeStamp: art.Date, ParentID: art.ParentArt, - Flags: []byte{0, 0, 0, 0}, - FlavorCount: []byte{0, 0}, Title: []byte(art.Title), Poster: []byte(art.Poster), ArticleSize: art.DataSize(), } + newsArts = append(newsArts, newArt) } sort.Sort(byID(newsArts)) for _, v := range newsArts { - newsArtsPayload = append(newsArtsPayload, v.Payload()...) + b, err := io.ReadAll(&v) + if err != nil { + // TODO + panic(err) + } + newsArtsPayload = append(newsArtsPayload, b...) } - nald := NewsArtListData{ - ID: []byte{0, 0, 0, 0}, + return NewsArtListData{ + Count: len(newsArts), Name: []byte{}, Description: []byte{}, NewsArtList: newsArtsPayload, } - - return nald } // NewsArtData represents single news article type NewsArtData struct { - Title string `yaml:"Title"` - Poster string `yaml:"Poster"` - Date []byte `yaml:"Date"` //size 8 - PrevArt []byte `yaml:"PrevArt"` //size 4 - NextArt []byte `yaml:"NextArt"` //size 4 - ParentArt []byte `yaml:"ParentArt"` //size 4 - FirstChildArt []byte `yaml:"FirstChildArtArt"` //size 4 - DataFlav []byte `yaml:"DataFlav"` // "text/plain" - Data string `yaml:"Data"` + Title string `yaml:"Title"` + Poster string `yaml:"Poster"` + Date [8]byte `yaml:"Date,flow"` + PrevArt [4]byte `yaml:"PrevArt,flow"` + NextArt [4]byte `yaml:"NextArt,flow"` + ParentArt [4]byte `yaml:"ParentArt,flow"` + FirstChildArt [4]byte `yaml:"FirstChildArtArt,flow"` + DataFlav []byte `yaml:"-"` // "text/plain" + Data string `yaml:"Data"` } func (art *NewsArtData) DataSize() []byte { @@ -82,33 +92,45 @@ func (art *NewsArtData) DataSize() []byte { } type NewsArtListData struct { - ID []byte `yaml:"ID"` // Size 4 - Name []byte `yaml:"Name"` - Description []byte `yaml:"Description"` // not used? - NewsArtList []byte // List of articles Optional (if article count > 0) + ID [4]byte `yaml:"ID"` + Name []byte `yaml:"Name"` + Description []byte `yaml:"Description"` // not used? + NewsArtList []byte // List of articles Optional (if article count > 0) + Count int + + readOffset int // Internal offset to track read progress } -func (nald *NewsArtListData) Payload() []byte { +func (nald *NewsArtListData) Read(p []byte) (int, error) { count := make([]byte, 4) - binary.BigEndian.PutUint32(count, uint32(len(nald.NewsArtList))) - - out := append(nald.ID, count...) - out = append(out, []byte{uint8(len(nald.Name))}...) - out = append(out, nald.Name...) - out = append(out, []byte{uint8(len(nald.Description))}...) - out = append(out, nald.Description...) - out = append(out, nald.NewsArtList...) + binary.BigEndian.PutUint32(count, uint32(nald.Count)) + + buf := slices.Concat( + nald.ID[:], + count, + []byte{uint8(len(nald.Name))}, + nald.Name, + []byte{uint8(len(nald.Description))}, + nald.Description, + nald.NewsArtList, + ) + + if nald.readOffset >= len(buf) { + return 0, io.EOF // All bytes have been read + } + n := copy(p, buf[nald.readOffset:]) + nald.readOffset += n - return out + return n, nil } // NewsArtList is a summarized version of a NewArtData record for display in list view type NewsArtList struct { - ID []byte // Size 4 - TimeStamp []byte // Year (2 bytes), milliseconds (2 bytes) and seconds (4 bytes) - ParentID []byte // Size 4 - Flags []byte // Size 4 - FlavorCount []byte // Size 2 + ID [4]byte + TimeStamp [8]byte // Year (2 bytes), milliseconds (2 bytes) and seconds (4 bytes) + ParentID [4]byte + Flags [4]byte + FlavorCount [2]byte // Title size 1 Title []byte // string // Poster size 1 @@ -117,6 +139,8 @@ type NewsArtList struct { FlavorList []NewsFlavorList // Flavor list… Optional (if flavor count > 0) ArticleSize []byte // Size 2 + + readOffset int // Internal offset to track read progress } type byID []NewsArtList @@ -128,24 +152,38 @@ func (s byID) Swap(i, j int) { s[i], s[j] = s[j], s[i] } func (s byID) Less(i, j int) bool { - return binary.BigEndian.Uint32(s[i].ID) < binary.BigEndian.Uint32(s[j].ID) + return binary.BigEndian.Uint32(s[i].ID[:]) < binary.BigEndian.Uint32(s[j].ID[:]) } -func (nal *NewsArtList) Payload() []byte { - out := append(nal.ID, nal.TimeStamp...) - out = append(out, nal.ParentID...) - out = append(out, nal.Flags...) +var ( + NewsFlavorLen = []byte{0x0a} + NewsFlavor = []byte("text/plain") +) - out = append(out, []byte{0, 1}...) +func (nal *NewsArtList) Read(p []byte) (int, error) { + out := slices.Concat( + nal.ID[:], + nal.TimeStamp[:], + nal.ParentID[:], + nal.Flags[:], + []byte{0, 1}, // Flavor Count TODO: make this not hardcoded + []byte{uint8(len(nal.Title))}, + nal.Title, + []byte{uint8(len(nal.Poster))}, + nal.Poster, + NewsFlavorLen, + NewsFlavor, + nal.ArticleSize, + ) + + if nal.readOffset >= len(out) { + return 0, io.EOF // All bytes have been read + } - out = append(out, []byte{uint8(len(nal.Title))}...) - out = append(out, nal.Title...) - out = append(out, []byte{uint8(len(nal.Poster))}...) - out = append(out, nal.Poster...) - out = append(out, []byte{0x0a, 0x74, 0x65, 0x78, 0x74, 0x2f, 0x70, 0x6c, 0x61, 0x69, 0x6e}...) // TODO: wat? - out = append(out, nal.ArticleSize...) + n := copy(p, out[nal.readOffset:]) + nal.readOffset += n - return out + return n, io.EOF } type NewsFlavorList struct { @@ -154,76 +192,40 @@ type NewsFlavorList struct { // Article size 2 } -func (newscat *NewsCategoryListData15) MarshalBinary() (data []byte, err error) { +func (newscat *NewsCategoryListData15) Read(p []byte) (int, error) { count := make([]byte, 2) binary.BigEndian.PutUint16(count, uint16(len(newscat.Articles)+len(newscat.SubCats))) - out := append(newscat.Type, count...) + out := slices.Concat( + newscat.Type[:], + count, + ) - if bytes.Equal(newscat.Type, []byte{0, 3}) { - // Generate a random GUID // TODO: does this need to be random? - b := make([]byte, 16) - _, err := rand.Read(b) - if err != nil { - return data, err - } - - out = append(out, b...) // GUID - out = append(out, []byte{0, 0, 0, 1}...) // Add SN (TODO: not sure what this is) - out = append(out, []byte{0, 0, 0, 2}...) // Delete SN (TODO: not sure what this is) + // If type is category + if newscat.Type == [2]byte{0, 3} { + out = append(out, newscat.GUID[:]...) + out = append(out, newscat.AddSN[:]...) + out = append(out, newscat.DeleteSN[:]...) } out = append(out, newscat.nameLen()...) out = append(out, []byte(newscat.Name)...) - return out, err -} - -// ReadNewsCategoryListData parses a byte slice into a NewsCategoryListData15 struct -// For use on the client side -func ReadNewsCategoryListData(payload []byte) NewsCategoryListData15 { - ncld := NewsCategoryListData15{ - Type: payload[0:2], - Count: payload[2:4], + if newscat.readOffset >= len(out) { + return 0, io.EOF // All bytes have been read } - if bytes.Equal(ncld.Type, []byte{0, 3}) { - ncld.GUID = payload[4:20] - ncld.AddSN = payload[20:24] - ncld.AddSN = payload[24:28] - ncld.Name = string(payload[29:]) - } else { - ncld.Name = string(payload[5:]) - } + n := copy(p, out) + newscat.readOffset = n - return ncld + return n, nil } func (newscat *NewsCategoryListData15) nameLen() []byte { return []byte{uint8(len(newscat.Name))} } -//type NewsPath struct { -// Paths []string -//} -// -//func (np *NewsPath) Payload() []byte { -// var out []byte -// -// count := make([]byte, 2) -// binary.BigEndian.PutUint16(count, uint16(len(np.Paths))) -// -// out = append(out, count...) -// for _, p := range np.Paths { -// pLen := byte(len(p)) -// out = append(out, []byte{0, 0}...) // what is this? -// out = append(out, pLen) -// out = append(out, []byte(p)...) -// } -// -// return out -//} - +// TODO: re-implement as bufio.Scanner interface func ReadNewsPath(newsPath []byte) []string { if len(newsPath) == 0 { return []string{} @@ -250,25 +252,3 @@ func (s *Server) GetNewsCatByPath(paths []string) map[string]NewsCategoryListDat } return cats } - -// News article date field contains this structure: -// Year 2 -// Milliseconds 2 (seriously?) -// Seconds 4 -func NewsDate() []byte { - t := time.Now() - ms := []byte{0, 0} - seconds := []byte{0, 0, 0, 0} - - year := []byte{0, 0} - binary.BigEndian.PutUint16(year, uint16(t.Year())) - - yearStart := time.Date(t.Year(), time.January, 1, 0, 0, 0, 0, time.Local) - - binary.BigEndian.PutUint32(seconds, uint32(t.Sub(yearStart).Seconds())) - - date := append(year, ms...) - date = append(date, seconds...) - - return date -}