Commit graph

1813 commits

Author SHA1 Message Date
Ajay
77a1799a7f Filter input 2022-02-12 13:11:46 -05:00
Ajay Ramachandran
0dbd081063 Update nginx config 2022-02-12 06:49:21 +01:00
Ajay
c9b18a4938 Don't fail if no latest submission with video duration 2022-02-12 00:06:46 -05:00
Ajay
155c5a9b97 Don't allow upvoting dead locked category segment
for full video
2022-02-12 00:05:01 -05:00
Ajay
1bc9a69b79 Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer 2022-02-11 12:06:33 -05:00
Ajay
fb6e98f93f Don't allow changing highlight category 2022-02-11 12:05:04 -05:00
Ajay Ramachandran
61eb2e665b
Merge pull request #451 from mchangrh/voteOnSponsorTime
rewrite voteOnSponsorTimes
2022-02-10 23:02:35 -05:00
Ajay Ramachandran
de7b985535
Merge branch 'master' into voteOnSponsorTime 2022-02-10 23:00:51 -05:00
Ajay Ramachandran
bbcbd3783a
Merge pull request #449 from mchangrh/fixFullLocks
add full video and exclusive_access support
2022-02-10 22:13:14 -05:00
Ajay Ramachandran
6db9404e1c
Merge pull request #456 from ajayyy/dependabot/npm_and_yarn/follow-redirects-1.14.8
Bump follow-redirects from 1.14.5 to 1.14.8
2022-02-10 20:22:12 -05:00
dependabot[bot]
857ee04c3c
Bump follow-redirects from 1.14.5 to 1.14.8
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.5 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.5...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-11 01:21:14 +00:00
Ajay Ramachandran
8b58d52b12
Merge pull request #450 from ajayyy/dependabot/npm_and_yarn/simple-get-4.0.1
Bump simple-get from 4.0.0 to 4.0.1
2022-02-10 20:20:34 -05:00
Ajay
50fab971e0 Temp vip fix 2022-02-10 19:42:08 -05:00
Michael C
df6c76ede9
quote for postgres 2022-02-04 00:43:20 -05:00
Michael C
0ff38b918b
fix tests, add add actionType tests 2022-02-04 00:40:13 -05:00
Michael C
5713b96d13
add test for downvote videoDuration change 2022-02-04 00:21:15 -05:00
Michael C
f3d10bd19f
don't leak adminID on tempVIP 2022-02-03 21:31:43 -05:00
Michael C
a2f2cf9c0d
update lockCategories
- migration to remove invalid locks
- lockCategories poi_highlight is now actionType poi
- deleteLockCategories now takes actionType
- update postLockCategories response, serverside filtering for accepted categories
- fix tests accordingly
2022-02-03 17:44:29 -05:00
Michael C
2b8944bf15
correct tempVIP test 2022-02-03 13:51:15 -05:00
Michael C
db5922e4b7
fix tempvip cases 2022-02-03 13:49:13 -05:00
Michael C
0854ad1f65
rewrite voteOnSponsorTimes 2022-02-03 06:06:54 -05:00
dependabot[bot]
75cf14a960
Bump simple-get from 4.0.0 to 4.0.1
Bumps [simple-get](https://github.com/feross/simple-get) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/feross/simple-get/releases)
- [Commits](https://github.com/feross/simple-get/compare/v4.0.0...v4.0.1)

---
updated-dependencies:
- dependency-name: simple-get
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-29 00:04:08 +00:00
Ajay
985039a86b Fix segments always coming back as skip 2022-01-20 19:07:34 -05:00
Ajay
acc983b829 Downgrade redis 2022-01-20 15:57:31 -05:00
Ajay
ae6255cc69 Add timeout to newleaf 2022-01-20 15:36:38 -05:00
Michael C
830fdff3be
add full video and exclusive_access support 2022-01-19 21:53:40 -05:00
Ajay Ramachandran
c2516461ad
Merge pull request #448 from ajayyy/poi-highlight
Highlight category now has it's own action type
2022-01-19 19:34:35 -05:00
Ajay
d367998d39 Remove use of "CategoryActionType" 2022-01-19 18:11:01 -05:00
Ajay
6ece944536 Highlight category now has it's own action type 2022-01-19 17:48:09 -05:00
Ajay
5413d8dc9c Ignore full video for reputation 2022-01-17 12:34:51 -05:00
Ajay
5aa78967de Add nice error page to homepage 2022-01-16 18:18:46 -05:00
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