Merge pull request #1872 from pixelfed/staging

Update assets

package.json

@@ -12,27 +12,27 @@
     },
     "devDependencies": {
         "axios": "^0.18.1",
-        "bootstrap": ">=4.3.1",
-        "cross-env": "^5.2.0",
+        "bootstrap": ">=4.4.0",
+        "cross-env": "^5.2.1",
         "jquery": "^3.4.1",
         "lodash": ">=4.17.13",
-        "popper.js": "^1.15.0",
+        "popper.js": "^1.16.0",
         "resolve-url-loader": "^2.3.2",
-        "sass": "^1.22.3",
-        "sass-loader": "^7.1.0",
+        "sass": "^1.23.7",
+        "sass-loader": "^7.3.1",
         "vue": "^2.6.10",
         "vue-masonry-css": "^1.0.3",
         "vue-template-compiler": "^2.6.10"
     },
     "dependencies": {
-        "@trevoreyre/autocomplete-vue": "^2.0.2",
-        "bootstrap-vue": "^2.0.0-rc.26",
+        "@trevoreyre/autocomplete-vue": "^2.0.3",
+        "bootstrap-vue": "^2.1.0",
         "filesize": "^3.6.1",
         "howler": "^2.1.2",
         "infinite-scroll": "^3.0.6",
-        "laravel-echo": "^1.5.4",
-        "laravel-mix": "^4.1.2",
-        "node-sass": "^4.12.0",
+        "laravel-echo": "^1.6.1",
+        "laravel-mix": "^4.1.4",
+        "node-sass": "^4.13.0",
         "promise-polyfill": "8.1.0",
         "quill": "^1.3.7",
         "readmore-js": "^2.2.1",
@@ -40,7 +40,7 @@
         "twitter-text": "^2.0.5",
         "vue-carousel": "^0.18.0",
         "vue-content-loader": "^0.2.2",
-        "vue-cropperjs": "^4.0.0",
+        "vue-cropperjs": "^4.0.1",
         "vue-infinite-loading": "^2.4.4",
         "vue-loading-overlay": "^3.2.0",
         "vue-timeago": "^5.1.2",

resources/assets/js/app.js

@@ -16,11 +16,22 @@ if (token) {
 
 window.App = window.App || {};
 
+window.App.redirect = function() {
+	document.querySelectorAll('a').forEach(function(i,k) { 
+		let a = i.getAttribute('href');
+		if(a && a.length > 5 && a.startsWith('https://')) {
+			let url = new URL(a);
+			if(url.host !== window.location.host && url.pathname !== '/i/redirect') {
+				i.setAttribute('href', '/i/redirect?url=' + encodeURIComponent(a));
+			}
+		}
+	});
+}
+
 window.App.boot = function() {
 	new Vue({ el: '#content'});
 }
 
-
 window.App.util = {
 	time: (function() { 
 		return new Date; 

resources/assets/js/components/Hashtag.vue

@@ -136,7 +136,7 @@
 			},
 
 			infiniteLoader($state) {
-				if(this.page > (this.authenticated ? 19 : 3)) {
+				if(this.page > (this.authenticated ? 29 : 10)) {
 					$state.complete();
 					return;
 				}

resources/assets/js/components/NotificationCard.vue

@@ -15,7 +15,7 @@
 			</div>
 			<div class="card-body pt-2 px-0 py-0 contents" style="max-height: 230px; overflow-y: scroll;">
 				<div v-if="notifications.length > 0" class="media align-items-center px-3 py-2 border-bottom border-light" v-for="(n, index) in notifications">
-					<img class="mr-2 rounded-circle" style="border:1px solid #ccc" :src="n.account.avatar" alt="" width="32px" height="32px">
+					<img class="mr-2 rounded-circle" style="border:1px solid #ccc" :src="n.account.avatar" alt="" width="32px" height="32px" onerror="this.onerror=null;this.src='/storage/avatars/default.png';">
 					<div class="media-body font-weight-light small">
 						<div v-if="n.type == 'favourite'">
 							<p class="my-0">

resources/assets/js/components/Timeline.vue

@@ -182,7 +182,9 @@
 											<span v-html="reply.content"></span>
 										</span>
 										<span class="mb-0" style="min-width:38px">
-											<span v-on:click="likeStatus(reply, $event)"><i v-bind:class="[reply.favourited ? 'fas fa-heart fa-sm text-danger cursor-pointer':'far fa-heart fa-sm text-lighter cursor-pointer']"></i></span>
+											<span v-on:click="likeStatus(reply, $event)">
+												<i v-bind:class="[reply.favourited ? 'fas fa-heart fa-sm text-danger cursor-pointer':'far fa-heart fa-sm text-lighter cursor-pointer']"></i>
+											</span>
 											<!-- <post-menu :status="reply" :profile="profile" size="sm" :modal="'true'" :feed="feed" class="d-inline-flex pl-2"></post-menu> -->
 											<span class="text-lighter pl-2 cursor-pointer" @click="ctxMenu(reply)">
 												<span class="fas fa-ellipsis-v text-lighter"></span>