From c44c0483566efc8c48361e4143b25d852cecede4 Mon Sep 17 00:00:00 2001
From: shpuld <shp@cock.li>
Date: Wed, 1 May 2019 17:33:56 +0300
Subject: [PATCH 01/29] add title and alt for avatars, fix console errors in
 avatarlist

---
 src/components/avatar_list/avatar_list.js       |  6 +++---
 src/components/avatar_list/avatar_list.vue      |  4 ++--
 .../basic_user_card/basic_user_card.vue         |  6 +++++-
 src/components/notification/notification.vue    |  2 +-
 src/components/status/status.js                 |  6 +++---
 src/components/status/status.vue                | 17 +++++++++++------
 src/components/user_avatar/user_avatar.js       |  2 +-
 src/components/user_avatar/user_avatar.vue      |  4 +++-
 src/components/user_card/user_card.vue          |  2 +-
 .../entity_normalizer.service.js                |  3 +++
 10 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/src/components/avatar_list/avatar_list.js b/src/components/avatar_list/avatar_list.js
index d65125c2c..b9e11aaa5 100644
--- a/src/components/avatar_list/avatar_list.js
+++ b/src/components/avatar_list/avatar_list.js
@@ -1,10 +1,10 @@
 import UserAvatar from '../user_avatar/user_avatar.vue'
 
 const AvatarList = {
-  props: ['avatars'],
+  props: ['users'],
   computed: {
-    slicedAvatars () {
-      return this.avatars ? this.avatars.slice(0, 15) : []
+    slicedUsers () {
+      return this.users ? this.users.slice(0, 15) : []
     }
   },
   components: {
diff --git a/src/components/avatar_list/avatar_list.vue b/src/components/avatar_list/avatar_list.vue
index b14474bab..4e0de2c97 100644
--- a/src/components/avatar_list/avatar_list.vue
+++ b/src/components/avatar_list/avatar_list.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="avatars">
-      <div class="avatars-item" v-for="avatar in slicedAvatars">
-        <UserAvatar :src="avatar.profile_image_url" class="avatar-small" />
+      <div class="avatars-item" v-for="user in slicedUsers">
+        <UserAvatar :user="user" class="avatar-small" />
       </div>
   </div>
 </template>
diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 25f1fb2a0..634d62b30 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -1,7 +1,11 @@
 <template>
   <div class="basic-user-card">
     <router-link :to="userProfileLink(user)">
-      <UserAvatar class="avatar" @click.prevent.native="toggleUserExpanded" :src="user.profile_image_url"/>
+      <UserAvatar
+        class="avatar"
+        :user="user"
+        @click.prevent.native="toggleUserExpanded"
+      />
     </router-link>
     <div class="basic-user-card-expanded-content" v-if="userExpanded">
       <UserCard :user="user" :rounded="true" :bordered="true"/>
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index ae11d6924..3427b9c5f 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -7,7 +7,7 @@
   </status>
   <div class="non-mention" :class="[userClass, { highlighted: userStyle }]" :style="[ userStyle ]" v-else>
     <a class='avatar-container' :href="notification.from_profile.statusnet_profile_url" @click.stop.prevent.capture="toggleUserExpanded">
-      <UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.from_profile.profile_image_url_original" />
+      <UserAvatar :compact="true" :betterShadow="betterShadow" :user="notification.from_profile"/>
     </a>
     <div class='notification-right'>
       <UserCard :user="getUser(notification)" :rounded="true" :bordered="true" v-if="userExpanded" />
diff --git a/src/components/status/status.js b/src/components/status/status.js
index f10eb2e44..ff8cbe18b 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -263,13 +263,13 @@ const Status = {
       }
       return this.status.summary_html + '<br />' + this.status.statusnet_html
     },
-    combinedFavsAndRepeatsAvatars () {
+    combinedFavsAndRepeatsUsers () {
       // Use the status from the global status repository since favs and repeats are saved in it
-      const combinedAvatars = [].concat(
+      const combinedUsers = [].concat(
         this.statusFromGlobalRepository.favoritedBy,
         this.statusFromGlobalRepository.rebloggedBy
       )
-      return uniqBy(combinedAvatars, 'id')
+      return uniqBy(combinedUsers, 'id')
     }
   },
   components: {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index a5f7429c7..43c3030e1 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -13,7 +13,7 @@
     </template>
     <template v-else>
       <div v-if="retweet && !noHeading && !inConversation" :class="[repeaterClass, { highlighted: repeaterStyle }]" :style="[repeaterStyle]" class="media container retweet-info">
-        <UserAvatar class="media-left" v-if="retweet" :betterShadow="betterShadow" :src="statusoid.user.profile_image_url_original"/>
+        <UserAvatar class="media-left" v-if="retweet" :betterShadow="betterShadow" :user="statusoid.user"/>
         <div class="media-body faint">
           <span class="user-name">
             <router-link v-if="retweeterHtml" :to="retweeterProfileLink" v-html="retweeterHtml"/>
@@ -27,7 +27,7 @@
       <div :class="[userClass, { highlighted: userStyle, 'is-retweet': retweet && !inConversation }]" :style="[ userStyle ]" class="media status">
         <div v-if="!noHeading" class="media-left">
           <router-link :to="userProfileLink" @click.stop.prevent.capture.native="toggleUserExpanded">
-            <UserAvatar :compact="compact" :betterShadow="betterShadow" :src="status.user.profile_image_url_original"/>
+            <UserAvatar :compact="compact" :betterShadow="betterShadow" :user="status.user"/>
           </router-link>
         </div>
         <div class="status-body">
@@ -91,8 +91,13 @@
           </div>
 
           <div v-if="showPreview" class="status-preview-container">
-            <status class="status-preview" v-if="preview" :isPreview="true" :statusoid="preview" :compact=true></status>
-            <div class="status-preview status-preview-loading" v-else>
+            <status class="status-preview"
+              v-if="preview"
+              :isPreview="true"
+              :statusoid="preview"
+              :compact=true
+            />
+            <div v-else class="status-preview status-preview-loading">
               <i class="icon-spin4 animate-spin"></i>
             </div>
           </div>
@@ -134,7 +139,7 @@
           </div>
 
           <transition name="fade">
-            <div class="favs-repeated-users" v-if="combinedFavsAndRepeatsAvatars.length > 0 && isFocused">
+            <div class="favs-repeated-users" v-if="combinedFavsAndRepeatsUsers.length > 0 && isFocused">
               <div class="stats">
                 <div class="stat-count" v-if="statusFromGlobalRepository.rebloggedBy && statusFromGlobalRepository.rebloggedBy.length > 0">
                   <a class="stat-title">{{ $t('status.repeats') }}</a>
@@ -145,7 +150,7 @@
                   <div class="stat-number">{{ statusFromGlobalRepository.favoritedBy.length }}</div>
                 </div>
                 <div class="avatar-row">
-                  <AvatarList :avatars='combinedFavsAndRepeatsAvatars'></AvatarList>
+                  <AvatarList :users="combinedFavsAndRepeatsUsers"></AvatarList>
                 </div>
               </div>
             </div>
diff --git a/src/components/user_avatar/user_avatar.js b/src/components/user_avatar/user_avatar.js
index e6fed3b59..a42b9c711 100644
--- a/src/components/user_avatar/user_avatar.js
+++ b/src/components/user_avatar/user_avatar.js
@@ -2,7 +2,7 @@ import StillImage from '../still-image/still-image.vue'
 
 const UserAvatar = {
   props: [
-    'src',
+    'user',
     'betterShadow',
     'compact'
   ],
diff --git a/src/components/user_avatar/user_avatar.vue b/src/components/user_avatar/user_avatar.vue
index 6bf7123d0..e5466fdf2 100644
--- a/src/components/user_avatar/user_avatar.vue
+++ b/src/components/user_avatar/user_avatar.vue
@@ -1,8 +1,10 @@
 <template>
   <StillImage
     class="avatar"
+    :alt="user.screen_name"
+    :title="user.screen_name"
+    :src="user.profile_image_url_original"
     :class="{ 'avatar-compact': compact, 'better-shadow': betterShadow }"
-    :src="imgSrc"
     :imageLoadError="imageLoadError"
   />
 </template>
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index e1d3ff57d..e62b384d2 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -4,7 +4,7 @@
     <div class='user-info'>
       <div class='container'>
         <router-link :to="userProfileLink(user)">
-          <UserAvatar :betterShadow="betterShadow" :src="user.profile_image_url_original"/>
+          <UserAvatar :betterShadow="betterShadow" :user="user"/>
         </router-link>
         <div class="name-and-screen-name">
           <div class="top-line">
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index e706e7d9e..309aa1e8b 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -275,6 +275,9 @@ export const parseStatus = (data) => {
     output.retweeted_status = parseStatus(retweetedStatus)
   }
 
+  output.favoritedBy = []
+  output.rebloggedBy = []
+
   return output
 }
 

From b98bab52a9912a3cb09e87cd6bf8d2d0fc0daf01 Mon Sep 17 00:00:00 2001
From: Exilat <quentinantonin@free.fr>
Date: Wed, 1 May 2019 16:40:40 +0000
Subject: [PATCH 02/29] Update oc.json

---
 src/i18n/oc.json | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/i18n/oc.json b/src/i18n/oc.json
index a58262395..5f8d153fd 100644
--- a/src/i18n/oc.json
+++ b/src/i18n/oc.json
@@ -2,6 +2,10 @@
   "chat": {
     "title": "Messatjariá"
   },
+  "exporter": {
+     "export": "Exportar",
+     "processing": "Tractament, vos demandarem lèu de telecargar lo fichièr"
+  },  
     "features_panel": {
       "chat": "Chat",
       "gopher": "Gopher",
@@ -30,6 +34,11 @@
      "save": "Salvar",
      "save_without_cropping": "Salvar sens talhada",
      "cancel": "Anullar"
+  },
+    "importer": {
+    "submit": "Mandar",
+    "success": "Corrèctament importat.",
+    "error": "Una error s’es producha pendent l’importacion d’aqueste fichièr."
   },
   "login": {
     "login": "Connexion",
@@ -126,6 +135,11 @@
     "avatarRadius": "Avatars",
     "background": "Rèire plan",
     "bio": "Biografia",
+    "block_export": "Exportar los blocatges",
+    "block_export_button": "Exportar los blocatges dins un fichièr csv",
+    "block_import": "Impòrt de blocatges",
+    "block_import_error": "Error en importar los blocatges",
+    "blocks_imported": "Blocatges importats ! Lo tractament tardarà un pauc.",
     "blocks_tab": "Blocatges",
     "btnRadius": "Botons",
     "cBlue": "Blau (Respondre, seguir)",
@@ -153,7 +167,6 @@
     "filtering_explanation": "Totes los estatuts amb aqueles mots seràn en silenci, un mot per linha",
     "follow_export": "Exportar los abonaments",
     "follow_export_button": "Exportar vòstres abonaments dins un fichièr csv",
-    "follow_export_processing": "Tractament, vos demandarem lèu de telecargar lo fichièr",
     "follow_import": "Importar los abonaments",
     "follow_import_error": "Error en important los seguidors",
     "follows_imported": "Seguidors importats. Lo tractament pòt trigar una estona.",
@@ -188,6 +201,7 @@
     "use_contain_fit": "Talhar pas las pèças juntas per las vinhetas",
     "name": "Nom",
     "name_bio": "Nom & Bio",
+
     "new_password": "Nòu senhal",
     "notification_visibility_follows": "Abonaments",
     "notification_visibility_likes": "Aimar",
@@ -380,6 +394,8 @@
     "no_statuses": "Cap d’estatuts"
   },
   "status": {
+    "favorites": "Li a agradat",
+    "repeats": "A repetit",
     "reply_to": "Respond a",
     "replies_list": "Responsas :"
   },
@@ -461,4 +477,4 @@
       "TiB": "Tio"
     }
   }
-}
+}
\ No newline at end of file

From f8ae631d8cf2f8f6383b4fe3a0a6bd4803350344 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Thu, 2 May 2019 08:21:02 -0400
Subject: [PATCH 03/29] fix notifications div scrolling issue on mobile

---
 src/components/mobile_nav/mobile_nav.vue | 40 +++++++++++++-----------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index 5fa416380..30b1715fc 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -1,25 +1,26 @@
 <template>
-  <nav class='nav-bar container' id="nav">
-    <div class='mobile-inner-nav' @click="scrollToTop()">
-      <div class='item'>
-        <a href="#" class="mobile-nav-button" @click.stop.prevent="toggleMobileSidebar()">
-          <i class="button-icon icon-menu"></i>
-        </a>
-        <router-link class="site-name" :to="{ name: 'root' }" active-class="home">{{sitename}}</router-link>
+  <div>
+    <nav class='nav-bar container' id="nav">
+      <div class='mobile-inner-nav' @click="scrollToTop()">
+        <div class='item'>
+          <a href="#" class="mobile-nav-button" @click.stop.prevent="toggleMobileSidebar()">
+            <i class="button-icon icon-menu"></i>
+          </a>
+          <router-link class="site-name" :to="{ name: 'root' }" active-class="home">{{sitename}}</router-link>
+        </div>
+        <div class='item right'>
+          <a class="mobile-nav-button" v-if="currentUser" href="#" @click.stop.prevent="openMobileNotifications()">
+            <i class="button-icon icon-bell-alt"></i>
+            <div class="alert-dot" v-if="unseenNotificationsCount"></div>
+          </a>
+        </div>
       </div>
-      <div class='item right'>
-        <a class="mobile-nav-button" v-if="currentUser" href="#" @click.stop.prevent="openMobileNotifications()">
-          <i class="button-icon icon-bell-alt"></i>
-          <div class="alert-dot" v-if="unseenNotificationsCount"></div>
-        </a>
-      </div>
-    </div>
-    <SideDrawer ref="sideDrawer" :logout="logout"/>
+    </nav>
     <div v-if="currentUser"
       class="mobile-notifications-drawer"
       :class="{ 'closed': !notificationsOpen }"
-      @touchstart="notificationsTouchStart"
-      @touchmove="notificationsTouchMove"
+      @touchstart.stop="notificationsTouchStart"
+      @touchmove.stop="notificationsTouchMove"
     >
       <div class="mobile-notifications-header">
         <span class="title">{{$t('notifications.notifications')}}</span>
@@ -31,8 +32,9 @@
         <Notifications ref="notifications" noHeading="true"/>
       </div>
     </div>
+    <SideDrawer ref="sideDrawer" :logout="logout"/>
     <MobilePostStatusModal />
-  </nav>
+  </div>
 </template>
 
 <script src="./mobile_nav.js"></script>
@@ -79,6 +81,8 @@
   transition-property: transform;
   transition-duration: 0.25s;
   transform: translateX(0);
+  z-index: 1001;
+  -webkit-overflow-scrolling: touch;
 
   &.closed {
     transform: translateX(100%);

From 09253420a20001c3eb95c1c100879ccaf1f72cd4 Mon Sep 17 00:00:00 2001
From: tarteka <info@tarteka.net>
Date: Fri, 3 May 2019 00:22:14 +0000
Subject: [PATCH 04/29] Update es.json

---
 src/i18n/es.json | 106 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 97 insertions(+), 9 deletions(-)

diff --git a/src/i18n/es.json b/src/i18n/es.json
index a692eef9c..6c8fd26ac 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -2,6 +2,10 @@
   "chat": {
     "title": "Chat"
   },
+  "exporter": {
+    "export": "Exportar",
+    "processing": "Procesando. Pronto se te pedirá que descargues tu archivo"
+  },
   "features_panel": {
     "chat": "Chat",
     "gopher": "Gopher",
@@ -19,7 +23,22 @@
     "apply": "Aplicar",
     "submit": "Enviar",
     "more": "Más",
-    "generic_error": "Ha ocurrido un error"
+    "generic_error": "Ha ocurrido un error",
+    "optional": "opcional",
+    "show_more": "Mostrar más",
+    "show_less": "Mostrar menos",
+    "cancel": "Cancelar"
+  },
+  "image_cropper": {
+    "crop_picture": "Recortar la foto",
+    "save": "Guardar",
+    "save_without_cropping": "Guardar sin recortar",
+    "cancel": "Cancelar"
+  },
+  "importer": {
+    "submit": "Enviar",
+    "success": "Importado con éxito",
+    "error": "Se ha producido un error al importar el archivo."
   },
   "login": {
     "login": "Identificación",
@@ -30,6 +49,10 @@
     "register": "Registrar",
     "username": "Usuario",
     "hint": "Inicia sesión para unirte a la discusión"
+  },
+   "media_modal": {
+    "previous": "Anterior",
+    "next": "Siguiente"
   },
   "nav": {
     "about": "Sobre",
@@ -61,15 +84,19 @@
     "account_not_locked_warning_link": "bloqueada",
     "attachments_sensitive": "Contenido sensible",
     "content_type": {
-      "text/plain": "Texto Plano"
+      "text/plain": "Texto Plano",
+      "text/html": "HTML",
+      "text/markdown": "Markdown",
+      "text/bbcode": "BBCode"
     },
     "content_warning": "Tema (opcional)",
     "default": "Acabo de aterrizar en L.A.",
-    "direct_warning": "Esta entrada solo será visible para los usuarios mencionados.",
+    "direct_warning": "Esta publicación solo será visible para los usuarios mencionados.",
+    "direct_warning_to_first_only": "Esta publicación solo será visible para los usuarios mencionados al comienzo del mensaje.",
     "posting": "Publicando",
     "scope": {
       "direct": "Directo - Solo para los usuarios mencionados.",
-      "private": "Solo-Seguidores - Solo tus seguidores leeran la entrada",
+      "private": "Solo-Seguidores - Solo tus seguidores leeran la publicación",
       "public": "Público - Entradas visibles en las Líneas Temporales Públicas",
       "unlisted": "Sin Listar - Entradas no visibles en las Líneas Temporales Públicas"
     }
@@ -83,6 +110,9 @@
     "token": "Token de invitación",
     "captcha": "CAPTCHA",
     "new_captcha": "Click en la imagen para obtener un nuevo captca",
+    "username_placeholder": "p.ej. lain",
+    "fullname_placeholder": "p.ej. Lain Iwakura",
+    "bio_placeholder": "e.g.\nHola, soy un ejemplo.\nAquí puedes poner algo representativo tuyo... o no.",
     "validations": {
       "username_required": "no puede estar vacío",
       "fullname_required": "no puede estar vacío",
@@ -91,8 +121,12 @@
       "password_confirmation_required": "no puede estar vacío",
       "password_confirmation_match": "la contraseña no coincide"
     }
+  },
+   "selectable_list": {
+    "select_all": "Seleccionarlo todo"
   },
   "settings": {
+    "app_name": "Nombre de la aplicación",
     "attachmentRadius": "Adjuntos",
     "attachments": "Adjuntos",
     "autoload": "Activar carga automática al llegar al final de la página",
@@ -101,6 +135,12 @@
     "avatarRadius": "Avatares",
     "background": "Fondo",
     "bio": "Biografía",
+    "block_export": "Exportar usuarios bloqueados",
+    "block_export_button": "Exporta la lista de tus usarios bloqueados a un archivo csv",
+    "block_import": "Importar usuarios bloqueados",
+    "block_import_error": "Error importando la lista de usuarios bloqueados",
+    "blocks_imported": "¡Lista de usuarios bloqueados importada! El procesado puede tardar un poco.",
+    "blocks_tab": "Bloqueados",
     "btnRadius": "Botones",
     "cBlue": "Azul (Responder, seguir)",
     "cGreen": "Verde (Retweet)",
@@ -127,7 +167,6 @@
     "filtering_explanation": "Todos los estados que contengan estas palabras serán silenciados, una por línea",
     "follow_export": "Exportar personas que tú sigues",
     "follow_export_button": "Exporta tus seguidores a un archivo csv",
-    "follow_export_processing": "Procesando, en breve se te preguntará para guardar el archivo",
     "follow_import": "Importar personas que tú sigues",
     "follow_import_error": "Error al importal el archivo",
     "follows_imported": "¡Importado! Procesarlos llevará tiempo.",
@@ -135,12 +174,15 @@
     "general": "General",
     "hide_attachments_in_convo": "Ocultar adjuntos en las conversaciones",
     "hide_attachments_in_tl": "Ocultar adjuntos en la línea temporal",
+    "hide_muted_posts": "Ocultar las publicaciones de los usuarios silenciados",
+    "max_thumbnails": "Cantidad máxima de miniaturas por publicación",
     "hide_isp": "Ocultar el panel específico de la instancia",
     "preload_images": "Precargar las imágenes",
     "use_one_click_nsfw": "Abrir los adjuntos NSFW con un solo click.",
     "hide_post_stats": "Ocultar las estadísticas de las entradas (p.ej. el número de favoritos)",
     "hide_user_stats": "Ocultar las estadísticas del usuario (p.ej. el número de seguidores)",
     "hide_filtered_statuses": "Ocultar estados filtrados",
+    "import_blocks_from_a_csv_file": "Importar lista de usuarios bloqueados dese un archivo csv",
     "import_followers_from_a_csv_file": "Importar personas que tú sigues a partir de un archivo csv",
     "import_theme": "Importar tema",
     "inputRadius": "Campos de entrada",
@@ -155,6 +197,7 @@
     "lock_account_description": "Restringir el acceso a tu cuenta solo a seguidores admitidos",
     "loop_video": "Vídeos en bucle",
     "loop_video_silent_only": "Bucle solo en vídeos sin sonido (p.ej. \"gifs\" de Mastodon)",
+    "mutes_tab": "Silenciados",
     "play_videos_in_modal": "Reproducir los vídeos directamente en el visor de medios",
     "use_contain_fit": "No recortar los adjuntos en miniaturas",
     "name": "Nombre",
@@ -166,6 +209,8 @@
     "notification_visibility_mentions": "Menciones",
     "notification_visibility_repeats": "Repeticiones (Repeats)",
     "no_rich_text_description": "Eliminar el formato de texto enriquecido de todas las entradas",
+    "no_blocks": "No hay usuarios bloqueados",
+    "no_mutes": "No hay usuarios sinlenciados",
     "hide_follows_description": "No mostrar a quién sigo",
     "hide_followers_description": "No mostrar quién me sigue",
     "show_admin_badge": "Mostrar la placa de administrador en mi perfil",
@@ -190,8 +235,11 @@
     "reply_visibility_self": "Solo mostrar réplicas para mí",
     "saving_err": "Error al guardar los ajustes",
     "saving_ok": "Ajustes guardados",
+    "search_user_to_block": "Buscar usuarios a bloquear",
+    "search_user_to_mute": "Buscar usuarios a silenciar",
     "security_tab": "Seguridad",
-    "scope_copy": "Copiar la visibilidad cuando contestamos (En los mensajes directos (MDs) siempre se copia)",
+    "scope_copy": "Copiar la visibilidad de la publicación cuando contestamos (En los mensajes directos (MDs) siempre se copia)",
+    "minimal_scopes_mode": "Minimizar las opciones de publicación",
     "set_new_avatar": "Cambiar avatar",
     "set_new_profile_background": "Cambiar fondo del perfil",
     "set_new_profile_banner": "Cambiar cabecera del perfil",
@@ -210,6 +258,7 @@
     "theme_help_v2_1": "También puede invalidar los colores y la opacidad de ciertos componentes si activa la casilla de verificación, use el botón \"Borrar todo\" para deshacer los cambios.",
     "theme_help_v2_2": "Los iconos debajo de algunas entradas son indicadores de contraste de fondo/texto, desplace el ratón para obtener información detallada. Tenga en cuenta que cuando se utilizan indicadores de contraste de transparencia se muestra el peor caso posible.",
     "tooltipRadius": "Información/alertas",
+     "upload_a_photo": "Subir una foto",
     "user_settings": "Ajustes de Usuario",
     "values": {
       "false": "no",
@@ -325,6 +374,11 @@
         "checkbox": "He revisado los términos y condiciones",
         "link": "un bonito enlace"
       }
+    },
+    "version": {
+      "title": "Versión",
+      "backend_version": "Versión del Backend",
+      "frontend_version": "Versión del Frontend"
     }
   },
   "timeline": {
@@ -336,7 +390,14 @@
     "repeated": "repetida",
     "show_new": "Mostrar lo nuevo",
     "up_to_date": "Actualizado",
-    "no_more_statuses": "No hay más estados"
+    "no_more_statuses": "No hay más estados",
+    "no_statuses": "Sin estados"
+  },
+  "status": {
+    "favorites": "Favoritos",
+    "repeats": "Repetidos",
+    "reply_to": "Responder a",
+    "replies_list": "Respuestas:"
   },
   "user_card": {
     "approve": "Aprovar",
@@ -359,10 +420,37 @@
     "muted": "Silenciado",
     "per_day": "por día",
     "remote_follow": "Seguir",
-    "statuses": "Estados"
+    "statuses": "Estados",
+    "unblock": "Desbloquear",
+    "unblock_progress": "Desbloqueando...",
+    "block_progress": "Bloqueando...",
+    "unmute": "Desenmudecer",
+    "unmute_progress": "Sesenmudeciendo...",
+    "mute_progress": "Silenciando...",
+    "admin_menu": {
+      "moderation": "Moderación",
+      "grant_admin": "Conceder permisos de Administrador",
+      "revoke_admin": "Revocar permisos de Administrador",
+      "grant_moderator": "Conceder permisos de Moderador",
+      "revoke_moderator": "Revocar permisos de Moderador",
+      "activate_account": "Activar cuenta",
+      "deactivate_account": "Desactivar cuenta",
+      "delete_account": "Borrar cuenta",
+      "force_nsfw": "Marcar todas las publicaciones como NSFW (no es seguro/apropiado para el trabajo)",
+      "strip_media": "Eliminar archivos multimedia de las publicaciones",
+      "force_unlisted": "Forzar que se publique en el modo -Sin Listar-",
+      "sandbox": "Forzar que se publique solo para tus seguidores",
+      "disable_remote_subscription": "No permitir que usuarios de instancias remotas te siga.",
+      "disable_any_subscription": "No permitir que ningún usuario te siga",
+      "quarantine": "No permitir publicaciones de usuarios de instancias remotas",
+      "delete_user": "Borrar usuario",
+      "delete_user_confirmation": "¿Estás completamente seguro? Esta acción no se puede deshacer."
+    }
   },
   "user_profile": {
-    "timeline_title": "Linea temporal del usuario"
+    "timeline_title": "Linea temporal del usuario",
+    "profile_does_not_exist": "Lo sentimos, este perfil no existe.",
+    "profile_loading_error": "Lo sentimos, hubo un error al cargar este perfil."
   },
   "who_to_follow": {
     "more": "Más",

From 6ae3c1cfcf896839f799888e53fc751db952b0f1 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Fri, 3 May 2019 07:52:22 -0400
Subject: [PATCH 05/29] autoload older notifications when scrolled to the
 bottom

---
 src/components/mobile_nav/mobile_nav.js       | 5 +++++
 src/components/mobile_nav/mobile_nav.vue      | 2 +-
 src/components/notifications/notifications.js | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index bc63d2ba7..9b341a3be 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -63,6 +63,11 @@ const MobileNav = {
     },
     markNotificationsAsSeen () {
       this.$refs.notifications.markAsSeen()
+    },
+    onScroll ({ target: { scrollTop, clientHeight, scrollHeight } }) {
+      if (this.$store.state.config.autoLoad && scrollTop + clientHeight >= scrollHeight) {
+        this.$refs.notifications.fetchOlderNotifications()
+      }
     }
   },
   watch: {
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index 30b1715fc..90707ce79 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -28,7 +28,7 @@
           <i class="button-icon icon-cancel"/>
         </a>
       </div>
-      <div v-if="currentUser" class="mobile-notifications">
+      <div class="mobile-notifications" @scroll="onScroll">
         <Notifications ref="notifications" noHeading="true"/>
       </div>
     </div>
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index e341212e6..5b13b98ea 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -52,6 +52,10 @@ const Notifications = {
       this.$store.dispatch('markNotificationsAsSeen')
     },
     fetchOlderNotifications () {
+      if (this.loading) {
+        return
+      }
+
       const store = this.$store
       const credentials = store.state.users.currentUser.credentials
       store.commit('setNotificationsLoading', { value: true })

From 2cda9010df6192b008515b2138a2e071473bc40b Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Tue, 19 Mar 2019 04:53:11 -0400
Subject: [PATCH 06/29] add user reporting modal

---
 src/App.js                                    |   4 +-
 src/App.vue                                   |   1 +
 src/components/checkbox/checkbox.js           |  44 +++++++
 src/components/checkbox/checkbox.scss         |  48 ++++++++
 src/components/user_card/user_card.js         |   3 +
 src/components/user_card/user_card.vue        |  10 +-
 .../user_reporting_modal.js                   |  81 +++++++++++++
 .../user_reporting_modal.vue                  | 111 ++++++++++++++++++
 src/i18n/en.json                              |   1 +
 src/main.js                                   |   4 +-
 src/modules/reports.js                        |  33 ++++++
 11 files changed, 336 insertions(+), 4 deletions(-)
 create mode 100644 src/components/checkbox/checkbox.js
 create mode 100644 src/components/checkbox/checkbox.scss
 create mode 100644 src/components/user_reporting_modal/user_reporting_modal.js
 create mode 100644 src/components/user_reporting_modal/user_reporting_modal.vue
 create mode 100644 src/modules/reports.js

diff --git a/src/App.js b/src/App.js
index 46145b16a..e72c73e35 100644
--- a/src/App.js
+++ b/src/App.js
@@ -10,6 +10,7 @@ import MediaModal from './components/media_modal/media_modal.vue'
 import SideDrawer from './components/side_drawer/side_drawer.vue'
 import MobilePostStatusModal from './components/mobile_post_status_modal/mobile_post_status_modal.vue'
 import MobileNav from './components/mobile_nav/mobile_nav.vue'
+import UserReportingModal from './components/user_reporting_modal/user_reporting_modal.vue'
 import { windowWidth } from './services/window_utils/window_utils'
 
 export default {
@@ -26,7 +27,8 @@ export default {
     MediaModal,
     SideDrawer,
     MobilePostStatusModal,
-    MobileNav
+    MobileNav,
+    UserReportingModal
   },
   data: () => ({
     mobileActivePanel: 'timeline',
diff --git a/src/App.vue b/src/App.vue
index 3b8623ad7..cb7e8d785 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -46,6 +46,7 @@
       <media-modal></media-modal>
     </div>
     <chat-panel :floating="true" v-if="currentUser && chat" class="floating-chat mobile-hidden"></chat-panel>
+    <UserReportingModal />
   </div>
 </template>
 
diff --git a/src/components/checkbox/checkbox.js b/src/components/checkbox/checkbox.js
new file mode 100644
index 000000000..324a7597d
--- /dev/null
+++ b/src/components/checkbox/checkbox.js
@@ -0,0 +1,44 @@
+// TODO: Template-based functional component is supported in vue-loader 13.3.0+.
+// Also, somehow, props are not provided through 'context' even though they are defined.
+// Need to upgrade vue-loader
+
+import './checkbox.scss'
+
+export default {
+  functional: true,
+  name: 'Checkbox',
+  model: {
+    prop: 'checked',
+    event: 'change'
+  },
+  render (createElement, { data, children }) {
+    const { props = {}, attrs = {}, on = {}, ...rest } = data
+    const { name, checked, disabled, readonly, ...restAttrs } = attrs
+    const { change, ...restListeners } = on
+    const wrapperProps = {
+      attrs: restAttrs,
+      on: restListeners,
+      ...rest
+    }
+    const inputProps = {
+      attrs: {
+        name,
+        checked,
+        disabled,
+        readonly,
+        ...props
+      },
+      on: {}
+    }
+    if (change) {
+      inputProps.on.change = e => change(e.target.checked)
+    }
+    return (
+      <label class="checkbox" {...wrapperProps}>
+        <input type="checkbox" {...inputProps} />
+        <i />
+        {children && <span>{children}</span>}
+      </label>
+    )
+  }
+}
diff --git a/src/components/checkbox/checkbox.scss b/src/components/checkbox/checkbox.scss
new file mode 100644
index 000000000..07b3f39e1
--- /dev/null
+++ b/src/components/checkbox/checkbox.scss
@@ -0,0 +1,48 @@
+@import '../../_variables.scss';
+
+.checkbox {
+  position: relative;
+  display: inline-block;
+  padding-left: 1.2em;
+
+  input[type=checkbox] {
+    display: none;
+
+    & + i::before {
+      position: absolute;
+      left: 0;
+      top: 0;
+      display: block;
+      content: '✔';
+      transition: color 200ms;
+      width: 1.1em;
+      height: 1.1em;
+      border-radius: $fallback--checkboxRadius;
+      border-radius: var(--checkboxRadius, $fallback--checkboxRadius);
+      box-shadow: 0px 0px 2px black inset;
+      box-shadow: var(--inputShadow);
+      background-color: $fallback--fg;
+      background-color: var(--input, $fallback--fg);
+      vertical-align: top;
+      text-align: center;
+      line-height: 1.1em;
+      font-size: 1.1em;
+      color: transparent;
+      overflow: hidden;
+      box-sizing: border-box;
+    }
+
+    &:checked + i::before {
+      color: $fallback--text;
+      color: var(--text, $fallback--text);
+    }
+
+    &:disabled + i::before {
+      opacity: .5;
+    }
+  }
+
+  & > span {
+    margin-left: .5em;
+  }
+}
\ No newline at end of file
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index 1a100de39..7c6ffa898 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -151,6 +151,9 @@ export default {
     },
     userProfileLink (user) {
       return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames)
+    },
+    reportUser () {
+      this.$store.dispatch('openUserReportingModal', this.user.id)
     }
   }
 }
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index e62b384d2..2d02ca030 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -99,8 +99,14 @@
             </button>
           </span>
         </div>
-        <ModerationTools :user='user' v-if='loggedIn.role === "admin"'>
-        </ModerationTools>
+        <div class='block' v-if='isOtherUser && loggedIn'>
+          <span>
+            <button @click="reportUser">
+              {{ $t('user_card.report') }}
+            </button>
+          </span>
+        </div>
+        <ModerationTools :user='user' v-if='loggedIn.role === "admin"'/>
       </div>
     </div>
   </div>
diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js
new file mode 100644
index 000000000..fb9ea16da
--- /dev/null
+++ b/src/components/user_reporting_modal/user_reporting_modal.js
@@ -0,0 +1,81 @@
+
+import Status from '../status/status.vue'
+import Checkbox from '../checkbox/checkbox.js'
+
+const UserReportingModal = {
+  components: {
+    Status,
+    Checkbox
+  },
+  data () {
+    return {
+      comment: '',
+      forward: false,
+      statusIdsToReport: []
+    }
+  },
+  computed: {
+    isLoggedIn () {
+      return !!this.$store.state.users.currentUser
+    },
+    isOpen () {
+      return this.isLoggedIn && this.$store.state.reports.modalActivated
+    },
+    userId () {
+      return this.$store.state.reports.userId
+    },
+    user () {
+      return this.$store.getters.findUser(this.userId)
+    },
+    remoteInstance () {
+      return !this.user.is_local && this.user.screen_name.substr(this.user.screen_name.indexOf('@') + 1)
+    },
+    statuses () {
+      return this.$store.state.reports.statuses
+    }
+  },
+  watch: {
+    userId (value) {
+      this.statusIdsToReport = []
+    }
+  },
+  methods: {
+    closeModal () {
+      this.$store.dispatch('closeUserReportingModal')
+    },
+    reportUser () {
+      const payload = {
+        comment: this.comment,
+        forward: this.forward,
+        statusIdsToReport: this.statusIdsToReport
+      }
+      this.$store.dispatch('reportUser', payload)
+    },
+    isChecked (statusId) {
+      return this.statusIdsToReport.indexOf(statusId) !== -1
+    },
+    toggleStatus (checked, statusId) {
+      if (checked === this.isChecked(statusId)) {
+        return
+      }
+
+      if (checked) {
+        this.statusIdsToReport.push(statusId)
+      } else {
+        this.statusIdsToReport.splice(this.statusIdsToReport.indexOf(statusId), 1)
+      }
+    },
+    resize (e) {
+      const target = e.target || e
+      if (!(target instanceof window.Element)) { return }
+      // Auto is needed to make textbox shrink when removing lines
+      target.style.height = 'auto'
+      target.style.height = `${target.scrollHeight}px`
+      if (target.value === '') {
+        target.style.height = null
+      }
+    }
+  }
+}
+
+export default UserReportingModal
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
new file mode 100644
index 000000000..49839da3a
--- /dev/null
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -0,0 +1,111 @@
+<template>
+<div class="modal-view" @click="closeModal" v-if="isOpen">
+  <div class="user-reporting-panel panel" @click.stop="">
+    <div class="panel-heading">Reporting {{user.screen_name}}</div>
+    <div class="panel-body">
+      <div class="user-reporting-panel-left">
+        <div>
+          <p>The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:</p>
+          <textarea
+            v-model="comment"
+            class="form-control"
+            placeholder="Additional comments"
+            rows="1"
+            @input="resize"
+          />
+        </div>
+        <div v-if="!user.is_local">
+          <p>The account is from another server. Send an anonymized copy of the report there as well?</p>
+          <Checkbox v-model="forward">Forward to {{remoteInstance}}</Checkbox>
+        </div>
+        <div>
+          <button class="btn btn-default" @click="reportUser">Submit</button>
+        </div>
+      </div>
+      <div class="user-reporting-panel-right">
+        <div v-for="status in statuses" :key="status.id" class="status-fadein">
+          <Status :inConversation="false" :focused="false" :statusoid="status" />
+          <Checkbox :checked="isChecked(status.id)" @change="checked => toggleStatus(checked, status.id)" />
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+</template>
+
+<script src="./user_reporting_modal.js"></script>
+
+<style lang="scss">
+@import '../../_variables.scss';
+
+.user-reporting-panel {
+  width: 90vw;
+  max-width: 700px;
+
+  .panel-body {
+    display: flex;
+    border-top: 1px solid;
+    border-color: $fallback--border;
+    border-color: var(--border, $fallback--border);
+  }
+
+  &-left {
+    width: 50%;
+    padding: 1.1em;
+    border-right: 1px solid;
+    border-color: $fallback--border;
+    border-color: var(--border, $fallback--border);
+    max-width: 320px;
+    line-height: 1.4em;
+    box-sizing: border-box;
+
+    > div {
+      margin-bottom: 2em;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+
+    p {
+      margin-top: 0;
+    }
+
+    textarea.form-control {
+      line-height: 16px;
+      resize: none;
+      overflow: hidden;
+      transition: min-height 200ms 100ms;
+      min-height: 44px;
+      width: 100%;
+    }
+
+    .btn {
+      min-width: 10em;
+      padding: 0 2em;
+    }
+  }
+
+  &-right {
+    width: 50%;
+    flex: 1 1 auto;
+    min-height: 20vh;
+    max-height: 80vh;
+    overflow-y: auto;
+    overflow-x: hidden;
+
+    > div {
+      display: flex;
+      justify-content: space-between;
+      border-bottom-width: 1px;
+      border-bottom-style: solid;
+      border-color: $fallback--border;
+      border-color: var(--border, $fallback--border);
+
+      .checkbox {
+        margin: 0.75em;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index b07af5e5d..8292c921b 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -420,6 +420,7 @@
     "muted": "Muted",
     "per_day": "per day",
     "remote_follow": "Remote follow",
+    "report": "Report",
     "statuses": "Statuses",
     "unblock": "Unblock",
     "unblock_progress": "Unblocking...",
diff --git a/src/main.js b/src/main.js
index 725f58065..92f843b1b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,6 +12,7 @@ import chatModule from './modules/chat.js'
 import oauthModule from './modules/oauth.js'
 import mediaViewerModule from './modules/media_viewer.js'
 import oauthTokensModule from './modules/oauth_tokens.js'
+import reportsModule from './modules/reports.js'
 
 import VueTimeago from 'vue-timeago'
 import VueI18n from 'vue-i18n'
@@ -75,7 +76,8 @@ const persistedStateOptions = {
       chat: chatModule,
       oauth: oauthModule,
       mediaViewer: mediaViewerModule,
-      oauthTokens: oauthTokensModule
+      oauthTokens: oauthTokensModule,
+      reports: reportsModule
     },
     plugins: [persistedState, pushNotifications],
     strict: false // Socket modifies itself, let's ignore this for now.
diff --git a/src/modules/reports.js b/src/modules/reports.js
new file mode 100644
index 000000000..b712cfebf
--- /dev/null
+++ b/src/modules/reports.js
@@ -0,0 +1,33 @@
+import filter from 'lodash/filter'
+
+const reports = {
+  state: {
+    userId: null,
+    statuses: [],
+    modalActivated: false
+  },
+  mutations: {
+    openUserReportingModal (state, { userId, statuses }) {
+      state.userId = userId
+      state.statuses = statuses
+      state.modalActivated = true
+    },
+    closeUserReportingModal (state) {
+      state.modalActivated = false
+    }
+  },
+  actions: {
+    openUserReportingModal ({ rootState, commit }, userId) {
+      const statuses = filter(rootState.statuses.allStatuses, status => status.user.id === userId)
+      commit('openUserReportingModal', { userId, statuses })
+    },
+    closeUserReportingModal ({ commit }) {
+      commit('closeUserReportingModal')
+    },
+    reportUser ({ commit }, payload) {
+      console.log('payload', payload)
+    }
+  }
+}
+
+export default reports

From cea6ea42f0f882864e01f79a8af08c8bc59272fb Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 20 Mar 2019 11:45:19 -0400
Subject: [PATCH 07/29] add api service function

---
 .../user_reporting_modal.js                   |  6 ++---
 src/modules/reports.js                        |  5 +++--
 src/services/api/api.service.js               | 22 ++++++++++++++++++-
 .../backend_interactor_service.js             |  4 +++-
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js
index fb9ea16da..87b6fde96 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.js
+++ b/src/components/user_reporting_modal/user_reporting_modal.js
@@ -44,12 +44,12 @@ const UserReportingModal = {
       this.$store.dispatch('closeUserReportingModal')
     },
     reportUser () {
-      const payload = {
+      const params = {
         comment: this.comment,
         forward: this.forward,
-        statusIdsToReport: this.statusIdsToReport
+        statusIds: this.statusIdsToReport
       }
-      this.$store.dispatch('reportUser', payload)
+      this.$store.dispatch('reportUser', params)
     },
     isChecked (statusId) {
       return this.statusIdsToReport.indexOf(statusId) !== -1
diff --git a/src/modules/reports.js b/src/modules/reports.js
index b712cfebf..0470b3bed 100644
--- a/src/modules/reports.js
+++ b/src/modules/reports.js
@@ -24,8 +24,9 @@ const reports = {
     closeUserReportingModal ({ commit }) {
       commit('closeUserReportingModal')
     },
-    reportUser ({ commit }, payload) {
-      console.log('payload', payload)
+    reportUser ({ state, rootState, commit }, params) {
+      rootState.api.backendInteractor.reportUser({ userId: state.userId, ...params })
+        .then(result => console.log(result))
     }
   }
 }
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index c5e2280dd..9753049fc 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -50,6 +50,7 @@ const MASTODON_MEDIA_UPLOAD_URL = '/api/v1/media'
 const MASTODON_STATUS_FAVORITEDBY_URL = id => `/api/v1/statuses/${id}/favourited_by`
 const MASTODON_STATUS_REBLOGGEDBY_URL = id => `/api/v1/statuses/${id}/reblogged_by`
 const MASTODON_PROFILE_UPDATE_URL = '/api/v1/accounts/update_credentials'
+const MASTODON_REPORT_USER_URL = 'api/v1/reports'
 
 import { each, map, concat, last } from 'lodash'
 import { parseStatus, parseUser, parseNotification, parseAttachment } from '../entity_normalizer/entity_normalizer.service.js'
@@ -722,6 +723,24 @@ const fetchRebloggedByUsers = ({id}) => {
   return promisedRequest(MASTODON_STATUS_REBLOGGEDBY_URL(id)).then((users) => users.map(parseUser))
 }
 
+const reportUser = ({credentials, userId, statusIds, comment, forward}) => {
+  const payload = {
+    'account_id': userId,
+    'status_ids': statusIds,
+    comment,
+    forward
+  }
+  return fetch(MASTODON_REPORT_USER_URL, {
+    body: JSON.stringify(payload),
+    headers: {
+      ...authHeaders(credentials),
+      'Accept': 'application/json',
+      'Content-Type': 'application/json'
+    },
+    method: 'POST'
+  }).then((data) => data.json())
+}
+
 const apiService = {
   verifyCredentials,
   fetchTimeline,
@@ -773,7 +792,8 @@ const apiService = {
   suggestions,
   markNotificationsAsSeen,
   fetchFavoritedByUsers,
-  fetchRebloggedByUsers
+  fetchRebloggedByUsers,
+  reportUser
 }
 
 export default apiService
diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
index d2b581ca2..58bb12485 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -115,6 +115,7 @@ const backendInteractorService = (credentials) => {
 
   const fetchFavoritedByUsers = (id) => apiService.fetchFavoritedByUsers({id})
   const fetchRebloggedByUsers = (id) => apiService.fetchRebloggedByUsers({id})
+  const reportUser = (params) => apiService.reportUser({credentials, ...params})
 
   const backendInteractorServiceInstance = {
     fetchStatus,
@@ -159,7 +160,8 @@ const backendInteractorService = (credentials) => {
     approveUser,
     denyUser,
     fetchFavoritedByUsers,
-    fetchRebloggedByUsers
+    fetchRebloggedByUsers,
+    reportUser
   }
 
   return backendInteractorServiceInstance

From 02d169b92c61015a5663b703a23e769848239b13 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 20 Mar 2019 11:54:16 -0400
Subject: [PATCH 08/29] add promisedRequest helper

---
 src/services/api/api.service.js | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 9753049fc..a19aff9f8 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -724,21 +724,17 @@ const fetchRebloggedByUsers = ({id}) => {
 }
 
 const reportUser = ({credentials, userId, statusIds, comment, forward}) => {
-  const payload = {
-    'account_id': userId,
-    'status_ids': statusIds,
-    comment,
-    forward
-  }
-  return fetch(MASTODON_REPORT_USER_URL, {
-    body: JSON.stringify(payload),
-    headers: {
-      ...authHeaders(credentials),
-      'Accept': 'application/json',
-      'Content-Type': 'application/json'
+  return promisedRequest({
+    uri: MASTODON_REPORT_USER_URL,
+    method: 'POST',
+    payload: {
+      'account_id': userId,
+      'status_ids': statusIds,
+      comment,
+      forward
     },
-    method: 'POST'
-  }).then((data) => data.json())
+    credentials
+  })
 }
 
 const apiService = {

From 1878e56c16cf2ed09faf653a69efeca73c38ea65 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 20 Mar 2019 12:11:15 -0400
Subject: [PATCH 09/29] reset modal state when userId is changed

---
 src/components/user_reporting_modal/user_reporting_modal.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js
index 87b6fde96..ed7e74f07 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.js
+++ b/src/components/user_reporting_modal/user_reporting_modal.js
@@ -36,6 +36,9 @@ const UserReportingModal = {
   },
   watch: {
     userId (value) {
+      // Reset state
+      this.comment = ''
+      this.forward = false
       this.statusIdsToReport = []
     }
   },

From 1b07c6ae4f0d06e25b124bba2f088d3a02f78ecc Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 20 Mar 2019 12:20:31 -0400
Subject: [PATCH 10/29] add processing state and close modal after api request
 is completed

---
 .../user_reporting_modal/user_reporting_modal.js     | 12 ++++++++++--
 .../user_reporting_modal/user_reporting_modal.vue    |  2 +-
 src/modules/reports.js                               |  4 ----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js
index ed7e74f07..ac5b51927 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.js
+++ b/src/components/user_reporting_modal/user_reporting_modal.js
@@ -11,7 +11,8 @@ const UserReportingModal = {
     return {
       comment: '',
       forward: false,
-      statusIdsToReport: []
+      statusIdsToReport: [],
+      processing: false
     }
   },
   computed: {
@@ -40,6 +41,7 @@ const UserReportingModal = {
       this.comment = ''
       this.forward = false
       this.statusIdsToReport = []
+      this.processing = false
     }
   },
   methods: {
@@ -47,12 +49,18 @@ const UserReportingModal = {
       this.$store.dispatch('closeUserReportingModal')
     },
     reportUser () {
+      this.processing = true
       const params = {
+        userId: this.userId,
         comment: this.comment,
         forward: this.forward,
         statusIds: this.statusIdsToReport
       }
-      this.$store.dispatch('reportUser', params)
+      this.$store.state.api.backendInteractor.reportUser(params)
+        .then(() => {
+          this.processing = false
+          this.closeModal()
+        })
     },
     isChecked (statusId) {
       return this.statusIdsToReport.indexOf(statusId) !== -1
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index 49839da3a..30d3ab19b 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -19,7 +19,7 @@
           <Checkbox v-model="forward">Forward to {{remoteInstance}}</Checkbox>
         </div>
         <div>
-          <button class="btn btn-default" @click="reportUser">Submit</button>
+          <button class="btn btn-default" @click="reportUser" :disabled="processing">Submit</button>
         </div>
       </div>
       <div class="user-reporting-panel-right">
diff --git a/src/modules/reports.js b/src/modules/reports.js
index 0470b3bed..904022f1b 100644
--- a/src/modules/reports.js
+++ b/src/modules/reports.js
@@ -23,10 +23,6 @@ const reports = {
     },
     closeUserReportingModal ({ commit }) {
       commit('closeUserReportingModal')
-    },
-    reportUser ({ state, rootState, commit }, params) {
-      rootState.api.backendInteractor.reportUser({ userId: state.userId, ...params })
-        .then(result => console.log(result))
     }
   }
 }

From dfc56dfee25a178e757f5d0b9d0d111a43083eab Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 20 Mar 2019 12:22:56 -0400
Subject: [PATCH 11/29] reset modal state if api request is completed

---
 .../user_reporting_modal/user_reporting_modal.js       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js
index ac5b51927..6b1177b9b 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.js
+++ b/src/components/user_reporting_modal/user_reporting_modal.js
@@ -36,15 +36,16 @@ const UserReportingModal = {
     }
   },
   watch: {
-    userId (value) {
+    userId: 'resetState'
+  },
+  methods: {
+    resetState () {
       // Reset state
       this.comment = ''
       this.forward = false
       this.statusIdsToReport = []
       this.processing = false
-    }
-  },
-  methods: {
+    },
     closeModal () {
       this.$store.dispatch('closeUserReportingModal')
     },
@@ -59,6 +60,7 @@ const UserReportingModal = {
       this.$store.state.api.backendInteractor.reportUser(params)
         .then(() => {
           this.processing = false
+          this.resetState()
           this.closeModal()
         })
     },

From 471085f0f36e91daa74938e34ad738a86849894a Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 20 Mar 2019 12:37:13 -0400
Subject: [PATCH 12/29] add error message

---
 .../user_reporting_modal/user_reporting_modal.js     | 12 +++++++++++-
 .../user_reporting_modal/user_reporting_modal.vue    |  7 +++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js
index 6b1177b9b..34a87720a 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.js
+++ b/src/components/user_reporting_modal/user_reporting_modal.js
@@ -12,7 +12,8 @@ const UserReportingModal = {
       comment: '',
       forward: false,
       statusIdsToReport: [],
-      processing: false
+      processing: false,
+      error: false
     }
   },
   computed: {
@@ -45,12 +46,14 @@ const UserReportingModal = {
       this.forward = false
       this.statusIdsToReport = []
       this.processing = false
+      this.error = false
     },
     closeModal () {
       this.$store.dispatch('closeUserReportingModal')
     },
     reportUser () {
       this.processing = true
+      this.error = false
       const params = {
         userId: this.userId,
         comment: this.comment,
@@ -63,6 +66,13 @@ const UserReportingModal = {
           this.resetState()
           this.closeModal()
         })
+        .catch(() => {
+          this.processing = false
+          this.error = true
+        })
+    },
+    clearError () {
+      this.error = false
     },
     isChecked (statusId) {
       return this.statusIdsToReport.indexOf(statusId) !== -1
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index 30d3ab19b..eae979001 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -20,6 +20,9 @@
         </div>
         <div>
           <button class="btn btn-default" @click="reportUser" :disabled="processing">Submit</button>
+          <div class="alert error" v-if="error">
+            An error occured processing your request
+          </div>
         </div>
       </div>
       <div class="user-reporting-panel-right">
@@ -84,6 +87,10 @@
       min-width: 10em;
       padding: 0 2em;
     }
+
+    .alert {
+      margin: 1em 0 0 0;
+    }
   }
 
   &-right {

From d115d98a1b0be846bddd1d24d7bd2c60a7d965ec Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 20 Mar 2019 12:51:43 -0400
Subject: [PATCH 13/29] add translations

---
 .../user_reporting_modal/user_reporting_modal.vue  | 14 +++++++-------
 src/i18n/en.json                                   |  9 +++++++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index eae979001..6ad4de17f 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -1,27 +1,27 @@
 <template>
 <div class="modal-view" @click="closeModal" v-if="isOpen">
   <div class="user-reporting-panel panel" @click.stop="">
-    <div class="panel-heading">Reporting {{user.screen_name}}</div>
+    <div class="panel-heading">{{$t('user_reporting.title', [user.screen_name])}}</div>
     <div class="panel-body">
       <div class="user-reporting-panel-left">
         <div>
-          <p>The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:</p>
+          <p>{{$t('user_reporting.add_comment_description')}}</p>
           <textarea
             v-model="comment"
             class="form-control"
-            placeholder="Additional comments"
+            :placeholder="$t('user_reporting.additional_comments')"
             rows="1"
             @input="resize"
           />
         </div>
         <div v-if="!user.is_local">
-          <p>The account is from another server. Send an anonymized copy of the report there as well?</p>
-          <Checkbox v-model="forward">Forward to {{remoteInstance}}</Checkbox>
+          <p>{{$t('user_reporting.forward_description')}}</p>
+          <Checkbox v-model="forward">{{$t('user_reporting.forward_to', [remoteInstance])}}</Checkbox>
         </div>
         <div>
-          <button class="btn btn-default" @click="reportUser" :disabled="processing">Submit</button>
+          <button class="btn btn-default" @click="reportUser" :disabled="processing">{{$t('user_reporting.submit')}}</button>
           <div class="alert error" v-if="error">
-            An error occured processing your request
+            {{$t('user_reporting.generic_error')}}
           </div>
         </div>
       </div>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 8292c921b..731c68b49 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -453,6 +453,15 @@
     "profile_does_not_exist": "Sorry, this profile does not exist.",
     "profile_loading_error": "Sorry, there was an error loading this profile."
   },
+  "user_reporting": {
+    "title": "Reporting {0}",
+    "add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+    "additional_comments": "Additional comments",
+    "forward_description": "The account is from another server. Send an anonymized copy of the report there as well?",
+    "forward_to": "Forward to {0}",
+    "submit": "Submit",
+    "generic_error": "An error occured processing your request."
+  },
   "who_to_follow": {
     "more": "More",
     "who_to_follow": "Who to follow"

From 5d0bae5569071dbfb6fe038325af620eb83cf865 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 20 Mar 2019 13:46:53 -0400
Subject: [PATCH 14/29] update generic error message

---
 src/components/user_reporting_modal/user_reporting_modal.vue | 1 +
 src/i18n/en.json                                             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index 6ad4de17f..fd9dd797f 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -90,6 +90,7 @@
 
     .alert {
       margin: 1em 0 0 0;
+      line-height: 1.3em;
     }
   }
 
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 731c68b49..f7a52c90e 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -460,7 +460,7 @@
     "forward_description": "The account is from another server. Send an anonymized copy of the report there as well?",
     "forward_to": "Forward to {0}",
     "submit": "Submit",
-    "generic_error": "An error occured processing your request."
+    "generic_error": "An error occurred while processing your request."
   },
   "who_to_follow": {
     "more": "More",

From cf72ebb40720b21736c56289a7bbffa9b67e2d2d Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 20 Mar 2019 16:41:27 -0400
Subject: [PATCH 15/29] update copy

---
 src/i18n/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index f7a52c90e..2f48c3892 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -457,7 +457,7 @@
     "title": "Reporting {0}",
     "add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
     "additional_comments": "Additional comments",
-    "forward_description": "The account is from another server. Send an anonymized copy of the report there as well?",
+    "forward_description": "The account is from another server. Send a copy of the report there as well?",
     "forward_to": "Forward to {0}",
     "submit": "Submit",
     "generic_error": "An error occurred while processing your request."

From 91502a25a4feaec60891ee5f7b7623fe4e05e0a8 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Fri, 22 Mar 2019 13:49:58 -0400
Subject: [PATCH 16/29] Add a css class to the checkbox indicator

---
 src/components/checkbox/checkbox.js   |  2 +-
 src/components/checkbox/checkbox.scss | 54 +++++++++++++--------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/components/checkbox/checkbox.js b/src/components/checkbox/checkbox.js
index 324a7597d..76e7e4f48 100644
--- a/src/components/checkbox/checkbox.js
+++ b/src/components/checkbox/checkbox.js
@@ -36,7 +36,7 @@ export default {
     return (
       <label class="checkbox" {...wrapperProps}>
         <input type="checkbox" {...inputProps} />
-        <i />
+        <i class="checkbox-indicator" />
         {children && <span>{children}</span>}
       </label>
     )
diff --git a/src/components/checkbox/checkbox.scss b/src/components/checkbox/checkbox.scss
index 07b3f39e1..4dfcfe340 100644
--- a/src/components/checkbox/checkbox.scss
+++ b/src/components/checkbox/checkbox.scss
@@ -5,39 +5,39 @@
   display: inline-block;
   padding-left: 1.2em;
 
+  &-indicator::before {
+    position: absolute;
+    left: 0;
+    top: 0;
+    display: block;
+    content: '✔';
+    transition: color 200ms;
+    width: 1.1em;
+    height: 1.1em;
+    border-radius: $fallback--checkboxRadius;
+    border-radius: var(--checkboxRadius, $fallback--checkboxRadius);
+    box-shadow: 0px 0px 2px black inset;
+    box-shadow: var(--inputShadow);
+    background-color: $fallback--fg;
+    background-color: var(--input, $fallback--fg);
+    vertical-align: top;
+    text-align: center;
+    line-height: 1.1em;
+    font-size: 1.1em;
+    color: transparent;
+    overflow: hidden;
+    box-sizing: border-box;
+  }
+
   input[type=checkbox] {
     display: none;
 
-    & + i::before {
-      position: absolute;
-      left: 0;
-      top: 0;
-      display: block;
-      content: '✔';
-      transition: color 200ms;
-      width: 1.1em;
-      height: 1.1em;
-      border-radius: $fallback--checkboxRadius;
-      border-radius: var(--checkboxRadius, $fallback--checkboxRadius);
-      box-shadow: 0px 0px 2px black inset;
-      box-shadow: var(--inputShadow);
-      background-color: $fallback--fg;
-      background-color: var(--input, $fallback--fg);
-      vertical-align: top;
-      text-align: center;
-      line-height: 1.1em;
-      font-size: 1.1em;
-      color: transparent;
-      overflow: hidden;
-      box-sizing: border-box;
-    }
-
-    &:checked + i::before {
+    &:checked + .checkbox-indicator::before {
       color: $fallback--text;
       color: var(--text, $fallback--text);
     }
 
-    &:disabled + i::before {
+    &:disabled + .checkbox-indicator::before {
       opacity: .5;
     }
   }
@@ -45,4 +45,4 @@
   & > span {
     margin-left: .5em;
   }
-}
\ No newline at end of file
+}

From f364068e103641e761e2ca2c6d337c3536112546 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Fri, 22 Mar 2019 14:19:50 -0400
Subject: [PATCH 17/29] Improve mobile layout

---
 src/App.scss                                  |  1 +
 .../user_reporting_modal.vue                  | 60 +++++++++++++------
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index b1c65ade1..07b33f471 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -379,6 +379,7 @@ main-router {
 
 .panel-heading {
   display: flex;
+  flex: none;
   border-radius: $fallback--panelRadius $fallback--panelRadius 0 0;
   border-radius: var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius) 0 0;
   background-size: cover;
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index fd9dd797f..b2cb6911a 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -26,7 +26,7 @@
         </div>
       </div>
       <div class="user-reporting-panel-right">
-        <div v-for="status in statuses" :key="status.id" class="status-fadein">
+        <div v-for="status in statuses" :key="status.id" class="status-fadein user-reporting-panel-sitem">
           <Status :inConversation="false" :focused="false" :statusoid="status" />
           <Checkbox :checked="isChecked(status.id)" @change="checked => toggleStatus(checked, status.id)" />
         </div>
@@ -44,26 +44,24 @@
 .user-reporting-panel {
   width: 90vw;
   max-width: 700px;
+  min-height: 20vh;
+  max-height: 80vh;
 
   .panel-body {
     display: flex;
+    flex-direction: column-reverse;
     border-top: 1px solid;
     border-color: $fallback--border;
     border-color: var(--border, $fallback--border);
   }
 
   &-left {
-    width: 50%;
-    padding: 1.1em;
-    border-right: 1px solid;
-    border-color: $fallback--border;
-    border-color: var(--border, $fallback--border);
-    max-width: 320px;
+    padding: 1.1em 0.7em 0.7em;
     line-height: 1.4em;
     box-sizing: border-box;
 
     > div {
-      margin-bottom: 2em;
+      margin-bottom: 1em;
 
       &:last-child {
         margin-bottom: 0;
@@ -95,25 +93,49 @@
   }
 
   &-right {
-    width: 50%;
-    flex: 1 1 auto;
-    min-height: 20vh;
-    max-height: 80vh;
     overflow-y: auto;
     overflow-x: hidden;
+  }
 
-    > div {
-      display: flex;
-      justify-content: space-between;
-      border-bottom-width: 1px;
-      border-bottom-style: solid;
+  &-sitem {
+    display: flex;
+    justify-content: space-between;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    border-color: $fallback--border;
+    border-color: var(--border, $fallback--border);
+
+    > .status-el {
+      flex: 1;
+    }
+
+    > .checkbox {
+      margin: 0.75em;
+    }
+  }
+
+  @media all and (min-width: 801px) {
+    .panel-body {
+      flex-direction: row;
+    }
+
+    &-left {
+      width: 50%;
+      max-width: 320px;
+      border-right: 1px solid;
       border-color: $fallback--border;
       border-color: var(--border, $fallback--border);
+      padding: 1.1em;
 
-      .checkbox {
-        margin: 0.75em;
+      > div {
+        margin-bottom: 2em;
       }
     }
+
+    &-right {
+      width: 50%;
+      flex: 1 1 auto;
+    }
   }
 }
 </style>

From 2e6eab51b8272e3136046544f195253ec6c5841c Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Sun, 24 Mar 2019 21:35:34 -0400
Subject: [PATCH 18/29] Update promisedRequest helper to support json payload

---
 src/services/api/api.service.js | 37 +++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index a19aff9f8..15c4b62a6 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -67,7 +67,24 @@ let fetch = (url, options) => {
   return oldfetch(fullUrl, options)
 }
 
-const promisedRequest = (url, options) => {
+const promisedRequest = ({ method, url, payload, credentials, headers = {} }) => {
+  const options = {
+    method,
+    headers: {
+      'Accept': 'application/json',
+      'Content-Type': 'application/json',
+      ...headers
+    }
+  }
+  if (payload) {
+    options.body = JSON.stringify(payload)
+  }
+  if (credentials) {
+    options.headers = {
+      ...options.headers,
+      ...authHeaders(credentials)
+    }
+  }
   return fetch(url, options)
     .then((response) => {
       return new Promise((resolve, reject) => response.json()
@@ -228,7 +245,7 @@ const denyUser = ({id, credentials}) => {
 
 const fetchUser = ({id, credentials}) => {
   let url = `${MASTODON_USER_URL}/${id}`
-  return promisedRequest(url, { headers: authHeaders(credentials) })
+  return promisedRequest({ url, credentials })
     .then((data) => parseUser(data))
 }
 
@@ -652,26 +669,20 @@ const changePassword = ({credentials, password, newPassword, newPasswordConfirma
 }
 
 const fetchMutes = ({credentials}) => {
-  return promisedRequest(MASTODON_USER_MUTES_URL, { headers: authHeaders(credentials) })
+  return promisedRequest({ url: MASTODON_USER_MUTES_URL, credentials })
     .then((users) => users.map(parseUser))
 }
 
 const muteUser = ({id, credentials}) => {
-  return promisedRequest(MASTODON_MUTE_USER_URL(id), {
-    headers: authHeaders(credentials),
-    method: 'POST'
-  })
+  return promisedRequest({ url: MASTODON_MUTE_USER_URL(id), credentials, method: 'POST' })
 }
 
 const unmuteUser = ({id, credentials}) => {
-  return promisedRequest(MASTODON_UNMUTE_USER_URL(id), {
-    headers: authHeaders(credentials),
-    method: 'POST'
-  })
+  return promisedRequest({ url: MASTODON_UNMUTE_USER_URL(id), credentials, method: 'POST' })
 }
 
 const fetchBlocks = ({credentials}) => {
-  return promisedRequest(MASTODON_USER_BLOCKS_URL, { headers: authHeaders(credentials) })
+  return promisedRequest({ url: MASTODON_USER_BLOCKS_URL, credentials })
     .then((users) => users.map(parseUser))
 }
 
@@ -725,7 +736,7 @@ const fetchRebloggedByUsers = ({id}) => {
 
 const reportUser = ({credentials, userId, statusIds, comment, forward}) => {
   return promisedRequest({
-    uri: MASTODON_REPORT_USER_URL,
+    url: MASTODON_REPORT_USER_URL,
     method: 'POST',
     payload: {
       'account_id': userId,

From 01cc7e448093cf8884610a96c7aeb89fb08c7307 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Thu, 28 Mar 2019 13:48:13 -0400
Subject: [PATCH 19/29] modal style improvements

---
 .../user_reporting_modal/user_reporting_modal.vue        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index b2cb6911a..becf882ad 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -1,7 +1,9 @@
 <template>
 <div class="modal-view" @click="closeModal" v-if="isOpen">
   <div class="user-reporting-panel panel" @click.stop="">
-    <div class="panel-heading">{{$t('user_reporting.title', [user.screen_name])}}</div>
+    <div class="panel-heading">
+      <div class="title">{{$t('user_reporting.title', [user.screen_name])}}</div>
+    </div>
     <div class="panel-body">
       <div class="user-reporting-panel-left">
         <div>
@@ -47,12 +49,17 @@
   min-height: 20vh;
   max-height: 80vh;
 
+  .panel-heading {
+    text-align: center;
+  }
+
   .panel-body {
     display: flex;
     flex-direction: column-reverse;
     border-top: 1px solid;
     border-color: $fallback--border;
     border-color: var(--border, $fallback--border);
+    overflow: hidden;
   }
 
   &-left {

From 6b1e305a181386be11fde996abe66e3be5a35600 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Thu, 28 Mar 2019 14:11:52 -0400
Subject: [PATCH 20/29] use custom scrollbar

---
 package.json                                  |  1 +
 src/App.scss                                  | 46 ++++++++++++++++++-
 .../user_reporting_modal.vue                  | 11 +++--
 src/main.js                                   |  2 +
 yarn.lock                                     |  4 ++
 5 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index fcdea2c13..36dfda31f 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "vue-router": "^3.0.1",
     "vue-template-compiler": "^2.3.4",
     "vue-timeago": "^3.1.2",
+    "vuebar": "^0.0.20",
     "vuelidate": "^0.7.4",
     "vuex": "^3.0.1",
     "whatwg-fetch": "^2.0.3"
diff --git a/src/App.scss b/src/App.scss
index 07b33f471..6d16c7c96 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -794,4 +794,48 @@ nav {
       background-color: var(--lightBg, $fallback--fg);
     }
   }
-}
\ No newline at end of file
+}
+
+// Vuebar default style
+.vb > .vb-dragger {
+  z-index: 5;
+  width: 12px;
+  right: 0;
+}
+
+.vb > .vb-dragger > .vb-dragger-styler {
+  backface-visibility: hidden;
+  transform: rotate3d(0,0,0,0);
+  transition:
+    opacity 100ms ease-out,
+    margin 100ms ease-out,
+    height 100ms ease-out;
+
+  background-color: $fallback--text;
+  background-color: var(--text, $fallback--text);
+  opacity: .1;
+  margin: 5px 5px 5px 0;
+  border-radius: 20px;
+  height: calc(100% - 10px);
+  display: block;
+}
+
+.vb.vb-scrolling-phantom > .vb-dragger > .vb-dragger-styler {
+  opacity: .3;
+}
+
+.vb > .vb-dragger:hover > .vb-dragger-styler {
+  opacity: .5;
+  margin: 0px;
+  height: 100%;
+}
+
+.vb.vb-dragging > .vb-dragger > .vb-dragger-styler {
+  opacity: .5;
+  margin: 0px;
+  height: 100%;
+}
+
+.vb.vb-dragging-phantom > .vb-dragger > .vb-dragger-styler {
+  opacity: .5;
+}
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index becf882ad..acd184cd7 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -27,10 +27,12 @@
           </div>
         </div>
       </div>
-      <div class="user-reporting-panel-right">
-        <div v-for="status in statuses" :key="status.id" class="status-fadein user-reporting-panel-sitem">
-          <Status :inConversation="false" :focused="false" :statusoid="status" />
-          <Checkbox :checked="isChecked(status.id)" @change="checked => toggleStatus(checked, status.id)" />
+      <div class="user-reporting-panel-right" v-bar>
+        <div>
+          <div v-for="status in statuses" :key="status.id" class="status-fadein user-reporting-panel-sitem">
+            <Status :inConversation="false" :focused="false" :statusoid="status" />
+            <Checkbox :checked="isChecked(status.id)" @change="checked => toggleStatus(checked, status.id)" />
+          </div>
         </div>
       </div>
     </div>
@@ -111,6 +113,7 @@
     border-bottom-style: solid;
     border-color: $fallback--border;
     border-color: var(--border, $fallback--border);
+    padding-right: 15px;
 
     > .status-el {
       flex: 1;
diff --git a/src/main.js b/src/main.js
index 92f843b1b..e01c921c7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,6 +16,7 @@ import reportsModule from './modules/reports.js'
 
 import VueTimeago from 'vue-timeago'
 import VueI18n from 'vue-i18n'
+import Vuebar from 'vuebar'
 
 import createPersistedState from './lib/persisted_state.js'
 import pushNotifications from './lib/push_notifications_plugin.js'
@@ -42,6 +43,7 @@ Vue.use(VueTimeago, {
 Vue.use(VueI18n)
 Vue.use(VueChatScroll)
 Vue.use(VueClickOutside)
+Vue.use(Vuebar)
 
 const i18n = new VueI18n({
   // By default, use the browser locale, we will update it if neccessary
diff --git a/yarn.lock b/yarn.lock
index 699515635..0dd2173e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6491,6 +6491,10 @@ vue@^2.5.13:
   version "2.5.21"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.21.tgz#3d33dcd03bb813912ce894a8303ab553699c4a85"
 
+vuebar@^0.0.20:
+  version "0.0.20"
+  resolved "https://registry.yarnpkg.com/vuebar/-/vuebar-0.0.20.tgz#fd6313c2d3a2202c49e42419fe1d9ef126134200"
+
 vuelidate@^0.7.4:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/vuelidate/-/vuelidate-0.7.4.tgz#5a0e54be09ac0192f1aa3387d74b92e0945bf8aa"

From e97f8a4728bdc224b683242ca446c23a4e4ba5d1 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Thu, 28 Mar 2019 14:33:21 -0400
Subject: [PATCH 21/29] prevent parent scroll

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

diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index acd184cd7..bf668efc5 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -27,7 +27,7 @@
           </div>
         </div>
       </div>
-      <div class="user-reporting-panel-right" v-bar>
+      <div class="user-reporting-panel-right" v-bar="{preventParentScroll: true}">
         <div>
           <div v-for="status in statuses" :key="status.id" class="status-fadein user-reporting-panel-sitem">
             <Status :inConversation="false" :focused="false" :statusoid="status" />

From 0bb82478229b19adae998b9a32b05bcaa4ed0a4f Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Thu, 28 Mar 2019 15:50:53 -0400
Subject: [PATCH 22/29] fix double scrollbar display bug in mobile

---
 src/App.js                                            |  9 ++++++++-
 src/App.scss                                          | 11 +++++++++++
 src/App.vue                                           |  2 +-
 .../user_reporting_modal/user_reporting_modal.vue     |  4 ++--
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/App.js b/src/App.js
index e72c73e35..87f00989e 100644
--- a/src/App.js
+++ b/src/App.js
@@ -39,7 +39,14 @@ export default {
         window.CSS.supports('-moz-mask-size', 'contain') ||
         window.CSS.supports('-ms-mask-size', 'contain') ||
         window.CSS.supports('-o-mask-size', 'contain')
-    )
+    ),
+    isMobile: navigator.userAgent.match(/Android/i) ||
+      navigator.userAgent.match(/webOS/i) ||
+      navigator.userAgent.match(/iPhone/i) ||
+      navigator.userAgent.match(/iPad/i) ||
+      navigator.userAgent.match(/iPod/i) ||
+      navigator.userAgent.match(/BlackBerry/i) ||
+      navigator.userAgent.match(/Windows Phone/i)
   }),
   created () {
     // Load the locale from the storage
diff --git a/src/App.scss b/src/App.scss
index 6d16c7c96..c72529acc 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -839,3 +839,14 @@ nav {
 .vb.vb-dragging-phantom > .vb-dragger > .vb-dragger-styler {
   opacity: .5;
 }
+
+// Disable vuebar and use native scrollbar in mobile device
+#app.mobile {
+  .vb-content {
+    width: 100% !important;
+    padding-right: 0 !important;
+  }
+  .vb-dragger {
+    display: none;
+  }
+}
diff --git a/src/App.vue b/src/App.vue
index cb7e8d785..229bf62b0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="app" v-bind:style="bgAppStyle">
+  <div id="app" v-bind:style="bgAppStyle" v-bind:class="{ mobile: isMobile }">
     <div class="app-bg-wrapper" v-bind:style="bgStyle"></div>
     <MobileNav v-if="isMobileLayout" />
     <nav v-else class='nav-bar container' @click="scrollToTop()" id="nav">
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index bf668efc5..41c01919a 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -102,8 +102,8 @@
   }
 
   &-right {
-    overflow-y: auto;
-    overflow-x: hidden;
+    display: flex;
+    flex-direction: column;
   }
 
   &-sitem {

From 58a420f2b3935bffe950497672f60c19f86bd2ed Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Thu, 28 Mar 2019 16:19:27 -0400
Subject: [PATCH 23/29] fix panel title overflow issue in mobile

---
 .../user_reporting_modal/user_reporting_modal.vue        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index 41c01919a..d5f3b4389 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -52,7 +52,14 @@
   max-height: 80vh;
 
   .panel-heading {
-    text-align: center;
+    .title {
+      text-align: center;
+      // TODO: Consider making these as default of panel
+      flex: 1;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
   }
 
   .panel-body {

From ddc7c870f401a1cb7e59cd5144b6acff65a01e7e Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Sat, 6 Apr 2019 15:35:23 -0400
Subject: [PATCH 24/29] rewrite checkbox component

---
 src/components/checkbox/checkbox.js           | 44 -----------------
 src/components/checkbox/checkbox.scss         | 48 -------------------
 .../user_reporting_modal.js                   |  2 +-
 3 files changed, 1 insertion(+), 93 deletions(-)
 delete mode 100644 src/components/checkbox/checkbox.js
 delete mode 100644 src/components/checkbox/checkbox.scss

diff --git a/src/components/checkbox/checkbox.js b/src/components/checkbox/checkbox.js
deleted file mode 100644
index 76e7e4f48..000000000
--- a/src/components/checkbox/checkbox.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// TODO: Template-based functional component is supported in vue-loader 13.3.0+.
-// Also, somehow, props are not provided through 'context' even though they are defined.
-// Need to upgrade vue-loader
-
-import './checkbox.scss'
-
-export default {
-  functional: true,
-  name: 'Checkbox',
-  model: {
-    prop: 'checked',
-    event: 'change'
-  },
-  render (createElement, { data, children }) {
-    const { props = {}, attrs = {}, on = {}, ...rest } = data
-    const { name, checked, disabled, readonly, ...restAttrs } = attrs
-    const { change, ...restListeners } = on
-    const wrapperProps = {
-      attrs: restAttrs,
-      on: restListeners,
-      ...rest
-    }
-    const inputProps = {
-      attrs: {
-        name,
-        checked,
-        disabled,
-        readonly,
-        ...props
-      },
-      on: {}
-    }
-    if (change) {
-      inputProps.on.change = e => change(e.target.checked)
-    }
-    return (
-      <label class="checkbox" {...wrapperProps}>
-        <input type="checkbox" {...inputProps} />
-        <i class="checkbox-indicator" />
-        {children && <span>{children}</span>}
-      </label>
-    )
-  }
-}
diff --git a/src/components/checkbox/checkbox.scss b/src/components/checkbox/checkbox.scss
deleted file mode 100644
index 4dfcfe340..000000000
--- a/src/components/checkbox/checkbox.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-@import '../../_variables.scss';
-
-.checkbox {
-  position: relative;
-  display: inline-block;
-  padding-left: 1.2em;
-
-  &-indicator::before {
-    position: absolute;
-    left: 0;
-    top: 0;
-    display: block;
-    content: '✔';
-    transition: color 200ms;
-    width: 1.1em;
-    height: 1.1em;
-    border-radius: $fallback--checkboxRadius;
-    border-radius: var(--checkboxRadius, $fallback--checkboxRadius);
-    box-shadow: 0px 0px 2px black inset;
-    box-shadow: var(--inputShadow);
-    background-color: $fallback--fg;
-    background-color: var(--input, $fallback--fg);
-    vertical-align: top;
-    text-align: center;
-    line-height: 1.1em;
-    font-size: 1.1em;
-    color: transparent;
-    overflow: hidden;
-    box-sizing: border-box;
-  }
-
-  input[type=checkbox] {
-    display: none;
-
-    &:checked + .checkbox-indicator::before {
-      color: $fallback--text;
-      color: var(--text, $fallback--text);
-    }
-
-    &:disabled + .checkbox-indicator::before {
-      opacity: .5;
-    }
-  }
-
-  & > span {
-    margin-left: .5em;
-  }
-}
diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js
index 34a87720a..f445f184a 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.js
+++ b/src/components/user_reporting_modal/user_reporting_modal.js
@@ -1,6 +1,6 @@
 
 import Status from '../status/status.vue'
-import Checkbox from '../checkbox/checkbox.js'
+import Checkbox from '../checkbox/checkbox.vue'
 
 const UserReportingModal = {
   components: {

From 19a04769858c6786826a546bd5c0d3876049bad2 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 24 Apr 2019 22:40:37 -0400
Subject: [PATCH 25/29] update api endpoint url

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

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 15c4b62a6..846fab3af 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -50,7 +50,7 @@ const MASTODON_MEDIA_UPLOAD_URL = '/api/v1/media'
 const MASTODON_STATUS_FAVORITEDBY_URL = id => `/api/v1/statuses/${id}/favourited_by`
 const MASTODON_STATUS_REBLOGGEDBY_URL = id => `/api/v1/statuses/${id}/reblogged_by`
 const MASTODON_PROFILE_UPDATE_URL = '/api/v1/accounts/update_credentials'
-const MASTODON_REPORT_USER_URL = 'api/v1/reports'
+const MASTODON_REPORT_USER_URL = '/api/v1/reports'
 
 import { each, map, concat, last } from 'lodash'
 import { parseStatus, parseUser, parseNotification, parseAttachment } from '../entity_normalizer/entity_normalizer.service.js'

From 8561bf6612a43050791a57572b4fef7dd27ed32c Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Fri, 26 Apr 2019 15:22:52 -0400
Subject: [PATCH 26/29] remove transition css

---
 src/App.scss | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index c72529acc..adbe949c8 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -806,11 +806,6 @@ nav {
 .vb > .vb-dragger > .vb-dragger-styler {
   backface-visibility: hidden;
   transform: rotate3d(0,0,0,0);
-  transition:
-    opacity 100ms ease-out,
-    margin 100ms ease-out,
-    height 100ms ease-out;
-
   background-color: $fallback--text;
   background-color: var(--text, $fallback--text);
   opacity: .1;

From abad528dd4885265f5d80056d430eb0341022a99 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Fri, 26 Apr 2019 15:31:10 -0400
Subject: [PATCH 27/29] refactor using List component

---
 .../user_reporting_modal.js                    |  2 ++
 .../user_reporting_modal.vue                   | 18 ++++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js
index f445f184a..7c6ea4096 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.js
+++ b/src/components/user_reporting_modal/user_reporting_modal.js
@@ -1,10 +1,12 @@
 
 import Status from '../status/status.vue'
+import List from '../list/list.vue'
 import Checkbox from '../checkbox/checkbox.vue'
 
 const UserReportingModal = {
   components: {
     Status,
+    List,
     Checkbox
   },
   data () {
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index d5f3b4389..1cf25e8f5 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -28,12 +28,14 @@
         </div>
       </div>
       <div class="user-reporting-panel-right" v-bar="{preventParentScroll: true}">
-        <div>
-          <div v-for="status in statuses" :key="status.id" class="status-fadein user-reporting-panel-sitem">
-            <Status :inConversation="false" :focused="false" :statusoid="status" />
-            <Checkbox :checked="isChecked(status.id)" @change="checked => toggleStatus(checked, status.id)" />
-          </div>
-        </div>
+        <List :items="statuses">
+          <template slot="item" slot-scope="{item}">
+            <div class="status-fadein user-reporting-panel-sitem">
+              <Status :inConversation="false" :focused="false" :statusoid="item" />
+              <Checkbox :checked="isChecked(item.id)" @change="checked => toggleStatus(checked, item.id)" />
+            </div>
+          </template>
+        </List>
       </div>
     </div>
   </div>
@@ -116,10 +118,6 @@
   &-sitem {
     display: flex;
     justify-content: space-between;
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
-    border-color: $fallback--border;
-    border-color: var(--border, $fallback--border);
     padding-right: 15px;
 
     > .status-el {

From 220a7e89d5087af3989975cb326cd4d8f60cbc6a Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 29 Apr 2019 14:37:08 -0400
Subject: [PATCH 28/29] use native scrollbar

---
 package.json                                  |  1 -
 src/App.js                                    |  9 +---
 src/App.scss                                  | 50 -------------------
 src/App.vue                                   |  2 +-
 .../user_reporting_modal.vue                  |  5 +-
 src/main.js                                   |  2 -
 yarn.lock                                     |  4 --
 7 files changed, 5 insertions(+), 68 deletions(-)

diff --git a/package.json b/package.json
index 36dfda31f..fcdea2c13 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,6 @@
     "vue-router": "^3.0.1",
     "vue-template-compiler": "^2.3.4",
     "vue-timeago": "^3.1.2",
-    "vuebar": "^0.0.20",
     "vuelidate": "^0.7.4",
     "vuex": "^3.0.1",
     "whatwg-fetch": "^2.0.3"
diff --git a/src/App.js b/src/App.js
index 87f00989e..e72c73e35 100644
--- a/src/App.js
+++ b/src/App.js
@@ -39,14 +39,7 @@ export default {
         window.CSS.supports('-moz-mask-size', 'contain') ||
         window.CSS.supports('-ms-mask-size', 'contain') ||
         window.CSS.supports('-o-mask-size', 'contain')
-    ),
-    isMobile: navigator.userAgent.match(/Android/i) ||
-      navigator.userAgent.match(/webOS/i) ||
-      navigator.userAgent.match(/iPhone/i) ||
-      navigator.userAgent.match(/iPad/i) ||
-      navigator.userAgent.match(/iPod/i) ||
-      navigator.userAgent.match(/BlackBerry/i) ||
-      navigator.userAgent.match(/Windows Phone/i)
+    )
   }),
   created () {
     // Load the locale from the storage
diff --git a/src/App.scss b/src/App.scss
index adbe949c8..921f2c3be 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -795,53 +795,3 @@ nav {
     }
   }
 }
-
-// Vuebar default style
-.vb > .vb-dragger {
-  z-index: 5;
-  width: 12px;
-  right: 0;
-}
-
-.vb > .vb-dragger > .vb-dragger-styler {
-  backface-visibility: hidden;
-  transform: rotate3d(0,0,0,0);
-  background-color: $fallback--text;
-  background-color: var(--text, $fallback--text);
-  opacity: .1;
-  margin: 5px 5px 5px 0;
-  border-radius: 20px;
-  height: calc(100% - 10px);
-  display: block;
-}
-
-.vb.vb-scrolling-phantom > .vb-dragger > .vb-dragger-styler {
-  opacity: .3;
-}
-
-.vb > .vb-dragger:hover > .vb-dragger-styler {
-  opacity: .5;
-  margin: 0px;
-  height: 100%;
-}
-
-.vb.vb-dragging > .vb-dragger > .vb-dragger-styler {
-  opacity: .5;
-  margin: 0px;
-  height: 100%;
-}
-
-.vb.vb-dragging-phantom > .vb-dragger > .vb-dragger-styler {
-  opacity: .5;
-}
-
-// Disable vuebar and use native scrollbar in mobile device
-#app.mobile {
-  .vb-content {
-    width: 100% !important;
-    padding-right: 0 !important;
-  }
-  .vb-dragger {
-    display: none;
-  }
-}
diff --git a/src/App.vue b/src/App.vue
index 229bf62b0..cb7e8d785 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="app" v-bind:style="bgAppStyle" v-bind:class="{ mobile: isMobile }">
+  <div id="app" v-bind:style="bgAppStyle">
     <div class="app-bg-wrapper" v-bind:style="bgStyle"></div>
     <MobileNav v-if="isMobileLayout" />
     <nav v-else class='nav-bar container' @click="scrollToTop()" id="nav">
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index 1cf25e8f5..432dd14dc 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -27,7 +27,7 @@
           </div>
         </div>
       </div>
-      <div class="user-reporting-panel-right" v-bar="{preventParentScroll: true}">
+      <div class="user-reporting-panel-right">
         <List :items="statuses">
           <template slot="item" slot-scope="{item}">
             <div class="status-fadein user-reporting-panel-sitem">
@@ -113,12 +113,12 @@
   &-right {
     display: flex;
     flex-direction: column;
+    overflow-y: auto;
   }
 
   &-sitem {
     display: flex;
     justify-content: space-between;
-    padding-right: 15px;
 
     > .status-el {
       flex: 1;
@@ -150,6 +150,7 @@
     &-right {
       width: 50%;
       flex: 1 1 auto;
+      margin-bottom: 12px;
     }
   }
 }
diff --git a/src/main.js b/src/main.js
index e01c921c7..92f843b1b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,7 +16,6 @@ import reportsModule from './modules/reports.js'
 
 import VueTimeago from 'vue-timeago'
 import VueI18n from 'vue-i18n'
-import Vuebar from 'vuebar'
 
 import createPersistedState from './lib/persisted_state.js'
 import pushNotifications from './lib/push_notifications_plugin.js'
@@ -43,7 +42,6 @@ Vue.use(VueTimeago, {
 Vue.use(VueI18n)
 Vue.use(VueChatScroll)
 Vue.use(VueClickOutside)
-Vue.use(Vuebar)
 
 const i18n = new VueI18n({
   // By default, use the browser locale, we will update it if neccessary
diff --git a/yarn.lock b/yarn.lock
index 0dd2173e5..699515635 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6491,10 +6491,6 @@ vue@^2.5.13:
   version "2.5.21"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.21.tgz#3d33dcd03bb813912ce894a8303ab553699c4a85"
 
-vuebar@^0.0.20:
-  version "0.0.20"
-  resolved "https://registry.yarnpkg.com/vuebar/-/vuebar-0.0.20.tgz#fd6313c2d3a2202c49e42419fe1d9ef126134200"
-
 vuelidate@^0.7.4:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/vuelidate/-/vuelidate-0.7.4.tgz#5a0e54be09ac0192f1aa3387d74b92e0945bf8aa"

From 9787d996722e44e6554d936e0995bf4c346207e2 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Tue, 30 Apr 2019 16:38:34 -0400
Subject: [PATCH 29/29] update api services

---
 src/services/api/api.service.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 846fab3af..da44fc54b 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -140,14 +140,11 @@ const updateBanner = ({credentials, banner}) => {
 }
 
 const updateProfile = ({credentials, params}) => {
-  return promisedRequest(MASTODON_PROFILE_UPDATE_URL, {
-    headers: {
-      'Accept': 'application/json',
-      'Content-Type': 'application/json',
-      ...authHeaders(credentials)
-    },
+  return promisedRequest({
+    url: MASTODON_PROFILE_UPDATE_URL,
     method: 'PATCH',
-    body: JSON.stringify(params)
+    payload: params,
+    credentials
   })
   .then((data) => parseUser(data))
 }
@@ -727,11 +724,11 @@ const markNotificationsAsSeen = ({id, credentials}) => {
 }
 
 const fetchFavoritedByUsers = ({id}) => {
-  return promisedRequest(MASTODON_STATUS_FAVORITEDBY_URL(id)).then((users) => users.map(parseUser))
+  return promisedRequest({ url: MASTODON_STATUS_FAVORITEDBY_URL(id) }).then((users) => users.map(parseUser))
 }
 
 const fetchRebloggedByUsers = ({id}) => {
-  return promisedRequest(MASTODON_STATUS_REBLOGGEDBY_URL(id)).then((users) => users.map(parseUser))
+  return promisedRequest({ url: MASTODON_STATUS_REBLOGGEDBY_URL(id) }).then((users) => users.map(parseUser))
 }
 
 const reportUser = ({credentials, userId, statusIds, comment, forward}) => {