Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grayjay
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoStreaming
Grayjay
Commits
c2dce52a
Commit
c2dce52a
authored
1 year ago
by
Kelvin
Browse files
Options
Downloads
Patches
Plain Diff
Fix Twitch live streams on channel, hasMore can now be nullable defaulting to false
parent
a2c63c59
No related branches found
No related tags found
No related merge requests found
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSPager.kt
+3
-2
3 additions, 2 deletions
...o/platformplayer/api/media/platforms/js/models/JSPager.kt
app/src/unstable/assets/sources/twitch
+1
-1
1 addition, 1 deletion
app/src/unstable/assets/sources/twitch
with
4 additions
and
3 deletions
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSPager.kt
+
3
−
2
View file @
c2dce52a
...
...
@@ -7,6 +7,7 @@ import com.futo.platformplayer.BuildConfig
import
com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
import
com.futo.platformplayer.api.media.structures.IPager
import
com.futo.platformplayer.engine.V8Plugin
import
com.futo.platformplayer.getOrDefault
import
com.futo.platformplayer.getOrThrow
import
com.futo.platformplayer.warnIfMainThread
...
...
@@ -27,7 +28,7 @@ abstract class JSPager<T> : IPager<T> {
this
.
pager
=
pager
;
this
.
config
=
config
;
_hasMorePages
=
pager
.
getOr
Throw
(
config
,
"hasMore"
,
"Pager"
)
;
_hasMorePages
=
pager
.
getOr
Default
(
config
,
"hasMore"
,
"Pager"
,
false
)
?:
false
;
getResults
();
}
...
...
@@ -45,7 +46,7 @@ abstract class JSPager<T> : IPager<T> {
pager
=
plugin
.
catchScriptErrors
(
"[${plugin.config.name}] JSPager"
,
"pager.nextPage()"
)
{
pager
.
invoke
(
"nextPage"
,
arrayOf
<
Any
>());
};
_hasMorePages
=
pager
.
getOr
Throw
(
config
,
"hasMore"
,
"Pager"
)
;
_hasMorePages
=
pager
.
getOr
Default
(
config
,
"hasMore"
,
"Pager"
,
false
)
?:
false
;
_resultChanged
=
true
;
/*
try {
...
...
This diff is collapsed.
Click to expand it.
twitch
@
eb198a3d
Compare
7645b88a
...
eb198a3d
Subproject commit
7645b88a768d1a1c1ea7e4a94abd97362bd5ce17
Subproject commit
eb198a3d2095f0df28508e8481eebdccdd2a222a
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment