Commit graph

1532 commits

Author SHA1 Message Date
Ajay
50d0cbd378 Fix error conf redirecting to wrong url 2022-01-16 18:18:37 -05:00
Ajay
8759f8dbf2 Use object for merging locks
Co-authored-by: Nishant Arora <whizzzkid@users.noreply.github.com>
2022-01-16 15:17:36 -05:00
Ajay
acb5a9467e Fix warning 2022-01-16 15:03:46 -05:00
Ajay
a31a4d016f Fix lock reason test 2022-01-16 13:19:42 -05:00
Ajay Ramachandran
b39d323a22
Merge pull request #444 from mchangrh/full-tests
Tests for full video locks
2022-01-16 13:17:19 -05:00
Ajay Ramachandran
bfd017a66a
formatting 2022-01-16 13:16:13 -05:00
Ajay Ramachandran
72bbc79943
Fix syntax 2022-01-16 13:10:14 -05:00
Ajay Ramachandran
677e05e46c
Merge pull request #442 from mchangrh/nginx-update
update nginx configs
2022-01-16 13:04:35 -05:00
Ajay Ramachandran
732eeed41d Update nginx config 2022-01-16 19:03:02 +01:00
Ajay Ramachandran
ea196e84f1
Merge pull request #439 from mchangrh/channelVipTests
additional tests for tempVIP
2022-01-16 12:54:22 -05:00
Ajay
df23d1510d More friendly lock message 2022-01-15 15:41:39 -05:00
Ajay
76bfd27b33 Add exclusive access category 2022-01-14 00:23:09 -05:00
Ajay
6fe7200481 don't allow category vote for full video segment 2022-01-14 00:21:13 -05:00
Michael C
6f737ab0b6
minor typo spotted 2022-01-08 17:16:23 -05:00
Michael C
ea4adc0e14
getLockCategories + lint 2022-01-07 18:12:20 -05:00
Michael C
6ec80df8f4
update getLockReason 2022-01-07 03:04:47 -05:00
Ajay Ramachandran
762f4f6964
Merge pull request #445 from HaiDang666/substr-deprecated
remove deprecated method: String.substr
2022-01-07 02:19:05 -05:00
Haidang666
a1b59cba34 remove deprecated method: String.substr 2022-01-07 13:59:47 +07:00
Michael C
0584492b8c
getLockCategories 2022-01-06 23:56:27 -05:00
Michael C
77de17c810
add allow-headers content-type 2022-01-06 21:31:34 -05:00
Ajay Ramachandran
9ca01407e8
Fix typo 2022-01-06 20:26:33 -05:00
Michael C
7472af714a
missing semicolons 2022-01-06 18:49:49 -05:00
Michael C
164a9dab17
refactored nginx configs
- handle CORS within nginx
- remove allow-headers from CORS
- add custom dynamic error pages
- remove unused fastcgi
- removed OPTIONS backend
- remove previous custom errorDirective
- moved proxy directives to appropiate file
2022-01-06 18:42:48 -05:00
Ajay Ramachandran
b2e37804f5
Merge pull request #440 from ajayyy/full-video-labels
Full video labeling
2022-01-06 15:55:11 -05:00
Ajay
cb9b2ff965 Fix test data using wrong hash 2022-01-06 15:28:44 -05:00
Ajay
ad4c34ef28 Fix UUID test 2022-01-06 15:20:41 -05:00
Ajay
c0c2b365ae Fix full video different category duplicate error 2022-01-06 15:17:21 -05:00
Ajay
77565d7eda Fix wrong array being returned for highlight and full video segments 2022-01-06 15:17:01 -05:00
Ajay
75cad434b6 Fix unlocked segments being ignored 2022-01-06 14:58:46 -05:00
Ajay
be441a314f Fix locked segment filtering for highlight and full video 2022-01-06 14:54:27 -05:00
Ajay
d5d73273de Don't autohide full video segments for duration change 2022-01-06 14:45:05 -05:00
Ajay
44ffa40b6c Should not add full segments to db from shadowbanned users 2022-01-06 14:15:50 -05:00
Ajay
b4f8bdd719 Add test for submitting full video converting to upvote 2022-01-06 14:10:41 -05:00
Ajay
68c6266139 formatting 2022-01-06 03:40:04 -05:00
Ajay
65954520d0 Treat duplicate full video submission as upvote 2022-01-06 03:39:46 -05:00
Ajay
da03958e97 Lock docker dependency versions 2022-01-06 01:45:52 -05:00
Ajay
f89bef74d6 Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer 2022-01-04 20:39:53 -05:00
Ajay
6a98a215ac Don't group different categories 2022-01-04 20:39:50 -05:00
Ajay
89ea13956a Ensure only one full video label is served 2022-01-04 19:27:50 -05:00
Ajay Ramachandran
f86d2ab0e4
Merge pull request #441 from mchangrh/cache-getTopUsers
[nginx] add getTopCategoryUsers to CACHEZONE
2022-01-02 22:49:01 -05:00
Ajay
8fef35dbbc Allow submitting full sponsors and selfpromo 2022-01-02 22:38:06 -05:00
Michael C
8a80b97e8c
add getTopCategoryUsers to CACHEZONE 2022-01-02 22:28:22 -05:00
Ajay
7f7cc3a7ca Increase required overlap for same category and action type 2022-01-02 14:02:26 -05:00
Ajay
09eec5a4a5 Add locking by action type 2022-01-02 14:00:54 -05:00
Michael C
05516a5d7d
fix postgres quotes & fixed test.json 2021-12-31 17:12:46 -05:00
Michael C
a42f023074
add more testing, change enabled
- add 404 if channelID cannot be dervived
- added response message on success returning channel name
- test limits of temp VIP
- minor eslint
2021-12-31 16:54:28 -05:00
Ajay Ramachandran
aaa3179d42
Merge pull request #435 from mchangrh/categoryLeaderboards
add getTopCategoryUsers
2021-12-31 14:06:34 -05:00
Ajay Ramachandran
ce4270b96d
Merge branch 'master' into categoryLeaderboards 2021-12-31 14:04:20 -05:00
Ajay Ramachandran
df3d6fe9c7
Merge pull request #438 from mchangrh/tempVIP
channel-specific VIP
2021-12-31 14:02:05 -05:00
Ajay Ramachandran
dd900497f4
Merge pull request #437 from mchangrh/redis-track-status
add redis status/min
2021-12-31 14:01:20 -05:00