this repo has no description
0
fork

Configure Feed

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

remove deprecated `api/label` code (#497)

This is a cleanup to unwind some temporary types which were used for
labelmaker development before the label Lexicons were merged upstream.

This is just confusing cruft now, so ripping it out.

authored by

bnewbold and committed by
GitHub
89078784 bb08103f

+682 -870
+652
api/atproto/cbor_gen.go
··· 1961 1961 1962 1962 return nil 1963 1963 } 1964 + func (t *LabelDefs_Label) MarshalCBOR(w io.Writer) error { 1965 + if t == nil { 1966 + _, err := w.Write(cbg.CborNull) 1967 + return err 1968 + } 1969 + 1970 + cw := cbg.NewCborWriter(w) 1971 + fieldCount := 6 1972 + 1973 + if t.Cid == nil { 1974 + fieldCount-- 1975 + } 1976 + 1977 + if t.Neg == nil { 1978 + fieldCount-- 1979 + } 1980 + 1981 + if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { 1982 + return err 1983 + } 1984 + 1985 + // t.Cid (string) (string) 1986 + if t.Cid != nil { 1987 + 1988 + if len("cid") > cbg.MaxLength { 1989 + return xerrors.Errorf("Value in field \"cid\" was too long") 1990 + } 1991 + 1992 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("cid"))); err != nil { 1993 + return err 1994 + } 1995 + if _, err := cw.WriteString(string("cid")); err != nil { 1996 + return err 1997 + } 1998 + 1999 + if t.Cid == nil { 2000 + if _, err := cw.Write(cbg.CborNull); err != nil { 2001 + return err 2002 + } 2003 + } else { 2004 + if len(*t.Cid) > cbg.MaxLength { 2005 + return xerrors.Errorf("Value in field t.Cid was too long") 2006 + } 2007 + 2008 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Cid))); err != nil { 2009 + return err 2010 + } 2011 + if _, err := cw.WriteString(string(*t.Cid)); err != nil { 2012 + return err 2013 + } 2014 + } 2015 + } 2016 + 2017 + // t.Cts (string) (string) 2018 + if len("cts") > cbg.MaxLength { 2019 + return xerrors.Errorf("Value in field \"cts\" was too long") 2020 + } 2021 + 2022 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("cts"))); err != nil { 2023 + return err 2024 + } 2025 + if _, err := cw.WriteString(string("cts")); err != nil { 2026 + return err 2027 + } 2028 + 2029 + if len(t.Cts) > cbg.MaxLength { 2030 + return xerrors.Errorf("Value in field t.Cts was too long") 2031 + } 2032 + 2033 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Cts))); err != nil { 2034 + return err 2035 + } 2036 + if _, err := cw.WriteString(string(t.Cts)); err != nil { 2037 + return err 2038 + } 2039 + 2040 + // t.Neg (bool) (bool) 2041 + if t.Neg != nil { 2042 + 2043 + if len("neg") > cbg.MaxLength { 2044 + return xerrors.Errorf("Value in field \"neg\" was too long") 2045 + } 2046 + 2047 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("neg"))); err != nil { 2048 + return err 2049 + } 2050 + if _, err := cw.WriteString(string("neg")); err != nil { 2051 + return err 2052 + } 2053 + 2054 + if t.Neg == nil { 2055 + if _, err := cw.Write(cbg.CborNull); err != nil { 2056 + return err 2057 + } 2058 + } else { 2059 + if err := cbg.WriteBool(w, *t.Neg); err != nil { 2060 + return err 2061 + } 2062 + } 2063 + } 2064 + 2065 + // t.Src (string) (string) 2066 + if len("src") > cbg.MaxLength { 2067 + return xerrors.Errorf("Value in field \"src\" was too long") 2068 + } 2069 + 2070 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("src"))); err != nil { 2071 + return err 2072 + } 2073 + if _, err := cw.WriteString(string("src")); err != nil { 2074 + return err 2075 + } 2076 + 2077 + if len(t.Src) > cbg.MaxLength { 2078 + return xerrors.Errorf("Value in field t.Src was too long") 2079 + } 2080 + 2081 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Src))); err != nil { 2082 + return err 2083 + } 2084 + if _, err := cw.WriteString(string(t.Src)); err != nil { 2085 + return err 2086 + } 2087 + 2088 + // t.Uri (string) (string) 2089 + if len("uri") > cbg.MaxLength { 2090 + return xerrors.Errorf("Value in field \"uri\" was too long") 2091 + } 2092 + 2093 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("uri"))); err != nil { 2094 + return err 2095 + } 2096 + if _, err := cw.WriteString(string("uri")); err != nil { 2097 + return err 2098 + } 2099 + 2100 + if len(t.Uri) > cbg.MaxLength { 2101 + return xerrors.Errorf("Value in field t.Uri was too long") 2102 + } 2103 + 2104 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Uri))); err != nil { 2105 + return err 2106 + } 2107 + if _, err := cw.WriteString(string(t.Uri)); err != nil { 2108 + return err 2109 + } 2110 + 2111 + // t.Val (string) (string) 2112 + if len("val") > cbg.MaxLength { 2113 + return xerrors.Errorf("Value in field \"val\" was too long") 2114 + } 2115 + 2116 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("val"))); err != nil { 2117 + return err 2118 + } 2119 + if _, err := cw.WriteString(string("val")); err != nil { 2120 + return err 2121 + } 2122 + 2123 + if len(t.Val) > cbg.MaxLength { 2124 + return xerrors.Errorf("Value in field t.Val was too long") 2125 + } 2126 + 2127 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Val))); err != nil { 2128 + return err 2129 + } 2130 + if _, err := cw.WriteString(string(t.Val)); err != nil { 2131 + return err 2132 + } 2133 + return nil 2134 + } 2135 + 2136 + func (t *LabelDefs_Label) UnmarshalCBOR(r io.Reader) (err error) { 2137 + *t = LabelDefs_Label{} 2138 + 2139 + cr := cbg.NewCborReader(r) 2140 + 2141 + maj, extra, err := cr.ReadHeader() 2142 + if err != nil { 2143 + return err 2144 + } 2145 + defer func() { 2146 + if err == io.EOF { 2147 + err = io.ErrUnexpectedEOF 2148 + } 2149 + }() 2150 + 2151 + if maj != cbg.MajMap { 2152 + return fmt.Errorf("cbor input should be of type map") 2153 + } 2154 + 2155 + if extra > cbg.MaxLength { 2156 + return fmt.Errorf("LabelDefs_Label: map struct too large (%d)", extra) 2157 + } 2158 + 2159 + var name string 2160 + n := extra 2161 + 2162 + for i := uint64(0); i < n; i++ { 2163 + 2164 + { 2165 + sval, err := cbg.ReadString(cr) 2166 + if err != nil { 2167 + return err 2168 + } 2169 + 2170 + name = string(sval) 2171 + } 2172 + 2173 + switch name { 2174 + // t.Cid (string) (string) 2175 + case "cid": 2176 + 2177 + { 2178 + b, err := cr.ReadByte() 2179 + if err != nil { 2180 + return err 2181 + } 2182 + if b != cbg.CborNull[0] { 2183 + if err := cr.UnreadByte(); err != nil { 2184 + return err 2185 + } 2186 + 2187 + sval, err := cbg.ReadString(cr) 2188 + if err != nil { 2189 + return err 2190 + } 2191 + 2192 + t.Cid = (*string)(&sval) 2193 + } 2194 + } 2195 + // t.Cts (string) (string) 2196 + case "cts": 2197 + 2198 + { 2199 + sval, err := cbg.ReadString(cr) 2200 + if err != nil { 2201 + return err 2202 + } 2203 + 2204 + t.Cts = string(sval) 2205 + } 2206 + // t.Neg (bool) (bool) 2207 + case "neg": 2208 + 2209 + { 2210 + b, err := cr.ReadByte() 2211 + if err != nil { 2212 + return err 2213 + } 2214 + if b != cbg.CborNull[0] { 2215 + if err := cr.UnreadByte(); err != nil { 2216 + return err 2217 + } 2218 + 2219 + maj, extra, err = cr.ReadHeader() 2220 + if err != nil { 2221 + return err 2222 + } 2223 + if maj != cbg.MajOther { 2224 + return fmt.Errorf("booleans must be major type 7") 2225 + } 2226 + 2227 + var val bool 2228 + switch extra { 2229 + case 20: 2230 + val = false 2231 + case 21: 2232 + val = true 2233 + default: 2234 + return fmt.Errorf("booleans are either major type 7, value 20 or 21 (got %d)", extra) 2235 + } 2236 + t.Neg = &val 2237 + } 2238 + } 2239 + // t.Src (string) (string) 2240 + case "src": 2241 + 2242 + { 2243 + sval, err := cbg.ReadString(cr) 2244 + if err != nil { 2245 + return err 2246 + } 2247 + 2248 + t.Src = string(sval) 2249 + } 2250 + // t.Uri (string) (string) 2251 + case "uri": 2252 + 2253 + { 2254 + sval, err := cbg.ReadString(cr) 2255 + if err != nil { 2256 + return err 2257 + } 2258 + 2259 + t.Uri = string(sval) 2260 + } 2261 + // t.Val (string) (string) 2262 + case "val": 2263 + 2264 + { 2265 + sval, err := cbg.ReadString(cr) 2266 + if err != nil { 2267 + return err 2268 + } 2269 + 2270 + t.Val = string(sval) 2271 + } 2272 + 2273 + default: 2274 + // Field doesn't exist on this type, so ignore it 2275 + cbg.ScanForLinks(r, func(cid.Cid) {}) 2276 + } 2277 + } 2278 + 2279 + return nil 2280 + } 2281 + func (t *LabelSubscribeLabels_Labels) MarshalCBOR(w io.Writer) error { 2282 + if t == nil { 2283 + _, err := w.Write(cbg.CborNull) 2284 + return err 2285 + } 2286 + 2287 + cw := cbg.NewCborWriter(w) 2288 + 2289 + if _, err := cw.Write([]byte{162}); err != nil { 2290 + return err 2291 + } 2292 + 2293 + // t.Seq (int64) (int64) 2294 + if len("seq") > cbg.MaxLength { 2295 + return xerrors.Errorf("Value in field \"seq\" was too long") 2296 + } 2297 + 2298 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("seq"))); err != nil { 2299 + return err 2300 + } 2301 + if _, err := cw.WriteString(string("seq")); err != nil { 2302 + return err 2303 + } 2304 + 2305 + if t.Seq >= 0 { 2306 + if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.Seq)); err != nil { 2307 + return err 2308 + } 2309 + } else { 2310 + if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-t.Seq-1)); err != nil { 2311 + return err 2312 + } 2313 + } 2314 + 2315 + // t.Labels ([]*atproto.LabelDefs_Label) (slice) 2316 + if len("labels") > cbg.MaxLength { 2317 + return xerrors.Errorf("Value in field \"labels\" was too long") 2318 + } 2319 + 2320 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("labels"))); err != nil { 2321 + return err 2322 + } 2323 + if _, err := cw.WriteString(string("labels")); err != nil { 2324 + return err 2325 + } 2326 + 2327 + if len(t.Labels) > cbg.MaxLength { 2328 + return xerrors.Errorf("Slice value in field t.Labels was too long") 2329 + } 2330 + 2331 + if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.Labels))); err != nil { 2332 + return err 2333 + } 2334 + for _, v := range t.Labels { 2335 + if err := v.MarshalCBOR(cw); err != nil { 2336 + return err 2337 + } 2338 + } 2339 + return nil 2340 + } 2341 + 2342 + func (t *LabelSubscribeLabels_Labels) UnmarshalCBOR(r io.Reader) (err error) { 2343 + *t = LabelSubscribeLabels_Labels{} 2344 + 2345 + cr := cbg.NewCborReader(r) 2346 + 2347 + maj, extra, err := cr.ReadHeader() 2348 + if err != nil { 2349 + return err 2350 + } 2351 + defer func() { 2352 + if err == io.EOF { 2353 + err = io.ErrUnexpectedEOF 2354 + } 2355 + }() 2356 + 2357 + if maj != cbg.MajMap { 2358 + return fmt.Errorf("cbor input should be of type map") 2359 + } 2360 + 2361 + if extra > cbg.MaxLength { 2362 + return fmt.Errorf("LabelSubscribeLabels_Labels: map struct too large (%d)", extra) 2363 + } 2364 + 2365 + var name string 2366 + n := extra 2367 + 2368 + for i := uint64(0); i < n; i++ { 2369 + 2370 + { 2371 + sval, err := cbg.ReadString(cr) 2372 + if err != nil { 2373 + return err 2374 + } 2375 + 2376 + name = string(sval) 2377 + } 2378 + 2379 + switch name { 2380 + // t.Seq (int64) (int64) 2381 + case "seq": 2382 + { 2383 + maj, extra, err := cr.ReadHeader() 2384 + var extraI int64 2385 + if err != nil { 2386 + return err 2387 + } 2388 + switch maj { 2389 + case cbg.MajUnsignedInt: 2390 + extraI = int64(extra) 2391 + if extraI < 0 { 2392 + return fmt.Errorf("int64 positive overflow") 2393 + } 2394 + case cbg.MajNegativeInt: 2395 + extraI = int64(extra) 2396 + if extraI < 0 { 2397 + return fmt.Errorf("int64 negative overflow") 2398 + } 2399 + extraI = -1 - extraI 2400 + default: 2401 + return fmt.Errorf("wrong type for int64 field: %d", maj) 2402 + } 2403 + 2404 + t.Seq = int64(extraI) 2405 + } 2406 + // t.Labels ([]*atproto.LabelDefs_Label) (slice) 2407 + case "labels": 2408 + 2409 + maj, extra, err = cr.ReadHeader() 2410 + if err != nil { 2411 + return err 2412 + } 2413 + 2414 + if extra > cbg.MaxLength { 2415 + return fmt.Errorf("t.Labels: array too large (%d)", extra) 2416 + } 2417 + 2418 + if maj != cbg.MajArray { 2419 + return fmt.Errorf("expected cbor array") 2420 + } 2421 + 2422 + if extra > 0 { 2423 + t.Labels = make([]*LabelDefs_Label, extra) 2424 + } 2425 + 2426 + for i := 0; i < int(extra); i++ { 2427 + { 2428 + var maj byte 2429 + var extra uint64 2430 + var err error 2431 + _ = maj 2432 + _ = extra 2433 + _ = err 2434 + 2435 + { 2436 + 2437 + b, err := cr.ReadByte() 2438 + if err != nil { 2439 + return err 2440 + } 2441 + if b != cbg.CborNull[0] { 2442 + if err := cr.UnreadByte(); err != nil { 2443 + return err 2444 + } 2445 + t.Labels[i] = new(LabelDefs_Label) 2446 + if err := t.Labels[i].UnmarshalCBOR(cr); err != nil { 2447 + return xerrors.Errorf("unmarshaling t.Labels[i] pointer: %w", err) 2448 + } 2449 + } 2450 + 2451 + } 2452 + } 2453 + } 2454 + 2455 + default: 2456 + // Field doesn't exist on this type, so ignore it 2457 + cbg.ScanForLinks(r, func(cid.Cid) {}) 2458 + } 2459 + } 2460 + 2461 + return nil 2462 + } 2463 + func (t *LabelSubscribeLabels_Info) MarshalCBOR(w io.Writer) error { 2464 + if t == nil { 2465 + _, err := w.Write(cbg.CborNull) 2466 + return err 2467 + } 2468 + 2469 + cw := cbg.NewCborWriter(w) 2470 + fieldCount := 2 2471 + 2472 + if t.Message == nil { 2473 + fieldCount-- 2474 + } 2475 + 2476 + if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { 2477 + return err 2478 + } 2479 + 2480 + // t.Name (string) (string) 2481 + if len("name") > cbg.MaxLength { 2482 + return xerrors.Errorf("Value in field \"name\" was too long") 2483 + } 2484 + 2485 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("name"))); err != nil { 2486 + return err 2487 + } 2488 + if _, err := cw.WriteString(string("name")); err != nil { 2489 + return err 2490 + } 2491 + 2492 + if len(t.Name) > cbg.MaxLength { 2493 + return xerrors.Errorf("Value in field t.Name was too long") 2494 + } 2495 + 2496 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Name))); err != nil { 2497 + return err 2498 + } 2499 + if _, err := cw.WriteString(string(t.Name)); err != nil { 2500 + return err 2501 + } 2502 + 2503 + // t.Message (string) (string) 2504 + if t.Message != nil { 2505 + 2506 + if len("message") > cbg.MaxLength { 2507 + return xerrors.Errorf("Value in field \"message\" was too long") 2508 + } 2509 + 2510 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("message"))); err != nil { 2511 + return err 2512 + } 2513 + if _, err := cw.WriteString(string("message")); err != nil { 2514 + return err 2515 + } 2516 + 2517 + if t.Message == nil { 2518 + if _, err := cw.Write(cbg.CborNull); err != nil { 2519 + return err 2520 + } 2521 + } else { 2522 + if len(*t.Message) > cbg.MaxLength { 2523 + return xerrors.Errorf("Value in field t.Message was too long") 2524 + } 2525 + 2526 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Message))); err != nil { 2527 + return err 2528 + } 2529 + if _, err := cw.WriteString(string(*t.Message)); err != nil { 2530 + return err 2531 + } 2532 + } 2533 + } 2534 + return nil 2535 + } 2536 + 2537 + func (t *LabelSubscribeLabels_Info) UnmarshalCBOR(r io.Reader) (err error) { 2538 + *t = LabelSubscribeLabels_Info{} 2539 + 2540 + cr := cbg.NewCborReader(r) 2541 + 2542 + maj, extra, err := cr.ReadHeader() 2543 + if err != nil { 2544 + return err 2545 + } 2546 + defer func() { 2547 + if err == io.EOF { 2548 + err = io.ErrUnexpectedEOF 2549 + } 2550 + }() 2551 + 2552 + if maj != cbg.MajMap { 2553 + return fmt.Errorf("cbor input should be of type map") 2554 + } 2555 + 2556 + if extra > cbg.MaxLength { 2557 + return fmt.Errorf("LabelSubscribeLabels_Info: map struct too large (%d)", extra) 2558 + } 2559 + 2560 + var name string 2561 + n := extra 2562 + 2563 + for i := uint64(0); i < n; i++ { 2564 + 2565 + { 2566 + sval, err := cbg.ReadString(cr) 2567 + if err != nil { 2568 + return err 2569 + } 2570 + 2571 + name = string(sval) 2572 + } 2573 + 2574 + switch name { 2575 + // t.Name (string) (string) 2576 + case "name": 2577 + 2578 + { 2579 + sval, err := cbg.ReadString(cr) 2580 + if err != nil { 2581 + return err 2582 + } 2583 + 2584 + t.Name = string(sval) 2585 + } 2586 + // t.Message (string) (string) 2587 + case "message": 2588 + 2589 + { 2590 + b, err := cr.ReadByte() 2591 + if err != nil { 2592 + return err 2593 + } 2594 + if b != cbg.CborNull[0] { 2595 + if err := cr.UnreadByte(); err != nil { 2596 + return err 2597 + } 2598 + 2599 + sval, err := cbg.ReadString(cr) 2600 + if err != nil { 2601 + return err 2602 + } 2603 + 2604 + t.Message = (*string)(&sval) 2605 + } 2606 + } 2607 + 2608 + default: 2609 + // Field doesn't exist on this type, so ignore it 2610 + cbg.ScanForLinks(r, func(cid.Cid) {}) 2611 + } 2612 + } 2613 + 2614 + return nil 2615 + }
-2
api/label/README.md
··· 1 - 2 - NOTE: these lexicons are actually part of com.atproto.label.* and should end up under the package api/atproto. They are living here temporarily until the lexicons are formally merged upstream in the atproto repo.
-757
api/label/cbor_gen.go
··· 1 - // Code generated by github.com/whyrusleeping/cbor-gen. DO NOT EDIT. 2 - 3 - package label 4 - 5 - import ( 6 - "fmt" 7 - "io" 8 - "math" 9 - "sort" 10 - 11 - cid "github.com/ipfs/go-cid" 12 - cbg "github.com/whyrusleeping/cbor-gen" 13 - xerrors "golang.org/x/xerrors" 14 - ) 15 - 16 - var _ = xerrors.Errorf 17 - var _ = cid.Undef 18 - var _ = math.E 19 - var _ = sort.Sort 20 - 21 - func (t *Label) MarshalCBOR(w io.Writer) error { 22 - if t == nil { 23 - _, err := w.Write(cbg.CborNull) 24 - return err 25 - } 26 - 27 - cw := cbg.NewCborWriter(w) 28 - fieldCount := 7 29 - 30 - if t.Cid == nil { 31 - fieldCount-- 32 - } 33 - 34 - if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { 35 - return err 36 - } 37 - 38 - // t.Cid (string) (string) 39 - if t.Cid != nil { 40 - 41 - if len("cid") > cbg.MaxLength { 42 - return xerrors.Errorf("Value in field \"cid\" was too long") 43 - } 44 - 45 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("cid"))); err != nil { 46 - return err 47 - } 48 - if _, err := cw.WriteString(string("cid")); err != nil { 49 - return err 50 - } 51 - 52 - if t.Cid == nil { 53 - if _, err := cw.Write(cbg.CborNull); err != nil { 54 - return err 55 - } 56 - } else { 57 - if len(*t.Cid) > cbg.MaxLength { 58 - return xerrors.Errorf("Value in field t.Cid was too long") 59 - } 60 - 61 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Cid))); err != nil { 62 - return err 63 - } 64 - if _, err := cw.WriteString(string(*t.Cid)); err != nil { 65 - return err 66 - } 67 - } 68 - } 69 - 70 - // t.Cts (string) (string) 71 - if len("cts") > cbg.MaxLength { 72 - return xerrors.Errorf("Value in field \"cts\" was too long") 73 - } 74 - 75 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("cts"))); err != nil { 76 - return err 77 - } 78 - if _, err := cw.WriteString(string("cts")); err != nil { 79 - return err 80 - } 81 - 82 - if len(t.Cts) > cbg.MaxLength { 83 - return xerrors.Errorf("Value in field t.Cts was too long") 84 - } 85 - 86 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Cts))); err != nil { 87 - return err 88 - } 89 - if _, err := cw.WriteString(string(t.Cts)); err != nil { 90 - return err 91 - } 92 - 93 - // t.Neg (bool) (bool) 94 - if len("neg") > cbg.MaxLength { 95 - return xerrors.Errorf("Value in field \"neg\" was too long") 96 - } 97 - 98 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("neg"))); err != nil { 99 - return err 100 - } 101 - if _, err := cw.WriteString(string("neg")); err != nil { 102 - return err 103 - } 104 - 105 - if err := cbg.WriteBool(w, t.Neg); err != nil { 106 - return err 107 - } 108 - 109 - // t.Src (string) (string) 110 - if len("src") > cbg.MaxLength { 111 - return xerrors.Errorf("Value in field \"src\" was too long") 112 - } 113 - 114 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("src"))); err != nil { 115 - return err 116 - } 117 - if _, err := cw.WriteString(string("src")); err != nil { 118 - return err 119 - } 120 - 121 - if len(t.Src) > cbg.MaxLength { 122 - return xerrors.Errorf("Value in field t.Src was too long") 123 - } 124 - 125 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Src))); err != nil { 126 - return err 127 - } 128 - if _, err := cw.WriteString(string(t.Src)); err != nil { 129 - return err 130 - } 131 - 132 - // t.Uri (string) (string) 133 - if len("uri") > cbg.MaxLength { 134 - return xerrors.Errorf("Value in field \"uri\" was too long") 135 - } 136 - 137 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("uri"))); err != nil { 138 - return err 139 - } 140 - if _, err := cw.WriteString(string("uri")); err != nil { 141 - return err 142 - } 143 - 144 - if len(t.Uri) > cbg.MaxLength { 145 - return xerrors.Errorf("Value in field t.Uri was too long") 146 - } 147 - 148 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Uri))); err != nil { 149 - return err 150 - } 151 - if _, err := cw.WriteString(string(t.Uri)); err != nil { 152 - return err 153 - } 154 - 155 - // t.Val (string) (string) 156 - if len("val") > cbg.MaxLength { 157 - return xerrors.Errorf("Value in field \"val\" was too long") 158 - } 159 - 160 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("val"))); err != nil { 161 - return err 162 - } 163 - if _, err := cw.WriteString(string("val")); err != nil { 164 - return err 165 - } 166 - 167 - if len(t.Val) > cbg.MaxLength { 168 - return xerrors.Errorf("Value in field t.Val was too long") 169 - } 170 - 171 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Val))); err != nil { 172 - return err 173 - } 174 - if _, err := cw.WriteString(string(t.Val)); err != nil { 175 - return err 176 - } 177 - 178 - // t.LexiconTypeID (string) (string) 179 - if len("$type") > cbg.MaxLength { 180 - return xerrors.Errorf("Value in field \"$type\" was too long") 181 - } 182 - 183 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("$type"))); err != nil { 184 - return err 185 - } 186 - if _, err := cw.WriteString(string("$type")); err != nil { 187 - return err 188 - } 189 - 190 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("com.atproto.label.label"))); err != nil { 191 - return err 192 - } 193 - if _, err := cw.WriteString(string("com.atproto.label.label")); err != nil { 194 - return err 195 - } 196 - return nil 197 - } 198 - 199 - func (t *Label) UnmarshalCBOR(r io.Reader) (err error) { 200 - *t = Label{} 201 - 202 - cr := cbg.NewCborReader(r) 203 - 204 - maj, extra, err := cr.ReadHeader() 205 - if err != nil { 206 - return err 207 - } 208 - defer func() { 209 - if err == io.EOF { 210 - err = io.ErrUnexpectedEOF 211 - } 212 - }() 213 - 214 - if maj != cbg.MajMap { 215 - return fmt.Errorf("cbor input should be of type map") 216 - } 217 - 218 - if extra > cbg.MaxLength { 219 - return fmt.Errorf("Label: map struct too large (%d)", extra) 220 - } 221 - 222 - var name string 223 - n := extra 224 - 225 - for i := uint64(0); i < n; i++ { 226 - 227 - { 228 - sval, err := cbg.ReadString(cr) 229 - if err != nil { 230 - return err 231 - } 232 - 233 - name = string(sval) 234 - } 235 - 236 - switch name { 237 - // t.Cid (string) (string) 238 - case "cid": 239 - 240 - { 241 - b, err := cr.ReadByte() 242 - if err != nil { 243 - return err 244 - } 245 - if b != cbg.CborNull[0] { 246 - if err := cr.UnreadByte(); err != nil { 247 - return err 248 - } 249 - 250 - sval, err := cbg.ReadString(cr) 251 - if err != nil { 252 - return err 253 - } 254 - 255 - t.Cid = (*string)(&sval) 256 - } 257 - } 258 - // t.Cts (string) (string) 259 - case "cts": 260 - 261 - { 262 - sval, err := cbg.ReadString(cr) 263 - if err != nil { 264 - return err 265 - } 266 - 267 - t.Cts = string(sval) 268 - } 269 - // t.Neg (bool) (bool) 270 - case "neg": 271 - 272 - maj, extra, err = cr.ReadHeader() 273 - if err != nil { 274 - return err 275 - } 276 - if maj != cbg.MajOther { 277 - return fmt.Errorf("booleans must be major type 7") 278 - } 279 - switch extra { 280 - case 20: 281 - t.Neg = false 282 - case 21: 283 - t.Neg = true 284 - default: 285 - return fmt.Errorf("booleans are either major type 7, value 20 or 21 (got %d)", extra) 286 - } 287 - // t.Src (string) (string) 288 - case "src": 289 - 290 - { 291 - sval, err := cbg.ReadString(cr) 292 - if err != nil { 293 - return err 294 - } 295 - 296 - t.Src = string(sval) 297 - } 298 - // t.Uri (string) (string) 299 - case "uri": 300 - 301 - { 302 - sval, err := cbg.ReadString(cr) 303 - if err != nil { 304 - return err 305 - } 306 - 307 - t.Uri = string(sval) 308 - } 309 - // t.Val (string) (string) 310 - case "val": 311 - 312 - { 313 - sval, err := cbg.ReadString(cr) 314 - if err != nil { 315 - return err 316 - } 317 - 318 - t.Val = string(sval) 319 - } 320 - // t.LexiconTypeID (string) (string) 321 - case "$type": 322 - 323 - { 324 - sval, err := cbg.ReadString(cr) 325 - if err != nil { 326 - return err 327 - } 328 - 329 - t.LexiconTypeID = string(sval) 330 - } 331 - 332 - default: 333 - // Field doesn't exist on this type, so ignore it 334 - cbg.ScanForLinks(r, func(cid.Cid) {}) 335 - } 336 - } 337 - 338 - return nil 339 - } 340 - func (t *SubscribeLabels_Info) MarshalCBOR(w io.Writer) error { 341 - if t == nil { 342 - _, err := w.Write(cbg.CborNull) 343 - return err 344 - } 345 - 346 - cw := cbg.NewCborWriter(w) 347 - fieldCount := 3 348 - 349 - if t.LexiconTypeID == "" { 350 - fieldCount-- 351 - } 352 - 353 - if t.Message == nil { 354 - fieldCount-- 355 - } 356 - 357 - if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { 358 - return err 359 - } 360 - 361 - // t.Name (string) (string) 362 - if len("name") > cbg.MaxLength { 363 - return xerrors.Errorf("Value in field \"name\" was too long") 364 - } 365 - 366 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("name"))); err != nil { 367 - return err 368 - } 369 - if _, err := cw.WriteString(string("name")); err != nil { 370 - return err 371 - } 372 - 373 - if len(t.Name) > cbg.MaxLength { 374 - return xerrors.Errorf("Value in field t.Name was too long") 375 - } 376 - 377 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Name))); err != nil { 378 - return err 379 - } 380 - if _, err := cw.WriteString(string(t.Name)); err != nil { 381 - return err 382 - } 383 - 384 - // t.LexiconTypeID (string) (string) 385 - if t.LexiconTypeID != "" { 386 - 387 - if len("$type") > cbg.MaxLength { 388 - return xerrors.Errorf("Value in field \"$type\" was too long") 389 - } 390 - 391 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("$type"))); err != nil { 392 - return err 393 - } 394 - if _, err := cw.WriteString(string("$type")); err != nil { 395 - return err 396 - } 397 - 398 - if len(t.LexiconTypeID) > cbg.MaxLength { 399 - return xerrors.Errorf("Value in field t.LexiconTypeID was too long") 400 - } 401 - 402 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.LexiconTypeID))); err != nil { 403 - return err 404 - } 405 - if _, err := cw.WriteString(string(t.LexiconTypeID)); err != nil { 406 - return err 407 - } 408 - } 409 - 410 - // t.Message (string) (string) 411 - if t.Message != nil { 412 - 413 - if len("message") > cbg.MaxLength { 414 - return xerrors.Errorf("Value in field \"message\" was too long") 415 - } 416 - 417 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("message"))); err != nil { 418 - return err 419 - } 420 - if _, err := cw.WriteString(string("message")); err != nil { 421 - return err 422 - } 423 - 424 - if t.Message == nil { 425 - if _, err := cw.Write(cbg.CborNull); err != nil { 426 - return err 427 - } 428 - } else { 429 - if len(*t.Message) > cbg.MaxLength { 430 - return xerrors.Errorf("Value in field t.Message was too long") 431 - } 432 - 433 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Message))); err != nil { 434 - return err 435 - } 436 - if _, err := cw.WriteString(string(*t.Message)); err != nil { 437 - return err 438 - } 439 - } 440 - } 441 - return nil 442 - } 443 - 444 - func (t *SubscribeLabels_Info) UnmarshalCBOR(r io.Reader) (err error) { 445 - *t = SubscribeLabels_Info{} 446 - 447 - cr := cbg.NewCborReader(r) 448 - 449 - maj, extra, err := cr.ReadHeader() 450 - if err != nil { 451 - return err 452 - } 453 - defer func() { 454 - if err == io.EOF { 455 - err = io.ErrUnexpectedEOF 456 - } 457 - }() 458 - 459 - if maj != cbg.MajMap { 460 - return fmt.Errorf("cbor input should be of type map") 461 - } 462 - 463 - if extra > cbg.MaxLength { 464 - return fmt.Errorf("SubscribeLabels_Info: map struct too large (%d)", extra) 465 - } 466 - 467 - var name string 468 - n := extra 469 - 470 - for i := uint64(0); i < n; i++ { 471 - 472 - { 473 - sval, err := cbg.ReadString(cr) 474 - if err != nil { 475 - return err 476 - } 477 - 478 - name = string(sval) 479 - } 480 - 481 - switch name { 482 - // t.Name (string) (string) 483 - case "name": 484 - 485 - { 486 - sval, err := cbg.ReadString(cr) 487 - if err != nil { 488 - return err 489 - } 490 - 491 - t.Name = string(sval) 492 - } 493 - // t.LexiconTypeID (string) (string) 494 - case "$type": 495 - 496 - { 497 - sval, err := cbg.ReadString(cr) 498 - if err != nil { 499 - return err 500 - } 501 - 502 - t.LexiconTypeID = string(sval) 503 - } 504 - // t.Message (string) (string) 505 - case "message": 506 - 507 - { 508 - b, err := cr.ReadByte() 509 - if err != nil { 510 - return err 511 - } 512 - if b != cbg.CborNull[0] { 513 - if err := cr.UnreadByte(); err != nil { 514 - return err 515 - } 516 - 517 - sval, err := cbg.ReadString(cr) 518 - if err != nil { 519 - return err 520 - } 521 - 522 - t.Message = (*string)(&sval) 523 - } 524 - } 525 - 526 - default: 527 - // Field doesn't exist on this type, so ignore it 528 - cbg.ScanForLinks(r, func(cid.Cid) {}) 529 - } 530 - } 531 - 532 - return nil 533 - } 534 - func (t *SubscribeLabels_Labels) MarshalCBOR(w io.Writer) error { 535 - if t == nil { 536 - _, err := w.Write(cbg.CborNull) 537 - return err 538 - } 539 - 540 - cw := cbg.NewCborWriter(w) 541 - fieldCount := 3 542 - 543 - if t.LexiconTypeID == "" { 544 - fieldCount-- 545 - } 546 - 547 - if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { 548 - return err 549 - } 550 - 551 - // t.Seq (int64) (int64) 552 - if len("seq") > cbg.MaxLength { 553 - return xerrors.Errorf("Value in field \"seq\" was too long") 554 - } 555 - 556 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("seq"))); err != nil { 557 - return err 558 - } 559 - if _, err := cw.WriteString(string("seq")); err != nil { 560 - return err 561 - } 562 - 563 - if t.Seq >= 0 { 564 - if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.Seq)); err != nil { 565 - return err 566 - } 567 - } else { 568 - if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-t.Seq-1)); err != nil { 569 - return err 570 - } 571 - } 572 - 573 - // t.LexiconTypeID (string) (string) 574 - if t.LexiconTypeID != "" { 575 - 576 - if len("$type") > cbg.MaxLength { 577 - return xerrors.Errorf("Value in field \"$type\" was too long") 578 - } 579 - 580 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("$type"))); err != nil { 581 - return err 582 - } 583 - if _, err := cw.WriteString(string("$type")); err != nil { 584 - return err 585 - } 586 - 587 - if len(t.LexiconTypeID) > cbg.MaxLength { 588 - return xerrors.Errorf("Value in field t.LexiconTypeID was too long") 589 - } 590 - 591 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.LexiconTypeID))); err != nil { 592 - return err 593 - } 594 - if _, err := cw.WriteString(string(t.LexiconTypeID)); err != nil { 595 - return err 596 - } 597 - } 598 - 599 - // t.Labels ([]*label.Label) (slice) 600 - if len("labels") > cbg.MaxLength { 601 - return xerrors.Errorf("Value in field \"labels\" was too long") 602 - } 603 - 604 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("labels"))); err != nil { 605 - return err 606 - } 607 - if _, err := cw.WriteString(string("labels")); err != nil { 608 - return err 609 - } 610 - 611 - if len(t.Labels) > cbg.MaxLength { 612 - return xerrors.Errorf("Slice value in field t.Labels was too long") 613 - } 614 - 615 - if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.Labels))); err != nil { 616 - return err 617 - } 618 - for _, v := range t.Labels { 619 - if err := v.MarshalCBOR(cw); err != nil { 620 - return err 621 - } 622 - } 623 - return nil 624 - } 625 - 626 - func (t *SubscribeLabels_Labels) UnmarshalCBOR(r io.Reader) (err error) { 627 - *t = SubscribeLabels_Labels{} 628 - 629 - cr := cbg.NewCborReader(r) 630 - 631 - maj, extra, err := cr.ReadHeader() 632 - if err != nil { 633 - return err 634 - } 635 - defer func() { 636 - if err == io.EOF { 637 - err = io.ErrUnexpectedEOF 638 - } 639 - }() 640 - 641 - if maj != cbg.MajMap { 642 - return fmt.Errorf("cbor input should be of type map") 643 - } 644 - 645 - if extra > cbg.MaxLength { 646 - return fmt.Errorf("SubscribeLabels_Labels: map struct too large (%d)", extra) 647 - } 648 - 649 - var name string 650 - n := extra 651 - 652 - for i := uint64(0); i < n; i++ { 653 - 654 - { 655 - sval, err := cbg.ReadString(cr) 656 - if err != nil { 657 - return err 658 - } 659 - 660 - name = string(sval) 661 - } 662 - 663 - switch name { 664 - // t.Seq (int64) (int64) 665 - case "seq": 666 - { 667 - maj, extra, err := cr.ReadHeader() 668 - var extraI int64 669 - if err != nil { 670 - return err 671 - } 672 - switch maj { 673 - case cbg.MajUnsignedInt: 674 - extraI = int64(extra) 675 - if extraI < 0 { 676 - return fmt.Errorf("int64 positive overflow") 677 - } 678 - case cbg.MajNegativeInt: 679 - extraI = int64(extra) 680 - if extraI < 0 { 681 - return fmt.Errorf("int64 negative overflow") 682 - } 683 - extraI = -1 - extraI 684 - default: 685 - return fmt.Errorf("wrong type for int64 field: %d", maj) 686 - } 687 - 688 - t.Seq = int64(extraI) 689 - } 690 - // t.LexiconTypeID (string) (string) 691 - case "$type": 692 - 693 - { 694 - sval, err := cbg.ReadString(cr) 695 - if err != nil { 696 - return err 697 - } 698 - 699 - t.LexiconTypeID = string(sval) 700 - } 701 - // t.Labels ([]*label.Label) (slice) 702 - case "labels": 703 - 704 - maj, extra, err = cr.ReadHeader() 705 - if err != nil { 706 - return err 707 - } 708 - 709 - if extra > cbg.MaxLength { 710 - return fmt.Errorf("t.Labels: array too large (%d)", extra) 711 - } 712 - 713 - if maj != cbg.MajArray { 714 - return fmt.Errorf("expected cbor array") 715 - } 716 - 717 - if extra > 0 { 718 - t.Labels = make([]*Label, extra) 719 - } 720 - 721 - for i := 0; i < int(extra); i++ { 722 - { 723 - var maj byte 724 - var extra uint64 725 - var err error 726 - _ = maj 727 - _ = extra 728 - _ = err 729 - 730 - { 731 - 732 - b, err := cr.ReadByte() 733 - if err != nil { 734 - return err 735 - } 736 - if b != cbg.CborNull[0] { 737 - if err := cr.UnreadByte(); err != nil { 738 - return err 739 - } 740 - t.Labels[i] = new(Label) 741 - if err := t.Labels[i].UnmarshalCBOR(cr); err != nil { 742 - return xerrors.Errorf("unmarshaling t.Labels[i] pointer: %w", err) 743 - } 744 - } 745 - 746 - } 747 - } 748 - } 749 - 750 - default: 751 - // Field doesn't exist on this type, so ignore it 752 - cbg.ScanForLinks(r, func(cid.Cid) {}) 753 - } 754 - } 755 - 756 - return nil 757 - }
-23
api/label/labellabel.go
··· 1 - package label 2 - 3 - import ( 4 - "github.com/bluesky-social/indigo/lex/util" 5 - ) 6 - 7 - // schema: com.atproto.label.label 8 - 9 - func init() { 10 - util.RegisterType("com.atproto.label.label", &Label{}) 11 - } 12 - 13 - // RECORDTYPE: Label 14 - type Label struct { 15 - LexiconTypeID string `json:"$type,const=com.atproto.label.label" cborgen:"$type,const=com.atproto.label.label"` 16 - Cid *string `json:"cid,omitempty" cborgen:"cid,omitempty"` 17 - Cts string `json:"cts" cborgen:"cts"` 18 - // manually setting this to 'bool' not '*bool' 19 - Neg bool `json:"neg" cborgen:"neg"` 20 - Src string `json:"src" cborgen:"src"` 21 - Uri string `json:"uri" cborgen:"uri"` 22 - Val string `json:"val" cborgen:"val"` 23 - }
-34
api/label/labelqueryLabels.go
··· 1 - package label 2 - 3 - import ( 4 - "context" 5 - 6 - "github.com/bluesky-social/indigo/xrpc" 7 - ) 8 - 9 - // schema: com.atproto.label.queryLabels 10 - 11 - func init() { 12 - } 13 - 14 - type QueryLabels_Output struct { 15 - LexiconTypeID string `json:"$type,omitempty" cborgen:"$type,omitempty"` 16 - Cursor *string `json:"cursor,omitempty" cborgen:"cursor,omitempty"` 17 - Labels []*Label `json:"labels" cborgen:"labels"` 18 - } 19 - 20 - func QueryLabels(ctx context.Context, c *xrpc.Client, cursor string, limit int64, sources []string, uriPatterns []string) (*QueryLabels_Output, error) { 21 - var out QueryLabels_Output 22 - 23 - params := map[string]interface{}{ 24 - "cursor": cursor, 25 - "limit": limit, 26 - "sources": sources, 27 - "uriPatterns": uriPatterns, 28 - } 29 - if err := c.Do(ctx, xrpc.Query, "", "com.atproto.label.queryLabels", params, nil, &out); err != nil { 30 - return nil, err 31 - } 32 - 33 - return &out, nil 34 - }
-18
api/label/labelsubscribeLabels.go
··· 1 - package label 2 - 3 - // schema: com.atproto.label.subscribeLabels 4 - 5 - func init() { 6 - } 7 - 8 - type SubscribeLabels_Info struct { 9 - LexiconTypeID string `json:"$type,omitempty" cborgen:"$type,omitempty"` 10 - Message *string `json:"message,omitempty" cborgen:"message,omitempty"` 11 - Name string `json:"name" cborgen:"name"` 12 - } 13 - 14 - type SubscribeLabels_Labels struct { 15 - LexiconTypeID string `json:"$type,omitempty" cborgen:"$type,omitempty"` 16 - Labels []*Label `json:"labels" cborgen:"labels"` 17 - Seq int64 `json:"seq" cborgen:"seq"` 18 - }
+3 -4
events/consumer.go
··· 8 8 "time" 9 9 10 10 comatproto "github.com/bluesky-social/indigo/api/atproto" 11 - label "github.com/bluesky-social/indigo/api/label" 12 11 "github.com/prometheus/client_golang/prometheus" 13 12 "golang.org/x/time/rate" 14 13 ··· 21 20 RepoInfo func(evt *comatproto.SyncSubscribeRepos_Info) error 22 21 RepoMigrate func(evt *comatproto.SyncSubscribeRepos_Migrate) error 23 22 RepoTombstone func(evt *comatproto.SyncSubscribeRepos_Tombstone) error 24 - LabelLabels func(evt *label.SubscribeLabels_Labels) error 25 - LabelInfo func(evt *label.SubscribeLabels_Info) error 23 + LabelLabels func(evt *comatproto.LabelSubscribeLabels_Labels) error 24 + LabelInfo func(evt *comatproto.LabelSubscribeLabels_Info) error 26 25 Error func(evt *ErrorFrame) error 27 26 } 28 27 ··· 235 234 return err 236 235 } 237 236 case "#labebatch": 238 - var evt label.SubscribeLabels_Labels 237 + var evt comatproto.LabelSubscribeLabels_Labels 239 238 if err := evt.UnmarshalCBOR(r); err != nil { 240 239 return fmt.Errorf("reading Labels event: %w", err) 241 240 }
+2 -3
events/events.go
··· 8 8 "time" 9 9 10 10 comatproto "github.com/bluesky-social/indigo/api/atproto" 11 - label "github.com/bluesky-social/indigo/api/label" 12 11 "github.com/bluesky-social/indigo/models" 13 12 "github.com/prometheus/client_golang/prometheus" 14 13 ··· 141 140 RepoInfo *comatproto.SyncSubscribeRepos_Info 142 141 RepoMigrate *comatproto.SyncSubscribeRepos_Migrate 143 142 RepoTombstone *comatproto.SyncSubscribeRepos_Tombstone 144 - LabelLabels *label.SubscribeLabels_Labels 145 - LabelInfo *label.SubscribeLabels_Info 143 + LabelLabels *comatproto.LabelSubscribeLabels_Labels 144 + LabelInfo *comatproto.LabelSubscribeLabels_Info 146 145 147 146 // some private fields for internal routing perf 148 147 PrivUid models.Uid `json:"-" cborgen:"-"`
+3 -5
gen/main.go
··· 6 6 "github.com/bluesky-social/indigo/api" 7 7 atproto "github.com/bluesky-social/indigo/api/atproto" 8 8 bsky "github.com/bluesky-social/indigo/api/bsky" 9 - label "github.com/bluesky-social/indigo/api/label" 10 9 "github.com/bluesky-social/indigo/events" 11 10 lexutil "github.com/bluesky-social/indigo/lex/util" 12 11 "github.com/bluesky-social/indigo/mst" ··· 72 71 atproto.SyncSubscribeRepos_Tombstone{}, 73 72 atproto.LabelDefs_SelfLabels{}, 74 73 atproto.LabelDefs_SelfLabel{}, 74 + atproto.LabelDefs_Label{}, 75 + atproto.LabelSubscribeLabels_Labels{}, 76 + atproto.LabelSubscribeLabels_Info{}, 75 77 ); err != nil { 76 - panic(err) 77 - } 78 - 79 - if err := cbg.WriteMapEncodersToFile("api/label/cbor_gen.go", "label", label.Label{}, label.SubscribeLabels_Info{}, label.SubscribeLabels_Labels{}); err != nil { 80 78 panic(err) 81 79 } 82 80
+3 -3
labeler/commit.go
··· 6 6 "strings" 7 7 "time" 8 8 9 - label "github.com/bluesky-social/indigo/api/label" 9 + comatproto "github.com/bluesky-social/indigo/api/atproto" 10 10 "github.com/bluesky-social/indigo/events" 11 11 "github.com/bluesky-social/indigo/models" 12 12 util "github.com/bluesky-social/indigo/util" ··· 15 15 ) 16 16 17 17 // Persist to database (and repo), and emit events. 18 - func (s *Server) CommitLabels(ctx context.Context, labels []*label.Label, negate bool) error { 18 + func (s *Server) CommitLabels(ctx context.Context, labels []*comatproto.LabelDefs_Label, negate bool) error { 19 19 20 20 now := time.Now() 21 21 nowStr := now.Format(util.ISO8601) ··· 61 61 if len(labels) > 0 { 62 62 log.Infof("broadcasting labels: %s", labels) 63 63 lev := events.XRPCStreamEvent{ 64 - LabelLabels: &label.SubscribeLabels_Labels{ 64 + LabelLabels: &comatproto.LabelSubscribeLabels_Labels{ 65 65 // NOTE(bnewbold): generic event handler code handles Seq field for us 66 66 Labels: labels, 67 67 },
+2 -3
labeler/helpers_test.go
··· 13 13 "github.com/stretchr/testify/assert" 14 14 15 15 comatproto "github.com/bluesky-social/indigo/api/atproto" 16 - label "github.com/bluesky-social/indigo/api/label" 17 16 ) 18 17 19 18 // fetches report via getModerationReport, verifies match ··· 82 81 return out 83 82 } 84 83 85 - func testQueryLabels(t *testing.T, e *echo.Echo, lm *Server, params *url.Values) (*label.QueryLabels_Output, error) { 84 + func testQueryLabels(t *testing.T, e *echo.Echo, lm *Server, params *url.Values) (*comatproto.LabelQueryLabels_Output, error) { 86 85 87 86 req := httptest.NewRequest(http.MethodGet, "/xrpc/com.atproto.label.queryLabels?"+params.Encode(), nil) 88 87 req.Header.Set(echo.HeaderContentType, echo.MIMEApplicationJSON) ··· 92 91 if err != nil { 93 92 return nil, err 94 93 } 95 - var out label.QueryLabels_Output 94 + var out comatproto.LabelQueryLabels_Output 96 95 if err := json.Unmarshal([]byte(recorder.Body.String()), &out); err != nil { 97 96 t.Fatal(err) 98 97 }
+3 -4
labeler/service.go
··· 14 14 "github.com/bluesky-social/indigo/api" 15 15 comatproto "github.com/bluesky-social/indigo/api/atproto" 16 16 appbsky "github.com/bluesky-social/indigo/api/bsky" 17 - label "github.com/bluesky-social/indigo/api/label" 18 17 "github.com/bluesky-social/indigo/bgs" 19 18 "github.com/bluesky-social/indigo/carstore" 20 19 "github.com/bluesky-social/indigo/events" ··· 358 357 return err 359 358 } 360 359 361 - labels := []*label.Label{} 360 + labels := []*comatproto.LabelDefs_Label{} 362 361 for _, op := range evt.RepoCommit.Ops { 363 362 uri := "at://" + evt.RepoCommit.Repo + "/" + op.Path 364 363 nsid := strings.SplitN(op.Path, "/", 2)[0] ··· 380 379 // apply labels with this pattern to the whole repo, not the record 381 380 if strings.HasPrefix(val, "repo:") { 382 381 val = strings.SplitN(val, ":", 2)[1] 383 - labels = append(labels, &label.Label{ 382 + labels = append(labels, &comatproto.LabelDefs_Label{ 384 383 Src: s.user.Did, 385 384 Uri: "at://" + evt.RepoCommit.Repo, 386 385 Val: val, ··· 388 387 //Cts 389 388 }) 390 389 } else { 391 - labels = append(labels, &label.Label{ 390 + labels = append(labels, &comatproto.LabelDefs_Label{ 392 391 Src: s.user.Did, 393 392 Uri: uri, 394 393 Cid: &cidStr,
+1 -2
labeler/xrpc_endpoints.go
··· 5 5 "strconv" 6 6 7 7 atproto "github.com/bluesky-social/indigo/api/atproto" 8 - label "github.com/bluesky-social/indigo/api/label" 9 8 10 9 "github.com/carlmjohnson/versioninfo" 11 10 "github.com/labstack/echo/v4" ··· 76 75 sources := c.QueryParams()["sources"] 77 76 78 77 uriPatterns := c.QueryParams()["uriPatterns"] 79 - var out *label.QueryLabels_Output 78 + var out *atproto.LabelQueryLabels_Output 80 79 var handleErr error 81 80 // func (s *Server) handleComAtprotoLabelQueryLabels(ctx context.Context,cursor string,limit int,sources []string,uriPatterns []string) (*comatprototypes.LabelQueryLabels_Output, error) 82 81 out, handleErr = s.handleComAtprotoLabelQueryLabels(ctx, cursor, limit, sources, uriPatterns)
+5 -6
labeler/xrpc_handlers.go
··· 7 7 "time" 8 8 9 9 atproto "github.com/bluesky-social/indigo/api/atproto" 10 - label "github.com/bluesky-social/indigo/api/label" 11 10 "github.com/bluesky-social/indigo/models" 12 11 "github.com/bluesky-social/indigo/util" 13 12 ··· 23 22 }, nil 24 23 } 25 24 26 - func (s *Server) handleComAtprotoLabelQueryLabels(ctx context.Context, cursor string, limit int, sources, uriPatterns []string) (*label.QueryLabels_Output, error) { 25 + func (s *Server) handleComAtprotoLabelQueryLabels(ctx context.Context, cursor string, limit int, sources, uriPatterns []string) (*atproto.LabelQueryLabels_Output, error) { 27 26 28 27 if limit <= 0 { 29 28 limit = 20 ··· 77 76 nextCursor = strconv.FormatUint(labelRows[len(labelRows)-1].ID, 10) 78 77 } 79 78 80 - labelObjs := []*label.Label{} 79 + labelObjs := []*atproto.LabelDefs_Label{} 81 80 for _, row := range labelRows { 82 81 neg := false 83 82 if row.Neg != nil && *row.Neg == true { 84 83 neg = true 85 84 } 86 - labelObjs = append(labelObjs, &label.Label{ 85 + labelObjs = append(labelObjs, &atproto.LabelDefs_Label{ 87 86 Src: row.SourceDid, 88 87 Uri: row.Uri, 89 88 Cid: row.Cid, 90 89 Val: row.Val, 91 - Neg: neg, 90 + Neg: &neg, 92 91 Cts: row.CreatedAt.Format(util.ISO8601), 93 92 }) 94 93 } 95 - out := label.QueryLabels_Output{ 94 + out := atproto.LabelQueryLabels_Output{ 96 95 Labels: labelObjs, 97 96 } 98 97 if nextCursor != "" {
+5 -3
labeler/xrpc_test.go
··· 10 10 "testing" 11 11 12 12 comatproto "github.com/bluesky-social/indigo/api/atproto" 13 - label "github.com/bluesky-social/indigo/api/label" 14 13 15 14 "github.com/labstack/echo/v4" 16 15 "github.com/stretchr/testify/assert" ··· 176 175 assert.Equal(0, len(out1.Labels)) 177 176 178 177 // create a label, then query 179 - l3 := label.Label{ 178 + neg := false 179 + l3 := comatproto.LabelDefs_Label{ 180 180 Uri: "at://did:plc:fake/com.example/abc234", 181 181 Val: "example", 182 182 Cts: "2023-03-15T22:16:18.408Z", 183 + // TODO: temporary hack, should just be null 184 + Neg: &neg, 183 185 } 184 - lm.CommitLabels(ctx, []*label.Label{&l3}, false) 186 + lm.CommitLabels(ctx, []*comatproto.LabelDefs_Label{&l3}, false) 185 187 p3 := make(url.Values) 186 188 p3.Set("uriPatterns", l3.Uri) 187 189 out3, err := testQueryLabels(t, e, lm, &p3)
+3 -3
testing/labelmaker_fakedata_test.go
··· 9 9 "testing" 10 10 "time" 11 11 12 - label "github.com/bluesky-social/indigo/api/label" 12 + comatproto "github.com/bluesky-social/indigo/api/atproto" 13 13 "github.com/bluesky-social/indigo/carstore" 14 14 "github.com/bluesky-social/indigo/events" 15 15 "github.com/bluesky-social/indigo/events/schedulers/sequential" ··· 101 101 102 102 go func() { 103 103 rsc := &events.RepoStreamCallbacks{ 104 - LabelLabels: func(evt *label.SubscribeLabels_Labels) error { 104 + LabelLabels: func(evt *comatproto.LabelSubscribeLabels_Labels) error { 105 105 fmt.Println("received event: ", evt.Seq) 106 106 es.Lk.Lock() 107 107 es.Events = append(es.Events, &events.XRPCStreamEvent{LabelLabels: evt}) ··· 164 164 } 165 165 166 166 // no auth required 167 - queryOut, err := label.QueryLabels(ctx, &xrpcc, "", 20, []string{}, []string{"*"}) 167 + queryOut, err := comatproto.LabelQueryLabels(ctx, &xrpcc, "", 20, []string{}, []string{"*"}) 168 168 assert.NoError(err) 169 169 assert.Equal(0, len(queryOut.Labels)) 170 170 assert.Nil(queryOut.Cursor)