this repo has no description
events: omitempty on 't' in header (#952)
I'm not sure what the timeline would be on getting this deployed; we are
in the middle of refactoring the relay.
On the other hand it is a pretty small/simple change.
closes: [#3086](https://github.com/bluesky-social/atproto/issues/3086)
+27
-19
+26
-18
events/cbor_gen.go
+26
-18
events/cbor_gen.go
···
25
25
}
26
26
27
27
cw := cbg.NewCborWriter(w)
28
+
fieldCount := 2
28
29
29
-
if _, err := cw.Write([]byte{162}); err != nil {
30
+
if t.MsgType == "" {
31
+
fieldCount--
32
+
}
33
+
34
+
if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil {
30
35
return err
31
36
}
32
37
33
38
// t.MsgType (string) (string)
34
-
if len("t") > 1000000 {
35
-
return xerrors.Errorf("Value in field \"t\" was too long")
36
-
}
39
+
if t.MsgType != "" {
37
40
38
-
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("t"))); err != nil {
39
-
return err
40
-
}
41
-
if _, err := cw.WriteString(string("t")); err != nil {
42
-
return err
43
-
}
41
+
if len("t") > 1000000 {
42
+
return xerrors.Errorf("Value in field \"t\" was too long")
43
+
}
44
44
45
-
if len(t.MsgType) > 1000000 {
46
-
return xerrors.Errorf("Value in field t.MsgType was too long")
47
-
}
45
+
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("t"))); err != nil {
46
+
return err
47
+
}
48
+
if _, err := cw.WriteString(string("t")); err != nil {
49
+
return err
50
+
}
48
51
49
-
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.MsgType))); err != nil {
50
-
return err
51
-
}
52
-
if _, err := cw.WriteString(string(t.MsgType)); err != nil {
53
-
return err
52
+
if len(t.MsgType) > 1000000 {
53
+
return xerrors.Errorf("Value in field t.MsgType was too long")
54
+
}
55
+
56
+
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.MsgType))); err != nil {
57
+
return err
58
+
}
59
+
if _, err := cw.WriteString(string(t.MsgType)); err != nil {
60
+
return err
61
+
}
54
62
}
55
63
56
64
// t.Op (int64) (int64)