@@ -10,16 +10,17 @@ describe("getUserInfo", () => {
10
10
const insertUserNameQuery = 'INSERT INTO "userNames" ("userID", "userName") VALUES(?, ?)' ;
11
11
await db . prepare ( "run" , insertUserNameQuery , [ getHash ( "getuserinfo_user_01" ) , "Username user 01" ] ) ;
12
12
13
- const sponsorTimesQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", views, category, "shadowHidden") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)' ;
14
- await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo0" , 1 , 11 , 2 , "uuid000001" , getHash ( "getuserinfo_user_01" ) , 1 , 10 , "sponsor" , 0 ] ) ;
15
- await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo0" , 1 , 11 , 2 , "uuid000002" , getHash ( "getuserinfo_user_01" ) , 2 , 10 , "sponsor" , 0 ] ) ;
16
- await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo1" , 1 , 11 , - 1 , "uuid000003" , getHash ( "getuserinfo_user_01" ) , 3 , 10 , "sponsor" , 0 ] ) ;
17
- await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo1" , 1 , 11 , - 2 , "uuid000004" , getHash ( "getuserinfo_user_01" ) , 4 , 10 , "sponsor" , 1 ] ) ;
18
- await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo2" , 1 , 11 , - 5 , "uuid000005" , getHash ( "getuserinfo_user_01" ) , 5 , 10 , "sponsor" , 1 ] ) ;
19
- await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo0" , 1 , 11 , 2 , "uuid000007" , getHash ( "getuserinfo_user_02" ) , 7 , 10 , "sponsor" , 1 ] ) ;
20
- await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo0" , 1 , 11 , 2 , "uuid000008" , getHash ( "getuserinfo_user_02" ) , 8 , 10 , "sponsor" , 1 ] ) ;
21
- await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo0" , 0 , 36000 , 2 , "uuid000009" , getHash ( "getuserinfo_user_03" ) , 8 , 10 , "sponsor" , 0 ] ) ;
22
- await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo3" , 1 , 11 , 2 , "uuid000006" , getHash ( "getuserinfo_user_02" ) , 6 , 10 , "sponsor" , 0 ] ) ;
13
+ const sponsorTimesQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", views, category, "actionType", "shadowHidden") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)' ;
14
+ await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo0" , 1 , 11 , 2 , "uuid000001" , getHash ( "getuserinfo_user_01" ) , 1 , 10 , "sponsor" , "skip" , 0 ] ) ;
15
+ await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo0" , 1 , 11 , 2 , "uuid000002" , getHash ( "getuserinfo_user_01" ) , 2 , 10 , "sponsor" , "skip" , 0 ] ) ;
16
+ await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo1" , 1 , 11 , - 1 , "uuid000003" , getHash ( "getuserinfo_user_01" ) , 3 , 10 , "sponsor" , "skip" , 0 ] ) ;
17
+ await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo1" , 1 , 11 , - 2 , "uuid000004" , getHash ( "getuserinfo_user_01" ) , 4 , 10 , "sponsor" , "skip" , 1 ] ) ;
18
+ await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo2" , 1 , 11 , - 5 , "uuid000005" , getHash ( "getuserinfo_user_01" ) , 5 , 10 , "sponsor" , "skip" , 1 ] ) ;
19
+ await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo0" , 1 , 11 , 2 , "uuid000007" , getHash ( "getuserinfo_user_02" ) , 7 , 10 , "sponsor" , "skip" , 1 ] ) ;
20
+ await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo0" , 1 , 11 , 2 , "uuid000008" , getHash ( "getuserinfo_user_02" ) , 8 , 10 , "sponsor" , "skip" , 1 ] ) ;
21
+ await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo0" , 0 , 36000 , 2 , "uuid000009" , getHash ( "getuserinfo_user_03" ) , 8 , 10 , "sponsor" , "skip" , 0 ] ) ;
22
+ await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo3" , 1 , 11 , 2 , "uuid000006" , getHash ( "getuserinfo_user_02" ) , 6 , 10 , "sponsor" , "skip" , 0 ] ) ;
23
+ await db . prepare ( "run" , sponsorTimesQuery , [ "getUserInfo4" , 1 , 11 , 2 , "uuid000010" , getHash ( "getuserinfo_user_04" ) , 9 , 10 , "chapter" , "chapter" , 0 ] ) ;
23
24
24
25
25
26
const insertWarningQuery = 'INSERT INTO warnings ("userID", "issueTime", "issuerUserID", "enabled", "reason") VALUES (?, ?, ?, ?, ?)' ;
@@ -307,4 +308,28 @@ describe("getUserInfo", () => {
307
308
} )
308
309
. catch ( err => done ( err ) ) ;
309
310
} ) ;
311
+
312
+ it ( "Should ignore chapters for saved time calculations" , ( done ) => {
313
+ client . get ( endpoint , { params : { userID : "getuserinfo_user_04" } } )
314
+ . then ( res => {
315
+ assert . strictEqual ( res . status , 200 ) ;
316
+ const expected = {
317
+ userName : "f187933817e7b0211a3f6f7d542a63ca9cc289d6cc8a8a79669d69a313671ccf" ,
318
+ userID : "f187933817e7b0211a3f6f7d542a63ca9cc289d6cc8a8a79669d69a313671ccf" ,
319
+ minutesSaved : 0 ,
320
+ viewCount : 10 ,
321
+ ignoredViewCount : 0 ,
322
+ segmentCount : 1 ,
323
+ ignoredSegmentCount : 0 ,
324
+ reputation : 0 ,
325
+ lastSegmentID : "uuid000010" ,
326
+ vip : false ,
327
+ warnings : 0 ,
328
+ warningReason : ""
329
+ } ;
330
+ assert . deepStrictEqual ( res . data , expected ) ;
331
+ done ( ) ;
332
+ } )
333
+ . catch ( err => done ( err ) ) ;
334
+ } ) ;
310
335
} ) ;
0 commit comments