Merge pull request #2804 from pixelfed/staging

Staging

CHANGELOG.md

@@ -14,6 +14,8 @@
 - Updated Profile, add linkified bio, joined date, follows you label and improved website handling. ([8ee10436](https://github.com/pixelfed/pixelfed/commit/8ee10436))
 - Updated routes, add legacy webfinger profile redirect. ([93c7af74](https://github.com/pixelfed/pixelfed/commit/93c7af74))
 - Updated StoryController, fix expiration time bug. ([39e57f95](https://github.com/pixelfed/pixelfed/commit/39e57f95))
+- Updated Profile component, fix remote urls. ([6e56dbed](https://github.com/pixelfed/pixelfed/commit/6e56dbed))
+- Updated verify email screen, add contact admin link. ([f37952d6](https://github.com/pixelfed/pixelfed/commit/f37952d6))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)

README.md

@@ -11,7 +11,7 @@
 A free and ethical photo sharing platform, powered by ActivityPub federation.
 
 <p align="center">
-<img src="https://pixelfed.nyc3.cdn.digitaloceanspaces.com/media/Screen%20Shot%202019-09-08%20at%2010.40.54%20PM.png">
+<img src="https://pixelfed.nyc3.cdn.digitaloceanspaces.com/media/pixelfed-screenshot.jpg">
 </p>
 
 ## Official Documentation
@@ -27,7 +27,6 @@ Pixelfed is open-sourced software licensed under the AGPL license.
 The ways you can communicate on the project are below. Before interacting, please
 read through the [Code Of Conduct](CODE_OF_CONDUCT.md).
 
-* IRC: [#pixelfed](irc://chat.freenode.net/pixelfed) on irc.freenode.net
 * Mastodon: [@pixelfed@mastodon.social](https://mastodon.social/@pixelfed)
 * E-mail: [hello@pixelfed.org](mailto:hello@pixelfed.org)
 

app/Http/Middleware/EmailVerificationCheck.php

@@ -23,6 +23,7 @@ class EmailVerificationCheck
 				'i/auth/*',
 				'i/verify-email',
 				'log*',
+				'site*',
 				'i/confirm-email/*',
 				'settings/home',
 				'settings/email'

resources/assets/js/components/Profile.vue

@@ -423,12 +423,12 @@
 			</div>
 			<div class="list-group-item border-0 py-1" v-for="(user, index) in following" :key="'following_'+index">
 				<div class="media">
-					<a :href="user.url">
+					<a :href="profileUrlRedirect(user)">
 						<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px" loading="lazy">
 					</a>
 					<div class="media-body text-truncate">
 						<p class="mb-0" style="font-size: 14px">
-							<a :href="user.url" class="font-weight-bold text-dark">
+							<a :href="profileUrlRedirect(user)" class="font-weight-bold text-dark">
 								{{user.username}}
 							</a>
 						</p>
@@ -470,12 +470,12 @@
 			</div>
 			<div class="list-group-item border-0 py-1" v-for="(user, index) in followers" :key="'follower_'+index">
 				<div class="media mb-0">
-					<a :href="user.url">
+					<a :href="profileUrlRedirect(user)">
 						<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px" height="30px" loading="lazy">
 					</a>
 					<div class="media-body mb-0">
 						<p class="mb-0" style="font-size: 14px">
-							<a :href="user.url" class="font-weight-bold text-dark">
+							<a :href="profileUrlRedirect(user)" class="font-weight-bold text-dark">
 								{{user.username}}
 							</a>
 						</p>
@@ -1179,7 +1179,6 @@
 				});
 			},
 
-
 			followersLoadMore() {
 				if($('body').hasClass('loggedIn') == false) {
 					return;
@@ -1279,6 +1278,14 @@
 				return '/i/web/profile/_/' + status.account.id;
 			},
 
+			profileUrlRedirect(profile) {
+				if(profile.local == true) {
+					return profile.url;
+				}
+
+				return '/i/web/profile/_/' + profile.id;
+			},
+
 			showEmbedProfileModal() {
 				this.ctxEmbedPayload = window.App.util.embed.profile(this.profile.url);
 				this.$refs.visitorContextMenu.hide();

resources/assets/js/components/StoryCompose.vue

@@ -165,11 +165,21 @@
 										<p class="mb-0 text-muted font-weight-bold"><span>{{story.created_ago}} ago</span></p>
 									</div>
 									<div class="flex-grow-1 text-right">
+										<button v-if="story.viewers.length" @click="toggleShowViewers(index)" class="btn btn-link btn-sm mr-1">
+											<i class="fas fa-eye fa-lg text-muted"></i>
+										</button>
 										<button @click="deleteStory(story, index)" class="btn btn-link btn-sm">
 											<i class="fas fa-trash-alt fa-lg text-muted"></i>
 										</button>
 									</div>
 								</div>
+								<div v-if="story.showViewers && story.viewers.length" class="m-2 text-left">
+									<p class="font-weight-bold mb-2">Viewed By</p>
+									<div v-for="viewer in story.viewers" class="d-flex">
+										<img src="/storage/avatars/default.png" width="24" height="24" class="rounded-circle mr-2">
+										<p class="mb-0 font-weight-bold">viewer.username</p>
+									</div>
+								</div>
 							</div>
 						</div>
 					</div>
@@ -256,7 +266,11 @@
 			this.mediaWatcher();
 			axios.get('/api/stories/v0/fetch/' + this.profileId)
 			.then(res => {
-				this.stories = res.data;
+				this.stories = res.data.map(s => {
+					s.showViewers = false;
+					s.viewers = [];
+					return s;
+				});
 				this.loaded = true;
 			});
 		},
@@ -397,6 +411,10 @@
 
 			viewMyStory() {
 				window.location.href = '/i/my/story';
+			},
+
+			toggleShowViewers(index) {
+				this.stories[index].showViewers = this.stories[index].showViewers ? false : true;
 			}
 		}
 	}

resources/views/account/verify_email.blade.php

@@ -13,10 +13,12 @@
             <p class="font-weight-bold mb-0">{{ session('error') }}</p>
         </div>
     @endif
-    <div class="card">
+    <div class="card shadow-none border">
       <div class="card-header font-weight-bold bg-white">Confirm Email Address</div>
       <div class="card-body">
         <p class="lead">You need to confirm your email address (<span class="font-weight-bold">{{Auth::user()->email}}</span>) before you can proceed.</p>
+    	<p class="lead">You can change your email address <a href="/settings/email">here</a>.</p>
+    	<p class="small">If you don't recieve an email within 30 minutes, you can <a href="/site/contact">contact the administrator</a>.</p>
         <hr>
         <form method="post">
           @csrf