From 82b7782c2b75c3987c4e17082db8f6b2efbdd9a4 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 20 Apr 2019 22:29:21 -0600
Subject: [PATCH 1/3] Update config

---
 config/purify.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/purify.php b/config/purify.php
index 36915eb17..5c09c28c6 100644
--- a/config/purify.php
+++ b/config/purify.php
@@ -67,7 +67,7 @@ return [
         |
         */
 
-        'HTML.Allowed' => 'a[href|title|rel],p,strong,em,i,u,h1,h2,h3,h4,h5,ul,ol,li',
+        'HTML.Allowed' => 'a[href|title|rel],p,strong,em,i,u,h1,h2,h3,h4,h5,ul,ol,li,br',
 
         /*
         |--------------------------------------------------------------------------

From cca1bf9ec2126708cd81c447c742a61b724177c3 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 20 Apr 2019 22:29:52 -0600
Subject: [PATCH 2/3] Update SettingsController

---
 app/Http/Controllers/Settings/HomeSettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Settings/HomeSettings.php b/app/Http/Controllers/Settings/HomeSettings.php
index f99d92ce0..2dfa0de38 100644
--- a/app/Http/Controllers/Settings/HomeSettings.php
+++ b/app/Http/Controllers/Settings/HomeSettings.php
@@ -42,7 +42,7 @@ trait HomeSettings
 
         $changes = false;
         $name = strip_tags($request->input('name'));
-        $bio = $request->filled('bio') ? Purify::clean($request->input('bio')) : null;
+        $bio = $request->filled('bio') ? strip_tags(Purify::clean($request->input('bio'))) : null;
         $website = $request->input('website');
         $email = $request->input('email');
         $user = Auth::user();

From 3c5cdf9e3160cb6290536b54e95073496822ba2b Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 20 Apr 2019 22:31:16 -0600
Subject: [PATCH 3/3] Update settings view

---
 resources/views/settings/home.blade.php | 78 ++++++++++++++++---------
 1 file changed, 49 insertions(+), 29 deletions(-)

diff --git a/resources/views/settings/home.blade.php b/resources/views/settings/home.blade.php
index 1a47f30f6..115ac5055 100644
--- a/resources/views/settings/home.blade.php
+++ b/resources/views/settings/home.blade.php
@@ -128,12 +128,8 @@
 @push('scripts')
 <script type="text/javascript">
 
-  $(document).on('click', '.modal-close', function(e) {
-    swal.close();
-  });
-
-  $('#bio').on('change keyup paste', function(e) {
-    let el = $(this);
+$(document).ready(function() {
+    let el = $('#bio');
     let len = el.val().length;
     let limit = el.data('max-length');
 
@@ -149,33 +145,57 @@
     }
 
     $('.bio-counter').html(val);
-  });
 
-  $('#maxAvatarSize').text(filesize({{config('pixelfed.max_avatar_size') * 1024}}, {round: 0}));
+    $('#bio').on('change keyup paste', function(e) {
+      let el = $(this);
+      let len = el.val().length;
+      let limit = el.data('max-length');
 
-  $('#avatarInput').on('change', function(e) {
-      var file = document.getElementById('avatarInput').files[0];
-      var reader = new FileReader();
-
-      reader.addEventListener("load", function() {
-          $('#previewAvatar').html('<img src="' + reader.result + '" class="rounded-circle box-shadow mb-3" width="100%" height="100%"/>');
-      }, false);
-
-      if (file) {
-          reader.readAsDataURL(file);
+      if(len > 100) {
+        el.attr('rows', '4');
       }
-  });
 
-  $('.delete-profile-photo').on('click', function(e) {
-    e.preventDefault();
-    if(window.confirm('Are you sure you want to delete your profile photo.') == false) {
-      return;
-    }
-    axios.delete('/settings/avatar').then(res => {
-      window.location.href = window.location.href;
-    }).catch(err => {
-      swal('Error', 'An error occured, please try again later', 'error');
+      let val = len + ' / ' + limit;
+
+      if(len > limit) {
+        let diff = len - limit;
+        val = '<span class="text-danger">-' + diff + '</span> / ' + limit;
+      }
+
+      $('.bio-counter').html(val);
     });
-  });
+
+    $(document).on('click', '.modal-close', function(e) {
+      swal.close();
+    });
+    
+    $('#maxAvatarSize').text(filesize({{config('pixelfed.max_avatar_size') * 1024}}, {round: 0}));
+
+    $('#avatarInput').on('change', function(e) {
+        var file = document.getElementById('avatarInput').files[0];
+        var reader = new FileReader();
+
+        reader.addEventListener("load", function() {
+            $('#previewAvatar').html('<img src="' + reader.result + '" class="rounded-circle box-shadow mb-3" width="100%" height="100%"/>');
+        }, false);
+
+        if (file) {
+            reader.readAsDataURL(file);
+        }
+    });
+
+    $('.delete-profile-photo').on('click', function(e) {
+      e.preventDefault();
+      if(window.confirm('Are you sure you want to delete your profile photo.') == false) {
+        return;
+      }
+      axios.delete('/settings/avatar').then(res => {
+        window.location.href = window.location.href;
+      }).catch(err => {
+        swal('Error', 'An error occured, please try again later', 'error');
+      });
+    });
+})
+
 </script>
 @endpush