diff options
| author | Henry Jameson <me@hjkos.com> | 2022-05-20 12:45:06 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2022-05-20 12:45:06 +0300 |
| commit | 2c876f455af53e25cd7f193aab9c12031956ec07 (patch) | |
| tree | 965132878c78927d010f26ca16007e27271beda5 /src | |
| parent | c83657a072dc0d6e77a9c866147094099fb5dc24 (diff) | |
| parent | c93adf2e9a8ac6bfbe1e6cebde1d189475b3cb58 (diff) | |
Merge remote-tracking branch 'origin/develop' into threecolumn
* origin/develop:
Fix virtual scrolling when the user has a lot of pinned statuses
fix "allow discovery" setting misbehaving
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/timeline/timeline.js | 5 | ||||
| -rw-r--r-- | src/modules/serverSideConfig.js | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 94f0e916..c575e876 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -77,8 +77,9 @@ const Timeline = { statusesToDisplay () { const amount = this.timeline.visibleStatuses.length const statusesPerSide = Math.ceil(Math.max(3, window.innerHeight / 80)) - const min = Math.max(0, this.virtualScrollIndex - statusesPerSide) - const max = Math.min(amount, this.virtualScrollIndex + statusesPerSide) + const nonPinnedIndex = this.virtualScrollIndex - this.filteredPinnedStatusIds.length + const min = Math.max(0, nonPinnedIndex - statusesPerSide) + const max = Math.min(amount, nonPinnedIndex + statusesPerSide) return this.timeline.visibleStatuses.slice(min, max).map(_ => _.id) }, virtualScrollingEnabled () { diff --git a/src/modules/serverSideConfig.js b/src/modules/serverSideConfig.js index 5c1baedb..4b73af26 100644 --- a/src/modules/serverSideConfig.js +++ b/src/modules/serverSideConfig.js @@ -55,7 +55,10 @@ export const settingsMap = { get: 'pleroma.allow_following_move', set: 'allow_following_move' }, - 'discoverable': 'source.discoverable', + 'discoverable': { + get: 'source.pleroma.discoverable', + set: 'discoverable' + }, 'hideFavorites': { get: 'pleroma.hide_favorites', set: 'hide_favorites' |