Merge pull request #2788 from pixelfed/staging

Staging

CHANGELOG.md

@@ -3,6 +3,9 @@
 ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.0...dev)
 ### Updated
 - Updated PrettyNumber, fix deprecated warning. ([20ec870b](https://github.com/pixelfed/pixelfed/commit/20ec870b))
+- Updated landing page, use config_cache. ([54920294](https://github.com/pixelfed/pixelfed/commit/54920294))
+- Updated Timeline, implement suggested post opt out. ([66750d34](https://github.com/pixelfed/pixelfed/commit/66750d34))
+-  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)
 ### Added

resources/assets/js/components/Timeline.vue

@@ -294,6 +294,9 @@
 												<p class="text-center mb-0">
 													<a class="btn btn-link font-weight-bold px-4" href="/?a=vop">View Older Posts</a>
 												</p>
+												<p class="text-center mb-0">
+													<a class="btn btn-link font-weight-bold px-4" href="/" @click.prevent="alwaysViewOlderPosts()">Always show older posts on this device</a>
+												</p>
 											</div>
 											<div v-else>
 												<p class="text-center h3 font-weight-light">You've reached the end of this feed</p>
@@ -310,6 +313,9 @@
 												<p class="text-center mb-0">
 													<a class="btn btn-link font-weight-bold px-4" href="/?a=vop">View Older Posts</a>
 												</p>
+												<p class="text-center mb-0">
+													<a class="btn btn-link font-weight-bold px-4" href="/" @click.prevent="alwaysViewOlderPosts()">Always show older posts on this device</a>
+												</p>
 											</div>
 											<div v-else>
 												<p class="text-center h3 font-weight-light">You've reached the end of this feed</p>
@@ -331,6 +337,9 @@
 									<p class="text-center mb-0">
 										<a class="btn btn-link font-weight-bold px-4" href="/?a=vop">View Older Posts</a>
 									</p>
+									<p class="text-center mb-0">
+										<a class="btn btn-link font-weight-bold px-4" href="/" @click.prevent="alwaysViewOlderPosts()">Always show older posts on this device</a>
+									</p>
 								</div>
 								<div v-else class="card-body py-5 my-5">
 									<p class="text-center"><i class="far fa-smile fa-8x text-lighter"></i></p>
@@ -1223,6 +1232,7 @@
 		},
 
 		beforeMount() {
+			let avop = window.localStorage.getItem('pf.feed:avop') === 'always';
 			let u = new URLSearchParams(window.location.search);
 			if(u.has('a')) {
 				switch(u.get('a')) {
@@ -1236,6 +1246,7 @@
 					break;
 				}
 			}
+			this.recentFeed = avop ? false : this.recentFeed;
 			this.fetchProfile();
 			this.fetchTimelineApi();
 		},
@@ -2479,6 +2490,12 @@
 					this.pagination = response.data.meta.pagination;
 					$('.load-more-link').removeClass('d-none');
 				});
+			},
+
+			alwaysViewOlderPosts() {
+				// Set Feed:Always View Older Posts
+				window.localStorage.setItem('pf.feed:avop', 'always');
+				window.location.href = '/';
 			}
 		},
 

resources/views/site/index.blade.php

@@ -127,7 +127,7 @@
 						</div>
 						<div class="card shadow-none border card-body">
 							<p class="text-center mb-0 font-weight-bold small">
-								@if(config('pixelfed.open_registration'))
+								@if(config_cache('pixelfed.open_registration'))
 								<a href="/register">Register</a>
 								<span class="px-1">·</span>
 								@endif