From 5ab96ae0d235b6a30648d2d493be3fd3c4301e5b Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 11 Jan 2021 19:40:35 +0200
Subject: don't filter own posts

---
 src/components/status/status.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/components')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index f9c710ab..2bf93a9e 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -157,6 +157,7 @@ const Status = {
       return muteWordHits(this.status, this.muteWords)
     },
     muted () {
+      if (this.statusoid.user.id === this.currentUser.id) return false
       const { status } = this
       const { reblog } = status
       const relationship = this.$store.getters.relationship(status.user.id)
-- 
cgit v1.2.3-70-g09d2


From b76a68e622b2db6474acdd206bbdfb2e66fefd8f Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 20 Jan 2021 14:03:26 +0300
Subject: UserCard: Make user roles translateable

I did not add a translation for my native language in this patch because
I am not sure how weblate would react, but I did add it locally and it
seems to work.
---
 src/components/user_card/user_card.vue | 3 +--
 src/i18n/en.json                       | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/components')

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 16dd5249..773f764a 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -83,7 +83,7 @@
                   v-if="!!visibleRole"
                   class="alert user-role"
                 >
-                  {{ visibleRole }}
+                  {{ $t(`user_card.roles.${visibleRole}`) }}
                 </span>
                 <span
                   v-if="user.bot"
@@ -507,7 +507,6 @@
 
     .user-role {
       flex: none;
-      text-transform: capitalize;
       color: $fallback--text;
       color: var(--alertNeutralText, $fallback--text);
       background-color: $fallback--fg;
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 26dd6144..16a368b1 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -729,6 +729,10 @@
       "quarantine": "Disallow user posts from federating",
       "delete_user": "Delete user",
       "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone."
+    },
+    "roles": {
+      "admin": "Admin",
+      "moderator": "Moderator"
     }
   },
   "user_profile": {
-- 
cgit v1.2.3-70-g09d2


From dcba920f92db596aea3a097bd7fca3753532cc6f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 20 Jan 2021 17:01:57 +0200
Subject: fix profile field buttons, remove attachment button

---
 .../post_status_form/post_status_form.vue          | 26 +++++-----------------
 .../settings_modal/tabs/profile_tab.scss           |  9 ++++----
 src/components/settings_modal/tabs/profile_tab.vue | 14 ++++++------
 3 files changed, 18 insertions(+), 31 deletions(-)

(limited to 'src/components')

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index ed830f57..73f6a4f1 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -302,11 +302,12 @@
           :key="file.url"
           class="media-upload-wrapper"
         >
-          <FAIcon
-            class="fa-scale-110 fa-old-padding"
-            icon="times"
+          <button
+            class="button-unstyled hider"
             @click="removeMediaFile(file)"
-          />
+          >
+            <FAIcon icon="times" />
+          </button>
           <attachment
             :attachment="file"
             :set-media="() => $store.dispatch('setMedia', newStatus.files)"
@@ -516,26 +517,11 @@
   }
 
    .attachments .media-upload-wrapper {
-    padding: 0 0.5em;
+    position: relative;
 
     .attachment {
       margin: 0;
       padding: 0;
-      position: relative;
-    }
-
-    .fa-scale-110 fa-old-padding {
-      position: absolute;
-      margin: 10px;
-      margin: .75em;
-      padding: .5em;
-      background: rgba(230,230,230,0.6);
-      z-index: 2;
-      color: black;
-      border-radius: $fallback--attachmentRadius;
-      border-radius: var(--attachmentRadius, $fallback--attachmentRadius);
-      font-weight: bold;
-      cursor: pointer;
     }
   }
 
diff --git a/src/components/settings_modal/tabs/profile_tab.scss b/src/components/settings_modal/tabs/profile_tab.scss
index e821f952..1a19b50d 100644
--- a/src/components/settings_modal/tabs/profile_tab.scss
+++ b/src/components/settings_modal/tabs/profile_tab.scss
@@ -111,16 +111,17 @@
   .profile-fields {
     display: flex;
 
-    &>.emoji-input {
+    & > .emoji-input {
       flex: 1 1 auto;
-      margin: 0 .2em .5em;
+      margin: 0 0.2em 0.5em;
       min-width: 0;
     }
 
-    &>.icon-container {
+    & > .button-unstyled {
       width: 20px;
       align-self: center;
-      margin: 0 .2em .5em;
+      margin: 0 0.2em 0.5em;
+      padding: 0 0.5em;
     }
   }
 }
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index b7ef21d7..abb16db2 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -124,24 +124,24 @@
               :placeholder="$t('settings.profile_fields.value')"
             >
           </EmojiInput>
-          <div
-            class="icon-container"
+          <button
+            class="button-unstyled"
+            @click="deleteField(i)"
           >
             <FAIcon
               v-show="newFields.length > 1"
               icon="times"
-              @click="deleteField(i)"
             />
-          </div>
+          </button>
         </div>
-        <a
+        <button
           v-if="newFields.length < maxFields"
-          class="add-field faint"
+          class="add-field faint button-unstyled"
           @click="addField"
         >
           <FAIcon icon="plus" />
           {{ $t("settings.profile_fields.add_field") }}
-        </a>
+        </button>
       </div>
       <p>
         <Checkbox v-model="bot">
-- 
cgit v1.2.3-70-g09d2


From 02ab803725e42a749c6c8f564e8093df70e97fc7 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 20 Jan 2021 17:36:40 +0200
Subject: change a few more buttons to real buttons

---
 CHANGELOG.md                                       |  2 ++
 src/App.scss                                       |  7 +++++
 src/components/poll/poll_form.vue                  | 30 +++++++---------------
 src/components/settings_modal/tabs/profile_tab.vue |  4 +--
 4 files changed, 20 insertions(+), 23 deletions(-)

(limited to 'src/components')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12a38a03..1107491e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
+### Fixed
+- Button to remove uploaded media in post status form is now properly placed and sized.
 
 
 ## [2.2.3] - 2021-01-18
diff --git a/src/App.scss b/src/App.scss
index 2a1d7b1b..8b91f3de 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -178,6 +178,13 @@ a {
   &.-fullwidth {
     width: 100%;
   }
+
+  &.-hover-highlight {
+    &:hover svg {
+      color: $fallback--lightText;
+      color: var(--lightText, $fallback--lightText);
+    }
+  }
 }
 
 input, textarea, .select, .input {
diff --git a/src/components/poll/poll_form.vue b/src/components/poll/poll_form.vue
index 31f204a0..09496105 100644
--- a/src/components/poll/poll_form.vue
+++ b/src/components/poll/poll_form.vue
@@ -21,20 +21,17 @@
           @keydown.enter.stop.prevent="nextOption(index)"
         >
       </div>
-      <div
+      <button
         v-if="options.length > 2"
-        class="icon-container"
+        class="delete-option button-unstyled -hover-highlight"
+        @click="deleteOption(index)"
       >
-        <FAIcon
-          icon="times"
-          class="delete"
-          @click="deleteOption(index)"
-        />
-      </div>
+        <FAIcon icon="times" />
+      </button>
     </div>
-    <a
+    <button
       v-if="options.length < maxOptions"
-      class="add-option faint"
+      class="add-option faint button-unstyled -hover-highlight"
       @click="addOption"
     >
       <FAIcon
@@ -43,7 +40,7 @@
       />
 
       {{ $t("polls.add_option") }}
-    </a>
+    </button>
     <div class="poll-type-expiry">
       <div
         class="poll-type"
@@ -116,7 +113,6 @@
     align-self: flex-start;
     padding-top: 0.25em;
     padding-left: 0.1em;
-    cursor: pointer;
   }
 
   .poll-option {
@@ -135,19 +131,11 @@
     }
   }
 
-  .icon-container {
+  .delete-option {
     // Hack: Move the icon over the input box
     width: 1.5em;
     margin-left: -1.5em;
     z-index: 1;
-
-    .delete {
-      cursor: pointer;
-
-      &:hover {
-        color: inherit;
-      }
-    }
   }
 
   .poll-type-expiry {
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index abb16db2..cfbd94fc 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -125,7 +125,7 @@
             >
           </EmojiInput>
           <button
-            class="button-unstyled"
+            class="button-unstyled -hover-highlight"
             @click="deleteField(i)"
           >
             <FAIcon
@@ -136,7 +136,7 @@
         </div>
         <button
           v-if="newFields.length < maxFields"
-          class="add-field faint button-unstyled"
+          class="add-field faint button-unstyled -hover-highlight"
           @click="addField"
         >
           <FAIcon icon="plus" />
-- 
cgit v1.2.3-70-g09d2


From 11c7355749b6e0180841dd02604a06dd924dd217 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 20 Jan 2021 23:49:34 +0300
Subject: Use native language names in the language picker

This seems more intuitive to me and is what I've seen in most other
language pickers.
---
 CHANGELOG.md                                       |  1 +
 .../interface_language_switcher.vue                | 28 ++++++++++------------
 src/services/locale/locale.service.js              | 12 ++++++++++
 3 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 src/services/locale/locale.service.js

(limited to 'src/components')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40c1d982..2d751bf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 - Don't filter own posts when they hit your wordfilter
+- Language picker now uses native language names
 
 ## [2.2.2] - 2020-12-22
 ### Added
diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue
index 524ec5e9..dc3bd408 100644
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@@ -12,11 +12,11 @@
         v-model="language"
       >
         <option
-          v-for="(langCode, i) in languageCodes"
-          :key="langCode"
-          :value="langCode"
+          v-for="lang in languages"
+          :key="lang.code"
+          :value="lang.code"
         >
-          {{ languageNames[i] }}
+          {{ lang.name }}
         </option>
       </select>
       <FAIcon
@@ -29,6 +29,7 @@
 
 <script>
 import languagesObject from '../../i18n/messages'
+import localeService from '../../services/locale/locale.service.js'
 import ISO6391 from 'iso-639-1'
 import _ from 'lodash'
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -42,12 +43,8 @@ library.add(
 
 export default {
   computed: {
-    languageCodes () {
-      return languagesObject.languages
-    },
-
-    languageNames () {
-      return _.map(this.languageCodes, this.getLanguageName)
+    languages () {
+      return _.map(languagesObject.languages, (code) => ({ code: code, name: this.getLanguageName(code) })).sort((a, b) => a.name.localeCompare(b.name))
     },
 
     language: {
@@ -61,12 +58,13 @@ export default {
   methods: {
     getLanguageName (code) {
       const specialLanguageNames = {
-        'ja': 'Japanese (日本語)',
-        'ja_easy': 'Japanese (やさしいにほんご)',
-        'zh': 'Simplified Chinese (简体中文)',
-        'zh_Hant': 'Traditional Chinese (繁體中文)'
+        'ja_easy': 'やさしいにほんご',
+        'zh': '简体中文',
+        'zh_Hant': '繁體中文'
       }
-      return specialLanguageNames[code] || ISO6391.getName(code)
+      const languageName = specialLanguageNames[code] || ISO6391.getNativeName(code)
+      const browserLocale = localeService.internalToBrowserLocale(code)
+      return languageName.charAt(0).toLocaleUpperCase(browserLocale) + languageName.slice(1)
     }
   }
 }
diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js
new file mode 100644
index 00000000..5be99d81
--- /dev/null
+++ b/src/services/locale/locale.service.js
@@ -0,0 +1,12 @@
+const specialLanguageCodes = {
+  'ja_easy': 'ja',
+  'zh_Hant': 'zh-HANT'
+}
+
+const internalToBrowserLocale = code => specialLanguageCodes[code] || code
+
+const localeService = {
+  internalToBrowserLocale
+}
+
+export default localeService
-- 
cgit v1.2.3-70-g09d2


From 27a537d307964101a574a2616d4c90d3cd26431f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 22 Jan 2021 12:06:39 +0200
Subject: give delete field its own class

---
 src/components/settings_modal/tabs/profile_tab.scss | 2 +-
 src/components/settings_modal/tabs/profile_tab.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/components')

diff --git a/src/components/settings_modal/tabs/profile_tab.scss b/src/components/settings_modal/tabs/profile_tab.scss
index 1a19b50d..111eaed3 100644
--- a/src/components/settings_modal/tabs/profile_tab.scss
+++ b/src/components/settings_modal/tabs/profile_tab.scss
@@ -117,7 +117,7 @@
       min-width: 0;
     }
 
-    & > .button-unstyled {
+    .delete-field {
       width: 20px;
       align-self: center;
       margin: 0 0.2em 0.5em;
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index cfbd94fc..175a0219 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -125,7 +125,7 @@
             >
           </EmojiInput>
           <button
-            class="button-unstyled -hover-highlight"
+            class="delete-field button-unstyled -hover-highlight"
             @click="deleteField(i)"
           >
             <FAIcon
-- 
cgit v1.2.3-70-g09d2


From 9cf487497e8df5e9cb5872452a67a655d15d49e3 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 25 Jan 2021 18:49:03 +0200
Subject: fix wrong route in side drawer shoutbox link

---
 CHANGELOG.md                               | 1 +
 src/components/side_drawer/side_drawer.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/components')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91908abe..588348a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 ### Fixed
 - Button to remove uploaded media in post status form is now properly placed and sized.
+- Fixed shoutbox not working in mobile layout
 
 
 ## [2.2.3] - 2021-01-18
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 695ae03b..223b1632 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -109,7 +109,7 @@
           v-if="chat"
           @click="toggleDrawer"
         >
-          <router-link :to="{ name: 'chat' }">
+          <router-link :to="{ name: 'chat-panel' }">
             <FAIcon
               fixed-width
               class="fa-scale-110 fa-old-padding"
-- 
cgit v1.2.3-70-g09d2