Compare commits

..

22 Commits

Author SHA1 Message Date
b6ec7ed39d Merge pull request 'Add clientUploadStatus' (#137) from mk/stream-status into master
Reviewed-on: #137
2024-11-18 18:47:30 -07:00
545ba638c2 Add clientUploadStatus
All checks were successful
Tests / Tests (pull_request) Successful in 8s
2024-11-18 17:46:48 -08:00
94e4e55558 Merge pull request 'Medals' (#135) from volodymyr/medals into master
Reviewed-on: #135
2024-11-15 17:52:14 -07:00
2536f5db6b add nickname to operation, remove currently unsupported fields from request
All checks were successful
Tests / Tests (pull_request) Successful in 15s
2024-11-15 16:51:17 -08:00
ffd0814a98 remove dasystreak 2024-11-15 16:44:42 -08:00
55bfe42484 Medals 2024-11-15 16:44:42 -08:00
dabb0d1d9c Merge pull request 'Remove unimplemented dayStreak and add support for nickname' (#136) from mk/add-nickname-to-medals into master
Reviewed-on: #136
2024-11-15 12:50:49 -07:00
a538c1d81c Remove unimplemented dayStreak and add support for nickname
All checks were successful
Tests / Tests (pull_request) Successful in 7s
2024-11-15 11:50:11 -08:00
872bce3adb Merge pull request 'Add ID to user processing' (#134) from kat/add-id-processing into master
Reviewed-on: #134
2024-11-14 00:20:05 -07:00
457d375bed Add ID to user processing
All checks were successful
Tests / Tests (pull_request) Successful in 9s
2024-11-14 00:18:57 -07:00
12798e368c Merge pull request 'Get user videos' (#132) from volodymyr/get-user-videos into master
Reviewed-on: #132
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>
2024-11-13 15:14:48 -07:00
a3d6e6e19e Merge branch 'master' into volodymyr/get-user-videos
All checks were successful
Tests / Tests (pull_request) Successful in 13s
2024-11-13 15:14:30 -07:00
f7a6e393e7 Merge pull request 'Add excludeVideosWithNoShots filter' (#133) from mk/exclude-no-shots-filter into master
Reviewed-on: #133
2024-11-13 15:13:33 -07:00
ee11e506ed Add excludeVideosWithNoShots filter
All checks were successful
Tests / Tests (pull_request) Successful in 16s
2024-11-13 14:12:57 -08:00
90ec47848b Get user videos
All checks were successful
Tests / Tests (pull_request) Successful in 12s
2024-11-13 21:33:50 +01:00
21acb5219d Merge pull request 'Change includeCallersVideos default to True' (#131) from mk/change-caller-video-default into master
Reviewed-on: #131
2024-11-13 12:52:07 -07:00
087d511efc Change includeCallersVideos default to True
All checks were successful
Tests / Tests (pull_request) Successful in 14s
2024-11-13 11:51:29 -08:00
7cc0dca821 Merge pull request 'Add includeCallersVideos to getFeedVideos' (#130) from mk/make-feed-get-only-theirs into master
Reviewed-on: #130
2024-11-13 11:11:22 -07:00
f826121aa3 Add includeCallersVideos to getFeedVideos
All checks were successful
Tests / Tests (pull_request) Successful in 13s
2024-11-13 10:10:11 -08:00
2aadb8b49b Merge pull request 'Add createdAt filterInput to GetUserPlayTime' (#129) from loewy/update-get-play-time-operation into master
Reviewed-on: #129
2024-11-12 14:28:36 -07:00
5468b7ccda add createdAt dateRangeFilter
All checks were successful
Tests / Tests (pull_request) Successful in 8s
2024-11-12 13:00:18 -08:00
08dfafe1a3 Merge pull request 'Privacy' (#128) from volodymyr/privacy into master
Reviewed-on: #128
Reviewed-by: Kat Huang <kkathuang@gmail.com>
2024-11-12 11:27:56 -07:00
6 changed files with 412 additions and 81 deletions

View File

@@ -117,6 +117,11 @@ export type BucketSetInputGql = {
feature: Scalars["String"]["input"];
};
export enum ClientUploadStatusEnum {
UploadDisabled = "UPLOAD_DISABLED",
UploadEnabled = "UPLOAD_ENABLED",
}
export type CreateBucketSetInput = {
buckets: Array<BucketInputGql>;
feature: Scalars["String"]["input"];
@@ -1979,6 +1984,7 @@ export type MakePercentageIntervalGql = {
export type MedalGql = {
__typename?: "MedalGQL";
count: Scalars["Int"]["output"];
nickname?: Maybe<Scalars["String"]["output"]>;
};
export type MedalScope =
@@ -2210,6 +2216,7 @@ export type QueryGetBucketSetArgs = {
export type QueryGetFeedVideosArgs = {
after?: InputMaybe<Scalars["String"]["input"]>;
filters?: InputMaybe<VideoFilterInput>;
includeCallersVideos?: InputMaybe<Scalars["Boolean"]["input"]>;
limit?: Scalars["Int"]["input"];
};
@@ -2298,17 +2305,6 @@ export type QueryWaitForArgs = {
export type RequestedMedalsGql = {
__typename?: "RequestedMedalsGQL";
dayStreak2?: Maybe<MedalGql>;
dayStreak3?: Maybe<MedalGql>;
dayStreak4?: Maybe<MedalGql>;
dayStreak5?: Maybe<MedalGql>;
dayStreak6?: Maybe<MedalGql>;
dayStreak7?: Maybe<MedalGql>;
dayStreak14?: Maybe<MedalGql>;
dayStreak21?: Maybe<MedalGql>;
dayStreak30?: Maybe<MedalGql>;
dayStreak60?: Maybe<MedalGql>;
dayStreak90?: Maybe<MedalGql>;
distanceOver66?: Maybe<MedalGql>;
distanceOver78?: Maybe<MedalGql>;
distanceOver90?: Maybe<MedalGql>;
@@ -2555,6 +2551,7 @@ export type UploadSegmentGql = {
export type UploadStreamGql = {
__typename?: "UploadStreamGQL";
clientUploadStatus?: Maybe<ClientUploadStatusEnum>;
createdAt: Scalars["DateTime"]["output"];
errors: Array<StreamErrorGql>;
id: Scalars["ID"]["output"];
@@ -2609,6 +2606,7 @@ export type UserRelationshipsResult = {
export type VideoFilterInput = {
createdAt?: InputMaybe<DateRangeFilter>;
excludeVideosWithNoShots?: InputMaybe<Scalars["Boolean"]["input"]>;
isStreamCompleted?: InputMaybe<Scalars["Boolean"]["input"]>;
requireCursorCompletion?: Scalars["Boolean"]["input"];
};
@@ -2648,6 +2646,7 @@ export type VideoHistoryGql = {
};
export type VideoMetadataInput = {
clientUploadStatus?: InputMaybe<ClientUploadStatusEnum>;
endStream?: Scalars["Boolean"]["input"];
endTime?: InputMaybe<Scalars["DateTime"]["input"]>;
framesPerSecond?: InputMaybe<Scalars["Float"]["input"]>;
@@ -2778,9 +2777,15 @@ export type GetFeedQuery = {
updatedAt?: any | null;
startTime?: any | null;
endTime?: any | null;
private: boolean;
elapsedTime?: number | null;
tableSize: number;
owner?: { __typename?: "UserGQL"; username: string } | null;
owner?: {
__typename?: "UserGQL";
id: number;
username: string;
profileImageUri?: string | null;
} | null;
stream?: {
__typename?: "UploadStreamGQL";
id: string;
@@ -2791,6 +2796,19 @@ export type GetFeedQuery = {
name: string;
tagClasses: Array<{ __typename?: "VideoTagClass"; name: string }>;
}>;
currentProcessing?: {
__typename?: "VideoProcessingGQL";
id: number;
status: ProcessingStatusEnum;
errors: Array<{
__typename?: "VideoProcessingErrorGQL";
message: string;
}>;
statuses: Array<{
__typename?: "VideoProcessingStatusGQL";
status: ProcessingStatusEnum;
}>;
} | null;
}>;
pageInfo: {
__typename?: "PageInfoGQL";
@@ -2847,6 +2865,7 @@ export type GetVideoFeedQueryVariables = Exact<{
limit?: Scalars["Int"]["input"];
after?: InputMaybe<Scalars["String"]["input"]>;
filters?: InputMaybe<VideoFilterInput>;
includeCallersVideos?: InputMaybe<Scalars["Boolean"]["input"]>;
}>;
export type GetVideoFeedQuery = {
@@ -2920,6 +2939,118 @@ export type GetVideoMakePercentageIntervalsQuery = {
}>;
};
export type GetMedalsQueryVariables = Exact<{
scope: MedalScope;
userId?: InputMaybe<Scalars["Int"]["input"]>;
}>;
export type GetMedalsQuery = {
__typename?: "Query";
getMedals: {
__typename?: "RequestedMedalsGQL";
distanceOver66?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
distanceOver78?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
distanceOver90?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
runLength3?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
runLength5?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
runLength8?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
runLength10?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
runLength15?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
runLength20?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
runLength25?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
runLength30?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
runLength40?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
runLength50?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
totalMakes25?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
totalMakes50?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
totalMakes75?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
totalMakes100?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
totalMakes200?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
totalMakes300?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
totalMakes400?: {
__typename?: "MedalGQL";
count: number;
nickname?: string | null;
} | null;
};
};
export type GetSerializedShotPathsQueryVariables = Exact<{
filterInput: FilterInput;
}>;
@@ -3322,6 +3453,7 @@ export type GetLoggedInUserQuery = {
export type GetUserPlayTimeQueryVariables = Exact<{
userId: Scalars["Int"]["input"];
filters?: InputMaybe<VideoFilterInput>;
}>;
export type GetUserPlayTimeQuery = {
@@ -3516,6 +3648,7 @@ export type GetStreamMonitoringDetailsQuery = {
} | null;
currentProcessing?: {
__typename?: "VideoProcessingGQL";
id: number;
errors: Array<{
__typename?: "VideoProcessingErrorGQL";
message: string;
@@ -4497,32 +4630,7 @@ export const GetFeedDocument = gql`
) {
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
@@ -4530,6 +4638,7 @@ export const GetFeedDocument = gql`
}
}
}
${VideoCardFieldsFragmentDoc}
`;
/**
@@ -4597,8 +4706,14 @@ export const GetVideoFeedDocument = gql`
$limit: Int! = 5
$after: String = null
$filters: VideoFilterInput = null
$includeCallersVideos: Boolean = null
) {
getFeedVideos(limit: $limit, after: $after, filters: $filters) {
getFeedVideos(
limit: $limit
after: $after
filters: $filters
includeCallersVideos: $includeCallersVideos
) {
videos {
...VideoCardFields
}
@@ -4626,6 +4741,7 @@ export const GetVideoFeedDocument = gql`
* limit: // value for 'limit'
* after: // value for 'after'
* filters: // value for 'filters'
* includeCallersVideos: // value for 'includeCallersVideos'
* },
* });
*/
@@ -4759,6 +4875,154 @@ export type GetVideoMakePercentageIntervalsQueryResult = Apollo.QueryResult<
GetVideoMakePercentageIntervalsQuery,
GetVideoMakePercentageIntervalsQueryVariables
>;
export const GetMedalsDocument = gql`
query getMedals($scope: MedalScope!, $userId: Int) {
getMedals(scope: $scope, userId: $userId) {
distanceOver66 {
count
nickname
}
distanceOver78 {
count
nickname
}
distanceOver90 {
count
nickname
}
runLength3 {
count
nickname
}
runLength5 {
count
nickname
}
runLength8 {
count
nickname
}
runLength10 {
count
nickname
}
runLength15 {
count
nickname
}
runLength20 {
count
nickname
}
runLength25 {
count
nickname
}
runLength30 {
count
nickname
}
runLength40 {
count
nickname
}
runLength50 {
count
nickname
}
totalMakes25 {
count
nickname
}
totalMakes50 {
count
nickname
}
totalMakes75 {
count
nickname
}
totalMakes100 {
count
nickname
}
totalMakes200 {
count
nickname
}
totalMakes300 {
count
nickname
}
totalMakes400 {
count
nickname
}
}
}
`;
/**
* __useGetMedalsQuery__
*
* To run a query within a React component, call `useGetMedalsQuery` and pass it any options that fit your needs.
* When your component renders, `useGetMedalsQuery` returns an object from Apollo Client that contains loading, error, and data properties
* you can use to render your UI.
*
* @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
*
* @example
* const { data, loading, error } = useGetMedalsQuery({
* variables: {
* scope: // value for 'scope'
* userId: // value for 'userId'
* },
* });
*/
export function useGetMedalsQuery(
baseOptions: Apollo.QueryHookOptions<GetMedalsQuery, GetMedalsQueryVariables>,
) {
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useQuery<GetMedalsQuery, GetMedalsQueryVariables>(
GetMedalsDocument,
options,
);
}
export function useGetMedalsLazyQuery(
baseOptions?: Apollo.LazyQueryHookOptions<
GetMedalsQuery,
GetMedalsQueryVariables
>,
) {
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useLazyQuery<GetMedalsQuery, GetMedalsQueryVariables>(
GetMedalsDocument,
options,
);
}
export function useGetMedalsSuspenseQuery(
baseOptions?: Apollo.SuspenseQueryHookOptions<
GetMedalsQuery,
GetMedalsQueryVariables
>,
) {
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<GetMedalsQuery, GetMedalsQueryVariables>(
GetMedalsDocument,
options,
);
}
export type GetMedalsQueryHookResult = ReturnType<typeof useGetMedalsQuery>;
export type GetMedalsLazyQueryHookResult = ReturnType<
typeof useGetMedalsLazyQuery
>;
export type GetMedalsSuspenseQueryHookResult = ReturnType<
typeof useGetMedalsSuspenseQuery
>;
export type GetMedalsQueryResult = Apollo.QueryResult<
GetMedalsQuery,
GetMedalsQueryVariables
>;
export const GetSerializedShotPathsDocument = gql`
query GetSerializedShotPaths($filterInput: FilterInput!) {
getShots(filterInput: $filterInput) {
@@ -5620,8 +5884,8 @@ export type GetLoggedInUserQueryResult = Apollo.QueryResult<
GetLoggedInUserQueryVariables
>;
export const GetUserPlayTimeDocument = gql`
query GetUserPlayTime($userId: Int!) {
getPlayTime(userId: $userId) {
query GetUserPlayTime($userId: Int!, $filters: VideoFilterInput) {
getPlayTime(userId: $userId, filters: $filters) {
totalSeconds
}
}
@@ -5640,6 +5904,7 @@ export const GetUserPlayTimeDocument = gql`
* const { data, loading, error } = useGetUserPlayTimeQuery({
* variables: {
* userId: // value for 'userId'
* filters: // value for 'filters'
* },
* });
*/
@@ -6287,6 +6552,7 @@ export const GetStreamMonitoringDetailsDocument = gql`
initPlaylistUploadStatus
}
currentProcessing {
id
errors {
message
startSegmentIndex

View File

@@ -6,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
@@ -86,8 +61,14 @@ query GetVideoFeed(
$limit: Int! = 5
$after: String = null
$filters: VideoFilterInput = null
$includeCallersVideos: Boolean = null
) {
getFeedVideos(limit: $limit, after: $after, filters: $filters) {
getFeedVideos(
limit: $limit
after: $after
filters: $filters
includeCallersVideos: $includeCallersVideos
) {
videos {
...VideoCardFields
}

84
src/operations/medals.gql Normal file
View File

@@ -0,0 +1,84 @@
query getMedals($scope: MedalScope!, $userId: Int) {
getMedals(scope: $scope, userId: $userId) {
distanceOver66 {
count
nickname
}
distanceOver78 {
count
nickname
}
distanceOver90 {
count
nickname
}
runLength3 {
count
nickname
}
runLength5 {
count
nickname
}
runLength8 {
count
nickname
}
runLength10 {
count
nickname
}
runLength15 {
count
nickname
}
runLength20 {
count
nickname
}
runLength25 {
count
nickname
}
runLength30 {
count
nickname
}
runLength40 {
count
nickname
}
runLength50 {
count
nickname
}
totalMakes25 {
count
nickname
}
totalMakes50 {
count
nickname
}
totalMakes75 {
count
nickname
}
totalMakes100 {
count
nickname
}
totalMakes200 {
count
nickname
}
totalMakes300 {
count
nickname
}
totalMakes400 {
count
nickname
}
}
}

View File

@@ -45,8 +45,8 @@ query getLoggedInUser {
}
}
query GetUserPlayTime($userId: Int!) {
getPlayTime(userId: $userId) {
query GetUserPlayTime($userId: Int!, $filters: VideoFilterInput) {
getPlayTime(userId: $userId, filters: $filters) {
totalSeconds
}
}

View File

@@ -18,6 +18,7 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
initPlaylistUploadStatus
}
currentProcessing {
id
errors {
message
startSegmentIndex

View File

@@ -59,6 +59,7 @@ type Query {
getFeedVideos(
limit: Int! = 5
after: String = null
includeCallersVideos: Boolean = true
filters: VideoFilterInput = null
): VideoHistoryGQL!
}
@@ -295,21 +296,11 @@ type RequestedMedalsGQL {
totalMakes500: MedalGQL
totalMakes750: MedalGQL
totalMakes1000: MedalGQL
dayStreak2: MedalGQL
dayStreak3: MedalGQL
dayStreak4: MedalGQL
dayStreak5: MedalGQL
dayStreak6: MedalGQL
dayStreak7: MedalGQL
dayStreak14: MedalGQL
dayStreak21: MedalGQL
dayStreak30: MedalGQL
dayStreak60: MedalGQL
dayStreak90: MedalGQL
}
type MedalGQL {
count: Int!
nickname: String
}
input MedalScope @oneOf {
@@ -461,6 +452,7 @@ type UploadStreamGQL {
createdAt: DateTime!
updatedAt: DateTime!
segments: [UploadSegmentGQL!]!
clientUploadStatus: ClientUploadStatusEnum
resolution: VideoResolutionGQL!
streamSegmentType: StreamSegmentTypeEnum!
}
@@ -485,6 +477,11 @@ type UploadSegmentGQL {
linksRequested: Int!
}
enum ClientUploadStatusEnum {
UPLOAD_ENABLED
UPLOAD_DISABLED
}
type VideoResolutionGQL {
width: Int
height: Int
@@ -628,6 +625,7 @@ input VideoFilterInput {
isStreamCompleted: Boolean = null
requireCursorCompletion: Boolean! = true
createdAt: DateRangeFilter = null
excludeVideosWithNoShots: Boolean = null
}
type VideoHistoryGQL {
@@ -779,6 +777,7 @@ input VideoMetadataInput {
streamSegmentType: StreamSegmentTypeEnum = null
private: Boolean = null
endStream: Boolean! = false
clientUploadStatus: ClientUploadStatusEnum = null
resolution: VideoResolution = null
framesPerSecond: Float = null
}