Declare taxonomy filter variables on the makes/runs leaderboards

The backend leaderboard resolvers gained game_type, table size and pocket
size filters, but GetMakesLeaderboard and GetRunsLeaderboard never declared
them — GraphQL silently drops undeclared variables, so anything the client
passed was ignored and both boards stayed global.

Declare and forward the five filter args on both queries, matching the
names the drill run leaderboard already uses.

bin/assert-no-changes.sh

@@ -9,6 +9,7 @@ for proto in $(find ./rbproto -iname '*.proto'); do
 		protoc -I=./rbproto --python_out=./rbproto/python --pyi_out=./rbproto/python ./rbproto/shot.proto
     yarn pbjs ./rbproto/shot.proto --ts ./rbproto/ts/shot.ts
 done
+black rbproto/python
 prettier ./rbproto --write
 
 git ls-files | xargs md5sum > after.txt

flake.nix

@@ -21,7 +21,7 @@
     in
       with pkgs; {
         devShell = mkShell {
-          buildInputs = [nodejs yarn watchman alejandra nodePackages.prettier just protobuf];
+          buildInputs = [nodejs yarn watchman alejandra nodePackages.prettier just protobuf black];
         };
       });
 }

package.json

@@ -12,10 +12,10 @@
   "author": "Ivan Malison <IvanMalison@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "@apollo/client": "^3.9.2",
+    "@apollo/client": "^3.11.10",
     "@graphql-codegen/cli": "^5.0.0",
     "@graphql-codegen/typescript": "^4.0.1",
-    "@graphql-codegen/typescript-operations": "^4.0.1",
+    "@graphql-codegen/typescript-operations": "^5.0.4",
     "@graphql-codegen/typescript-react-apollo": "^4.2.0",
     "graphql": "^16.8.1",
     "pbjs": "^0.0.14",

pyproject.toml

@@ -7,8 +7,8 @@ readme = "README.md"
 packages = [{include = "rbproto"}]
 
 [tool.poetry.dependencies]
-python = ">=3.10,<3.12"
-protobuf = "^4.25.3"
+python = ">=3.10,<=3.13"
+protobuf = ">=4.25.3"
 
 
 [build-system]

rbproto/python/shot_pb2.py

@@ -6,44 +6,49 @@ from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
 from google.protobuf.internal import builder as _builder
+
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
 
 
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nshot.proto\x12\x0fserialized_shot\"?\n\x03\x42ox\x12\x0c\n\x04left\x18\x01 \x01(\x02\x12\x0b\n\x03top\x18\x02 \x01(\x02\x12\r\n\x05width\x18\x03 \x01(\x02\x12\x0e\n\x06height\x18\x04 \x01(\x02\"\x1d\n\x05Point\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\"\x7f\n\rBallDetection\x12.\n\x0eplane_position\x18\x01 \x01(\x0b\x32\x16.serialized_shot.Point\x12(\n\nannotation\x18\x02 \x01(\x0b\x32\x14.serialized_shot.Box\x12\x14\n\x0cinterpolated\x18\x03 \x01(\x08\"T\n\x10RLEBallDetection\x12\x31\n\tdetection\x18\x01 \x01(\x0b\x32\x1e.serialized_shot.BallDetection\x12\r\n\x05\x63ount\x18\x02 \x01(\r\"L\n\x13RLEDetectionHistory\x12\x35\n\ndetections\x18\x01 \x03(\x0b\x32!.serialized_shot.RLEBallDetection\"F\n\x10\x44\x65tectionHistory\x12\x32\n\ndetections\x18\x01 \x03(\x0b\x32\x1e.serialized_shot.BallDetection\"\xfc\x01\n\rCollisionInfo\x12\x0e\n\x06source\x18\x01 \x01(\r\x12M\n\x10\x62\x61ll_identifiers\x18\x02 \x03(\x0b\x32\x33.serialized_shot.CollisionInfo.BallIdentifiersEntry\x12\x17\n\x0fwall_identifier\x18\x03 \x01(\r\x12\x13\n\x0b\x66rame_index\x18\x04 \x01(\r\x12\x0e\n\x06static\x18\x05 \x01(\x08\x1aN\n\x14\x42\x61llIdentifiersEntry\x12\x0b\n\x03key\x18\x01 \x01(\r\x12%\n\x05value\x18\x02 \x01(\x0b\x32\x16.serialized_shot.Point:\x02\x38\x01\"\xcc\x02\n\x04Path\x12\x13\n\x0bstart_frame\x18\x01 \x01(\r\x12\x11\n\tend_frame\x18\x02 \x01(\r\x12\x37\n\ndetections\x18\x03 \x01(\x0b\x32!.serialized_shot.DetectionHistoryH\x00\x12>\n\x0erle_detections\x18\x04 \x01(\x0b\x32$.serialized_shot.RLEDetectionHistoryH\x00\x12\x15\n\x0bnot_present\x18\x05 \x01(\x08H\x00\x12\x11\n\tis_static\x18\x06 \x01(\x08\x12\x32\n\nstart_info\x18\x07 \x01(\x0b\x32\x1e.serialized_shot.CollisionInfo\x12\x30\n\x08\x65nd_info\x18\x08 \x01(\x0b\x32\x1e.serialized_shot.CollisionInfoB\x13\n\x11\x64\x65tection_history\"R\n\x11IdentifierHistory\x12\x17\n\x0f\x62\x61ll_identifier\x18\x01 \x01(\r\x12$\n\x05paths\x18\x02 \x03(\x0b\x32\x15.serialized_shot.Path\"\xf4\x01\n\x12KeyBallIdentifiers\x12\x10\n\x08\x63ue_ball\x18\x01 \x01(\r\x12\x13\n\x0bobject_ball\x18\x02 \x01(\r\x12\x13\n\x0btarget_ball\x18\x03 \x01(\r\x12\x18\n\x10\x63ontact_sequence\x18\x04 \x03(\r\x12\x18\n\x0b\x63ue_ball_id\x18\x05 \x01(\rH\x00\x88\x01\x01\x12\x1b\n\x0eobject_ball_id\x18\x06 \x01(\rH\x01\x88\x01\x01\x12\x1b\n\x0etarget_ball_id\x18\x07 \x01(\rH\x02\x88\x01\x01\x42\x0e\n\x0c_cue_ball_idB\x11\n\x0f_object_ball_idB\x11\n\x0f_target_ball_id\"\xa8\x01\n\x04Shot\x12@\n\x14identifier_histories\x18\x03 \x03(\x0b\x32\".serialized_shot.IdentifierHistory\x12\x36\n\tkey_balls\x18\x04 \x01(\x0b\x32#.serialized_shot.KeyBallIdentifiers\x12\x13\n\x0bstart_index\x18\x05 \x01(\r\x12\x11\n\tend_index\x18\x06 \x01(\rb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
+    b'\n\nshot.proto\x12\x0fserialized_shot"?\n\x03\x42ox\x12\x0c\n\x04left\x18\x01 \x01(\x02\x12\x0b\n\x03top\x18\x02 \x01(\x02\x12\r\n\x05width\x18\x03 \x01(\x02\x12\x0e\n\x06height\x18\x04 \x01(\x02"\x1d\n\x05Point\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02"\x7f\n\rBallDetection\x12.\n\x0eplane_position\x18\x01 \x01(\x0b\x32\x16.serialized_shot.Point\x12(\n\nannotation\x18\x02 \x01(\x0b\x32\x14.serialized_shot.Box\x12\x14\n\x0cinterpolated\x18\x03 \x01(\x08"T\n\x10RLEBallDetection\x12\x31\n\tdetection\x18\x01 \x01(\x0b\x32\x1e.serialized_shot.BallDetection\x12\r\n\x05\x63ount\x18\x02 \x01(\r"L\n\x13RLEDetectionHistory\x12\x35\n\ndetections\x18\x01 \x03(\x0b\x32!.serialized_shot.RLEBallDetection"F\n\x10\x44\x65tectionHistory\x12\x32\n\ndetections\x18\x01 \x03(\x0b\x32\x1e.serialized_shot.BallDetection"\xfc\x01\n\rCollisionInfo\x12\x0e\n\x06source\x18\x01 \x01(\r\x12M\n\x10\x62\x61ll_identifiers\x18\x02 \x03(\x0b\x32\x33.serialized_shot.CollisionInfo.BallIdentifiersEntry\x12\x17\n\x0fwall_identifier\x18\x03 \x01(\r\x12\x13\n\x0b\x66rame_index\x18\x04 \x01(\r\x12\x0e\n\x06static\x18\x05 \x01(\x08\x1aN\n\x14\x42\x61llIdentifiersEntry\x12\x0b\n\x03key\x18\x01 \x01(\r\x12%\n\x05value\x18\x02 \x01(\x0b\x32\x16.serialized_shot.Point:\x02\x38\x01"\xcc\x02\n\x04Path\x12\x13\n\x0bstart_frame\x18\x01 \x01(\r\x12\x11\n\tend_frame\x18\x02 \x01(\r\x12\x37\n\ndetections\x18\x03 \x01(\x0b\x32!.serialized_shot.DetectionHistoryH\x00\x12>\n\x0erle_detections\x18\x04 \x01(\x0b\x32$.serialized_shot.RLEDetectionHistoryH\x00\x12\x15\n\x0bnot_present\x18\x05 \x01(\x08H\x00\x12\x11\n\tis_static\x18\x06 \x01(\x08\x12\x32\n\nstart_info\x18\x07 \x01(\x0b\x32\x1e.serialized_shot.CollisionInfo\x12\x30\n\x08\x65nd_info\x18\x08 \x01(\x0b\x32\x1e.serialized_shot.CollisionInfoB\x13\n\x11\x64\x65tection_history"I\n\x0c\x43olorCluster\x12\x11\n\tlightness\x18\x01 \x01(\x02\x12\t\n\x01\x61\x18\x02 \x01(\x02\x12\t\n\x01\x62\x18\x03 \x01(\x02\x12\x10\n\x08\x66raction\x18\x04 \x01(\x02"B\n\x0fTrajectoryColor\x12/\n\x08\x63lusters\x18\x01 \x03(\x0b\x32\x1d.serialized_shot.ColorCluster"\x8e\x01\n\x11IdentifierHistory\x12\x17\n\x0f\x62\x61ll_identifier\x18\x01 \x01(\r\x12$\n\x05paths\x18\x02 \x03(\x0b\x32\x15.serialized_shot.Path\x12:\n\x10trajectory_color\x18\x03 \x01(\x0b\x32 .serialized_shot.TrajectoryColor"\xf4\x01\n\x12KeyBallIdentifiers\x12\x10\n\x08\x63ue_ball\x18\x01 \x01(\r\x12\x13\n\x0bobject_ball\x18\x02 \x01(\r\x12\x13\n\x0btarget_ball\x18\x03 \x01(\r\x12\x18\n\x10\x63ontact_sequence\x18\x04 \x03(\r\x12\x18\n\x0b\x63ue_ball_id\x18\x05 \x01(\rH\x00\x88\x01\x01\x12\x1b\n\x0eobject_ball_id\x18\x06 \x01(\rH\x01\x88\x01\x01\x12\x1b\n\x0etarget_ball_id\x18\x07 \x01(\rH\x02\x88\x01\x01\x42\x0e\n\x0c_cue_ball_idB\x11\n\x0f_object_ball_idB\x11\n\x0f_target_ball_id"\xa8\x01\n\x04Shot\x12@\n\x14identifier_histories\x18\x03 \x03(\x0b\x32".serialized_shot.IdentifierHistory\x12\x36\n\tkey_balls\x18\x04 \x01(\x0b\x32#.serialized_shot.KeyBallIdentifiers\x12\x13\n\x0bstart_index\x18\x05 \x01(\r\x12\x11\n\tend_index\x18\x06 \x01(\rb\x06proto3'
+)
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'shot_pb2', _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "shot_pb2", _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
-  DESCRIPTOR._options = None
-  _globals['_COLLISIONINFO_BALLIDENTIFIERSENTRY']._options = None
-  _globals['_COLLISIONINFO_BALLIDENTIFIERSENTRY']._serialized_options = b'8\001'
-  _globals['_BOX']._serialized_start=31
-  _globals['_BOX']._serialized_end=94
-  _globals['_POINT']._serialized_start=96
-  _globals['_POINT']._serialized_end=125
-  _globals['_BALLDETECTION']._serialized_start=127
-  _globals['_BALLDETECTION']._serialized_end=254
-  _globals['_RLEBALLDETECTION']._serialized_start=256
-  _globals['_RLEBALLDETECTION']._serialized_end=340
-  _globals['_RLEDETECTIONHISTORY']._serialized_start=342
-  _globals['_RLEDETECTIONHISTORY']._serialized_end=418
-  _globals['_DETECTIONHISTORY']._serialized_start=420
-  _globals['_DETECTIONHISTORY']._serialized_end=490
-  _globals['_COLLISIONINFO']._serialized_start=493
-  _globals['_COLLISIONINFO']._serialized_end=745
-  _globals['_COLLISIONINFO_BALLIDENTIFIERSENTRY']._serialized_start=667
-  _globals['_COLLISIONINFO_BALLIDENTIFIERSENTRY']._serialized_end=745
-  _globals['_PATH']._serialized_start=748
-  _globals['_PATH']._serialized_end=1080
-  _globals['_IDENTIFIERHISTORY']._serialized_start=1082
-  _globals['_IDENTIFIERHISTORY']._serialized_end=1164
-  _globals['_KEYBALLIDENTIFIERS']._serialized_start=1167
-  _globals['_KEYBALLIDENTIFIERS']._serialized_end=1411
-  _globals['_SHOT']._serialized_start=1414
-  _globals['_SHOT']._serialized_end=1582
+    DESCRIPTOR._options = None
+    _globals["_COLLISIONINFO_BALLIDENTIFIERSENTRY"]._options = None
+    _globals["_COLLISIONINFO_BALLIDENTIFIERSENTRY"]._serialized_options = b"8\001"
+    _globals["_BOX"]._serialized_start = 31
+    _globals["_BOX"]._serialized_end = 94
+    _globals["_POINT"]._serialized_start = 96
+    _globals["_POINT"]._serialized_end = 125
+    _globals["_BALLDETECTION"]._serialized_start = 127
+    _globals["_BALLDETECTION"]._serialized_end = 254
+    _globals["_RLEBALLDETECTION"]._serialized_start = 256
+    _globals["_RLEBALLDETECTION"]._serialized_end = 340
+    _globals["_RLEDETECTIONHISTORY"]._serialized_start = 342
+    _globals["_RLEDETECTIONHISTORY"]._serialized_end = 418
+    _globals["_DETECTIONHISTORY"]._serialized_start = 420
+    _globals["_DETECTIONHISTORY"]._serialized_end = 490
+    _globals["_COLLISIONINFO"]._serialized_start = 493
+    _globals["_COLLISIONINFO"]._serialized_end = 745
+    _globals["_COLLISIONINFO_BALLIDENTIFIERSENTRY"]._serialized_start = 667
+    _globals["_COLLISIONINFO_BALLIDENTIFIERSENTRY"]._serialized_end = 745
+    _globals["_PATH"]._serialized_start = 748
+    _globals["_PATH"]._serialized_end = 1080
+    _globals["_COLORCLUSTER"]._serialized_start = 1082
+    _globals["_COLORCLUSTER"]._serialized_end = 1155
+    _globals["_TRAJECTORYCOLOR"]._serialized_start = 1157
+    _globals["_TRAJECTORYCOLOR"]._serialized_end = 1223
+    _globals["_IDENTIFIERHISTORY"]._serialized_start = 1226
+    _globals["_IDENTIFIERHISTORY"]._serialized_end = 1368
+    _globals["_KEYBALLIDENTIFIERS"]._serialized_start = 1371
+    _globals["_KEYBALLIDENTIFIERS"]._serialized_end = 1615
+    _globals["_SHOT"]._serialized_start = 1618
+    _globals["_SHOT"]._serialized_end = 1786
 # @@protoc_insertion_point(module_scope)

rbproto/python/shot_pb2.pyi

@@ -1,7 +1,13 @@
 from google.protobuf.internal import containers as _containers
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
-from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union
+from typing import (
+    ClassVar as _ClassVar,
+    Iterable as _Iterable,
+    Mapping as _Mapping,
+    Optional as _Optional,
+    Union as _Union,
+)
 
 DESCRIPTOR: _descriptor.FileDescriptor
 
@@ -15,7 +21,13 @@ class Box(_message.Message):
     top: float
     width: float
     height: float
-    def __init__(self, left: _Optional[float] = ..., top: _Optional[float] = ..., width: _Optional[float] = ..., height: _Optional[float] = ...) -> None: ...
+    def __init__(
+        self,
+        left: _Optional[float] = ...,
+        top: _Optional[float] = ...,
+        width: _Optional[float] = ...,
+        height: _Optional[float] = ...,
+    ) -> None: ...
 
 class Point(_message.Message):
     __slots__ = ["x", "y"]
@@ -23,7 +35,9 @@ class Point(_message.Message):
     Y_FIELD_NUMBER: _ClassVar[int]
     x: float
     y: float
-    def __init__(self, x: _Optional[float] = ..., y: _Optional[float] = ...) -> None: ...
+    def __init__(
+        self, x: _Optional[float] = ..., y: _Optional[float] = ...
+    ) -> None: ...
 
 class BallDetection(_message.Message):
     __slots__ = ["plane_position", "annotation", "interpolated"]
@@ -33,7 +47,12 @@ class BallDetection(_message.Message):
     plane_position: Point
     annotation: Box
     interpolated: bool
-    def __init__(self, plane_position: _Optional[_Union[Point, _Mapping]] = ..., annotation: _Optional[_Union[Box, _Mapping]] = ..., interpolated: bool = ...) -> None: ...
+    def __init__(
+        self,
+        plane_position: _Optional[_Union[Point, _Mapping]] = ...,
+        annotation: _Optional[_Union[Box, _Mapping]] = ...,
+        interpolated: bool = ...,
+    ) -> None: ...
 
 class RLEBallDetection(_message.Message):
     __slots__ = ["detection", "count"]
@@ -41,29 +60,48 @@ class RLEBallDetection(_message.Message):
     COUNT_FIELD_NUMBER: _ClassVar[int]
     detection: BallDetection
     count: int
-    def __init__(self, detection: _Optional[_Union[BallDetection, _Mapping]] = ..., count: _Optional[int] = ...) -> None: ...
+    def __init__(
+        self,
+        detection: _Optional[_Union[BallDetection, _Mapping]] = ...,
+        count: _Optional[int] = ...,
+    ) -> None: ...
 
 class RLEDetectionHistory(_message.Message):
     __slots__ = ["detections"]
     DETECTIONS_FIELD_NUMBER: _ClassVar[int]
     detections: _containers.RepeatedCompositeFieldContainer[RLEBallDetection]
-    def __init__(self, detections: _Optional[_Iterable[_Union[RLEBallDetection, _Mapping]]] = ...) -> None: ...
+    def __init__(
+        self, detections: _Optional[_Iterable[_Union[RLEBallDetection, _Mapping]]] = ...
+    ) -> None: ...
 
 class DetectionHistory(_message.Message):
     __slots__ = ["detections"]
     DETECTIONS_FIELD_NUMBER: _ClassVar[int]
     detections: _containers.RepeatedCompositeFieldContainer[BallDetection]
-    def __init__(self, detections: _Optional[_Iterable[_Union[BallDetection, _Mapping]]] = ...) -> None: ...
+    def __init__(
+        self, detections: _Optional[_Iterable[_Union[BallDetection, _Mapping]]] = ...
+    ) -> None: ...
 
 class CollisionInfo(_message.Message):
-    __slots__ = ["source", "ball_identifiers", "wall_identifier", "frame_index", "static"]
+    __slots__ = [
+        "source",
+        "ball_identifiers",
+        "wall_identifier",
+        "frame_index",
+        "static",
+    ]
+
     class BallIdentifiersEntry(_message.Message):
         __slots__ = ["key", "value"]
         KEY_FIELD_NUMBER: _ClassVar[int]
         VALUE_FIELD_NUMBER: _ClassVar[int]
         key: int
         value: Point
-        def __init__(self, key: _Optional[int] = ..., value: _Optional[_Union[Point, _Mapping]] = ...) -> None: ...
+        def __init__(
+            self,
+            key: _Optional[int] = ...,
+            value: _Optional[_Union[Point, _Mapping]] = ...,
+        ) -> None: ...
     SOURCE_FIELD_NUMBER: _ClassVar[int]
     BALL_IDENTIFIERS_FIELD_NUMBER: _ClassVar[int]
     WALL_IDENTIFIER_FIELD_NUMBER: _ClassVar[int]
@@ -74,10 +112,26 @@ class CollisionInfo(_message.Message):
     wall_identifier: int
     frame_index: int
     static: bool
-    def __init__(self, source: _Optional[int] = ..., ball_identifiers: _Optional[_Mapping[int, Point]] = ..., wall_identifier: _Optional[int] = ..., frame_index: _Optional[int] = ..., static: bool = ...) -> None: ...
+    def __init__(
+        self,
+        source: _Optional[int] = ...,
+        ball_identifiers: _Optional[_Mapping[int, Point]] = ...,
+        wall_identifier: _Optional[int] = ...,
+        frame_index: _Optional[int] = ...,
+        static: bool = ...,
+    ) -> None: ...
 
 class Path(_message.Message):
-    __slots__ = ["start_frame", "end_frame", "detections", "rle_detections", "not_present", "is_static", "start_info", "end_info"]
+    __slots__ = [
+        "start_frame",
+        "end_frame",
+        "detections",
+        "rle_detections",
+        "not_present",
+        "is_static",
+        "start_info",
+        "end_info",
+    ]
     START_FRAME_FIELD_NUMBER: _ClassVar[int]
     END_FRAME_FIELD_NUMBER: _ClassVar[int]
     DETECTIONS_FIELD_NUMBER: _ClassVar[int]
@@ -94,18 +148,69 @@ class Path(_message.Message):
     is_static: bool
     start_info: CollisionInfo
     end_info: CollisionInfo
-    def __init__(self, start_frame: _Optional[int] = ..., end_frame: _Optional[int] = ..., detections: _Optional[_Union[DetectionHistory, _Mapping]] = ..., rle_detections: _Optional[_Union[RLEDetectionHistory, _Mapping]] = ..., not_present: bool = ..., is_static: bool = ..., start_info: _Optional[_Union[CollisionInfo, _Mapping]] = ..., end_info: _Optional[_Union[CollisionInfo, _Mapping]] = ...) -> None: ...
+    def __init__(
+        self,
+        start_frame: _Optional[int] = ...,
+        end_frame: _Optional[int] = ...,
+        detections: _Optional[_Union[DetectionHistory, _Mapping]] = ...,
+        rle_detections: _Optional[_Union[RLEDetectionHistory, _Mapping]] = ...,
+        not_present: bool = ...,
+        is_static: bool = ...,
+        start_info: _Optional[_Union[CollisionInfo, _Mapping]] = ...,
+        end_info: _Optional[_Union[CollisionInfo, _Mapping]] = ...,
+    ) -> None: ...
+
+class ColorCluster(_message.Message):
+    __slots__ = ["lightness", "a", "b", "fraction"]
+    LIGHTNESS_FIELD_NUMBER: _ClassVar[int]
+    A_FIELD_NUMBER: _ClassVar[int]
+    B_FIELD_NUMBER: _ClassVar[int]
+    FRACTION_FIELD_NUMBER: _ClassVar[int]
+    lightness: float
+    a: float
+    b: float
+    fraction: float
+    def __init__(
+        self,
+        lightness: _Optional[float] = ...,
+        a: _Optional[float] = ...,
+        b: _Optional[float] = ...,
+        fraction: _Optional[float] = ...,
+    ) -> None: ...
+
+class TrajectoryColor(_message.Message):
+    __slots__ = ["clusters"]
+    CLUSTERS_FIELD_NUMBER: _ClassVar[int]
+    clusters: _containers.RepeatedCompositeFieldContainer[ColorCluster]
+    def __init__(
+        self, clusters: _Optional[_Iterable[_Union[ColorCluster, _Mapping]]] = ...
+    ) -> None: ...
 
 class IdentifierHistory(_message.Message):
-    __slots__ = ["ball_identifier", "paths"]
+    __slots__ = ["ball_identifier", "paths", "trajectory_color"]
     BALL_IDENTIFIER_FIELD_NUMBER: _ClassVar[int]
     PATHS_FIELD_NUMBER: _ClassVar[int]
+    TRAJECTORY_COLOR_FIELD_NUMBER: _ClassVar[int]
     ball_identifier: int
     paths: _containers.RepeatedCompositeFieldContainer[Path]
-    def __init__(self, ball_identifier: _Optional[int] = ..., paths: _Optional[_Iterable[_Union[Path, _Mapping]]] = ...) -> None: ...
+    trajectory_color: TrajectoryColor
+    def __init__(
+        self,
+        ball_identifier: _Optional[int] = ...,
+        paths: _Optional[_Iterable[_Union[Path, _Mapping]]] = ...,
+        trajectory_color: _Optional[_Union[TrajectoryColor, _Mapping]] = ...,
+    ) -> None: ...
 
 class KeyBallIdentifiers(_message.Message):
-    __slots__ = ["cue_ball", "object_ball", "target_ball", "contact_sequence", "cue_ball_id", "object_ball_id", "target_ball_id"]
+    __slots__ = [
+        "cue_ball",
+        "object_ball",
+        "target_ball",
+        "contact_sequence",
+        "cue_ball_id",
+        "object_ball_id",
+        "target_ball_id",
+    ]
     CUE_BALL_FIELD_NUMBER: _ClassVar[int]
     OBJECT_BALL_FIELD_NUMBER: _ClassVar[int]
     TARGET_BALL_FIELD_NUMBER: _ClassVar[int]
@@ -120,7 +225,16 @@ class KeyBallIdentifiers(_message.Message):
     cue_ball_id: int
     object_ball_id: int
     target_ball_id: int
-    def __init__(self, cue_ball: _Optional[int] = ..., object_ball: _Optional[int] = ..., target_ball: _Optional[int] = ..., contact_sequence: _Optional[_Iterable[int]] = ..., cue_ball_id: _Optional[int] = ..., object_ball_id: _Optional[int] = ..., target_ball_id: _Optional[int] = ...) -> None: ...
+    def __init__(
+        self,
+        cue_ball: _Optional[int] = ...,
+        object_ball: _Optional[int] = ...,
+        target_ball: _Optional[int] = ...,
+        contact_sequence: _Optional[_Iterable[int]] = ...,
+        cue_ball_id: _Optional[int] = ...,
+        object_ball_id: _Optional[int] = ...,
+        target_ball_id: _Optional[int] = ...,
+    ) -> None: ...
 
 class Shot(_message.Message):
     __slots__ = ["identifier_histories", "key_balls", "start_index", "end_index"]
@@ -132,4 +246,12 @@ class Shot(_message.Message):
     key_balls: KeyBallIdentifiers
     start_index: int
     end_index: int
-    def __init__(self, identifier_histories: _Optional[_Iterable[_Union[IdentifierHistory, _Mapping]]] = ..., key_balls: _Optional[_Union[KeyBallIdentifiers, _Mapping]] = ..., start_index: _Optional[int] = ..., end_index: _Optional[int] = ...) -> None: ...
+    def __init__(
+        self,
+        identifier_histories: _Optional[
+            _Iterable[_Union[IdentifierHistory, _Mapping]]
+        ] = ...,
+        key_balls: _Optional[_Union[KeyBallIdentifiers, _Mapping]] = ...,
+        start_index: _Optional[int] = ...,
+        end_index: _Optional[int] = ...,
+    ) -> None: ...

rbproto/shot.proto

@@ -50,9 +50,21 @@ message Path {
   CollisionInfo end_info = 8;
 }
 
+message ColorCluster {
+  // LAB in OpenCV's 0-255 uint8 scale (see railbird LABCV2Color).
+  float lightness = 1;
+  float a = 2;
+  float b = 3;
+  // Share of this ball's accumulated color pixels in this cluster (0-1).
+  float fraction = 4;
+}
+
+message TrajectoryColor { repeated ColorCluster clusters = 1; }
+
 message IdentifierHistory {
   uint32 ball_identifier = 1;
   repeated Path paths = 2;
+  TrajectoryColor trajectory_color = 3;
 }
 message KeyBallIdentifiers {
   uint32 cue_ball = 1;

rbproto/ts/shot.ts

@@ -740,9 +740,158 @@ function _decodePath(bb: ByteBuffer): Path {
   return message;
 }
 
+export interface ColorCluster {
+  lightness?: number;
+  a?: number;
+  b?: number;
+  fraction?: number;
+}
+
+export function encodeColorCluster(message: ColorCluster): Uint8Array {
+  let bb = popByteBuffer();
+  _encodeColorCluster(message, bb);
+  return toUint8Array(bb);
+}
+
+function _encodeColorCluster(message: ColorCluster, bb: ByteBuffer): void {
+  // optional float lightness = 1;
+  let $lightness = message.lightness;
+  if ($lightness !== undefined) {
+    writeVarint32(bb, 13);
+    writeFloat(bb, $lightness);
+  }
+
+  // optional float a = 2;
+  let $a = message.a;
+  if ($a !== undefined) {
+    writeVarint32(bb, 21);
+    writeFloat(bb, $a);
+  }
+
+  // optional float b = 3;
+  let $b = message.b;
+  if ($b !== undefined) {
+    writeVarint32(bb, 29);
+    writeFloat(bb, $b);
+  }
+
+  // optional float fraction = 4;
+  let $fraction = message.fraction;
+  if ($fraction !== undefined) {
+    writeVarint32(bb, 37);
+    writeFloat(bb, $fraction);
+  }
+}
+
+export function decodeColorCluster(binary: Uint8Array): ColorCluster {
+  return _decodeColorCluster(wrapByteBuffer(binary));
+}
+
+function _decodeColorCluster(bb: ByteBuffer): ColorCluster {
+  let message: ColorCluster = {} as any;
+
+  end_of_message: while (!isAtEnd(bb)) {
+    let tag = readVarint32(bb);
+
+    switch (tag >>> 3) {
+      case 0:
+        break end_of_message;
+
+      // optional float lightness = 1;
+      case 1: {
+        message.lightness = readFloat(bb);
+        break;
+      }
+
+      // optional float a = 2;
+      case 2: {
+        message.a = readFloat(bb);
+        break;
+      }
+
+      // optional float b = 3;
+      case 3: {
+        message.b = readFloat(bb);
+        break;
+      }
+
+      // optional float fraction = 4;
+      case 4: {
+        message.fraction = readFloat(bb);
+        break;
+      }
+
+      default:
+        skipUnknownField(bb, tag & 7);
+    }
+  }
+
+  return message;
+}
+
+export interface TrajectoryColor {
+  clusters?: ColorCluster[];
+}
+
+export function encodeTrajectoryColor(message: TrajectoryColor): Uint8Array {
+  let bb = popByteBuffer();
+  _encodeTrajectoryColor(message, bb);
+  return toUint8Array(bb);
+}
+
+function _encodeTrajectoryColor(
+  message: TrajectoryColor,
+  bb: ByteBuffer,
+): void {
+  // repeated ColorCluster clusters = 1;
+  let array$clusters = message.clusters;
+  if (array$clusters !== undefined) {
+    for (let value of array$clusters) {
+      writeVarint32(bb, 10);
+      let nested = popByteBuffer();
+      _encodeColorCluster(value, nested);
+      writeVarint32(bb, nested.limit);
+      writeByteBuffer(bb, nested);
+      pushByteBuffer(nested);
+    }
+  }
+}
+
+export function decodeTrajectoryColor(binary: Uint8Array): TrajectoryColor {
+  return _decodeTrajectoryColor(wrapByteBuffer(binary));
+}
+
+function _decodeTrajectoryColor(bb: ByteBuffer): TrajectoryColor {
+  let message: TrajectoryColor = {} as any;
+
+  end_of_message: while (!isAtEnd(bb)) {
+    let tag = readVarint32(bb);
+
+    switch (tag >>> 3) {
+      case 0:
+        break end_of_message;
+
+      // repeated ColorCluster clusters = 1;
+      case 1: {
+        let limit = pushTemporaryLength(bb);
+        let values = message.clusters || (message.clusters = []);
+        values.push(_decodeColorCluster(bb));
+        bb.limit = limit;
+        break;
+      }
+
+      default:
+        skipUnknownField(bb, tag & 7);
+    }
+  }
+
+  return message;
+}
+
 export interface IdentifierHistory {
   ball_identifier?: number;
   paths?: Path[];
+  trajectory_color?: TrajectoryColor;
 }
 
 export function encodeIdentifierHistory(
@@ -776,6 +925,17 @@ function _encodeIdentifierHistory(
       pushByteBuffer(nested);
     }
   }
+
+  // optional TrajectoryColor trajectory_color = 3;
+  let $trajectory_color = message.trajectory_color;
+  if ($trajectory_color !== undefined) {
+    writeVarint32(bb, 26);
+    let nested = popByteBuffer();
+    _encodeTrajectoryColor($trajectory_color, nested);
+    writeVarint32(bb, nested.limit);
+    writeByteBuffer(bb, nested);
+    pushByteBuffer(nested);
+  }
 }
 
 export function decodeIdentifierHistory(binary: Uint8Array): IdentifierHistory {
@@ -807,6 +967,14 @@ function _decodeIdentifierHistory(bb: ByteBuffer): IdentifierHistory {
         break;
       }
 
+      // optional TrajectoryColor trajectory_color = 3;
+      case 3: {
+        let limit = pushTemporaryLength(bb);
+        message.trajectory_color = _decodeTrajectoryColor(bb);
+        bb.limit = limit;
+        break;
+      }
+
       default:
         skipUnknownField(bb, tag & 7);
     }

src/client-schema.gql

@@ -1,9 +1,16 @@
 # see: https://www.apollographql.com/docs/react/local-state/managing-state-with-field-policies/
 directive @client on FIELD
 
+type SegmentInfo {
+  index: Int!
+  time: Float!
+}
+
 extend type ShotGQL {
   startTime: Float!
   endTime: Float!
+  startSegment: SegmentInfo!
+  endSegment: SegmentInfo!
 }
 
 extend type UploadStreamGQL {

src/operations/aggregate.gql

@@ -7,6 +7,7 @@ query GetAggregatedShotMetrics($aggregateInput: AggregateInputGQL!) {
     targetMetrics {
       count
       makePercentage
+      averageDifficulty
     }
   }
 }

src/operations/challenges.gql

@@ -0,0 +1,282 @@
+query GetChallenges {
+  challenges {
+    id
+    name
+    description
+    minimumShots
+    startDate
+    endDate
+    createdAt
+    updatedAt
+    requiredTableSize
+    requiredPocketSize
+    isPublic
+    maxAttempts
+    ruleSet {
+      id
+      name
+      description
+    }
+    createdBy {
+      id
+      username
+      profileImageUri
+    }
+  }
+}
+
+query GetMyDismissedChallenges {
+  myDismissedChallenges {
+    id
+    name
+    description
+    minimumShots
+    startDate
+    endDate
+    createdAt
+    updatedAt
+    requiredTableSize
+    requiredPocketSize
+    isPublic
+    maxAttempts
+    ruleSet {
+      id
+      name
+      description
+    }
+    createdBy {
+      id
+      username
+      profileImageUri
+    }
+  }
+}
+
+query GetChallenge($id: ID!) {
+  challenge(id: $id) {
+    id
+    name
+    description
+    minimumShots
+    startDate
+    endDate
+    createdAt
+    updatedAt
+    requiredTableSize
+    requiredPocketSize
+    isPublic
+    maxAttempts
+    participantCount
+    ruleSet {
+      id
+      name
+      description
+    }
+    createdBy {
+      id
+      username
+      profileImageUri
+    }
+    invitations {
+      id
+      status
+      createdAt
+      invitee {
+        id
+        username
+        profileImageUri
+      }
+      inviter {
+        id
+        username
+        profileImageUri
+      }
+    }
+  }
+}
+
+query GetRuleSets {
+  ruleSets {
+    id
+    name
+    description
+  }
+}
+
+query GetChallengeLeaderboard($challengeId: ID!, $limit: Int) {
+  challengeLeaderboard(challengeId: $challengeId, limit: $limit) {
+    id
+    status
+    shotsCount
+    makesCount
+    makeRate
+    qualified
+    createdAt
+    attemptCount
+    user {
+      id
+      username
+      profileImageUri
+    }
+    video {
+      id
+      createdAt
+    }
+  }
+}
+
+query GetMyChallengeInvitations {
+  myChallengeInvitations {
+    id
+    status
+    createdAt
+    challenge {
+      id
+      name
+      description
+      startDate
+      endDate
+      createdBy {
+        id
+        username
+        profileImageUri
+      }
+    }
+    inviter {
+      id
+      username
+      profileImageUri
+    }
+  }
+}
+
+query GetMyChallengeEntries {
+  myChallengeEntries {
+    id
+    status
+    shotsCount
+    makesCount
+    makeRate
+    qualified
+    createdAt
+    challenge {
+      id
+      name
+    }
+    video {
+      id
+    }
+  }
+}
+
+mutation CreateRuleSet($name: String!, $description: String) {
+  createRuleSet(name: $name, description: $description) {
+    id
+    name
+    description
+  }
+}
+
+mutation CreateChallenge(
+  $name: String!
+  $ruleSetId: ID!
+  $minimumShots: Int!
+  $startDate: DateTime!
+  $endDate: DateTime!
+  $description: String
+  $requiredTableSize: Float
+  $requiredPocketSize: Float
+  $isPublic: Boolean! = false
+  $maxAttempts: Int
+) {
+  createChallenge(
+    name: $name
+    ruleSetId: $ruleSetId
+    minimumShots: $minimumShots
+    startDate: $startDate
+    endDate: $endDate
+    description: $description
+    requiredTableSize: $requiredTableSize
+    requiredPocketSize: $requiredPocketSize
+    isPublic: $isPublic
+    maxAttempts: $maxAttempts
+  ) {
+    id
+    name
+    description
+    requiredTableSize
+    requiredPocketSize
+    isPublic
+    maxAttempts
+  }
+}
+
+mutation InviteUsersToChallenge($challengeId: ID!, $userIds: [ID!]!) {
+  inviteUsersToChallenge(challengeId: $challengeId, userIds: $userIds) {
+    id
+    status
+    inviter {
+      id
+      username
+    }
+  }
+}
+
+mutation RespondToChallengeInvitation($invitationId: ID!, $accept: Boolean!) {
+  respondToChallengeInvitation(invitationId: $invitationId, accept: $accept) {
+    id
+    status
+    challenge {
+      id
+    }
+  }
+}
+
+mutation StartChallenge($challengeId: ID!) {
+  startChallenge(challengeId: $challengeId) {
+    id
+    status
+    createdAt
+    challenge {
+      id
+      name
+    }
+  }
+}
+
+mutation SubmitChallengeEntry($entryId: ID!, $videoId: ID!) {
+  submitChallengeEntry(entryId: $entryId, videoId: $videoId) {
+    id
+    status
+    qualified
+    makeRate
+    shotsCount
+    makesCount
+    video {
+      id
+    }
+  }
+}
+
+mutation RecalculateChallengeEntry($entryId: ID!) {
+  recalculateChallengeEntry(entryId: $entryId) {
+    id
+    status
+    qualified
+    makeRate
+    shotsCount
+    makesCount
+  }
+}
+
+query IsChallengeDismissed($challengeId: ID!) {
+  isChallengeDismissed(challengeId: $challengeId)
+}
+
+mutation DismissChallenge($challengeId: ID!) {
+  dismissChallenge(challengeId: $challengeId)
+}
+
+mutation UndismissChallenge($challengeId: ID!) {
+  undismissChallenge(challengeId: $challengeId)
+}

src/operations/comments.gql

@@ -0,0 +1,19 @@
+mutation CommentOnVideo(
+  $videoId: Int!
+  $message: String!
+  $parentCommentId: Int
+) {
+  commentOnVideo(
+    videoId: $videoId
+    message: $message
+    parentCommentId: $parentCommentId
+  )
+}
+
+mutation EditComment($videoId: Int!, $commentId: Int!, $newMessage: String!) {
+  editComment(videoId: $videoId, commentId: $commentId, newMessage: $newMessage)
+}
+
+mutation DeleteComment($videoId: Int!, $commentId: Int!) {
+  deleteComment(videoId: $videoId, commentId: $commentId)
+}

src/operations/config.gql

@@ -5,5 +5,19 @@ query getDeployedConfig {
     environment
     firebase
     minimumAllowedAppVersion
+    subscriptionGatingEnabled
+    quotaEnforcementEnabled
+    storageLimitEnforcementEnabled
+    capabilityEnforcementEnabled
+    bannerMessages {
+      color
+      dismissible
+      id
+      kind
+      message
+      priority
+    }
+    defaultAndroidRecordingFormat
+    bucketUrl
   }
 }

src/operations/content-moderation.gql

@@ -0,0 +1,15 @@
+mutation blockContent($videoId: Int!) {
+  blockContent(videoId: $videoId)
+}
+
+mutation blockUser($userId: Int!) {
+  blockUser(userId: $userId)
+}
+
+mutation reportContent(
+  $videoId: Int!
+  $reason: ReportReasonEnum!
+  $customReason: String = null
+) {
+  reportContent(videoId: $videoId, reason: $reason, customReason: $customReason)
+}

src/operations/feed.gql

@@ -1,3 +1,4 @@
+# DO NOT USE: use getVideoFeed instead
 query GetFeed(
   $limit: Int! = 5
   $after: String = null
@@ -5,32 +6,7 @@ query GetFeed(
 ) {
   getUserVideos(limit: $limit, after: $after, filters: $filters) {
     videos {
-      id
-      owner {
-        username
-      }
-      name
-      screenshotUri
-      totalShotsMade
-      totalShots
-      makePercentage
-      createdAt
-      updatedAt
-      startTime
-      endTime
-      elapsedTime
-      screenshotUri
-      stream {
-        id
-        isCompleted
-      }
-      tableSize
-      tags {
-        tagClasses {
-          name
-        }
-        name
-      }
+      ...VideoCardFields
     }
     pageInfo {
       hasNextPage
@@ -38,3 +14,142 @@ query GetFeed(
     }
   }
 }
+
+fragment UserSocialsFields on UserGQL {
+  id
+  username
+  profileImageUri
+  isFollowedByCurrentUser
+}
+
+fragment VideoCardFields on VideoGQL {
+  id
+  owner {
+    id
+    username
+    profileImageUri
+  }
+  name
+  screenshotUri
+  totalShots
+  makePercentage
+  averageTimeBetweenShots
+  averageDifficulty
+  startTime
+  private
+  elapsedTime
+  stream {
+    id
+    lastIntendedSegmentBound
+    uploadCompletionCursor
+    streamSegmentType
+    isCompleted
+    lastSegmentUploadedAt
+    clientUploadStatus
+  }
+  tableSize
+  pocketSize
+  tags {
+    name
+    tagClasses {
+      name
+    }
+  }
+  playerSummaries {
+    ...PlayerSummaryFields
+  }
+  currentProcessing {
+    id
+    status
+  }
+  reactions {
+    videoId
+    user {
+      ...UserSocialsFields
+    }
+    reaction
+  }
+  comments {
+    id
+    message
+    user {
+      ...UserSocialsFields
+    }
+    replies {
+      id
+      message
+      user {
+        ...UserSocialsFields
+      }
+    }
+  }
+}
+
+# Lightweight version of GetVideoFeed for counting sessions only
+query GetVideoFeedSessionCount(
+  $limit: Int! = 100
+  $filters: VideoFilterInput = null
+  $includePrivate: IncludePrivateEnum = MINE
+  $feedInput: VideoFeedInputGQL = null
+) {
+  getFeedVideos(
+    limit: $limit
+    filters: $filters
+    includePrivate: $includePrivate
+    feedInput: $feedInput
+  ) {
+    videos {
+      id
+      totalShots
+    }
+  }
+}
+
+# Minimal query for the Home recency nudge ("you haven't recorded in N days").
+# Only the most recent session's start time — avoids pulling the full
+# VideoCardFields payload (reactions, comments, player summaries, etc.).
+query GetLastSessionDate(
+  $filters: VideoFilterInput = null
+  $includePrivate: IncludePrivateEnum = MINE
+  $feedInput: VideoFeedInputGQL = null
+) {
+  getFeedVideos(
+    limit: 1
+    filters: $filters
+    includePrivate: $includePrivate
+    feedInput: $feedInput
+  ) {
+    videos {
+      id
+      startTime
+    }
+  }
+}
+
+query GetVideoFeed(
+  $limit: Int! = 5
+  $after: String = null
+  $filters: VideoFilterInput = null
+  $includeCallersVideos: Boolean = null
+  $includePrivate: IncludePrivateEnum = MINE
+  $feedInput: VideoFeedInputGQL = null
+) {
+  getFeedVideos(
+    limit: $limit
+    after: $after
+    filters: $filters
+    includeCallersVideos: $includeCallersVideos
+    includePrivate: $includePrivate
+    feedInput: $feedInput
+  ) {
+    videos {
+      ...VideoCardFields
+    }
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
+    hasFollowing
+    followingCount
+  }
+}

src/operations/leaderboards.gql

@@ -0,0 +1,118 @@
+query GetMakesLeaderboard(
+  $interval: TimeInterval
+  $when: DateTime
+  $gameType: String
+  $tableSizeMin: Float
+  $tableSizeMax: Float
+  $pocketSizeMin: Float
+  $pocketSizeMax: Float
+) {
+  getMakesLeaderboard(
+    interval: $interval
+    when: $when
+    gameType: $gameType
+    tableSizeMin: $tableSizeMin
+    tableSizeMax: $tableSizeMax
+    pocketSizeMin: $pocketSizeMin
+    pocketSizeMax: $pocketSizeMax
+  ) {
+    entries {
+      user {
+        id
+        username
+        profileImageUri
+      }
+      value
+      proportionMade
+      total
+    }
+  }
+}
+
+query GetRunsLeaderboard(
+  $interval: TimeInterval
+  $when: DateTime
+  $gameType: String
+  $tableSizeMin: Float
+  $tableSizeMax: Float
+  $pocketSizeMin: Float
+  $pocketSizeMax: Float
+) {
+  getLongestRunsLeaderboard(
+    interval: $interval
+    when: $when
+    gameType: $gameType
+    tableSizeMin: $tableSizeMin
+    tableSizeMax: $tableSizeMax
+    pocketSizeMin: $pocketSizeMin
+    pocketSizeMax: $pocketSizeMax
+  ) {
+    entries {
+      id
+      runLength
+      video {
+        name
+        createdAt
+      }
+      user {
+        id
+        username
+        profileImageUri
+      }
+    }
+  }
+}
+
+query GetDrillRunLeaderboard(
+  $drillTag: String!
+  $interval: TimeInterval
+  $limit: Int = 50
+  $tableSizeMin: Float
+  $tableSizeMax: Float
+  $pocketSizeMin: Float
+  $pocketSizeMax: Float
+) {
+  getDrillRunLeaderboard(
+    drillTag: $drillTag
+    interval: $interval
+    limit: $limit
+    tableSizeMin: $tableSizeMin
+    tableSizeMax: $tableSizeMax
+    pocketSizeMin: $pocketSizeMin
+    pocketSizeMax: $pocketSizeMax
+  ) {
+    entries {
+      id
+      runLength
+      videoId
+      video {
+        tableSize
+        pocketSize
+        createdAt
+      }
+      user {
+        id
+        username
+        profileImageUri
+      }
+    }
+    youRun {
+      id
+      runLength
+      videoId
+    }
+    youRank
+    totalPlayers
+  }
+}
+
+query GetMyDrillRuns($drillTag: String!, $limit: Int = 50) {
+  getMyDrillRuns(drillTag: $drillTag, limit: $limit) {
+    id
+    runLength
+    videoId
+    video {
+      createdAt
+    }
+  }
+}

src/operations/medals.gql

@@ -0,0 +1,75 @@
+fragment MedalFields on MedalGQL {
+  count
+  nickname
+}
+
+query getMedals($scope: MedalScope!, $userId: Int) {
+  getMedals(scope: $scope, userId: $userId) {
+    distanceOver78 {
+      ...MedalFields
+    }
+    distanceOver90 {
+      ...MedalFields
+    }
+    runLength3 {
+      ...MedalFields
+    }
+    runLength5 {
+      ...MedalFields
+    }
+    runLength8 {
+      ...MedalFields
+    }
+    runLength10 {
+      ...MedalFields
+    }
+    runLength15 {
+      ...MedalFields
+    }
+    runLength20 {
+      ...MedalFields
+    }
+    runLength25 {
+      ...MedalFields
+    }
+    runLength30 {
+      ...MedalFields
+    }
+    runLength40 {
+      ...MedalFields
+    }
+    runLength50 {
+      ...MedalFields
+    }
+    totalMakes100 {
+      ...MedalFields
+    }
+    totalMakes500 {
+      ...MedalFields
+    }
+    totalMakes1000 {
+      ...MedalFields
+    }
+    totalMakes5000 {
+      ...MedalFields
+    }
+    totalMakes10000 {
+      ...MedalFields
+    }
+    dailyMakes50 {
+      ...MedalFields
+    }
+    dailyMakes100 {
+      ...MedalFields
+    }
+    dailyMakes150 {
+      ...MedalFields
+    }
+    dailyMakes200 {
+      ...MedalFields
+    }
+    dailyMakes250 {
+      ...MedalFields
+    }
+  }
+}

src/operations/notifications.gql

@@ -0,0 +1,63 @@
+query GetNotifications(
+  $limit: Int! = 20
+  $offset: Int! = 0
+  $filters: NotificationFilters = null
+) {
+  notifications(limit: $limit, offset: $offset, filters: $filters) {
+    notifications {
+      ...Notification
+    }
+    totalCount
+    unreadCount
+    hasMore
+  }
+}
+
+query GetUnreadNotificationCount {
+  unreadNotificationCount
+}
+
+mutation MarkNotificationAsRead($notificationId: Int!) {
+  markNotificationAsRead(notificationId: $notificationId)
+}
+
+mutation MarkNotificationsAsRead($notificationIds: [Int!]!) {
+  markNotificationsAsRead(notificationIds: $notificationIds)
+}
+
+mutation MarkAllNotificationsAsRead {
+  markAllNotificationsAsRead
+}
+
+mutation DeleteNotification($notificationId: Int!) {
+  deleteNotification(notificationId: $notificationId)
+}
+
+fragment Notification on NotificationGQL {
+  id
+  notificationType
+  actor {
+    id
+    username
+    profileImageUri
+  }
+  videoId
+  challengeId
+  challenge {
+    id
+    name
+  }
+  comment {
+    id
+    message
+    user {
+      id
+      username
+      profileImageUri
+    }
+  }
+  reactionType
+  isRead
+  createdAt
+  readAt
+}

src/operations/payments.gql

@@ -0,0 +1,162 @@
+mutation EnsureStripeCustomerExists {
+  ensureStripeCustomerExists {
+    id
+    firebaseUid
+    username
+    stripeCustomerId
+    profileImageUri
+    isAdmin
+    fargoRating
+    videosPrivateByDefault
+    createdAt
+    updatedAt
+  }
+}
+
+mutation CreateSubscription($priceId: String!) {
+  createSubscription(priceId: $priceId) {
+    checkoutUrl
+    sessionId
+  }
+}
+
+mutation CreateCustomerPortalSession {
+  createCustomerPortalSession {
+    portalUrl
+  }
+}
+
+query GetAvailableSubscriptionOptions {
+  getAvailableSubscriptionOptions {
+    trialPeriodDays
+    products {
+      id
+      name
+      description
+      active
+      prices {
+        id
+        currency
+        unitAmount
+        recurringInterval
+        recurringIntervalCount
+        type
+        active
+      }
+    }
+    appleIap {
+      enabled
+      proMonthlyProductId
+      productIds
+    }
+    tierOptions {
+      tierName
+      tierDisplayName
+      billingInterval
+      platform
+      isConfigured
+      isAvailable
+      stripeProductId
+      stripePriceId
+      appleProductId
+      currency
+      unitAmount
+      recurringIntervalCount
+    }
+  }
+}
+
+query GetSubscriptionStatus {
+  getUserSubscriptionStatus {
+    hasActiveSubscription
+    entitlementSource
+    entitlementStartsAt
+    entitlementEndsAt
+    subscriptionStatus
+    currentPeriodStart
+    currentPeriodEnd
+    validUntil
+    stripePriceId
+    stripeSubscriptionId
+  }
+}
+
+query GetResolvedTier {
+  getResolvedTier {
+    tierName
+    tierDisplayName
+    hasActiveSubscription
+    entitlementSource
+    entitlementStatus
+    entitlementStartsAt
+    entitlementEndsAt
+    capabilities
+  }
+}
+
+query GetStorageStatus {
+  getStorageStatus {
+    userId
+    tierName
+    retainedStorageUsedBytes
+    retainedStorageLimitBytes
+    isUnlimited
+    policyConfigured
+    remainingStorageBytes
+    storageUsageRatio
+    isNearLimit
+    isOverLimit
+    usageCalculated
+    usageSource
+    lastCalculatedAt
+  }
+}
+
+query GetAppleAppAccountToken {
+  getAppleAppAccountToken
+}
+
+mutation SyncAppleSubscription($signedTransactionInfo: String!) {
+  syncAppleSubscription(
+    input: { signedTransactionInfo: $signedTransactionInfo }
+  ) {
+    ok
+    errorCode
+    errorMessage
+    hasActiveSubscription
+    entitlementSource
+    entitlementStartsAt
+    entitlementEndsAt
+    appleStatus
+    originalTransactionId
+    latestTransactionId
+    productId
+    expiresAt
+  }
+}
+
+mutation CancelSubscription {
+  cancelSubscription {
+    hasActiveSubscription
+    entitlementSource
+    entitlementStartsAt
+    entitlementEndsAt
+    subscriptionStatus
+    currentPeriodStart
+    currentPeriodEnd
+    validUntil
+    stripePriceId
+    stripeSubscriptionId
+  }
+}
+mutation SubmitCancellationFeedback(
+  $reasons: [CancellationReasonEnum!]
+  $feedback: String
+  $metadata: CancellationFeedbackMetadataInput
+) {
+  submitCancellationFeedback(
+    reasons: $reasons
+    feedback: $feedback
+    metadata: $metadata
+  )
+}

src/operations/pool_hall.gql

@@ -0,0 +1,187 @@
+fragment PoolHallFields on PoolHall {
+  id
+  name
+  address
+  city
+  state
+  latitude
+  longitude
+  timezone
+  status
+  createdAt
+  updatedAt
+}
+
+fragment PoolHallCameraFields on PoolHallCamera {
+  id
+  poolHallId
+  name
+  tableLabel
+  streamPath
+  status
+  tableSize
+  pocketSize
+  allowsPrivateVideos
+  claimTermsText
+  claimTermsVersion
+  inUse
+  lastPublishedAt
+  lastUnpublishedAt
+  createdAt
+  updatedAt
+}
+
+fragment PoolHallCameraWithHallFields on PoolHallCamera {
+  ...PoolHallCameraFields
+  poolHall {
+    ...PoolHallFields
+  }
+}
+
+fragment PoolHallCameraStreamCredentialsFields on PoolHallCameraStreamCredentials {
+  streamKey
+  rtmpPath
+  camera {
+    ...PoolHallCameraWithHallFields
+  }
+}
+
+fragment CameraClaimSessionFields on CameraClaimSession {
+  id
+  cameraId
+  userId
+  challengeCode
+  status
+  expiresAt
+  detectedAt
+  failedAt
+  failureReason
+  agreedTermsVersion
+  createdAt
+  updatedAt
+  camera {
+    ...PoolHallCameraWithHallFields
+  }
+}
+
+fragment CameraLeaseFields on CameraLease {
+  id
+  cameraId
+  claimSessionId
+  userId
+  videoId
+  status
+  startedAt
+  endedAt
+  expiresAt
+  endReason
+  createdAt
+  updatedAt
+  camera {
+    ...PoolHallCameraWithHallFields
+  }
+}
+
+query GetPoolHalls {
+  poolHalls {
+    ...PoolHallFields
+  }
+}
+
+query GetClaimablePoolHalls {
+  claimablePoolHalls {
+    ...PoolHallFields
+  }
+}
+
+query GetPoolHallCameras($poolHallId: ID!) {
+  poolHallCameras(poolHallId: $poolHallId) {
+    ...PoolHallCameraWithHallFields
+  }
+}
+
+query GetClaimableCameras($poolHallId: ID!) {
+  claimableCameras(poolHallId: $poolHallId) {
+    ...PoolHallCameraWithHallFields
+  }
+}
+
+query GetCameraClaimSession($id: ID!) {
+  cameraClaimSession(id: $id) {
+    ...CameraClaimSessionFields
+  }
+}
+
+query GetActiveCameraLease {
+  activeCameraLease {
+    ...CameraLeaseFields
+  }
+}
+
+mutation CreatePoolHall($input: CreatePoolHallInput!) {
+  createPoolHall(input: $input) {
+    ...PoolHallFields
+  }
+}
+
+mutation UpdatePoolHall($input: UpdatePoolHallInput!) {
+  updatePoolHall(input: $input) {
+    ...PoolHallFields
+  }
+}
+
+mutation CreatePoolHallCamera($input: CreatePoolHallCameraInput!) {
+  createPoolHallCamera(input: $input) {
+    ...PoolHallCameraStreamCredentialsFields
+  }
+}
+
+mutation UpdatePoolHallCamera($input: UpdatePoolHallCameraInput!) {
+  updatePoolHallCamera(input: $input) {
+    ...PoolHallCameraWithHallFields
+  }
+}
+
+mutation RotatePoolHallCameraStreamKey($cameraId: ID!) {
+  rotatePoolHallCameraStreamKey(cameraId: $cameraId) {
+    ...PoolHallCameraStreamCredentialsFields
+  }
+}
+
+mutation CreateCameraClaimSession(
+  $cameraId: ID!
+  $durationMinutes: Int
+  $videoName: String
+  $videoPrivate: Boolean
+  $agreedTermsVersion: Int
+  $tags: [VideoTagInput!]
+) {
+  createCameraClaimSession(
+    cameraId: $cameraId
+    durationMinutes: $durationMinutes
+    videoName: $videoName
+    videoPrivate: $videoPrivate
+    agreedTermsVersion: $agreedTermsVersion
+    tags: $tags
+  ) {
+    ...CameraClaimSessionFields
+  }
+}
+
+mutation CancelCameraClaimSession($claimSessionId: ID!) {
+  cancelCameraClaimSession(claimSessionId: $claimSessionId) {
+    ...CameraClaimSessionFields
+  }
+}
+
+mutation EndCameraLease($leaseId: ID!) {
+  endCameraLease(leaseId: $leaseId) {
+    ...CameraLeaseFields
+  }
+}
+
+mutation ExtendCameraLease($leaseId: ID!, $additionalMinutes: Int! = 60) {
+  extendCameraLease(leaseId: $leaseId, additionalMinutes: $additionalMinutes) {
+    ...CameraLeaseFields
+  }
+}

src/operations/reactions.gql

@@ -0,0 +1,3 @@
+mutation ReactToVideo($videoId: Int!, $reaction: ReactionEnum) {
+  reactToVideo(videoId: $videoId, reaction: $reaction)
+}

src/operations/recorded_shots.gql

@@ -0,0 +1,69 @@
+# Lightweight two-step picker data for Shot Lab's video-first source: recent
+# videos (completed or still uploading — no completion gate, so an in-progress
+# recording with no shots yet still appears), then that video's shots. The
+# stream fields let the client hint at "actively updating" without gating.
+query GetShotLabVideos($limit: Int! = 25) {
+  getFeedVideos(
+    limit: $limit
+    includePrivate: MINE
+    feedInput: { allUsers: true }
+  ) {
+    videos {
+      id
+      name
+      createdAt
+      screenshotUri
+      framesPerSecond
+      totalShots
+      owner {
+        id
+        username
+        profileImageUri
+      }
+      stream {
+        id
+        isCompleted
+        lastSegmentUploadedAt
+      }
+    }
+  }
+}
+
+query GetRecordedStreamShots($videoId: Int!, $limit: Int! = 200) {
+  getOrderedShots(
+    filterInput: { videoId: [$videoId] }
+    shotsOrdering: { orderings: [{ startFrame: { descending: false } }] }
+    limit: $limit
+  ) {
+    shots {
+      id
+      videoId
+      startFrame
+      endFrame
+      serializedShotPaths {
+        b64EncodedBuffer
+      }
+      cueObjectFeatures {
+        cueObjectDistance
+        cueObjectAngle
+        cueBallSpeed
+        shotDirection
+        spinType
+      }
+      pocketingIntentionFeatures {
+        make
+        targetPocketDistance
+        targetPocketAngle
+        targetPocketAngleDirection
+        marginOfErrorInDegrees
+        intendedPocketType
+        difficulty
+      }
+      pocketingIntentionInfo {
+        ballId
+        pocketId
+        pathMetadataIndex
+      }
+    }
+  }
+}

src/operations/runs.gql

@@ -0,0 +1,67 @@
+query GetRunsForHighlights(
+  $filterInput: RunFilterInput!
+  $runIds: [Int!] = null
+  $runsOrdering: GetRunsOrdering
+  $limit: Int! = 500
+  $countRespectsLimit: Boolean! = false
+) {
+  getRuns(
+    filterInput: $filterInput
+    runIds: $runIds
+    runsOrdering: $runsOrdering
+    limit: $limit
+    countRespectsLimit: $countRespectsLimit
+  ) {
+    count
+    runs {
+      id
+      runLength
+      userId
+      videoId
+      shots {
+        videoId
+        id
+      }
+    }
+    runIds
+  }
+}
+
+fragment PocketingIntentionFragment on PocketingIntentionFeaturesGQL {
+  make
+  targetPocketDistance
+  targetPocketAngle
+  targetPocketAngleDirection
+  marginOfErrorInDegrees
+  intendedPocketType
+  difficulty
+}
+
+query GetRunsWithTimestamps(
+  $filterInput: RunFilterInput!
+  $runIds: [Int!] = null
+  $runsOrdering: GetRunsOrdering
+) {
+  getRuns(
+    filterInput: $filterInput
+    runIds: $runIds
+    runsOrdering: $runsOrdering
+  ) {
+    count
+    runs {
+      id
+      runLength
+      userId
+      videoId
+      shots {
+        videoId
+        id
+        createdAt
+        pocketingIntentionFeatures {
+          ...PocketingIntentionFragment
+        }
+      }
+    }
+    runIds
+  }
+}

src/operations/session-coach.gql

@@ -0,0 +1,51 @@
+query GetSessionCoach($videoId: Int!) {
+  getSessionCoach(videoId: $videoId) {
+    videoId
+    processingId
+    analysisVersion
+    state
+    generatedAt
+    processingStatus
+    ineligibilityReason
+    summary
+    shotCount
+    madeCount
+    missedCount
+    unknownOutcomeCount
+    analyzedShotCount
+    makePercentage
+    primaryCandidate {
+      ...SessionCoachCandidateFields
+    }
+    candidates {
+      ...SessionCoachCandidateFields
+    }
+  }
+}
+
+fragment SessionCoachCandidateFields on SessionCoachCandidateGQL {
+  id
+  rank
+  family
+  kind
+  title
+  body
+  action
+  supportingShotIds
+  drillId
+  limitations
+  evidence {
+    bucketKey
+    bucketLabel
+    attemptCount
+    madeCount
+    missedCount
+    makePercentage
+    comparisonAttemptCount
+    comparisonMadeCount
+    comparisonMakePercentage
+    patternShotCount
+    score
+    rankReason
+  }
+}

src/operations/shooter.gql

@@ -0,0 +1,58 @@
+fragment PlayerSummaryFields on PlayerSummaryGQL {
+  clusterId
+  userId
+  username
+  profileImageUri
+  representativeFullFrameUrl
+  totalShots
+  totalShotsMade
+  makePercentage
+  score
+  longestRun
+  runLengths
+  spinTypeBreakdown {
+    draw
+    center
+    follow
+  }
+  averageDifficulty
+  averageTimeBetweenShots
+}
+
+fragment PlayerClusterShotFields on PlayerClusterShotGQL {
+  shotId
+  bboxX1
+  bboxY1
+  bboxX2
+  bboxY2
+  confidence
+  isConfirmed
+  cropUrl
+  fullFrameUrl
+}
+
+fragment PlayerClusterFields on PlayerClusterGQL {
+  videoId
+  clusterId
+  nShots
+  userId
+  username
+  profileImageUri
+  confirmed
+  score
+  shots {
+    ...PlayerClusterShotFields
+  }
+}
+
+query VideoPlayerClusters($videoId: Int!) {
+  videoPlayerClusters(videoId: $videoId) {
+    ...PlayerClusterFields
+  }
+}
+
+mutation FinalizePlayerAssignments($input: FinalizePlayerAssignmentsInput!) {
+  finalizePlayerAssignments(input: $input) {
+    ...PlayerClusterFields
+  }
+}

src/operations/shot_simulation.gql

@@ -0,0 +1,87 @@
+query GetTableState(
+  $b64Image: String!
+  $tableSize: Float
+  $useHomography: HomographyInputGQL
+) {
+  getTableState(
+    b64Image: $b64Image
+    tableSize: $tableSize
+    useHomography: $useHomography
+  ) {
+    identifierToPosition
+    identifierToColor {
+      hex
+    }
+  }
+}
+
+query GetLiveTableState($videoId: Int!) {
+  getLiveTableState(videoId: $videoId) {
+    videoId
+    frameIndex
+    tableState {
+      identifierToPosition
+      identifierToColor {
+        hex
+      }
+    }
+  }
+}
+
+query GetShotTableState($shotId: Int!) {
+  getShotTableState(shotId: $shotId) {
+    shotId
+    videoId
+    frameIndex
+    tableState {
+      identifierToPosition
+      identifierToColor {
+        hex
+      }
+    }
+  }
+}
+
+query SimulateShot($simulationInput: SimulateShotInputGQL!) {
+  simulateShot(simulationInput: $simulationInput) {
+    trajectories {
+      ballId
+      points {
+        time
+        position
+      }
+    }
+    events {
+      eventType
+      time
+      ballIds
+      position
+    }
+    finalState {
+      ballId
+      position
+    }
+    pottedBallIds
+  }
+}
+
+query ComputePotAim(
+  $simulationInput: SimulateShotInputGQL!
+  $targetBallId: Int!
+  $pocket: PocketIdentifier!
+) {
+  computePotAim(
+    simulationInput: $simulationInput
+    targetBallId: $targetBallId
+    pocket: $pocket
+  ) {
+    phi
+    geometricPhi
+    cutAngle
+    requiredPrecision
+    feasible
+    potted
+    converged
+    occludingBallIds
+  }
+}

src/operations/shots.gql

@@ -40,9 +40,17 @@ mutation UpdateShotAnnotations(
   }
 }
 
-query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
-  getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
-    ids
+## Should be deprecated
+query GetShotsWithVideoGql(
+  $filterInput: FilterInput!
+  $shotsOrdering: GetShotsOrdering
+  $limit: Int
+) {
+  getOrderedShots(
+    filterInput: $filterInput
+    shotsOrdering: $shotsOrdering
+    limit: $limit
+  ) {
     shots {
       id
       videoId
@@ -54,18 +62,40 @@ query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
   }
 }
 
+query GetShotsWithJustIds(
+  $filterInput: FilterInput!
+  $shotsOrdering: GetShotsOrdering
+  $limit: Int
+  $countRespectsLimit: Boolean
+) {
+  getOrderedShots(
+    filterInput: $filterInput
+    shotsOrdering: $shotsOrdering
+    limit: $limit
+    countRespectsLimit: $countRespectsLimit
+  ) {
+    count
+    shots {
+      id
+      videoId
+    }
+  }
+}
+
 ## Reserved for playlists (which are created from a filter)
 query GetShotsWithMetadataFilterResult(
   $filterInput: FilterInput!
   $shotsOrdering: GetShotsOrdering
   $limit: Int
   $ids: [Int!]
+  $countRespectsLimit: Boolean
 ) {
   getOrderedShots(
     filterInput: $filterInput
     shotsOrdering: $shotsOrdering
     limit: $limit
     ids: $ids
+    countRespectsLimit: $countRespectsLimit
   ) {
     count
     shots {
@@ -102,6 +132,38 @@ query GetShotsByIds($ids: [Int!]!) {
   }
 }
 
+# Lightweight clip boundaries for condensed session playback. The inline
+# session player only needs each shot's frame/time window to seek between
+# shots — this skips the heavy ShotWithAllFeatures payload (cue/pocketing
+# features, serialized shot paths, annotations, nested video/playlist). The
+# startTime/endTime @client resolvers derive their values from the frame
+# fields + the video (looked up internally), so this is all they require.
+fragment ShotClipRange on ShotGQL {
+  id
+  videoId
+  startFrame
+  endFrame
+  startTime @client
+  endTime @client
+}
+
+query GetShotClipRanges(
+  $filterInput: FilterInput!
+  $shotsOrdering: GetShotsOrdering
+  $limit: Int
+) {
+  getOrderedShots(
+    filterInput: $filterInput
+    shotsOrdering: $shotsOrdering
+    limit: $limit
+  ) {
+    count
+    shots {
+      ...ShotClipRange
+    }
+  }
+}
+
 fragment ShotWithAllFeatures on ShotGQL {
   id
   videoId
@@ -109,6 +171,14 @@ fragment ShotWithAllFeatures on ShotGQL {
   endFrame
   startTime @client
   endTime @client
+  startSegment @client {
+    index
+    time
+  }
+  endSegment @client {
+    index
+    time
+  }
   user {
     id
   }
@@ -129,6 +199,7 @@ fragment ShotWithAllFeatures on ShotGQL {
     targetPocketAngleDirection
     marginOfErrorInDegrees
     intendedPocketType
+    difficulty
   }
   pocketingIntentionInfo {
     ballId
@@ -146,4 +217,27 @@ fragment ShotWithAllFeatures on ShotGQL {
     }
     notes
   }
+  video {
+    id
+    stream {
+      id
+      streamSegmentType
+    }
+    playlist {
+      videoId
+      segmentDurations
+    }
+  }
+}
+
+mutation EditShot($shotId: Int!, $fieldsToEdit: EditableShotFieldInputGQL!) {
+  editShot(shotId: $shotId, fieldsToEdit: $fieldsToEdit) {
+    error {
+      shotId
+      msg
+    }
+    shot {
+      ...ShotWithAllFeatures
+    }
+  }
 }

src/operations/tags.gql

@@ -0,0 +1,7 @@
+mutation RetireTags($tagIds: [Int!]!) {
+  retireTags(tagIds: $tagIds)
+}
+
+mutation DeleteTags($videoId: Int!, $tagsToDelete: [VideoTagInput!]!) {
+  deleteTags(videoId: $videoId, tagsToDelete: $tagsToDelete)
+}

src/operations/usage_stats.gql

@@ -0,0 +1,45 @@
+query getUsageStats($days: Int! = 30) {
+  getUsageStats(days: $days) {
+    funnel {
+      freemiumEpoch
+      eraSignups
+      eraPaying
+      activationCohort
+      activationActivated
+      payingUsers
+      newPaid7d
+      newPaid30d
+      retentionPrevActive
+      retentionReturned
+    }
+    cohorts {
+      weekStart
+      signups
+      activated7d
+      paid7d
+      activatedNotPaid7d
+    }
+    totalUsers
+    totalVideos
+    totalShots
+    totalRuns
+    windows {
+      label
+      newUsers
+      activeUsers
+      sessions
+      shots
+    }
+    daily {
+      day
+      newUsers
+      activeUsers
+      sessions
+      shots
+    }
+    processingLast24h {
+      status
+      count
+    }
+  }
+}

src/operations/user.gql

@@ -21,34 +21,67 @@ mutation getProfileImageUploadLink($fileExt: String = ".png") {
 
 mutation editProfileImageUri($profileImageUri: String!) {
   editProfileImageUri(profileImageUri: $profileImageUri) {
-    id
-    firebaseUid
-    username
-    profileImageUri
-    createdAt
-    updatedAt
+    ...UserFragment
   }
 }
 
 query getLoggedInUser {
   getLoggedInUser {
-    id
-    firebaseUid
-    username
-    isAdmin
-    profileImageUri
-    activeVideoId
-    createdAt
-    updatedAt
+    ...UserFragment
   }
 }
 
-query GetUserPlayTime($userId: Int!) {
-  getPlayTime(userId: $userId) {
+query GetUser($userId: Int!) {
+  getUser(userId: $userId) {
+    ...UserFragment
+    following {
+      id
+    }
+    followers {
+      id
+    }
+  }
+}
+
+query GetUserPlayTime($userId: Int!, $filters: VideoFilterInput) {
+  getPlayTime(userId: $userId, filters: $filters) {
     totalSeconds
   }
 }
 
+query GetUploadQuotaStatus {
+  getQuotaStatus {
+    tierName
+    periodStart
+    periodEnd
+    durationUsedSeconds
+    durationLimitSeconds
+    maxVideoDurationSeconds
+    durationRemainingSeconds
+    canUpload
+    importQuotaBuckets {
+      quotaKey
+      appliesToUploadKind
+      periodStart
+      periodEnd
+      durationUsedSeconds
+      durationLimitSeconds
+      durationRemainingSeconds
+      canUpload
+    }
+    recordingQuotaBuckets {
+      quotaKey
+      appliesToUploadKind
+      periodStart
+      periodEnd
+      durationUsedSeconds
+      durationLimitSeconds
+      durationRemainingSeconds
+      canUpload
+    }
+  }
+}
+
 query getUsernames(
   $matchString: String!
   $limit: Int = null
@@ -57,20 +90,27 @@ query getUsernames(
   getUsernames(matchString: $matchString, limit: $limit, after: $after)
 }
 
-query getUsernamesAndFollowing(
+query getUserRelationshipsMatching(
   $userId: Int!
   $matchString: String!
   $limit: Int = null
   $after: String = null
 ) {
-  getUsernamesAndFollowing(
+  getUserRelationshipsMatching(
     userId: $userId
     matchString: $matchString
     limit: $limit
     after: $after
   ) {
-    followers
-    following
+    relationships {
+      toUser {
+        username
+        profileImageUri
+        id
+      }
+      toUserFollows
+      toUserIsFollowedBy
+    }
   }
 }
 
@@ -78,5 +118,112 @@ query GetUserTags {
   getUserTags {
     id
     name
+    tagClasses {
+      id
+      name
+    }
+  }
+}
+
+query GetGameTypeTagMetrics($input: GameTypeTagMetricsInput!) {
+  getGameTypeTagMetrics(input: $input) {
+    tagName
+    tagLabel
+    tableSize
+    shotCount
+    madeShots
+    makeRate
+  }
+}
+
+mutation followUser($followedUserId: Int!) {
+  followUser(followedUserId: $followedUserId) {
+    id
+    username
+  }
+}
+
+mutation unfollowUser($followedUserId: Int!) {
+  unfollowUser(followedUserId: $followedUserId) {
+    id
+    username
+  }
+}
+
+query getUserFollowingFollowers {
+  getLoggedInUser {
+    id
+    following {
+      id
+      username
+      profileImageUri
+      isFollowedByCurrentUser
+    }
+    followers {
+      id
+      username
+      profileImageUri
+      isFollowedByCurrentUser
+    }
+  }
+}
+
+query doesUsernameExist($candidateUsername: String!) {
+  doesUsernameExist(candidateUsername: $candidateUsername)
+}
+
+mutation editUser(
+  $username: String
+  $fargoRating: Int
+  $videosPrivateByDefault: Boolean
+  $agreesToMarketing: Boolean
+  $bio: String
+) {
+  editUser(
+    input: {
+      username: $username
+      fargoRating: $fargoRating
+      videosPrivateByDefault: $videosPrivateByDefault
+      agreesToMarketing: $agreesToMarketing
+      bio: $bio
+    }
+  ) {
+    id
+    firebaseUid
+    username
+    fargoRating
+    updatedAt
+    videosPrivateByDefault
+    agreesToMarketing
+    bio
+  }
+}
+
+mutation deleteUser {
+  deleteUser
+}
+
+fragment UserFragment on UserGQL {
+  id
+  firebaseUid
+  username
+  isAdmin
+  profileImageUri
+  bio
+  fargoRating
+  activeVideoId
+  createdAt
+  updatedAt
+  videosPrivateByDefault
+  agreesToMarketing
+}
+
+query GetUsersMatching(
+  $matchString: String = null
+  $limit: Int = null
+  $after: String = null
+) {
+  getUsersMatching(matchString: $matchString, limit: $limit, after: $after) {
+    ...UserFragment
   }
 }

src/operations/video.gql

@@ -5,48 +5,12 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
     makePercentage
     elapsedTime
     currentHomography {
-      crop {
-        left
-        top
-        width
-        height
-      }
-      pockets {
-        left
-        top
-        width
-        height
-      }
-      sourcePoints {
-        topLeft {
-          x
-          y
-        }
-        topSide {
-          x
-          y
-        }
-        topRight {
-          x
-          y
-        }
-        bottomLeft {
-          x
-          y
-        }
-        bottomSide {
-          x
-          y
-        }
-        bottomRight {
-          x
-          y
-        }
-      }
+      ...HomographyInfo
     }
     stream {
       id
       linksRequested
+      lowestUnuploadedSegmentIndex
       uploadsCompleted
       segmentProcessingCursor
       isCompleted
@@ -55,6 +19,7 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
       initPlaylistUploadStatus
     }
     currentProcessing {
+      id
       errors {
         message
         startSegmentIndex
@@ -72,6 +37,8 @@ query GetVideoUpdatePageDetails($videoId: Int!) {
     makePercentage
     elapsedTime
     tableSize
+    pocketSize
+    private
     tags {
       tagClasses {
         name
@@ -95,12 +62,15 @@ query GetVideoDetails($videoId: Int!) {
     endTime
     makePercentage
     medianRun
+    averageDifficulty
     startTime
     totalShots
     totalShotsMade
     createdAt
     updatedAt
     tableSize
+    pocketSize
+    private
     owner {
       id
       firebaseUid
@@ -113,6 +83,68 @@ query GetVideoDetails($videoId: Int!) {
       }
       name
     }
+    playerSummaries {
+      ...PlayerSummaryFields
+    }
+  }
+}
+
+fragment UserSocialsFields on UserGQL {
+  id
+  username
+  profileImageUri
+  isFollowedByCurrentUser
+}
+
+query GetVideoSocialDetailsById($videoId: Int!) {
+  getVideo(videoId: $videoId) {
+    id
+    name
+    screenshotUri
+    makePercentage
+    totalShots
+    owner {
+      id
+      firebaseUid
+      username
+      profileImageUri
+    }
+    tags {
+      tagClasses {
+        name
+      }
+      name
+    }
+    reactions {
+      videoId
+      user {
+        ...UserSocialsFields
+      }
+      reaction
+    }
+    comments {
+      id
+      message
+      user {
+        ...UserSocialsFields
+      }
+      replies {
+        id
+        message
+        user {
+          ...UserSocialsFields
+        }
+      }
+    }
+  }
+}
+
+# Full card payload for a single video — reuses the same VideoCardFields
+# fragment the feed list uses, so the session-detail meta header shares one
+# source of truth (and the normalized Apollo cache) with the feed card.
+query GetVideoCard($videoId: Int!) {
+  getVideo(videoId: $videoId) {
+    ...VideoCardFields
   }
 }
 
@@ -154,45 +186,7 @@ query GetVideo($videoId: Int!) {
       segmentDurations
     }
     homographyHistory {
-      frameIndex
-      crop {
-        left
-        top
-        width
-        height
-      }
-      pockets {
-        left
-        top
-        width
-        height
-      }
-      sourcePoints {
-        topLeft {
-          x
-          y
-        }
-        topSide {
-          x
-          y
-        }
-        topRight {
-          x
-          y
-        }
-        bottomLeft {
-          x
-          y
-        }
-        bottomSide {
-          x
-          y
-        }
-        bottomRight {
-          x
-          y
-        }
-      }
+      ...HomographyInfo
     }
     stream {
       id
@@ -231,6 +225,13 @@ query GetMedianRunForVideo($videoId: Int!) {
   }
 }
 
+query GetAverageDifficultyForVideo($videoId: Int!) {
+  getVideo(videoId: $videoId) {
+    id
+    averageDifficulty
+  }
+}
+
 fragment StreamWithEndFrames on UploadStreamGQL {
   id
   streamSegmentType
@@ -288,3 +289,69 @@ query GetHeaderInfoByVideoId($videoId: Int!) {
     startTime
   }
 }
+query GetBannerInfoByVideoId($videoId: Int!) {
+  getVideo(videoId: $videoId) {
+    id
+    name
+    stream {
+      id
+      lastIntendedSegmentBound
+    }
+    owner {
+      id
+    }
+    currentProcessing {
+      id
+      status
+    }
+  }
+}
+
+mutation FindPrerecordTableLayout($b64Image: String!, $videoId: Int!) {
+  findPrerecordTableLayout(b64Image: $b64Image, videoId: $videoId) {
+    ...HomographyInfo
+  }
+}
+
+fragment HomographyInfo on HomographyInfoGQL {
+  id
+  frameIndex
+  crop {
+    left
+    top
+    width
+    height
+  }
+  pockets {
+    left
+    top
+    width
+    height
+  }
+  sourcePoints {
+    topLeft {
+      x
+      y
+    }
+    topSide {
+      x
+      y
+    }
+    topRight {
+      x
+      y
+    }
+    bottomLeft {
+      x
+      y
+    }
+    bottomSide {
+      x
+      y
+    }
+    bottomRight {
+      x
+      y
+    }
+  }
+}

src/operations/video_export.gql

@@ -0,0 +1,36 @@
+fragment VideoExportJobFields on VideoExportJobGQL {
+  id
+  videoId
+  mode
+  status
+  videoName
+  videoThumbnailUri
+  shotIds
+  runId
+  downloadUrl
+  fileSizeBytes
+  expiresAt
+  createdAt
+}
+
+mutation RequestVideoExport($input: RequestVideoExportInput!) {
+  requestVideoExport(input: $input) {
+    ...VideoExportJobFields
+  }
+}
+
+mutation DismissVideoExport($jobId: Int!) {
+  dismissVideoExport(jobId: $jobId)
+}
+
+query VideoExportJob($jobId: Int!) {
+  videoExportJob(jobId: $jobId) {
+    ...VideoExportJobFields
+  }
+}
+
+query MyVideoExports($limit: Int = 30, $offset: Int = 0) {
+  myVideoExports(limit: $limit, offset: $offset) {
+    ...VideoExportJobFields
+  }
+}

src/operations/video_upload.gql

@@ -1,5 +1,11 @@
-mutation CreateUploadStream($videoMetadataInput: VideoMetadataInput!) {
-  createUploadStream(videoMetadata: $videoMetadataInput) {
+mutation CreateUploadStream(
+  $videoMetadataInput: VideoMetadataInput!
+  $expectedDurationSeconds: Float = null
+) {
+  createUploadStream(
+    videoMetadata: $videoMetadataInput
+    expectedDurationSeconds: $expectedDurationSeconds
+  ) {
     videoId
   }
 }
@@ -31,6 +37,13 @@ mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
               }
             }
           }
+          ... on StorageLimitExceededErr {
+            reason
+            tierName
+            retainedStorageUsedBytes
+            retainedStorageLimitBytes
+            remainingStorageBytes
+          }
         }
       }
     }
@@ -61,6 +74,13 @@ mutation GetHlsInitUploadLink($videoId: Int!) {
           ... on TooManyInitUploadsErr {
             linksRequested
           }
+          ... on StorageLimitExceededErr {
+            reason
+            tierName
+            retainedStorageUsedBytes
+            retainedStorageLimitBytes
+            remainingStorageBytes
+          }
         }
       }
     }
@@ -101,6 +121,19 @@ query GetUploadStreams(
     }
   }
 }
+
+fragment UploadStreamWithDetails on VideoGQL {
+  id
+  name
+  startTime
+  stream {
+    isCompleted
+    lastIntendedSegmentBound
+    uploadCompletionCursor
+    uploadsCompleted
+  }
+}
+
 query GetUploadStreamsWithDetails(
   $limit: Int! = 5
   $after: String = null
@@ -108,15 +141,7 @@ query GetUploadStreamsWithDetails(
 ) {
   getUserVideos(limit: $limit, after: $after, filters: $filters) {
     videos {
-      id
-      name
-      startTime
-      stream {
-        isCompleted
-        lastIntendedSegmentBound
-        uploadCompletionCursor
-        uploadsCompleted
-      }
+      ...UploadStreamWithDetails
     }
     pageInfo {
       hasNextPage

yarn.lock

@@ -10,10 +10,10 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@apollo/client@^3.9.2":
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.9.2.tgz#96edf2c212f828bad1ef3d84234fa473c5a27ff8"
-  integrity sha512-Zw9WvXjqhpbgkvAvnj52vstOWwM0iedKWtn1hSq1cODQyoe1CF2uFwMYFI7l56BrAY9CzLi6MQA0AhxpgJgvxw==
+"@apollo/client@^3.11.10":
+  version "3.12.3"
+  resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.12.3.tgz#0d252749baad8328e06883fe118dc7e73e3bbb1f"
+  integrity sha512-KZ5zymRdb8bMbGUb1wP2U04ff7qIGgaC1BCdCVC+IPFiXkxEhHBc5fDEQOwAUT+vUo9KbBh3g7QK/JCOswn59w==
   dependencies:
     "@graphql-typed-document-node/core" "^3.1.1"
     "@wry/caches" "^1.0.0"
@@ -23,7 +23,7 @@
     hoist-non-react-statics "^3.3.2"
     optimism "^0.18.0"
     prop-types "^15.7.2"
-    rehackt "0.0.3"
+    rehackt "^0.1.0"
     response-iterator "^0.2.6"
     symbol-observable "^4.0.0"
     ts-invariant "^0.10.3"
@@ -603,6 +603,18 @@
     lodash "~4.17.0"
     tslib "~2.5.0"
 
+"@graphql-codegen/plugin-helpers@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-6.0.0.tgz#8a913c82a95b9ff36b2180f7c56611cc56268625"
+  integrity sha512-Z7P89vViJvQakRyMbq/JF2iPLruRFOwOB6IXsuSvV/BptuuEd7fsGPuEf8bdjjDxUY0pJZnFN8oC7jIQ8p9GKA==
+  dependencies:
+    "@graphql-tools/utils" "^10.0.0"
+    change-case-all "1.0.15"
+    common-tags "1.8.2"
+    import-from "4.0.0"
+    lodash "~4.17.0"
+    tslib "~2.6.0"
+
 "@graphql-codegen/schema-ast@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-4.0.0.tgz#5d60996c87b64f81847da8fcb2d8ef50ede89755"
@@ -612,16 +624,25 @@
     "@graphql-tools/utils" "^10.0.0"
     tslib "~2.5.0"
 
-"@graphql-codegen/typescript-operations@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-4.0.1.tgz#930af3e2d2ae8ff06de696291be28fe7046a2fef"
-  integrity sha512-GpUWWdBVUec/Zqo23aFLBMrXYxN2irypHqDcKjN78JclDPdreasAEPcIpMfqf4MClvpmvDLy4ql+djVAwmkjbw==
+"@graphql-codegen/schema-ast@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-5.0.0.tgz#9708d7484a01bb3a502685126708d7b139fd0721"
+  integrity sha512-jn7Q3PKQc0FxXjbpo9trxzlz/GSFQWxL042l0iC8iSbM/Ar+M7uyBwMtXPsev/3Razk+osQyreghIz0d2+6F7Q==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^5.0.0"
-    "@graphql-codegen/typescript" "^4.0.1"
-    "@graphql-codegen/visitor-plugin-common" "4.0.1"
+    "@graphql-codegen/plugin-helpers" "^6.0.0"
+    "@graphql-tools/utils" "^10.0.0"
+    tslib "~2.6.0"
+
+"@graphql-codegen/typescript-operations@^5.0.4":
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-5.0.4.tgz#052680d41f4bab3bb85af8e906c43bde29239e7b"
+  integrity sha512-5Bu/BTmyNjdSfSLLBKjC0+4XWcY01uotVcnVIWIxxRdIHoRxnTW6PUkT5CoPHP5r/Uoo3OvIJxh+0LYSH5suwA==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^6.0.0"
+    "@graphql-codegen/typescript" "^5.0.4"
+    "@graphql-codegen/visitor-plugin-common" "6.1.2"
     auto-bind "~4.0.0"
-    tslib "~2.5.0"
+    tslib "~2.6.0"
 
 "@graphql-codegen/typescript-react-apollo@^4.2.0":
   version "4.2.0"
@@ -645,6 +666,17 @@
     auto-bind "~4.0.0"
     tslib "~2.5.0"
 
+"@graphql-codegen/typescript@^5.0.4":
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-5.0.4.tgz#a7f51505445568fd737b01ce7fad515c2b89897f"
+  integrity sha512-q6S8hX+aR4BzeGgolac4gp22rBnXbLhedmOwT1UBT9e3lGNmNpYC7WJUEzAPjWf6z1lRSNmojLlwEjTnffhKNA==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^6.0.0"
+    "@graphql-codegen/schema-ast" "^5.0.0"
+    "@graphql-codegen/visitor-plugin-common" "6.1.2"
+    auto-bind "~4.0.0"
+    tslib "~2.6.0"
+
 "@graphql-codegen/visitor-plugin-common@2.13.1":
   version "2.13.1"
   resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-2.13.1.tgz#2228660f6692bcdb96b1f6d91a0661624266b76b"
@@ -677,6 +709,22 @@
     parse-filepath "^1.0.2"
     tslib "~2.5.0"
 
+"@graphql-codegen/visitor-plugin-common@6.1.2":
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-6.1.2.tgz#e614d6606402a152686d6f90e6363150a7a55bde"
+  integrity sha512-zYdrhJKgk8kqE1Xz5/m/Ua42zk+rIvYB/FHh3dE1AhZ6b1IDqgKjF3LnkT+K2qenf9EfT4yNjXd5CEKMeXfHyg==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^6.0.0"
+    "@graphql-tools/optimize" "^2.0.0"
+    "@graphql-tools/relay-operation-optimizer" "^7.0.0"
+    "@graphql-tools/utils" "^10.0.0"
+    auto-bind "~4.0.0"
+    change-case-all "1.0.15"
+    dependency-graph "^1.0.0"
+    graphql-tag "^2.11.0"
+    parse-filepath "^1.0.2"
+    tslib "~2.6.0"
+
 "@graphql-tools/apollo-engine-loader@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@graphql-tools/apollo-engine-loader/-/apollo-engine-loader-8.0.0.tgz#ac1f351cbe41508411784f25757f5557b0f27489"
@@ -1649,6 +1697,11 @@ dependency-graph@^0.11.0:
   resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27"
   integrity sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==
 
+dependency-graph@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-1.0.0.tgz#bb5e85aec1310bc13b22dbd76e3196c4ee4c10d2"
+  integrity sha512-cW3gggJ28HZ/LExwxP2B++aiKxhJXMSIt9K48FOXQkm+vuG5gyatXnLsONRJdzO/7VfjDIiaOOa/bs4l464Lwg==
+
 detect-indent@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
@@ -2633,10 +2686,10 @@ regenerator-runtime@^0.14.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
   integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
 
-rehackt@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/rehackt/-/rehackt-0.0.3.tgz#1ea454620d4641db8342e2db44595cf0e7ac6aa0"
-  integrity sha512-aBRHudKhOWwsTvCbSoinzq+Lej/7R8e8UoPvLZo5HirZIIBLGAgdG7SL9QpdcBoQ7+3QYPi3lRLknAzXBlhZ7g==
+rehackt@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/rehackt/-/rehackt-0.1.0.tgz#a7c5e289c87345f70da8728a7eb878e5d03c696b"
+  integrity sha512-7kRDOuLHB87D/JESKxQoRwv4DzbIdwkAGQ7p6QKGdVlY1IZheUnVhlk/4UZlNUVxdAXpyxikE3URsG067ybVzw==
 
 relay-runtime@12.0.0:
   version "12.0.0"