Commit graph

473 commits

Author SHA1 Message Date
Ajay Ramachandran
f6d6e93847 Return locked and votes in skipSegment calls
#379
2021-10-15 00:14:59 -04:00
Ajay Ramachandran
658e391f50 Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into pr/FlorianZahn/376 2021-10-03 13:11:25 -04:00
FlorianZahn
69e321c405
Improved formatting 2021-10-03 19:03:49 +02:00
FlorianZahn
178c4d9792
Remove comment
Co-authored-by: Ajay Ramachandran <dev@ajay.app>
2021-10-03 18:53:34 +02:00
FlorianZahn
7135aa3369 removing console.log() commands 2021-10-02 05:11:26 +02:00
FlorianZahn
aacd297b3b Fixed bugs where normal users could cirumvent vip locks by changing categories 2021-10-02 05:04:18 +02:00
FlorianZahn
bb2a007ed1 first changes and timeout on 2nd test 2021-10-02 04:39:54 +02:00
Haidang666
356974b478 add service to table only have videoID 2021-09-30 13:56:55 +07:00
Michael C
82c5c70eb7
Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into switch-axios 2021-09-26 18:13:27 -04:00
Michael C
6433f50edf
replace node-fetch with axios in src 2021-09-23 01:21:10 -04:00
Michael C
28d637f620
remove extra async and extra utils 2021-09-22 23:34:46 -04:00
Michael C
4e50f0ab4b
remaining tests 2021-09-22 23:18:31 -04:00
Michael C
a028eaa41a
object-curly-spacing 2021-09-22 18:52:35 -04:00
Michael C
5dcc90b31a
fix CI errors 2021-09-22 18:46:13 -04:00
Michael C
a5c88693b8
Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into reWriteAxios 2021-09-22 18:44:23 -04:00
Michael C
9b6808273b
json as any 2021-09-22 17:57:12 -04:00
Michael C
c779c2c19e
everything to postClearCache 2021-09-22 17:50:06 -04:00
Michael C
94e1e8c377
Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into reWriteTests 2021-09-21 02:03:05 -04:00
Michael C
5758f6512d
move utils to seperate files and folder, update imports 2021-09-21 02:02:17 -04:00
Michael C
ce0073e7b0
Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into getLockReason 2021-09-18 23:26:49 -04:00
Michael C
c0074c9f8c
add tests 2021-09-18 23:24:23 -04:00
Michael C
d4d9f2d4d7
remove unnecessary async await 2021-09-17 00:03:42 -04:00
Michael C
802dd50163
naming 2021-09-17 00:01:29 -04:00
Michael C
9e9fcd47c0
finished other tests 2021-09-16 23:59:19 -04:00
Michael C
e7d55d1e1b
everything after postClearCache 2021-09-16 23:05:16 -04:00
Michael C
7cef510b29
quoted 2021-09-16 20:50:59 -04:00
Michael C
870ade6fa9
postSkipSegments 2021-09-16 20:44:12 -04:00
Ajay Ramachandran
803c3f2a29
Merge pull request #357 from mchangrh/getUserStats
add getUserStats
2021-09-15 20:45:52 -04:00
Ajay Ramachandran
4d9e595470 Rename user stats parameters 2021-09-15 20:44:20 -04:00
Haidang666
93c69248d9 Add getService helper function 2021-09-13 14:49:17 +07:00
Michael C
18c1735087
acceptance 2021-09-07 00:48:01 -04:00
Michael C
46270cfe84
partialDeepEquals for varying orders 2021-09-07 00:32:32 -04:00
Michael C
3d30eea1cb
add categoryStats and typeStats 2021-09-07 00:13:52 -04:00
Ajay Ramachandran
1e05c04a39 Allow mute and skip segments with same times 2021-09-05 22:40:40 -04:00
Michael C
6e55f9d979
everything up to purgeAllSegments 2021-09-04 19:23:43 -04:00
Michael C
9b05ee96af
add getUserStats 2021-09-04 17:06:49 -04:00
Ajay Ramachandran
1823a91d54 Limit mute action type to specific categories 2021-09-04 00:33:37 -04:00
Ajay Ramachandran
9cbea88f6f
Merge pull request #353 from mchangrh/statusOptions
get status with options
2021-09-02 12:04:38 -04:00
Michael C
74626f8e3f
more endpoints! 2021-09-01 23:49:18 -04:00
Michael C
fa1166e5d8
Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into searchSegments 2021-09-01 23:26:55 -04:00
Michael C
664db71104
get status with options 2021-09-01 23:24:43 -04:00
Michael C
e12724af15
add getStatus and cases 2021-09-01 16:52:41 -04:00
Michael C
e9bffd0cf2
add test cases and fixed bugs 2021-09-01 13:53:06 -04:00
Ajay Ramachandran
13480fe96c
Merge pull request #346 from mchangrh/update-dependencies
Update dependencies & eslint
2021-08-31 12:23:48 -04:00
Michael C
5f8a319f48
update matrix link 2021-08-29 14:58:41 -04:00
Michael C
e53f65f324
Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into update-dependencies 2021-08-28 01:49:23 -04:00
Michael C
9e488b8917
Merge branch 'master' of github.com:mchangrh/SponsorBlockServer into poi-restriction 2021-08-28 01:39:52 -04:00
Michael C
b3320ab0fd
submit test as poi_highlight 2021-08-28 01:38:00 -04:00
Ajay Ramachandran
7ef28d859f
Merge pull request #343 from mchangrh/409-ban-exists
re-shadowban user
2021-08-28 00:20:22 -04:00
Michael C
1c2dd055c1
Update dependencies & eslint
- update API-Docs link
- cast err as string to appease eslint
- update package and bump minimum to fix security issue
- removed unnecessary filters from gitignore
2021-08-27 17:09:31 -04:00
Michael C
c448bb3d9a
add test case 2021-08-27 16:44:29 -04:00
Michael C
265a01dcde
re-shadowban user
if user is already shadowbanned but unhideOldSubmissions is true, sets all submissions to hidden. If not true, then return 409 duplicate
2021-08-25 01:56:34 -04:00
Michael C
c3f7b29d44
throw error 400 when start or endtime has colon 2021-08-24 19:12:58 -04:00
Ajay Ramachandran
f1f5bdb2be Fix test 2021-08-17 22:08:51 -04:00
Ajay Ramachandran
5965879ed1 Rename highlight category to poi_highlight 2021-08-17 22:01:12 -04:00
Ajay Ramachandran
c869e60b04 Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer 2021-08-10 23:13:59 -04:00
Ajay Ramachandran
d653f00a2d Print when partial deep equals fails 2021-08-10 23:13:56 -04:00
Ajay Ramachandran
1cbd162a22 Support commas in timestamps 2021-08-10 23:12:20 -04:00
Ajay Ramachandran
fa901add35 print error in tests 2021-08-10 10:52:02 -04:00
Michael C
58551ba37f
add maxRewardTime 2021-08-06 00:51:22 -04:00
Michael C
5ad7c6a3ba
catch all error in endpoint 2021-08-06 00:51:22 -04:00
Ajay Ramachandran
71c01c0f3b add option to get ban status from user info 2021-08-05 20:11:05 -04:00
Michael C
ed0d832e08
use partialDeepEquals for tests 2021-08-03 00:19:37 -04:00
Michael C
b39c06a9ef
add tests, new partialDeepEquals 2021-08-02 21:59:06 -04:00
Michael C
7dff254604
add userAgent to tests 2021-08-01 15:28:17 -04:00
Haidang666
85e78d2490 Use assert in test 2021-08-01 14:59:25 +07:00
Ajay Ramachandran
3368615a77 Add test for body user agent 2021-08-01 02:57:02 -04:00
Ajay Ramachandran
8f0f01e6b2 Parse user agent header 2021-07-31 21:49:10 -04:00
Ajay Ramachandran
e056c30f05
Merge pull request #327 from HaiDang666/324_user-agent
Store user-agent in postSkipSegment
2021-07-31 20:56:00 -04:00
Haidang666
01cbf67bcb Fix test on new warning reason format 2021-07-30 13:50:46 +07:00
Haidang666
ce193b60f7 Store user-agent in postSkipSegment 2021-07-30 13:47:21 +07:00
Michael C
32056ab2f1
re-enable warning if still within issue time 2021-07-28 02:52:00 -04:00
Haidang666
c701998a35 return reason in locked categories when submission fail 2021-07-27 14:03:51 +07:00
Ajay Ramachandran
9aa0ff6de6
Merge pull request #319 from HaiDang666/266_final
Update: most upvoted segments on locked videos as locked submissions
2021-07-26 23:48:58 -04:00
Ajay Ramachandran
37ea8adb73 assert fixed value 2021-07-26 23:46:26 -04:00
Ajay Ramachandran
7b15957bb8 fix tests 2021-07-25 14:34:55 -04:00
Haidang666
0eb298a943 Update query and test 2021-07-24 15:09:30 +07:00
Ajay Ramachandran
0990a9b87d
Add semicolon 2021-07-22 20:00:42 -04:00
Michael C
87727ef360
fix tests and linting 2021-07-22 17:50:39 -04:00
Haidang666
2773c5f500 Update: most upvoted segments on locked videos as locked submissions 2021-07-21 16:16:58 +07:00
Ajay Ramachandran
c070e5f40d Fix falsey values getting through tests 2021-07-20 17:21:22 -04:00
Michael C
f774df972d
Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into stricter-eslint 2021-07-18 14:30:27 -04:00
Michael C
2075ed46e1
added null warningReason 2021-07-18 02:39:37 -04:00
Michael C
fdb88dd401
Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into getUserInfo/param 2021-07-18 02:38:12 -04:00
Michael C
205958464a
new stringDeepEquals 2021-07-18 02:33:57 -04:00
Michael C
a7aaffcfe5
Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into stricter-eslint 2021-07-18 02:27:48 -04:00
Michael C
8ee51a1cb0
testing CI 2021-07-14 14:11:34 -04:00
Michael C
5f2bc37e96
Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into stricter-eslint 2021-07-13 15:55:03 -04:00
Michael C
59bad90480
Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into getLockCategories/reason 2021-07-13 13:51:51 -04:00
Ajay Ramachandran
a342ad5bda
Merge pull request #316 from mchangrh/400-on-noparam
Return 400 if no parameters specified
2021-07-12 14:17:20 -04:00
Ajay Ramachandran
3d0b9edb9c Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer 2021-07-12 11:05:14 -04:00
Ajay Ramachandran
a23ec160c0 Make reputation take into account more recent segments 2021-07-12 11:05:12 -04:00
Michael C
8b3ffe5d0d
fix eslint for tests 2021-07-12 02:43:46 -04:00
Michael C
a8f7080bf2
fix typo in tests 2021-07-12 00:32:51 -04:00
Michael C
d9a66a5894 quote & check for db version 2021-07-12 08:59:12 +07:00
Haidang666
bbb1db014c Add archive downvote function unit test 2021-07-12 08:59:12 +07:00
Michael M. Chang
0b7ba793b4
Merge branch 'master' into 400-on-noparam 2021-07-11 14:27:32 -04:00
Michael C
e8d0da3ce3
add 400 conditions 2021-07-10 16:30:30 -04:00
Michael C
7e977ad811
add warningReason and specify returned types 2021-07-09 12:07:36 -04:00
Michael C
2d38ef921e
use deepStringEqual instead of deepAssert 2021-07-08 00:59:15 -04:00
Michael C
9f05595cd6
Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into testAssert 2021-07-08 00:51:56 -04:00
Michael C
178ed1e5af
replace if tests with assert 2021-07-08 00:39:57 -04:00
Ajay Ramachandran
2105cdf10b Fix segment id test 2021-07-07 18:24:16 -04:00
Michael C
596dbf4ac8
404 tests 2021-07-07 17:39:16 -04:00
Michael C
9088d9fb9e
additional tests 2021-07-07 17:37:40 -04:00
Michael C
4a835d5306
fix typos 2021-07-07 16:44:05 -04:00
Michael C
7d62fcd8cc
Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into getLockCategories/reason 2021-07-07 16:31:37 -04:00
Michael C
3371c6a099
add reason to getLockCategories 2021-07-07 00:22:05 -04:00
Haidang666
feba2af9ed Fix any type 2021-07-06 13:42:08 +07:00
Haidang666
6fcfeb2889 Fix deep equal fail 2021-07-06 13:36:56 +07:00
Haidang666
14f55c9ee5 Add lock category reason 2021-07-06 13:31:44 +07:00
Ajay Ramachandran
4272f9de99
Merge pull request #305 from ajayyy/userid-limit
Minimum userID size
2021-07-06 01:00:44 -04:00
Ajay Ramachandran
8e0e66d662
Merge pull request #298 from ajayyy/mute-skip
Silent skip type
2021-07-06 01:00:22 -04:00
Ajay Ramachandran
48349070b3 Combine action type segments when sorting overlapping 2021-07-06 00:57:57 -04:00
Ajay Ramachandran
2379899f02 Add a minimum size to userID when submitting 2021-07-06 00:49:07 -04:00
Ajay Ramachandran
35e1cf5733 Add test for submitting 2021-07-06 00:22:01 -04:00
Ajay Ramachandran
139dff97ef Add tests for normal get segments 2021-07-06 00:19:16 -04:00
Ajay Ramachandran
be006403ed Add tests for getting segment by hash 2021-07-06 00:11:04 -04:00
Michael C
ede02eaa8c
add hashedVideoID to lockCategories 2021-07-05 20:01:10 -04:00
Ajay Ramachandran
c2d4f2578c
Merge pull request #300 from mchangrh/appease-eslint
Appease eslint
2021-07-05 13:29:18 -04:00
Michael C
d5204e9813
lint & fix tests 2021-07-05 03:14:05 -04:00
Michael C
9a4cd431e8
rewrite getLockCategores to new spec 2021-07-05 02:33:32 -04:00
Michael C
cef6d5f365
fix eslint errors 2021-07-04 23:36:47 -04:00
Michael C
1c116eda3b
Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into getLockCategories 2021-07-04 23:33:21 -04:00
Michael C
a860e96d35
getLockCategoresByHash 2021-07-04 23:33:12 -04:00
Michael C
719a0956ac
add getLockCategories 2021-07-04 17:03:28 -04:00
Michael C
3c197ec3d9
Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into fix-eslint 2021-07-04 15:23:00 -04:00
Ajay Ramachandran
0a60ca6468 Add repeating category for fetching by hash
Fixes #235
2021-07-04 14:20:54 -04:00
Ajay Ramachandran
990572ff31 Add parameter to fetch specific segments 2021-07-04 14:15:17 -04:00
Michael C
d89b26b77d
fix eslint-errors 2021-07-04 01:36:03 -04:00
Ajay Ramachandran
be277d0218
Merge pull request #284 from HaiDang666/283_show-lastest-warning
Show lastest warning when post segment
2021-07-03 22:46:26 -04:00
Ajay Ramachandran
a7315eaee0 Add case for default warning message 2021-07-03 22:45:13 -04:00
Ajay Ramachandran
cf592554f1
Merge branch 'master' into unhide-vote 2021-07-03 22:37:23 -04:00
Michael C
931b3fdc68
disallow vote types 10/11 2021-07-02 23:07:17 -04:00
Michael C
36a5b4e1d3
VIP upvotes unhide segments
also added test for undo-vote
2021-07-02 22:54:54 -04:00
Haidang666
09e50d432e Update postSegment test with reason 2021-07-01 11:31:35 +07:00
Ajay Ramachandran
7a877a9653
Merge pull request #282 from HaiDang666/276_warn-reason
User warning reason
2021-06-30 13:43:08 -04:00
Ajay Ramachandran
ce59d3f95f Don't fail if row is undefined 2021-06-30 00:01:40 -04:00
Haidang666
081f2d14b7 Add test, Fix sql syntax 2021-06-30 08:59:20 +07:00
Ajay Ramachandran
8b54e965a2 Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer 2021-06-28 13:24:04 -04:00
Ajay Ramachandran
0ddde452e3 Auto-lock username when admin changes it
https://github.com/ajayyy/SponsorBlockServer/issues/168
2021-06-28 13:20:57 -04:00
Ajay Ramachandran
7dbd4a3150
Merge pull request #275 from HaiDang666/193_log-username-change
Add log when update username
2021-06-27 18:13:21 -04:00
Ajay Ramachandran
98b5fa7bce
Merge pull request #274 from mchangrh/getUserID
GET api/userID
2021-06-27 18:10:35 -04:00
Haidang666
41ba37c04e Fix boolean comparison, Add log table to schema visual 2021-06-27 11:57:39 +07:00
Haidang666
f5bb221ecd Add log when update username 2021-06-27 11:45:42 +07:00
Michael C
2f50d80a75
add explit param 2021-06-26 23:02:52 -04:00
Michael C
b06a6fbb51
redos prevention 2021-06-25 15:57:41 -04:00
Michael C
f2490beea2
put in limits and escapes 2021-06-25 14:35:51 -04:00
Michael C
09ab1dabdf
set limit of 64 characters for lookup 2021-06-25 11:57:27 -04:00
Michael C
f29bafe89a
fiix tests 2021-06-25 03:37:27 -04:00
Michael C
d4695f0192
add getUserID and tests 2021-06-25 03:33:41 -04:00
Michael C
2ab782f4b6
Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into more-tests 2021-06-25 00:54:38 -04:00
Ajay Ramachandran
3c3c963fd3 Fixed captialization error 2021-06-24 02:16:26 -04:00
Michael C
ae8a25e481
more edge cast test cases
- check for null instead of 0 #267
- check that parameter specifying multiple overrides repeating parameters
2021-06-24 01:37:51 -04:00
Ajay Ramachandran
0bbb2aa60d Add one more check in tests 2021-06-24 01:36:54 -04:00
Haidang666
9b43ce0ab7 Add purge all segments of VideoId 2021-06-24 12:29:02 +07:00
Ajay Ramachandran
0fbfee8dc8 Use logger instead of console.log 2021-06-24 00:08:19 -04:00
Michael C
da92f2082d
set up postgres CI route
uses env flag TEST_POSTGRES since the sqlite test also runs with env flag CI true
2021-06-23 15:35:08 -04:00
Nanobyte
7b9e06a471
Merge branch 'master' into fix/prepare-statements 2021-06-22 01:05:48 +02:00
Nanobyte
a005a961f9 Fix test cases 2021-06-22 00:59:56 +02:00
Nanobyte
4b1f5b4a44 Remove console log from test case 2021-06-22 00:56:00 +02:00
Ajay Ramachandran
0b24871415
Fix comment in reputation test 2021-06-21 18:42:54 -04:00
Ajay Ramachandran
a7cb0959e2
Merge pull request #262 from mchangrh/repeated-param
parse repeated parameters
2021-06-21 14:21:17 -04:00
Nanobyte
11e6c93932 Merge remote-tracking branch 'upstream/master' into fix/prepare-statements 2021-06-21 18:19:50 +02:00
Michael C
dd74dd3b1b
parse repeated parameters 2021-06-21 00:33:48 -04:00
Ajay Ramachandran
48d88614fb Move shadow ban list to public db
Warning: Migration is not automatic
2021-06-20 13:41:35 -04:00
Ajay Ramachandran
96015d402b Make reputation take into account self downvotes 2021-06-20 12:57:32 -04:00
Ajay Ramachandran
1770608525
Merge pull request #257 from mchangrh/vip-cache-clear
VIP endpoint for clearing cache of video
2021-06-18 19:01:08 -04:00
Michael C
c13bc6cfbd
added tests and route 2021-06-18 17:46:18 -04:00
Michael C
c92e44bb1d
made 400/404 behaviour consistent with API docs 2021-06-18 14:43:59 -04:00
Ajay Ramachandran
1dcb63f2cc
Fix typo in test 2021-06-17 19:09:24 -04:00
Ajay Ramachandran
0b967b9f45
Merge pull request #252 from mchangrh/segmentInfo
Implementation of segmentInfo and new userInfo properties
2021-06-16 13:24:39 -04:00
Ajay Ramachandran
5fe6ce6656
Merge pull request #250 from mchangrh/fix-getskipsegment-test
Fix Test Suite
2021-06-16 00:47:55 -04:00
Michael C
8dcc1a4a53
add getSegmentInfo with tests 2021-06-16 00:33:51 -04:00
Michael C
0a8f7aa39d
skipSegments return 400 if bad categories 2021-06-15 23:01:26 -04:00
Michael C
31071ddb17
new test cases 2021-06-15 21:56:20 -04:00
Michael C
a003733e51
fix test suite 2021-06-15 21:29:36 -04:00
Michael C
3b16cdb920
add last lastSegmentID 2021-06-15 17:08:17 -04:00
Michael C
607b7cbb0a
add ignored counts 2021-06-15 15:50:41 -04:00
Ajay Ramachandran
eb2b41bc8a
Merge pull request #243 from MRuy/feature/lock-username
Add lock username
2021-06-15 01:04:20 -04:00
Nanobyte
34fd78961b Add username lock 2021-06-15 00:09:37 +02:00
Ajay Ramachandran
e06eb96fa7 Add ability to ban specific category 2021-06-14 16:23:39 -04:00
Ajay Ramachandran
4225d9b3b3 Silently reject votes 2021-06-08 20:20:05 -04:00
Ajay Ramachandran
0904036009 Use newleaf instead of YouTube API 2021-06-02 22:34:38 -04:00
Ajay Ramachandran
ec51ff835a Consider locked segments when calculating reputation 2021-05-29 20:48:41 -04:00
Ajay Ramachandran
6a58a08781 Rename user info endpoint 2021-05-24 16:05:18 -04:00
Ajay Ramachandran
3f682d467d Fix reputation unit tests 2021-05-24 16:00:45 -04:00
Ajay Ramachandran
676fc8ea08 Add reputation to user info 2021-05-24 15:56:03 -04:00
Ajay Ramachandran
eb2ffff780 Add tests for reputation 2021-05-23 18:51:23 -04:00
Ajay Ramachandran
590ed037dd Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into export 2021-05-23 11:17:10 -04:00
Nanobyte
78a7f8a207 Fix test case prepare statements 2021-05-07 01:51:11 +02:00
Nanobyte
f561388a1f Rename noSegments to lockCategories 2021-04-24 01:54:42 +02:00
Ajay Ramachandran
9d06bda4f8 Don't allow downvoting dead submissions 2021-04-17 16:37:39 -04:00
Ajay Ramachandran
346485da8c Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer
# Conflicts:
#	src/routes/voteOnSponsorTime.ts
2021-04-17 16:25:10 -04:00
Ajay Ramachandran
5b2f05741e Fix no segments votes being allowed 2021-04-17 16:23:45 -04:00
Ajay Ramachandran
6a9b218e22 Don't always use YouTube API cache 2021-04-08 20:37:19 -04:00
Ajay Ramachandran
8088f37632 Only return one segment for highlight category 2021-04-05 23:48:51 -04:00
Ajay Ramachandran
7bf09906d3 Prevent voting for highlight category 2021-04-05 22:33:28 -04:00
Ajay Ramachandran
6554e142cc Add highlight category 2021-04-04 23:12:26 -04:00
Ajay Ramachandran
c9a8dc21b1 Unlock videos and hide segments if duration changed 2021-03-29 19:16:18 -04:00