+32 -21

api/atproto/cbor_gen.go

reviewed

··· 96 96 return err 97 97 } 98 98 99 99 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("com.atproto.repo.strongRef"))); err != nil { 99 99 + if len(t.LexiconTypeID) > cbg.MaxLength { 100 100 + return xerrors.Errorf("Value in field t.LexiconTypeID was too long") 101 101 + } 102 102 + 103 103 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.LexiconTypeID))); err != nil { 100 104 return err 101 105 } 102 102 - if _, err := io.WriteString(w, string("com.atproto.repo.strongRef")); err != nil { 106 106 + if _, err := io.WriteString(w, string(t.LexiconTypeID)); err != nil { 103 107 return err 104 108 } 105 109 } ··· 957 961 fieldCount-- 958 962 } 959 963 964 964 + if t.Message == nil { 965 965 + fieldCount-- 966 966 + } 967 967 + 960 968 if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { 961 969 return err 962 970 } ··· 1011 1019 } 1012 1020 1013 1021 // t.Message (string) (string) 1014 1014 - if len("message") > cbg.MaxLength { 1015 1015 - return xerrors.Errorf("Value in field \"message\" was too long") 1016 1016 - } 1022 1022 + if t.Message != nil { 1017 1023 1018 1018 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("message"))); err != nil { 1019 1019 - return err 1020 1020 - } 1021 1021 - if _, err := io.WriteString(w, string("message")); err != nil { 1022 1022 - return err 1023 1023 - } 1024 1024 + if len("message") > cbg.MaxLength { 1025 1025 + return xerrors.Errorf("Value in field \"message\" was too long") 1026 1026 + } 1024 1027 1025 1025 - if t.Message == nil { 1026 1026 - if _, err := cw.Write(cbg.CborNull); err != nil { 1028 1028 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("message"))); err != nil { 1027 1029 return err 1028 1030 } 1029 1029 - } else { 1030 1030 - if len(*t.Message) > cbg.MaxLength { 1031 1031 - return xerrors.Errorf("Value in field t.Message was too long") 1031 1031 + if _, err := io.WriteString(w, string("message")); err != nil { 1032 1032 + return err 1032 1033 } 1033 1034 1034 1034 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Message))); err != nil { 1035 1035 - return err 1036 1036 - } 1037 1037 - if _, err := io.WriteString(w, string(*t.Message)); err != nil { 1038 1038 - return err 1035 1035 + if t.Message == nil { 1036 1036 + if _, err := cw.Write(cbg.CborNull); err != nil { 1037 1037 + return err 1038 1038 + } 1039 1039 + } else { 1040 1040 + if len(*t.Message) > cbg.MaxLength { 1041 1041 + return xerrors.Errorf("Value in field t.Message was too long") 1042 1042 + } 1043 1043 + 1044 1044 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Message))); err != nil { 1045 1045 + return err 1046 1046 + } 1047 1047 + if _, err := io.WriteString(w, string(*t.Message)); err != nil { 1048 1048 + return err 1049 1049 + } 1039 1050 } 1040 1051 } 1041 1052 return nil

+108 -72

api/bsky/cbor_gen.go

reviewed

··· 1417 1417 fieldCount-- 1418 1418 } 1419 1419 1420 1420 + if t.Thumb == nil { 1421 1421 + fieldCount-- 1422 1422 + } 1423 1423 + 1420 1424 if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { 1421 1425 return err 1422 1426 } ··· 1471 1475 } 1472 1476 1473 1477 // t.Thumb (util.LexBlob) (struct) 1474 1474 - if len("thumb") > cbg.MaxLength { 1475 1475 - return xerrors.Errorf("Value in field \"thumb\" was too long") 1476 1476 - } 1478 1478 + if t.Thumb != nil { 1479 1479 + 1480 1480 + if len("thumb") > cbg.MaxLength { 1481 1481 + return xerrors.Errorf("Value in field \"thumb\" was too long") 1482 1482 + } 1477 1483 1478 1478 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("thumb"))); err != nil { 1479 1479 - return err 1480 1480 - } 1481 1481 - if _, err := io.WriteString(w, string("thumb")); err != nil { 1482 1482 - return err 1483 1483 - } 1484 1484 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("thumb"))); err != nil { 1485 1485 + return err 1486 1486 + } 1487 1487 + if _, err := io.WriteString(w, string("thumb")); err != nil { 1488 1488 + return err 1489 1489 + } 1484 1490 1485 1485 - if err := t.Thumb.MarshalCBOR(cw); err != nil { 1486 1486 - return err 1491 1491 + if err := t.Thumb.MarshalCBOR(cw); err != nil { 1492 1492 + return err 1493 1493 + } 1487 1494 } 1488 1495 1489 1496 // t.Title (string) (string) ··· 1984 1991 } 1985 1992 1986 1993 cw := cbg.NewCborWriter(w) 1994 1994 + fieldCount := 5 1987 1995 1988 1988 - if _, err := cw.Write([]byte{165}); err != nil { 1996 1996 + if t.Avatar == nil { 1997 1997 + fieldCount-- 1998 1998 + } 1999 1999 + 2000 2000 + if t.Banner == nil { 2001 2001 + fieldCount-- 2002 2002 + } 2003 2003 + 2004 2004 + if t.Description == nil { 2005 2005 + fieldCount-- 2006 2006 + } 2007 2007 + 2008 2008 + if t.DisplayName == nil { 2009 2009 + fieldCount-- 2010 2010 + } 2011 2011 + 2012 2012 + if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { 1989 2013 return err 1990 2014 } 1991 2015 ··· 2009 2033 } 2010 2034 2011 2035 // t.Avatar (util.LexBlob) (struct) 2012 2012 - if len("avatar") > cbg.MaxLength { 2013 2013 - return xerrors.Errorf("Value in field \"avatar\" was too long") 2014 2014 - } 2036 2036 + if t.Avatar != nil { 2015 2037 2016 2016 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("avatar"))); err != nil { 2017 2017 - return err 2018 2018 - } 2019 2019 - if _, err := io.WriteString(w, string("avatar")); err != nil { 2020 2020 - return err 2021 2021 - } 2038 2038 + if len("avatar") > cbg.MaxLength { 2039 2039 + return xerrors.Errorf("Value in field \"avatar\" was too long") 2040 2040 + } 2022 2041 2023 2023 - if err := t.Avatar.MarshalCBOR(cw); err != nil { 2024 2024 - return err 2042 2042 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("avatar"))); err != nil { 2043 2043 + return err 2044 2044 + } 2045 2045 + if _, err := io.WriteString(w, string("avatar")); err != nil { 2046 2046 + return err 2047 2047 + } 2048 2048 + 2049 2049 + if err := t.Avatar.MarshalCBOR(cw); err != nil { 2050 2050 + return err 2051 2051 + } 2025 2052 } 2026 2053 2027 2054 // t.Banner (util.LexBlob) (struct) 2028 2028 - if len("banner") > cbg.MaxLength { 2029 2029 - return xerrors.Errorf("Value in field \"banner\" was too long") 2030 2030 - } 2055 2055 + if t.Banner != nil { 2031 2056 2032 2032 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("banner"))); err != nil { 2033 2033 - return err 2034 2034 - } 2035 2035 - if _, err := io.WriteString(w, string("banner")); err != nil { 2036 2036 - return err 2037 2037 - } 2057 2057 + if len("banner") > cbg.MaxLength { 2058 2058 + return xerrors.Errorf("Value in field \"banner\" was too long") 2059 2059 + } 2038 2060 2039 2039 - if err := t.Banner.MarshalCBOR(cw); err != nil { 2040 2040 - return err 2061 2061 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("banner"))); err != nil { 2062 2062 + return err 2063 2063 + } 2064 2064 + if _, err := io.WriteString(w, string("banner")); err != nil { 2065 2065 + return err 2066 2066 + } 2067 2067 + 2068 2068 + if err := t.Banner.MarshalCBOR(cw); err != nil { 2069 2069 + return err 2070 2070 + } 2041 2071 } 2042 2072 2043 2073 // t.Description (string) (string) 2044 2044 - if len("description") > cbg.MaxLength { 2045 2045 - return xerrors.Errorf("Value in field \"description\" was too long") 2046 2046 - } 2074 2074 + if t.Description != nil { 2047 2075 2048 2048 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("description"))); err != nil { 2049 2049 - return err 2050 2050 - } 2051 2051 - if _, err := io.WriteString(w, string("description")); err != nil { 2052 2052 - return err 2053 2053 - } 2076 2076 + if len("description") > cbg.MaxLength { 2077 2077 + return xerrors.Errorf("Value in field \"description\" was too long") 2078 2078 + } 2054 2079 2055 2055 - if t.Description == nil { 2056 2056 - if _, err := cw.Write(cbg.CborNull); err != nil { 2080 2080 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("description"))); err != nil { 2057 2081 return err 2058 2082 } 2059 2059 - } else { 2060 2060 - if len(*t.Description) > cbg.MaxLength { 2061 2061 - return xerrors.Errorf("Value in field t.Description was too long") 2083 2083 + if _, err := io.WriteString(w, string("description")); err != nil { 2084 2084 + return err 2062 2085 } 2063 2086 2064 2064 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Description))); err != nil { 2065 2065 - return err 2066 2066 - } 2067 2067 - if _, err := io.WriteString(w, string(*t.Description)); err != nil { 2068 2068 - return err 2087 2087 + if t.Description == nil { 2088 2088 + if _, err := cw.Write(cbg.CborNull); err != nil { 2089 2089 + return err 2090 2090 + } 2091 2091 + } else { 2092 2092 + if len(*t.Description) > cbg.MaxLength { 2093 2093 + return xerrors.Errorf("Value in field t.Description was too long") 2094 2094 + } 2095 2095 + 2096 2096 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Description))); err != nil { 2097 2097 + return err 2098 2098 + } 2099 2099 + if _, err := io.WriteString(w, string(*t.Description)); err != nil { 2100 2100 + return err 2101 2101 + } 2069 2102 } 2070 2103 } 2071 2104 2072 2105 // t.DisplayName (string) (string) 2073 2073 - if len("displayName") > cbg.MaxLength { 2074 2074 - return xerrors.Errorf("Value in field \"displayName\" was too long") 2075 2075 - } 2106 2106 + if t.DisplayName != nil { 2076 2107 2077 2077 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("displayName"))); err != nil { 2078 2078 - return err 2079 2079 - } 2080 2080 - if _, err := io.WriteString(w, string("displayName")); err != nil { 2081 2081 - return err 2082 2082 - } 2108 2108 + if len("displayName") > cbg.MaxLength { 2109 2109 + return xerrors.Errorf("Value in field \"displayName\" was too long") 2110 2110 + } 2083 2111 2084 2084 - if t.DisplayName == nil { 2085 2085 - if _, err := cw.Write(cbg.CborNull); err != nil { 2112 2112 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("displayName"))); err != nil { 2086 2113 return err 2087 2114 } 2088 2088 - } else { 2089 2089 - if len(*t.DisplayName) > cbg.MaxLength { 2090 2090 - return xerrors.Errorf("Value in field t.DisplayName was too long") 2115 2115 + if _, err := io.WriteString(w, string("displayName")); err != nil { 2116 2116 + return err 2091 2117 } 2092 2118 2093 2093 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.DisplayName))); err != nil { 2094 2094 - return err 2095 2095 - } 2096 2096 - if _, err := io.WriteString(w, string(*t.DisplayName)); err != nil { 2097 2097 - return err 2119 2119 + if t.DisplayName == nil { 2120 2120 + if _, err := cw.Write(cbg.CborNull); err != nil { 2121 2121 + return err 2122 2122 + } 2123 2123 + } else { 2124 2124 + if len(*t.DisplayName) > cbg.MaxLength { 2125 2125 + return xerrors.Errorf("Value in field t.DisplayName was too long") 2126 2126 + } 2127 2127 + 2128 2128 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.DisplayName))); err != nil { 2129 2129 + return err 2130 2130 + } 2131 2131 + if _, err := io.WriteString(w, string(*t.DisplayName)); err != nil { 2132 2132 + return err 2133 2133 + } 2098 2134 } 2099 2135 } 2100 2136 return nil