mirror of
https://gitlab.futo.org/videostreaming/grayjay.git
synced 2026-05-16 04:52:39 +02:00
Hide sync ui, thumbnails nullable
This commit is contained in:
@@ -123,8 +123,6 @@ class LiveChatManager {
|
|||||||
val requestPosition = _position;
|
val requestPosition = _position;
|
||||||
_pager.nextPage(requestPosition.toInt());
|
_pager.nextPage(requestPosition.toInt());
|
||||||
var replayResults = _pager.getResults().filter { it.time > requestPosition || it is LiveEventEmojis };
|
var replayResults = _pager.getResults().filter { it.time > requestPosition || it is LiveEventEmojis };
|
||||||
//TODO: Remove this once dripfeed is done properly
|
|
||||||
replayResults = replayResults.filter{ it.time < requestPosition + 1500 || it is LiveEventEmojis };
|
|
||||||
if(replayResults.size > 0) {
|
if(replayResults.size > 0) {
|
||||||
_eventsPosition = replayResults.maxOf { it.time };
|
_eventsPosition = replayResults.maxOf { it.time };
|
||||||
Logger.i(TAG, "VOD Events last event: " + _eventsPosition);
|
Logger.i(TAG, "VOD Events last event: " + _eventsPosition);
|
||||||
|
|||||||
+2
-1
@@ -3,6 +3,7 @@ package com.futo.platformplayer.api.media.models.video
|
|||||||
import com.futo.platformplayer.api.media.PlatformID
|
import com.futo.platformplayer.api.media.PlatformID
|
||||||
import com.futo.platformplayer.api.media.Serializer
|
import com.futo.platformplayer.api.media.Serializer
|
||||||
import com.futo.platformplayer.api.media.models.PlatformAuthorLink
|
import com.futo.platformplayer.api.media.models.PlatformAuthorLink
|
||||||
|
import com.futo.platformplayer.api.media.models.Thumbnail
|
||||||
import com.futo.platformplayer.api.media.models.Thumbnails
|
import com.futo.platformplayer.api.media.models.Thumbnails
|
||||||
import com.futo.platformplayer.api.media.models.contents.ContentType
|
import com.futo.platformplayer.api.media.models.contents.ContentType
|
||||||
import com.futo.platformplayer.serializers.OffsetDateTimeNullableSerializer
|
import com.futo.platformplayer.serializers.OffsetDateTimeNullableSerializer
|
||||||
@@ -16,7 +17,7 @@ open class SerializedPlatformVideo(
|
|||||||
override val contentType: ContentType = ContentType.MEDIA,
|
override val contentType: ContentType = ContentType.MEDIA,
|
||||||
override val id: PlatformID,
|
override val id: PlatformID,
|
||||||
override val name: String,
|
override val name: String,
|
||||||
override val thumbnails: Thumbnails,
|
override val thumbnails: Thumbnails = Thumbnails(),
|
||||||
override val author: PlatformAuthorLink,
|
override val author: PlatformAuthorLink,
|
||||||
@kotlinx.serialization.Serializable(with = OffsetDateTimeNullableSerializer::class)
|
@kotlinx.serialization.Serializable(with = OffsetDateTimeNullableSerializer::class)
|
||||||
@JsonNames("datetime", "dateTime")
|
@JsonNames("datetime", "dateTime")
|
||||||
|
|||||||
+2
-15
@@ -116,25 +116,12 @@ class SourcePluginDescriptor {
|
|||||||
var enableShorts: Boolean? = null;
|
var enableShorts: Boolean? = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@FormField(R.string.sync, "group", R.string.sync_desc, 3)
|
@FormField(R.string.sync, "group", R.string.sync_desc, 3,"sync")
|
||||||
var sync = Sync();
|
var sync = Sync();
|
||||||
@Serializable
|
@Serializable
|
||||||
class Sync {
|
class Sync {
|
||||||
@FormField(R.string.sync_history, FieldForm.TOGGLE, R.string.sync_history_desc, 1)
|
@FormField(R.string.sync_history, FieldForm.TOGGLE, R.string.sync_history_desc, 1,"syncHistory")
|
||||||
var enableHistorySync: Boolean? = null;
|
var enableHistorySync: Boolean? = null;
|
||||||
|
|
||||||
@FormField(R.string.sync_history, FieldForm.BUTTON, R.string.sync_history_desc, 2)
|
|
||||||
@FormFieldButton()
|
|
||||||
fun syncHistoryNow() {
|
|
||||||
StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
|
|
||||||
val clients = StatePlatform.instance.getEnabledClients();
|
|
||||||
for (client in clients) {
|
|
||||||
if (client is JSClient) {//) && client.descriptor.appSettings.sync.enableHistorySync == true) {
|
|
||||||
StateHistory.instance.syncRemoteHistory(client);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@FormField(R.string.ratelimit, "group", R.string.ratelimit_description, 4)
|
@FormField(R.string.ratelimit, "group", R.string.ratelimit_description, 4)
|
||||||
|
|||||||
+5
@@ -152,6 +152,11 @@ class SourceDetailFragment : MainFragment() {
|
|||||||
if(field is View)
|
if(field is View)
|
||||||
field.isVisible = false;
|
field.isVisible = false;
|
||||||
}
|
}
|
||||||
|
if(!source.capabilities.hasGetUserHistory) {
|
||||||
|
val field = _settingsAppForm.findField("sync");
|
||||||
|
if(field is View)
|
||||||
|
field.isVisible = false;
|
||||||
|
}
|
||||||
_settingsAppForm.onChanged.clear();
|
_settingsAppForm.onChanged.clear();
|
||||||
_settingsAppForm.onChanged.subscribe { field, value ->
|
_settingsAppForm.onChanged.subscribe { field, value ->
|
||||||
_settingsAppChanged = true;
|
_settingsAppChanged = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user