Merge pull request #2388 from pixelfed/staging

Update SearchResults component

public/mix-manifest.json

@@ -23,7 +23,7 @@
     "/js/quill.js": "/js/quill.js?id=00f2dca2463b3c9d3920",
     "/js/rempos.js": "/js/rempos.js?id=b0e81561d85612cf9aab",
     "/js/rempro.js": "/js/rempro.js?id=bfe52f1149330c486da7",
-    "/js/search.js": "/js/search.js?id=4920eaab2c3c68947ffe",
+    "/js/search.js": "/js/search.js?id=0c1e20a004ada75853ec",
     "/js/status.js": "/js/status.js?id=5aa655780506cde35b92",
     "/js/story-compose.js": "/js/story-compose.js?id=8768fd0f62554e98ef10",
     "/js/theme-monokai.js": "/js/theme-monokai.js?id=3b6e62701f12b717cc5c",

resources/assets/js/components/SearchResults.vue

@@ -343,7 +343,8 @@ export default {
 			showPlaces: false,
 			placesCursor: 1,
 			placesCache: [],
-			placesSearchEnabled: false
+			placesSearchEnabled: false,
+			searchVersion: 2
 		}
 	},
 	beforeMount() {
@@ -443,7 +444,7 @@ export default {
 						params: {
 							'q': this.query,
 							'src': 'metro',
-							'v': 2,
+							'v': this.searchVersion,
 							'scope': 'all'
 						}
 					}).then(res => {
@@ -457,7 +458,6 @@ export default {
 						this.loading = false;
 					}).catch(err => {
 						this.loading = false;
-						console.log(err);
 						this.networkError = true;
 					});
 				break;
@@ -467,7 +467,7 @@ export default {
 						params: {
 							'q': this.query,
 							'src': 'metro',
-							'v': 1,
+							'v': this.searchVersion,
 							'scope': 'remote'
 						}
 					}).then(res => {
@@ -485,7 +485,6 @@ export default {
 						this.loading = false;
 					}).catch(err => {
 						this.loading = false;
-						console.log(err);
 						this.networkError = true;
 					});
 				break;
@@ -495,7 +494,7 @@ export default {
 						params: {
 							'q': this.query.slice(1),
 							'src': 'metro',
-							'v': 1,
+							'v': this.searchVersion,
 							'scope': 'hashtag'
 						}
 					}).then(res => {
@@ -506,7 +505,6 @@ export default {
 						this.loading = false;
 					}).catch(err => {
 						this.loading = false;
-						console.log(err);
 						this.networkError = true;
 					});
 				break;
@@ -516,7 +514,7 @@ export default {
 						params: {
 							'q': this.query,
 							'src': 'metro',
-							'v': 1,
+							'v': this.searchVersion,
 							'scope': 'profile'
 						}
 					}).then(res => {
@@ -527,7 +525,6 @@ export default {
 						this.loading = false;
 					}).catch(err => {
 						this.loading = false;
-						console.log(err);
 						this.networkError = true;
 					});
 				break;
@@ -537,7 +534,7 @@ export default {
 						params: {
 							'q': this.query,
 							'src': 'metro',
-							'v': 1,
+							'v': this.searchVersion,
 							'scope': 'webfinger'
 						}
 					}).then(res => {
@@ -548,7 +545,6 @@ export default {
 						this.loading = false;
 					}).catch(err => {
 						this.loading = false;
-						console.log(err);
 						this.networkError = true;
 					});
 				break;
@@ -582,7 +578,7 @@ export default {
 				params: {
 					'q': this.query,
 					'src': 'metro',
-					'v': 2,
+					'v': this.searchVersion,
 					'scope': 'all',
 					'page': this.placesCursor
 				}
@@ -593,7 +589,6 @@ export default {
 				this.loading = false;
 			}).catch(err => {
 				this.loading = false;
-				console.log(err);
 				this.networkError = true;
 			});