Merge pull request #2413 from pixelfed/staging

Staging

CHANGELOG.md

@@ -92,6 +92,8 @@
 - Updated email confirmation middleware, add 2FA to allow list. Fixes ([#2385](https://github.com/pixelfed/pixelfed/issues/2385)). ([27f3b29c](https://github.com/pixelfed/pixelfed/commit/27f3b29c))
 - Updated NotificationTransformer, fixes ([#2389](https://github.com/pixelfed/pixelfed/issues/2389)). ([c4506ebd](https://github.com/pixelfed/pixelfed/commit/c4506ebd))
 - Updated Profile + Timeline components, simplify UI. ([38d28ab4](https://github.com/pixelfed/pixelfed/commit/38d28ab4))
+- Updated Profile component, make modals scrollable. ([d1c664fa](https://github.com/pixelfed/pixelfed/commit/d1c664fa))
+- Updated PostComponent, fixes #2351. ([7a62a42a](https://github.com/pixelfed/pixelfed/commit/7a62a42a))
 
 ## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)
 ### Added

public/mix-manifest.json

@@ -18,13 +18,13 @@
     "/js/hashtag.js": "/js/hashtag.js?id=7e57442cbe641b10bfae",
     "/js/loops.js": "/js/loops.js?id=ac610897b12207c829b9",
     "/js/mode-dot.js": "/js/mode-dot.js?id=1225a9aac7a93d5d232f",
-    "/js/profile.js": "/js/profile.js?id=5312178d20bc43ac2d45",
+    "/js/profile.js": "/js/profile.js?id=9bdaef57acf15336d2a8",
     "/js/profile-directory.js": "/js/profile-directory.js?id=611af669221ad8be3068",
     "/js/quill.js": "/js/quill.js?id=00f2dca2463b3c9d3920",
     "/js/rempos.js": "/js/rempos.js?id=f7c284ac260f4f9b9474",
     "/js/rempro.js": "/js/rempro.js?id=bfe52f1149330c486da7",
     "/js/search.js": "/js/search.js?id=0c1e20a004ada75853ec",
-    "/js/status.js": "/js/status.js?id=5aa655780506cde35b92",
+    "/js/status.js": "/js/status.js?id=8abf06cc5bd0becad543",
     "/js/story-compose.js": "/js/story-compose.js?id=8768fd0f62554e98ef10",
     "/js/theme-monokai.js": "/js/theme-monokai.js?id=3b6e62701f12b717cc5c",
     "/js/timeline.js": "/js/timeline.js?id=df7947354d3da37f61e3"

resources/assets/js/components/PostComponent.vue

@@ -40,6 +40,7 @@
               <span class="fas fa-ellipsis-v text-muted"></span>
               </button>
               <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
+                  <a class="dropdown-item font-weight-bold" @click="copyPostUrl()">Copy Post Url</a>
                   <a class="dropdown-item font-weight-bold" @click="showEmbedPostModal()">Embed</a>
                   <div v-if="!owner()">
                     <a class="dropdown-item font-weight-bold" :href="reportUrl()">Report</a>
@@ -112,6 +113,7 @@
                   <span class="fas fa-ellipsis-v text-muted"></span>
                   </button>
                       <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
+                        <a class="dropdown-item font-weight-bold" @click="copyPostUrl()">Copy Post Url</a>
                         <a class="dropdown-item font-weight-bold" @click="showEmbedPostModal()">Embed</a>
                         <span v-if="!owner()">
                           <a class="dropdown-item font-weight-bold" :href="reportUrl()">Report</a>
@@ -1455,6 +1457,10 @@ export default {
         }).catch(err => {
             swal('An Error Occurred', 'Please try again later.', 'error');  
         });
+      },
+      copyPostUrl() {
+        navigator.clipboard.writeText(this.statusUrl);
+        return;
       }
     },
 }

resources/assets/js/components/Profile.vue

@@ -140,7 +140,7 @@
 										<span class="font-weight-bold pr-3">{{profile.display_name}}</span>
 									</p>
 									<div v-if="profile.note" class="mb-0" v-html="profile.note"></div>
-									<p v-if="profile.website" class=""><a :href="profile.website" class="profile-website" rel="me external nofollow noopener" target="_blank">{{truncate(profile.website,24)}}</a></p>
+									<p v-if="profile.website" class=""><a :href="profile.website" class="profile-website" rel="me external nofollow noopener" target="_blank" @click.prevent="remoteRedirect(profile.website)">{{truncate(profile.website,24)}}</a></p>
 								</div>
 							</div>
 						</div>
@@ -372,6 +372,7 @@
 		id="following-modal"
 		hide-footer
 		centered
+		scrollable
 		title="Following"
 		body-class="list-group-flush py-3 px-0"
 		dialog-class="follow-modal">
@@ -429,6 +430,7 @@
 		id="follower-modal"
 		hide-footer
 		centered
+		scrollable
 		title="Followers"
 		body-class="list-group-flush py-3 px-0"
 		dialog-class="follow-modal"
@@ -902,6 +904,11 @@
 				return;
 			},
 
+			remoteRedirect(url) {
+				window.location.href = window.App.config.site.url + '/i/redirect?url=' + encodeURIComponent(url);
+				return;
+			},
+
 			replyUrl(status) {
 				let username = this.profile.username;
 				let id = status.account.id == this.profile.id ? status.id : status.in_reply_to_id;