Skip to content

Commit eb1f1fa

Browse files
committed
Show newest live chat messages on top
1 parent 7727e97 commit eb1f1fa

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

app/src/main/java/org/schabi/newpipe/ui/components/video/comment/CommentSection.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ private fun CommentSection(
7777
val commentInfo = uiState.data
7878
val count = commentInfo.commentCount
7979

80-
if (commentInfo.isCommentsDisabled) {
80+
if (commentInfo.isCommentsDisabled && !commentInfo.isLiveChat) {
8181
item {
8282
EmptyStateComposable(
8383
spec = EmptyStateSpec.DisabledComments,
@@ -87,7 +87,7 @@ private fun CommentSection(
8787

8888
)
8989
}
90-
} else if (count == 0) {
90+
} else if (count == 0 && !commentInfo.isLiveChat) {
9191
item {
9292
EmptyStateComposable(
9393
spec = EmptyStateSpec.NoComments,

app/src/main/java/org/schabi/newpipe/viewmodels/CommentsViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class CommentsViewModel(savedStateHandle: SavedStateHandle) : ViewModel() {
9898
)
9999
Log.i(TAG, "liveChatPolling: fetched ${result.items.size} items, nextPage=${result.nextPage != null}")
100100
if (result.items.isNotEmpty()) {
101-
_liveChatItems.value = _liveChatItems.value + result.items
101+
_liveChatItems.value = result.items + _liveChatItems.value
102102
}
103103
nextPage = result.nextPage
104104
} catch (e: Exception) {

0 commit comments

Comments
 (0)