From ae4dc3e4390c4ba1b632be6aae7cc92480a65918 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 13 Aug 2020 16:29:12 +0300
Subject: [PATCH 01/15] treat field name as text

---
 src/components/user_profile/user_profile.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 361a3b5c..c7c67c0a 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -20,13 +20,14 @@
           :key="index"
           class="user-profile-field"
         >
-          <!-- eslint-disable vue/no-v-html -->
           <dt
             :title="user.fields_text[index].name"
             class="user-profile-field-name"
             @click.prevent="linkClicked"
-            v-html="field.name"
-          />
+          >
+            {{ field.name }}
+          </dt>
+          <!-- eslint-disable vue/no-v-html -->
           <dd
             :title="user.fields_text[index].value"
             class="user-profile-field-value"

From 2fa050b1630e11efd1db17ad8d63a88ec7a9c8f9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 18 Aug 2020 00:26:02 +0300
Subject: [PATCH 02/15] Fix muted notifications

---
 src/components/notification/notification.scss | 52 +++++++++++++++++++
 src/components/notification/notification.vue  |  3 +-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 src/components/notification/notification.scss

diff --git a/src/components/notification/notification.scss b/src/components/notification/notification.scss
new file mode 100644
index 00000000..d0e63d81
--- /dev/null
+++ b/src/components/notification/notification.scss
@@ -0,0 +1,52 @@
+// TODO Copypaste from Status, should unify it somehow
+.Notification {
+  &.-muted {
+    padding: 0.25em 0.6em;
+    height: 1.2em;
+    line-height: 1.2em;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    display: flex;
+    flex-wrap: nowrap;
+
+    & .status-username,
+    & .mute-thread,
+    & .mute-words {
+      word-wrap: normal;
+      word-break: normal;
+      white-space: nowrap;
+    }
+
+    & .status-username,
+    & .mute-words {
+      text-overflow: ellipsis;
+      overflow: hidden;
+    }
+
+    .status-username {
+      font-weight: normal;
+      flex: 0 1 auto;
+      margin-right: 0.2em;
+      font-size: smaller;
+    }
+
+    .mute-thread {
+      flex: 0 0 auto;
+    }
+
+    .mute-words {
+      flex: 1 0 5em;
+      margin-left: 0.2em;
+
+      &::before {
+        content: ' ';
+      }
+    }
+
+    .unmute {
+      flex: 0 0 auto;
+      margin-left: auto;
+      display: block;
+    }
+  }
+}
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 044ac871..7fac3840 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -7,7 +7,7 @@
   <div v-else>
     <div
       v-if="needMute && !unmuted"
-      class="container muted"
+      class="Notification container -muted"
     >
       <small>
         <router-link :to="userProfileLink">
@@ -168,3 +168,4 @@
 </template>
 
 <script src="./notification.js"></script>
+<style src="./notification.scss" lang="scss"></style>

From 30219098a6ba5ac5369f8c130676de7a7c8daea9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 18 Aug 2020 00:26:31 +0300
Subject: [PATCH 03/15] fix issues with reply-link

---
 src/components/status/status.scss | 21 ++++++++++++++++++---
 src/components/status/status.vue  |  1 +
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 898e914f..7fbab3b8 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -133,6 +133,13 @@ $status-margin: 0.75em;
     margin-right: 0.5em;
     max-width: 100%;
 
+    .reply-to-link {
+      white-space: nowrap;
+      word-break: break-word;
+      text-overflow: ellipsis;
+      overflow-x: hidden;
+    }
+
     .icon-reply {
       // mirror the icon
       transform: scaleX(-1);
@@ -143,11 +150,20 @@ $status-margin: 0.75em;
   & .reply-to-no-popover {
     min-width: 0;
     margin-right: 0.4em;
+    flex-shrink: 0;
   }
 
   .reply-to-popover {
-    &:hover {
+    position: relative;
+
+    .reply-to:hover::before {
+      content: '';
+      display: block;
+      position: absolute;
+      bottom: 0;
+      width: 100%;
       border-bottom: 1px solid var(--faint);
+      pointer-events: none;
     }
 
     .faint-link:hover {
@@ -156,8 +172,6 @@ $status-margin: 0.75em;
     }
 
     &.-strikethrough {
-      position: relative;
-
       &::after {
         content: '';
         display: block;
@@ -165,6 +179,7 @@ $status-margin: 0.75em;
         top: 50%;
         width: 100%;
         border-bottom: 1px solid var(--faint);
+        pointer-events: none;
       }
     }
   }
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 27af4340..282ad37d 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -234,6 +234,7 @@
                   <span class="reply-to-text">{{ $t('status.reply_to') }}</span>
                 </span>
                 <router-link
+                  class="reply-to-link"
                   :title="replyToName"
                   :to="replyProfileLink"
                 >

From ecbbec7b9798caff1d401403592de5ba02a3f509 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 18 Aug 2020 00:26:44 +0300
Subject: [PATCH 04/15] work around incorrect styles ordering in status popover

---
 src/components/status_popover/status_popover.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/status_popover/status_popover.vue b/src/components/status_popover/status_popover.vue
index 79a52e38..162eb210 100644
--- a/src/components/status_popover/status_popover.vue
+++ b/src/components/status_popover/status_popover.vue
@@ -38,7 +38,8 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.status-popover {
+/* popover styles load on-demand, so we need to override */
+.status-popover.popover {
   font-size: 1rem;
   min-width: 15em;
   max-width: 95%;

From a6223cec0c6bb037f1e64a3bc7dfd7fca354faa1 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 18 Aug 2020 00:52:51 +0300
Subject: [PATCH 05/15] Fix last line having slightly cut-off low-hanging parts
 of characters

---
 src/components/post_status_form/post_status_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index e7094bec..66252bda 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -481,7 +481,7 @@ const PostStatusForm = {
 
       // BEGIN content size update
       target.style.height = 'auto'
-      const heightWithoutPadding = Math.floor(target.scrollHeight - vertPadding)
+      const heightWithoutPadding = Math.ceil(target.scrollHeight - vertPadding) + 1
       let newHeight = this.maxHeight ? Math.min(heightWithoutPadding, this.maxHeight) : heightWithoutPadding
       // This is a bit of a hack to combat target.scrollHeight being different on every other input
       // on some browsers for whatever reason. Don't change the height if difference is 1px or less.

From 7de78b1401cf8454026afd0a2ba2578356173bcd Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 18 Aug 2020 23:50:23 +0300
Subject: [PATCH 06/15] revert change to form resize logic

---
 src/components/post_status_form/post_status_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 66252bda..e7094bec 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -481,7 +481,7 @@ const PostStatusForm = {
 
       // BEGIN content size update
       target.style.height = 'auto'
-      const heightWithoutPadding = Math.ceil(target.scrollHeight - vertPadding) + 1
+      const heightWithoutPadding = Math.floor(target.scrollHeight - vertPadding)
       let newHeight = this.maxHeight ? Math.min(heightWithoutPadding, this.maxHeight) : heightWithoutPadding
       // This is a bit of a hack to combat target.scrollHeight being different on every other input
       // on some browsers for whatever reason. Don't change the height if difference is 1px or less.

From 815f230ac7ace5a1507afae91bafa57589a77522 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 18 Aug 2020 23:57:42 +0300
Subject: [PATCH 07/15] fixed some issues related to user avatar

---
 src/components/attachment/attachment.vue          |  8 ++++++--
 src/components/chat_list_item/chat_list_item.scss |  2 +-
 src/components/chat_title/chat_title.vue          |  2 +-
 src/components/status/status.scss                 |  2 +-
 src/components/still-image/still-image.vue        |  3 +--
 src/components/user_avatar/user_avatar.vue        |  6 ++++--
 src/components/user_card/user_card.vue            | 10 +++-------
 7 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index be7377e9..63e0ceba 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -60,6 +60,7 @@
       @click="openModal"
     >
       <StillImage
+        class="image"
         :referrerpolicy="referrerpolicy"
         :mimetype="attachment.mimetype"
         :src="attachment.large_thumb_url || attachment.url"
@@ -281,8 +282,11 @@
   }
 
   .image-attachment {
-    width: 100%;
-    height: 100%;
+    &,
+    & .image {
+      width: 100%;
+      height: 100%;
+    }
 
     &.hidden {
       display: none;
diff --git a/src/components/chat_list_item/chat_list_item.scss b/src/components/chat_list_item/chat_list_item.scss
index 10ba45f2..9e97b28e 100644
--- a/src/components/chat_list_item/chat_list_item.scss
+++ b/src/components/chat_list_item/chat_list_item.scss
@@ -72,7 +72,7 @@
     }
   }
 
-  .avatar.still-image {
+  .Avatar {
     border-radius: $fallback--avatarAltRadius;
     border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
   }
diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue
index c375b10b..b16ed39d 100644
--- a/src/components/chat_title/chat_title.vue
+++ b/src/components/chat_title/chat_title.vue
@@ -51,7 +51,7 @@
     }
   }
 
-  .still-image.avatar {
+  .Avatar {
     width: 23px;
     height: 23px;
     margin-right: 0.5em;
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 7fbab3b8..4973e4ba 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -6,7 +6,7 @@ $status-margin: 0.75em;
 .Status {
   min-width: 0;
 
-  &:hover .avatar {
+  &:hover {
     --still-image-img: visible;
     --still-image-canvas: hidden;
   }
diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue
index 6fa055de..ad82210d 100644
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@@ -30,8 +30,6 @@
   position: relative;
   line-height: 0;
   overflow: hidden;
-  width: 100%;
-  height: 100%;
   display: flex;
   align-items: center;
 
@@ -68,6 +66,7 @@
       border-radius: $fallback--tooltipRadius;
       border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
       z-index: 2;
+      visibility: var(--still-image-label-visibility, visible);
     }
 
     &:hover canvas {
diff --git a/src/components/user_avatar/user_avatar.vue b/src/components/user_avatar/user_avatar.vue
index 3545b801..e4e4127c 100644
--- a/src/components/user_avatar/user_avatar.vue
+++ b/src/components/user_avatar/user_avatar.vue
@@ -1,6 +1,6 @@
 <template>
   <StillImage
-    class="avatar"
+    class="Avatar"
     :alt="user.screen_name"
     :title="user.screen_name"
     :src="imgSrc(user.profile_image_url_original)"
@@ -13,7 +13,9 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.avatar.still-image {
+.Avatar {
+  --still-image-label-visibility: hidden;
+
   width: 48px;
   height: 48px;
   box-shadow: var(--avatarStatusShadow);
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 75db5db1..07fce79a 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -364,13 +364,9 @@
     }
   }
 
-  &:hover .animated.avatar {
-    canvas {
-      display: none;
-    }
-    img {
-      visibility: visible;
-    }
+  &:hover .avatar {
+    --still-image-img: visible;
+    --still-image-canvas: hidden;
   }
 
   &-avatar-link {

From 36c9368ae5b70098c12f86de8e15a23dd5fbc264 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 19 Aug 2020 00:18:52 +0300
Subject: [PATCH 08/15] fix reply popovers being too slim

---
 src/components/status/status.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 4973e4ba..9d55bac3 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -154,7 +154,9 @@ $status-margin: 0.75em;
   }
 
   .reply-to-popover {
-    position: relative;
+    .reply-to {
+      position: relative;
+    }
 
     .reply-to:hover::before {
       content: '';

From 61966d290ae87b9aadd530ef180fc191d75e77d2 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 19 Aug 2020 00:22:08 +0300
Subject: [PATCH 09/15] fix lain's bug

---
 src/components/post_status_form/post_status_form.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 7ee9e748..520c03ea 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -143,6 +143,7 @@
             v-model="newStatus.status"
             :placeholder="placeholder || $t('post_status.default')"
             rows="1"
+            cols="1"
             :disabled="posting"
             class="form-post-body"
             :class="{ 'scrollable-form': !!maxHeight }"

From d7c42f146905a85a0ff0bad6da85090d5349acdd Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 19 Aug 2020 00:38:54 +0300
Subject: [PATCH 10/15] lint

---
 src/components/status/status.scss | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 9d55bac3..c558466b 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -154,10 +154,6 @@ $status-margin: 0.75em;
   }
 
   .reply-to-popover {
-    .reply-to {
-      position: relative;
-    }
-
     .reply-to:hover::before {
       content: '';
       display: block;
@@ -188,6 +184,7 @@ $status-margin: 0.75em;
 
   .reply-to {
     display: flex;
+    position: relative;
   }
 
   .reply-to-text {

From 800047b81f4375577e7d7298409cea5bd751ea71 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 19 Aug 2020 12:14:00 +0300
Subject: [PATCH 11/15] fixed

---
 src/components/status/status.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index c558466b..8d292d3f 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -170,7 +170,7 @@ $status-margin: 0.75em;
     }
 
     &.-strikethrough {
-      &::after {
+      .reply-to::after {
         content: '';
         display: block;
         position: absolute;

From 54b619dfec7255cec44dd2d23add1bbc9062ffee Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 19 Aug 2020 13:06:46 +0300
Subject: [PATCH 12/15] show tag name in title for tag timelines

---
 src/components/timeline_menu/timeline_menu.js  | 16 +++++++++++-----
 src/components/timeline_menu/timeline_menu.vue |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
index c0d75c54..2be75b06 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -9,7 +9,8 @@ export const timelineNames = () => {
     'bookmarks': 'nav.bookmarks',
     'dms': 'nav.dms',
     'public-timeline': 'nav.public_tl',
-    'public-external-timeline': 'nav.twkn'
+    'public-external-timeline': 'nav.twkn',
+    'tag-timeline': 'tag'
   }
 }
 
@@ -40,6 +41,14 @@ const TimelineMenu = {
       setTimeout(() => {
         this.isOpen = true
       }, 25)
+    },
+    timelineName () {
+      const route = this.$route.name
+      if (route === 'tag-timeline') {
+        return '#' + this.$route.params.tag
+      }
+      const i18nkey = timelineNames()[this.$route.name]
+      return i18nkey ? this.$t(i18nkey) : route
     }
   },
   computed: {
@@ -47,10 +56,7 @@ const TimelineMenu = {
       currentUser: state => state.users.currentUser,
       privateMode: state => state.instance.private,
       federating: state => state.instance.federating
-    }),
-    timelineNames () {
-      return timelineNames()
-    }
+    })
   }
 }
 
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index add8a6eb..be512d60 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -45,7 +45,7 @@
       slot="trigger"
       class="title timeline-menu-title"
     >
-      <span>{{ $t(timelineNames[$route.name]) }}</span>
+      <span>{{ timelineName() }}</span>
       <i class="icon-down-open" />
     </div>
   </Popover>

From a26fc61efad24bda2707f08ce8d54c7ca1b0b931 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Thu, 6 Aug 2020 20:45:15 +0000
Subject: [PATCH 13/15] Translated using Weblate (Italian)

Currently translated at 100.0% (663 of 663 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
---
 src/i18n/it.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 1473614a..b88fdd29 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -36,7 +36,8 @@
     "who_to_follow": "Chi seguire",
     "preferences": "Preferenze",
     "bookmarks": "Segnalibri",
-    "chats": "Conversazioni"
+    "chats": "Conversazioni",
+    "timelines": "Sequenze"
   },
   "notifications": {
     "followed_you": "ti segue",

From c649f28faf08fc3096c653018807171e8bb8fd4d Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 19 Aug 2020 14:54:00 +0200
Subject: [PATCH 14/15] EntityNormalizer: Normalize thumbnail url.

---
 src/services/entity_normalizer/entity_normalizer.service.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index c1bf8535..1884478a 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -209,6 +209,7 @@ export const parseAttachment = (data) => {
   }
 
   output.url = data.url
+  output.large_thumb_url = data.preview_url
   output.description = data.description
 
   return output

From a0c17e1fd0f63e3c7bf827f415caf94e5d5bf95d Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 19 Aug 2020 16:19:36 +0300
Subject: [PATCH 15/15] fix tests by removing only and adding empty func for
 notification tests

---
 test/unit/specs/modules/statuses.spec.js                  | 8 +++++---
 .../unit/specs/services/chat_service/chat_service.spec.js | 3 +--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index fe42e85b..b790b231 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -330,7 +330,7 @@ describe('Statuses module', () => {
       const deletion = makeMockStatus({ id: '4', type: 'deletion' })
       deletion.text = 'Dolus deleted notice {{tag:gs.smuglo.li,2016-11-18:noticeId=1038007:objectType=note}}.'
       deletion.uri = 'xxx'
-
+      const newNotificationSideEffects = () => {}
       mutations.addNewStatuses(state, { statuses: [status, otherStatus], user })
       mutations.addNewNotifications(
         state,
@@ -342,7 +342,8 @@ describe('Statuses module', () => {
             status: otherStatus,
             action: otherStatus,
             seen: false
-          }]
+          }],
+          newNotificationSideEffects
         })
 
       expect(state.notifications.data.length).to.eql(1)
@@ -356,7 +357,8 @@ describe('Statuses module', () => {
             status: mentionedStatus,
             action: mentionedStatus,
             seen: false
-          }]
+          }],
+          newNotificationSideEffects
         })
 
       mutations.addNewStatuses(state, { statuses: [mentionedStatus], user })
diff --git a/test/unit/specs/services/chat_service/chat_service.spec.js b/test/unit/specs/services/chat_service/chat_service.spec.js
index 4e8e566b..3ee9839d 100644
--- a/test/unit/specs/services/chat_service/chat_service.spec.js
+++ b/test/unit/specs/services/chat_service/chat_service.spec.js
@@ -17,8 +17,7 @@ const message3 = {
   created_at: (new Date('2020-07-22T18:45:59.000Z'))
 }
 
-// TODO: only
-describe.only('chatService', () => {
+describe('chatService', () => {
   describe('.add', () => {
     it("Doesn't add duplicates", () => {
       const chat = chatService.empty()