alice.mosphere.at / indigo
this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

clean up types in header

whyrusleeping 9bfa2cad dffdc107

+13 -9
+13 -9
events/diskpersist.go
··· 240 240 241 241 lastSeq = eh.Seq 242 242 243 - noff, err := fi.Seek(eh.Len, io.SeekCurrent) 243 + noff, err := fi.Seek(int64(eh.Len), io.SeekCurrent) 244 244 if err != nil { 245 245 return 0, err 246 246 } 247 247 248 - if noff != offset+headerSize+eh.Len { 248 + if noff != offset+headerSize+int64(eh.Len) { 249 249 // TODO: must recover from this 250 250 return 0, fmt.Errorf("did not seek to next event properly") 251 251 } ··· 410 410 Kind uint32 411 411 Seq int64 412 412 Usr models.Uid 413 - Len int64 413 + Len uint32 414 + } 415 + 416 + func (eh *evtHeader) Len64() int64 { 417 + return int64(eh.Len) 414 418 } 415 419 416 420 const headerSize = 4 + 4 + 4 + 8 + 8 ··· 435 439 return &evtHeader{ 436 440 Flags: flags, 437 441 Kind: kind, 438 - Len: int64(l), 442 + Len: l, 439 443 Usr: models.Uid(usr), 440 444 Seq: int64(seq), 441 445 }, nil ··· 528 532 529 533 if postDoNotEmit(h.Flags) { 530 534 // event taken down, skip 531 - _, err := io.CopyN(io.Discard, bufr, h.Len) // would be really nice if the buffered reader had a 'skip' method that does a seek under the hood 535 + _, err := io.CopyN(io.Discard, bufr, h.Len64()) // would be really nice if the buffered reader had a 'skip' method that does a seek under the hood 532 536 if err != nil { 533 537 return fmt.Errorf("failed while skipping event (seq: %d, fn: %q): %w", h.Seq, fn, err) 534 538 } ··· 538 542 switch h.Kind { 539 543 case evtKindCommit: 540 544 var evt atproto.SyncSubscribeRepos_Commit 541 - if err := evt.UnmarshalCBOR(io.LimitReader(bufr, h.Len)); err != nil { 545 + if err := evt.UnmarshalCBOR(io.LimitReader(bufr, h.Len64())); err != nil { 542 546 return err 543 547 } 544 548 evt.Seq = h.Seq ··· 547 551 } 548 552 case evtKindHandle: 549 553 var evt atproto.SyncSubscribeRepos_Handle 550 - if err := evt.UnmarshalCBOR(io.LimitReader(bufr, h.Len)); err != nil { 554 + if err := evt.UnmarshalCBOR(io.LimitReader(bufr, h.Len64())); err != nil { 551 555 return err 552 556 } 553 557 evt.Seq = h.Seq ··· 674 678 return fmt.Errorf("failed to seek: %w", err) 675 679 } 676 680 677 - _, err := io.CopyN(fi, &zeroReader{}, h.Len) 681 + _, err := io.CopyN(fi, &zeroReader{}, h.Len64()) 678 682 if err != nil { 679 683 return err 680 684 } 681 685 } 682 686 } 683 687 684 - offset += headerSize + h.Len 688 + offset += headerSize + h.Len64() 685 689 _, err = fi.Seek(offset, io.SeekStart) 686 690 if err != nil { 687 691 return fmt.Errorf("failed to seek: %w", err)