Update Profile, add linkified bio, joined date, follows you label and improved website handling

app/Http/Controllers/Settings/HomeSettings.php

@@ -8,6 +8,7 @@ use App\Media;
 use App\Profile;
 use App\User;
 use App\UserFilter;
+use App\Util\Lexer\Autolink;
 use App\Util\Lexer\PrettyNumber;
 use Auth;
 use Cache;
@@ -21,23 +22,23 @@ use App\Services\PronounService;
 trait HomeSettings
 {
 
-    public function home()
-    {
-        $id = Auth::user()->profile->id;
-        $storage = [];
-        $used = Media::whereProfileId($id)->sum('size');
-        $storage['limit'] = config_cache('pixelfed.max_account_size') * 1024;
-        $storage['used'] = $used;
-        $storage['percentUsed'] = ceil($storage['used'] / $storage['limit'] * 100);
-        $storage['limitPretty'] = PrettyNumber::size($storage['limit']);
-        $storage['usedPretty'] = PrettyNumber::size($storage['used']);
-        $pronouns = PronounService::get($id);
-
-        return view('settings.home', compact('storage', 'pronouns'));
-    }
-
-    public function homeUpdate(Request $request)
-    {
+	public function home()
+	{
+		$id = Auth::user()->profile->id;
+		$storage = [];
+		$used = Media::whereProfileId($id)->sum('size');
+		$storage['limit'] = config_cache('pixelfed.max_account_size') * 1024;
+		$storage['used'] = $used;
+		$storage['percentUsed'] = ceil($storage['used'] / $storage['limit'] * 100);
+		$storage['limitPretty'] = PrettyNumber::size($storage['limit']);
+		$storage['usedPretty'] = PrettyNumber::size($storage['used']);
+		$pronouns = PronounService::get($id);
+
+		return view('settings.home', compact('storage', 'pronouns'));
+	}
+
+	public function homeUpdate(Request $request)
+	{
 		$this->validate($request, [
 			'name'    => 'required|string|max:'.config('pixelfed.max_name_length'),
 			'bio'     => 'nullable|string|max:'.config('pixelfed.max_bio_length'),
@@ -46,164 +47,164 @@ trait HomeSettings
 			'pronouns' => 'nullable|array|max:4'
 		]);
 
-        $changes = false;
-        $name = strip_tags(Purify::clean($request->input('name')));
-        $bio = $request->filled('bio') ? strip_tags(Purify::clean($request->input('bio'))) : null;
-        $website = $request->input('website');
-        $language = $request->input('language');
-        $user = Auth::user();
-        $profile = $user->profile;
-        $pronouns = $request->input('pronouns');
-        $existingPronouns = PronounService::get($profile->id);
-        $layout = $request->input('profile_layout');
-        if($layout) {
-            $layout = !in_array($layout, ['metro', 'moment']) ? 'metro' : $layout;
-        }
-
-        $enforceEmailVerification = config_cache('pixelfed.enforce_email_verification');
-
-        // Only allow email to be updated if not yet verified
-        if (!$enforceEmailVerification || !$changes && $user->email_verified_at) {
-            if ($profile->name != $name) {
-                $changes = true;
-                $user->name = $name;
-                $profile->name = $name;
-            }
-
-            if ($profile->website != $website) {
-                $changes = true;
-                $profile->website = $website;
-            }
-
-            if ($profile->bio != $bio) {
-                $changes = true;
-                $profile->bio = $bio;
-            }
-
-            if($user->language != $language &&
-                in_array($language, \App\Util\Localization\Localization::languages())
-            ) {
-                $changes = true;
-                $user->language = $language;
-                session()->put('locale', $language);
-            }
-
-            if($existingPronouns != $pronouns) {
-            	if($pronouns && in_array('Select Pronoun(s)', $pronouns)) {
-            		PronounService::clear($profile->id);
-            	} else {
-            		PronounService::put($profile->id, $pronouns);
-            	}
-            }
-        }
-
-        if ($changes === true) {
-            Cache::forget('user:account:id:'.$user->id);
-            $user->save();
-            $profile->save();
-
-            return redirect('/settings/home')->with('status', 'Profile successfully updated!');
-        }
-
-        return redirect('/settings/home');
-    }
-
-    public function password()
-    {
-        return view('settings.password');
-    }
-
-    public function passwordUpdate(Request $request)
-    {
-        $this->validate($request, [
-        'current'                => 'required|string',
-        'password'               => 'required|string',
-        'password_confirmation'  => 'required|string',
-      ]);
-
-        $current = $request->input('current');
-        $new = $request->input('password');
-        $confirm = $request->input('password_confirmation');
-
-        $user = Auth::user();
-
-        if (password_verify($current, $user->password) && $new === $confirm) {
-            $user->password = bcrypt($new);
-            $user->save();
-
-            $log = new AccountLog();
-            $log->user_id = $user->id;
-            $log->item_id = $user->id;
-            $log->item_type = 'App\User';
-            $log->action = 'account.edit.password';
-            $log->message = 'Password changed';
-            $log->link = null;
-            $log->ip_address = $request->ip();
-            $log->user_agent = $request->userAgent();
-            $log->save();
-
-            Mail::to($request->user())->send(new PasswordChange($user));
-            return redirect('/settings/home')->with('status', 'Password successfully updated!');
-        } else {
-            return redirect()->back()->with('error', 'There was an error with your request! Please try again.');
-        }
-
-    }
-
-    public function email()
-    {
-        return view('settings.email');
-    }
-
-    public function emailUpdate(Request $request)
-    {
-        $this->validate($request, [
-            'email'   => 'required|email',
-        ]);
-        $changes = false;
-        $email = $request->input('email');
-        $user = Auth::user();
-        $profile = $user->profile;
-
-        $validate = config_cache('pixelfed.enforce_email_verification');
-
-        if ($user->email != $email) {
-            $changes = true;
-            $user->email = $email;
-
-            if ($validate) {
-                $user->email_verified_at = null;
-                // Prevent old verifications from working
-                EmailVerification::whereUserId($user->id)->delete();
-            }
-
-            $log = new AccountLog();
-            $log->user_id = $user->id;
-            $log->item_id = $user->id;
-            $log->item_type = 'App\User';
-            $log->action = 'account.edit.email';
-            $log->message = 'Email changed';
-            $log->link = null;
-            $log->ip_address = $request->ip();
-            $log->user_agent = $request->userAgent();
-            $log->save();
-        }
-
-        if ($changes === true) {
-            Cache::forget('user:account:id:'.$user->id);
-            $user->save();
-            $profile->save();
-
-            return redirect('/settings/home')->with('status', 'Email successfully updated!');
-        } else {
-            return redirect('/settings/email');
-        }
-
-    }
-
-    public function avatar()
-    {
-        return view('settings.avatar');
-    }
+		$changes = false;
+		$name = strip_tags(Purify::clean($request->input('name')));
+		$bio = $request->filled('bio') ? strip_tags(Purify::clean($request->input('bio'))) : null;
+		$website = $request->input('website');
+		$language = $request->input('language');
+		$user = Auth::user();
+		$profile = $user->profile;
+		$pronouns = $request->input('pronouns');
+		$existingPronouns = PronounService::get($profile->id);
+		$layout = $request->input('profile_layout');
+		if($layout) {
+			$layout = !in_array($layout, ['metro', 'moment']) ? 'metro' : $layout;
+		}
+
+		$enforceEmailVerification = config_cache('pixelfed.enforce_email_verification');
+
+		// Only allow email to be updated if not yet verified
+		if (!$enforceEmailVerification || !$changes && $user->email_verified_at) {
+			if ($profile->name != $name) {
+				$changes = true;
+				$user->name = $name;
+				$profile->name = $name;
+			}
+
+			if ($profile->website != $website) {
+				$changes = true;
+				$profile->website = $website;
+			}
+
+			if (strip_tags($profile->bio) != $bio) {
+				$changes = true;
+				$profile->bio = Autolink::create()->autolink($bio);
+			}
+
+			if($user->language != $language &&
+				in_array($language, \App\Util\Localization\Localization::languages())
+			) {
+				$changes = true;
+				$user->language = $language;
+				session()->put('locale', $language);
+			}
+
+			if($existingPronouns != $pronouns) {
+				if($pronouns && in_array('Select Pronoun(s)', $pronouns)) {
+					PronounService::clear($profile->id);
+				} else {
+					PronounService::put($profile->id, $pronouns);
+				}
+			}
+		}
+
+		if ($changes === true) {
+			Cache::forget('user:account:id:'.$user->id);
+			$user->save();
+			$profile->save();
+
+			return redirect('/settings/home')->with('status', 'Profile successfully updated!');
+		}
+
+		return redirect('/settings/home');
+	}
+
+	public function password()
+	{
+		return view('settings.password');
+	}
+
+	public function passwordUpdate(Request $request)
+	{
+		$this->validate($request, [
+		'current'                => 'required|string',
+		'password'               => 'required|string',
+		'password_confirmation'  => 'required|string',
+	  ]);
+
+		$current = $request->input('current');
+		$new = $request->input('password');
+		$confirm = $request->input('password_confirmation');
+
+		$user = Auth::user();
+
+		if (password_verify($current, $user->password) && $new === $confirm) {
+			$user->password = bcrypt($new);
+			$user->save();
+
+			$log = new AccountLog();
+			$log->user_id = $user->id;
+			$log->item_id = $user->id;
+			$log->item_type = 'App\User';
+			$log->action = 'account.edit.password';
+			$log->message = 'Password changed';
+			$log->link = null;
+			$log->ip_address = $request->ip();
+			$log->user_agent = $request->userAgent();
+			$log->save();
+
+			Mail::to($request->user())->send(new PasswordChange($user));
+			return redirect('/settings/home')->with('status', 'Password successfully updated!');
+		} else {
+			return redirect()->back()->with('error', 'There was an error with your request! Please try again.');
+		}
+
+	}
+
+	public function email()
+	{
+		return view('settings.email');
+	}
+
+	public function emailUpdate(Request $request)
+	{
+		$this->validate($request, [
+			'email'   => 'required|email',
+		]);
+		$changes = false;
+		$email = $request->input('email');
+		$user = Auth::user();
+		$profile = $user->profile;
+
+		$validate = config_cache('pixelfed.enforce_email_verification');
+
+		if ($user->email != $email) {
+			$changes = true;
+			$user->email = $email;
+
+			if ($validate) {
+				$user->email_verified_at = null;
+				// Prevent old verifications from working
+				EmailVerification::whereUserId($user->id)->delete();
+			}
+
+			$log = new AccountLog();
+			$log->user_id = $user->id;
+			$log->item_id = $user->id;
+			$log->item_type = 'App\User';
+			$log->action = 'account.edit.email';
+			$log->message = 'Email changed';
+			$log->link = null;
+			$log->ip_address = $request->ip();
+			$log->user_agent = $request->userAgent();
+			$log->save();
+		}
+
+		if ($changes === true) {
+			Cache::forget('user:account:id:'.$user->id);
+			$user->save();
+			$profile->save();
+
+			return redirect('/settings/home')->with('status', 'Email successfully updated!');
+		} else {
+			return redirect('/settings/email');
+		}
+
+	}
+
+	public function avatar()
+	{
+		return view('settings.avatar');
+	}
 
 }

resources/assets/js/components/Profile.vue

@@ -103,10 +103,6 @@
 							<div class="profile-details">
 								<div class="d-none d-md-flex username-bar pb-3 align-items-center">
 									<span class="font-weight-ultralight h3 mb-0">{{profile.username}}</span>
-									<span class="pl-1 pb-2 fa-stack" v-if="profile.is_admin" title="Admin Account" data-toggle="tooltip">
-										<i class="fas fa-certificate fa-lg text-danger fa-stack-1x"></i>
-										<i class="fas fa-crown text-white fa-sm fa-stack-1x" style="font-size:9px;"></i>
-									</span>
 									<span v-if="profile.id != user.id && user.hasOwnProperty('id')">
 										<span class="pl-4" v-if="relationship.following == true">
 											<a :href="'/account/direct/t/'+profile.id"  class="btn btn-outline-secondary font-weight-bold btn-sm py-1 text-dark mr-2 px-3 btn-sec-alt" style="border:1px solid #dbdbdb;" data-toggle="tooltip" title="Message">Message</a>
@@ -144,12 +140,21 @@
 											</a>
 										</div>
 									</div>
-									<p class="mb-0 d-flex align-items-center">
+									<p class="d-flex align-items-center mb-1">
 										<span class="font-weight-bold mr-1">{{profile.display_name}}</span>
 										<span v-if="profile.pronouns" class="text-muted small">{{profile.pronouns.join('/')}}</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" @click.prevent="remoteRedirect(profile.website)">{{truncate(profile.website,24)}}</a></p>
+									<p v-if="profile.note" class="mb-0" v-html="profile.note"></p>
+									<p v-if="profile.website"><a :href="profile.website" class="profile-website small" rel="me external nofollow noopener" target="_blank" @click.prevent="remoteRedirect(profile.website)">{{formatWebsite(profile.website)}}</a></p>
+									<p class="d-flex small text-muted align-items-center">
+										<span v-if="profile.is_admin" class="btn btn-outline-danger btn-sm py-0 mr-3" title="Admin Account" data-toggle="tooltip">
+											Admin
+										</span>
+										<span v-if="relationship && relationship.followed_by" class="btn btn-outline-muted btn-sm py-0 mr-3">Follows You</span>
+										<span>
+											Joined {{joinedAtFormat(profile.created_at)}}
+										</span>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -1316,6 +1321,24 @@
 				return _.truncate(str, {
 					length: len
 				});
+			},
+
+			formatWebsite(site) {
+				if(site.slice(0, 8) === 'https://') {
+					site = site.substr(8);
+				} else if(site.slice(0, 7) === 'http://') {
+					site = site.substr(7);
+				} else {
+					this.profile.website = null;
+					return;
+				}
+
+				return this.truncate(site, 60);
+			},
+
+			joinedAtFormat(created) {
+				let d = new Date(created);
+				return d.toDateString();
 			}
 		}
 	}

resources/views/settings/home.blade.php

@@ -51,7 +51,7 @@
 		<div class="form-group row">
 			<label for="bio" class="col-sm-3 col-form-label font-weight-bold">Bio</label>
 			<div class="col-sm-9">
-				<textarea class="form-control" id="bio" name="bio" placeholder="Add a bio here" rows="2" data-max-length="{{config('pixelfed.max_bio_length')}}" v-pre>{{Auth::user()->profile->bio}}</textarea>
+				<textarea class="form-control" id="bio" name="bio" placeholder="Add a bio here" rows="2" data-max-length="{{config('pixelfed.max_bio_length')}}" v-pre>{{strip_tags(Auth::user()->profile->bio)}}</textarea>
 				<p class="form-text">
 					<span class="bio-counter float-right small text-muted">0/{{config('pixelfed.max_bio_length')}}</span>
 				</p>