From 50bb8865c57d098a66aafedf9c64878d8e39dba0 Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Wed, 18 Dec 2019 21:17:06 +0300 Subject: [PATCH 01/22] dd --- local.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 local.json diff --git a/local.json b/local.json new file mode 100644 index 00000000..e9f4df0b --- /dev/null +++ b/local.json @@ -0,0 +1,4 @@ +{ + "target": "https://aqueous-sea-10253.herokuapp.com/", + "staticConfigPreference": false +} From b8afdb4c025e3d83f60fa3fc019390b75bff9eb7 Mon Sep 17 00:00:00 2001 From: eugenijm Date: Fri, 4 Sep 2020 23:11:10 +0300 Subject: [PATCH 02/22] Do not show desktop notifications for your own chat messages --- src/services/chat_utils/chat_utils.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/services/chat_utils/chat_utils.js b/src/services/chat_utils/chat_utils.js index ab898ced..583438f7 100644 --- a/src/services/chat_utils/chat_utils.js +++ b/src/services/chat_utils/chat_utils.js @@ -3,6 +3,7 @@ import { showDesktopNotification } from '../desktop_notification_utils/desktop_n export const maybeShowChatNotification = (store, chat) => { if (!chat.lastMessage) return if (store.rootState.chats.currentChatId === chat.id && !document.hidden) return + if (store.rootState.users.currentUser.id === chat.lastMessage.account.id) return const opts = { tag: chat.lastMessage.id, From 31a9da05fff68a2be078e5ef5d537f6b6c73449c Mon Sep 17 00:00:00 2001 From: tarteka Date: Sun, 6 Sep 2020 12:10:33 +0000 Subject: [PATCH 03/22] Translated using Weblate (Spanish) Currently translated at 83.2% (551 of 662 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/ --- src/i18n/es.json | 93 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 20 deletions(-) diff --git a/src/i18n/es.json b/src/i18n/es.json index 50bdcfb4..1a989cd2 100644 --- a/src/i18n/es.json +++ b/src/i18n/es.json @@ -13,7 +13,8 @@ "scope_options": "Opciones del alcance de la visibilidad", "text_limit": "Límite de caracteres", "title": "Características", - "who_to_follow": "A quién seguir" + "who_to_follow": "A quién seguir", + "pleroma_chat_messages": "Chat de Pleroma" }, "finder": { "error_fetching_user": "Error al buscar usuario", @@ -31,7 +32,13 @@ "disable": "Inhabilitar", "enable": "Habilitar", "confirm": "Confirmar", - "verify": "Verificar" + "verify": "Verificar", + "peek": "Ojear", + "close": "Cerrar", + "dismiss": "Descartar", + "retry": "Inténtalo de nuevo", + "error_retry": "Por favor, inténtalo de nuevo", + "loading": "Cargando…" }, "image_cropper": { "crop_picture": "Recortar la foto", @@ -41,7 +48,7 @@ }, "importer": { "submit": "Enviar", - "success": "Importado con éxito", + "success": "Importado con éxito.", "error": "Se ha producido un error al importar el archivo." }, "login": { @@ -77,21 +84,27 @@ "dms": "Mensajes Directos", "public_tl": "Línea Temporal Pública", "timeline": "Línea Temporal", - "twkn": "Toda La Red Conocida", + "twkn": "Red Conocida", "user_search": "Búsqueda de Usuarios", "search": "Buscar", "who_to_follow": "A quién seguir", - "preferences": "Preferencias" + "preferences": "Preferencias", + "chats": "Chats", + "timelines": "Líneas de Tiempo", + "bookmarks": "Marcadores" }, "notifications": { - "broken_favorite": "Estado desconocido, buscándolo...", + "broken_favorite": "Estado desconocido, buscándolo…", "favorited_you": "le gusta tu estado", "followed_you": "empezó a seguirte", "load_older": "Cargar notificaciones antiguas", "notifications": "Notificaciones", "read": "¡Leído!", "repeated_you": "repitió tu estado", - "no_more_notifications": "No hay más notificaciones" + "no_more_notifications": "No hay más notificaciones", + "reacted_with": "reaccionó con {0}", + "migrated_to": "migrado a", + "follow_request": "quiere seguirte" }, "polls": { "add_poll": "Añadir encuesta", @@ -114,7 +127,9 @@ "search_emoji": "Buscar un emoji", "add_emoji": "Insertar un emoji", "custom": "Emojis personalizados", - "unicode": "Emojis unicode" + "unicode": "Emojis unicode", + "load_all": "Cargando todos los {emojiAmount} emoji", + "load_all_hint": "Cargado el primer emoji {saneAmount}, cargar todos los emoji puede causar problemas de rendimiento." }, "stickers": { "add_sticker": "Añadir Pegatina" @@ -142,7 +157,7 @@ "posting": "Publicando", "scope_notice": { "public": "Esta publicación será visible para todo el mundo", - "private": "Esta publicación solo será visible para tus seguidores.", + "private": "Esta publicación solo será visible para tus seguidores", "unlisted": "Esta publicación no será visible en la Línea Temporal Pública ni en Toda La Red Conocida" }, "scope": { @@ -189,7 +204,7 @@ "generate_new_recovery_codes": "Generar códigos de recuperación nuevos", "warning_of_generate_new_codes": "Cuando generas nuevos códigos de recuperación, los antiguos dejarán de funcionar.", "recovery_codes": "Códigos de recuperación.", - "waiting_a_recovery_codes": "Recibiendo códigos de respaldo", + "waiting_a_recovery_codes": "Recibiendo códigos de respaldo…", "recovery_codes_warning": "Anote los códigos o guárdelos en un lugar seguro, de lo contrario no los volverá a ver. Si pierde el acceso a su aplicación 2FA y los códigos de recuperación, su cuenta quedará bloqueada.", "authentication_methods": "Métodos de autentificación", "scan": { @@ -232,7 +247,7 @@ "default_vis": "Alcance de visibilidad por defecto", "delete_account": "Eliminar la cuenta", "discoverable": "Permitir la aparición de esta cuenta en los resultados de búsqueda y otros servicios", - "delete_account_description": "Eliminar para siempre la cuenta y todos los mensajes.", + "delete_account_description": "Eliminar para siempre los datos y desactivar la cuenta.", "pad_emoji": "Rellenar con espacios al agregar emojis desde el selector", "delete_account_error": "Hubo un error al eliminar tu cuenta. Si el fallo persiste, ponte en contacto con el administrador de tu instancia.", "delete_account_instructions": "Escribe tu contraseña para confirmar la eliminación de tu cuenta.", @@ -253,7 +268,7 @@ "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.", + "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", @@ -299,7 +314,7 @@ "valid_until": "Válido hasta", "revoke_token": "Revocar", "panelRadius": "Paneles", - "pause_on_unfocused": "Parar la transmisión cuando no estés en foco.", + "pause_on_unfocused": "Parar la transmisión cuando no estés en foco", "presets": "Por defecto", "profile_background": "Fondo del Perfil", "profile_banner": "Cabecera del Perfil", @@ -546,11 +561,11 @@ "subscribe": "Suscribirse", "unsubscribe": "Desuscribirse", "unblock": "Desbloquear", - "unblock_progress": "Desbloqueando...", - "block_progress": "Bloqueando...", - "unmute": "Quitar silencio", - "unmute_progress": "Quitando silencio...", - "mute_progress": "Silenciando...", + "unblock_progress": "Desbloqueando…", + "block_progress": "Bloqueando…", + "unmute": "Dejar de silenciar", + "unmute_progress": "Quitando silencio…", + "mute_progress": "Silenciando…", "admin_menu": { "moderation": "Moderación", "grant_admin": "Conceder permisos de Administrador", @@ -564,12 +579,14 @@ "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_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": "Eliminar usuario", "delete_user_confirmation": "¿Estás completamente seguro? Esta acción no se puede deshacer." - } + }, + "show_repeats": "Mostrar repetidos", + "hide_repeats": "Ocultar repetidos" }, "user_profile": { "timeline_title": "Linea Temporal del Usuario", @@ -626,5 +643,41 @@ "return_home": "Volver a la página de inicio", "too_many_requests": "Has alcanzado el límite de intentos, vuelve a intentarlo más tarde.", "password_reset_disabled": "El restablecimiento de contraseñas está deshabilitado. Póngase en contacto con el administrador de su instancia." + }, + "errors": { + "storage_unavailable": "Pleroma no pudo acceder al almacenamiento del navegador. Su inicio de sesión o su configuración local no se guardarán y puede encontrar problemas inesperados. Intente habilitar las cookies." + }, + "domain_mute_card": { + "unmute_progress": "Quitando silencio…", + "unmute": "Dejar de silenciar", + "mute_progress": "Silenciando…", + "mute": "Silenciar" + }, + "about": { + "mrf": { + "simple": { + "accept_desc": "Esta instancia solo acepta mensajes de las siguientes instancias:", + "media_nsfw_desc": "Esta instancia obliga a que los archivos multimedia se establezcan como sensibles en las publicaciones de las siguientes instancias:", + "media_nsfw": "Forzar Multimedia Como Sensible", + "media_removal_desc": "Esta instancia elimina los archivos multimedia de las publicaciones de las siguientes instancias:", + "media_removal": "Eliminar Multimedia", + "quarantine": "Cuarentena", + "ftl_removal_desc": "Esta instancia elimina las siguientes instancias de la línea de tiempo \"Toda la red conocida\":", + "ftl_removal": "Eliminar de la línea de tiempo \"Toda La Red Conocida\"", + "quarantine_desc": "Esta instancia enviará solo publicaciones públicas a las siguientes instancias:", + "simple_policies": "Políticas sobre instancias específicas" + }, + "mrf_policies_desc": "Las políticas MRF manipulan la federación de esta instancia con el resto del fediverso. Las siguientes políticas están habilitadas:", + "mrf_policies": "Habilitar políticas MRF", + "keyword": { + "ftl_removal": "Eliminar de la línea de tiempo \"Toda La Red Conocida\"", + "keyword_policies": "Política de Palabras Clave" + }, + "federation": "Federación" + }, + "staff": "Equipo" + }, + "shoutbox": { + "title": "Jaula de Grillos" } } From a0aa45d3280e68043aa3cd43655289e23149f32e Mon Sep 17 00:00:00 2001 From: Anonymous Date: Sun, 6 Sep 2020 12:15:31 +0000 Subject: [PATCH 04/22] Translated using Weblate (Spanish) Currently translated at 83.2% (551 of 662 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/ --- src/i18n/es.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/i18n/es.json b/src/i18n/es.json index 1a989cd2..98c61e71 100644 --- a/src/i18n/es.json +++ b/src/i18n/es.json @@ -665,13 +665,19 @@ "ftl_removal_desc": "Esta instancia elimina las siguientes instancias de la línea de tiempo \"Toda la red conocida\":", "ftl_removal": "Eliminar de la línea de tiempo \"Toda La Red Conocida\"", "quarantine_desc": "Esta instancia enviará solo publicaciones públicas a las siguientes instancias:", - "simple_policies": "Políticas sobre instancias específicas" + "simple_policies": "Políticas sobre instancias específicas", + "reject_desc": "Esta instancia no aceptará mensajes de las siguientes instancias:", + "reject": "Rechazar", + "accept": "Aceptar" }, "mrf_policies_desc": "Las políticas MRF manipulan la federación de esta instancia con el resto del fediverso. Las siguientes políticas están habilitadas:", "mrf_policies": "Habilitar políticas MRF", "keyword": { "ftl_removal": "Eliminar de la línea de tiempo \"Toda La Red Conocida\"", - "keyword_policies": "Política de Palabras Clave" + "keyword_policies": "Política de Palabras Clave", + "is_replaced_by": "→", + "replace": "Reemplazar", + "reject": "Rechazar" }, "federation": "Federación" }, From 002cd61353d15689e5c4bba5fd7847a63527522f Mon Sep 17 00:00:00 2001 From: tarteka Date: Sun, 6 Sep 2020 13:04:25 +0000 Subject: [PATCH 05/22] Translated using Weblate (Spanish) Currently translated at 100.0% (662 of 662 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/ --- src/i18n/es.json | 146 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 135 insertions(+), 11 deletions(-) diff --git a/src/i18n/es.json b/src/i18n/es.json index 98c61e71..718d9040 100644 --- a/src/i18n/es.json +++ b/src/i18n/es.json @@ -137,7 +137,8 @@ "interactions": { "favs_repeats": "Favoritos y Repetidos", "follows": "Nuevos seguidores", - "load_older": "Cargar interacciones más antiguas" + "load_older": "Cargar interacciones más antiguas", + "moves": "Usuario Migrado" }, "post_status": { "new_status": "Publicar un nuevo estado", @@ -165,7 +166,12 @@ "private": "Solo-seguidores - Solo tus seguidores leerán 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" - } + }, + "media_description_error": "Error al actualizar el archivo, inténtalo de nuevo", + "empty_status_error": "No se puede publicar un estado vacío y sin archivos adjuntos", + "preview_empty": "Vacío", + "preview": "Vista previa", + "media_description": "Descripción multimedia" }, "registration": { "bio": "Biografía", @@ -370,7 +376,24 @@ "save_load_hint": "Las opciones \"Mantener\" conservan las opciones configuradas actualmente al seleccionar o cargar temas, también almacena dichas opciones al exportar un tema. Cuando se desactiven todas las casillas de verificación, el tema de exportación lo guardará todo.", "reset": "Reiniciar", "clear_all": "Limpiar todo", - "clear_opacity": "Limpiar opacidad" + "clear_opacity": "Limpiar opacidad", + "help": { + "snapshot_source_mismatch": "Conflicto de versiones: lo más probable es que el frontend se haya revertido y actualizado nuevamente, si cambió el tema con una versión anterior del frontend, lo más probable es que desee usar la versión anterior; de lo contrario, use la nueva versión.", + "migration_napshot_gone": "Por alguna razón, faltaba la instantánea, algunas cosas podrían verse diferentes de lo que recuerdas.", + "migration_snapshot_ok": "Solo para estar seguro, se cargó la instantánea del tema. Puede intentar cargar los datos del tema.", + "fe_downgraded": "Versión de PleromaFE revertida.", + "fe_upgraded": "El creador de temas de PleromaFE se actualizó después de la actualización de la versión.", + "snapshot_missing": "No había ninguna instantánea del tema en el archivo, por lo que podría verse diferente de lo previsto originalmente.", + "snapshot_present": "Se ha cargado una instantánea del tema, por lo que todos los valores se sobrescriben. De lo contrario, puede cargar el tema por completo.", + "older_version_imported": "El archivo que ha importado se creó en una versión anterior del frontend actual.", + "v2_imported": "El archivo que ha importado fue creado para un frontend más antiguo. Intentamos maximizar la compatibilidad, pero aún podría haber inconsistencias.", + "future_version_imported": "El archivo que ha importado se creó para una versión más reciente del frontend.", + "upgraded_from_v2": "PleromaFE se ha actualizado, el tema podría verse un poco diferente de lo que recuerdas." + }, + "use_source": "Nueva versión", + "use_snapshot": "Versión antigua", + "keep_as_is": "Mantener como está", + "load_theme": "Cargar tema" }, "common": { "color": "Color", @@ -405,7 +428,26 @@ "borders": "Bordes", "buttons": "Botones", "inputs": "Campos de entrada", - "faint_text": "Texto desvanecido" + "faint_text": "Texto desvanecido", + "alert_neutral": "Neutral", + "chat": { + "border": "Borde", + "outgoing": "Salientes", + "incoming": "Entrantes" + }, + "tabs": "Pestañas", + "toggled": "Intercambiado", + "disabled": "Deshabilitado", + "selectedMenu": "Elemento del menú seleccionado", + "selectedPost": "Publicación seleccionada", + "pressed": "Presionado", + "highlight": "Elementos destacados", + "icons": "Iconos", + "poll": "Gráfico de la encuesta", + "underlay": "Subrayado", + "popover": "Sugerencias, menús, superposiciones", + "post": "Publicaciones/Biografías de Usuarios", + "alert_warning": "Precaución" }, "radii": { "_tab_label": "Redondez" @@ -438,7 +480,8 @@ "buttonPressed": "Botón (presionado)", "buttonPressedHover": "Botón (presionado+encima)", "input": "Campo de entrada" - } + }, + "hintV3": "Para las sombras, también puede usar la notación {0} para usar otro espacio de color." }, "fonts": { "_tab_label": "Fuentes", @@ -473,7 +516,42 @@ "title": "Versión", "backend_version": "Versión del Backend", "frontend_version": "Versión del Frontend" - } + }, + "notification_visibility_moves": "Usuario Migrado", + "greentext": "Texto verde (meme arrows)", + "notification_setting_hide_notification_contents": "Ocultar el remitente y el contenido de las notificaciones push", + "notification_setting_privacy": "Privacidad", + "notification_setting_block_from_strangers": "Bloquea las notificaciones de los usuarios que no sigues", + "notification_setting_filters": "Filtros", + "fun": "Divertido", + "type_domains_to_mute": "Buscar dominios para silenciar", + "useStreamingApiWarning": "(no recomendado, experimental, puede omitir publicaciones)", + "useStreamingApi": "Recibir entradas y notificaciones en tiempo real", + "user_mutes": "Usuarios", + "reset_profile_background": "Restablecer el fondo de pantalla", + "reset_background_confirm": "¿Estás seguro de restablecer el fondo de pantalla?", + "reset_banner_confirm": "¿Estás seguro de restablecer la imagen del banner?", + "reset_avatar_confirm": "¿Estás seguro de restablecer la imagen de avatar?", + "reset_profile_banner": "Restabler imagen del banner del perfil", + "reset_avatar": "Restablecer avatar", + "notification_visibility_emoji_reactions": "Reacciones", + "new_email": "Nuevo correo electrónico", + "profile_fields": { + "value": "Contenido", + "name": "Etiqueta", + "add_field": "Añadir un campo", + "label": "Metadatos del perfil" + }, + "accent": "Acento", + "emoji_reactions_on_timeline": "Mostrar las reacciones de emoji en la línea de tiempo", + "domain_mutes": "Dominios", + "mutes_and_blocks": "Silenciado y Bloqueados", + "chatMessageRadius": "Mensaje de chat", + "changed_email": "¡Correo electrónico modificado correctamente!", + "change_email_error": "Ha ocurrido un error al intentar modificar tu correo electrónico.", + "change_email": "Modificar el correo electrónico", + "bot": "Esta cuenta es un bot", + "allow_following_move": "Permitir el seguimiento automático, cuando la cuenta que sigues se traslada a otra instancia" }, "time": { "day": "{0} día", @@ -519,7 +597,8 @@ "show_new": "Mostrar lo nuevo", "up_to_date": "Actualizado", "no_more_statuses": "No hay más estados", - "no_statuses": "Sin estados" + "no_statuses": "Sin estados", + "reload": "Recargar" }, "status": { "favorites": "Favoritos", @@ -532,7 +611,17 @@ "reply_to": "Respondiendo a", "replies_list": "Respuestas:", "mute_conversation": "Silenciar la conversación", - "unmute_conversation": "Mostrar la conversación" + "unmute_conversation": "Mostrar la conversación", + "hide_content": "Ocultar el contenido", + "show_content": "Mostrar el contenido", + "hide_full_subject": "Ocultar el tema completo", + "show_full_subject": "Mostrar el tema completo", + "thread_muted_and_words": ", contiene:", + "thread_muted": "Conversación silenciada", + "copy_link": "Copiar el enlace al estado", + "status_unavailable": "Estado no disponible", + "bookmark": "Marcar", + "unbookmark": "Desmarcar" }, "user_card": { "approve": "Aprobar", @@ -586,7 +675,9 @@ "delete_user_confirmation": "¿Estás completamente seguro? Esta acción no se puede deshacer." }, "show_repeats": "Mostrar repetidos", - "hide_repeats": "Ocultar repetidos" + "hide_repeats": "Ocultar repetidos", + "message": "Mensaje", + "hidden": "Oculto" }, "user_profile": { "timeline_title": "Linea Temporal del Usuario", @@ -611,7 +702,11 @@ "repeat": "Repetir", "reply": "Contestar", "favorite": "Favorito", - "user_settings": "Ajustes de usuario" + "user_settings": "Ajustes de usuario", + "bookmark": "Marcador", + "reject_follow_request": "Rechazar la solicitud de seguimiento", + "accept_follow_request": "Aceptar la solicitud de seguimiento", + "add_reaction": "Añadir Reacción" }, "upload": { "error": { @@ -642,7 +737,9 @@ "check_email": "Revise su correo electrónico para obtener un enlace para restablecer su contraseña.", "return_home": "Volver a la página de inicio", "too_many_requests": "Has alcanzado el límite de intentos, vuelve a intentarlo más tarde.", - "password_reset_disabled": "El restablecimiento de contraseñas está deshabilitado. Póngase en contacto con el administrador de su instancia." + "password_reset_disabled": "El restablecimiento de contraseñas está deshabilitado. Póngase en contacto con el administrador de su instancia.", + "password_reset_required_but_mailer_is_disabled": "Debes restablecer la contraseña, pero el restablecimiento de contraseñas está deshabilitado. Por favor contacta con el administrador de la instancia.", + "password_reset_required": "Debes restablecer la contraseña para iniciar sesión." }, "errors": { "storage_unavailable": "Pleroma no pudo acceder al almacenamiento del navegador. Su inicio de sesión o su configuración local no se guardarán y puede encontrar problemas inesperados. Intente habilitar las cookies." @@ -685,5 +782,32 @@ }, "shoutbox": { "title": "Jaula de Grillos" + }, + "remote_user_resolver": { + "remote_user_resolver": "Resolución de usuario remoto", + "error": "No encontrado.", + "searching_for": "Buscando" + }, + "chats": { + "chats": "Chats", + "empty_chat_list_placeholder": "Aún no tienes ninguna conversación. ¡Inicia una nueva conversación!", + "error_sending_message": "Algo salió mal al enviar el mensaje.", + "error_loading_chat": "Algo salió mal al cargar el chat.", + "delete_confirm": "¿Realmente quieres borrar este mensaje?", + "more": "Más", + "empty_message_error": "No puedes publicar un mensaje vacío", + "new": "Nueva conversación", + "delete": "Borrar", + "message_user": "Mensaje de {nickname}", + "you": "Tú:" + }, + "display_date": { + "today": "Hoy" + }, + "file_type": { + "file": "Archivo", + "image": "Imagen", + "video": "Vídeo", + "audio": "Audio" } } From 26c42484f04329082661b14de0ece38d521c20de Mon Sep 17 00:00:00 2001 From: tarteka Date: Sun, 6 Sep 2020 14:38:50 +0000 Subject: [PATCH 06/22] Translated using Weblate (Basque) Currently translated at 77.4% (513 of 662 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eu/ --- src/i18n/eu.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/i18n/eu.json b/src/i18n/eu.json index ad3e02a0..fdca6b95 100644 --- a/src/i18n/eu.json +++ b/src/i18n/eu.json @@ -232,7 +232,7 @@ "default_vis": "Lehenetsitako ikusgaitasunak", "delete_account": "Ezabatu kontua", "discoverable": "Baimendu zure kontua kanpo bilaketa-emaitzetan eta bestelako zerbitzuetan agertzea", - "delete_account_description": "Betirako ezabatu zure kontua eta zure mezu guztiak", + "delete_account_description": "Betirako ezabatu zure datuak eta desaktibatu kontua.", "pad_emoji": "Zuriuneak gehitu emoji bat aukeratzen denean", "delete_account_error": "Arazo bat gertatu da zure kontua ezabatzerakoan. Arazoa jarraitu eskero, administratzailearekin harremanetan jarri.", "delete_account_instructions": "Idatzi zure pasahitza kontua ezabatzeko.", @@ -630,5 +630,13 @@ "password_reset_disabled": "Pasahitza berrezartzea debekatuta dago. Mesedez, jarri harremanetan instantzia administratzailearekin.", "password_reset_required": "Pasahitza berrezarri behar duzu saioa hasteko.", "password_reset_required_but_mailer_is_disabled": "Pasahitza berrezarri behar duzu, baina pasahitza berrezartzeko aukera desgaituta dago. Mesedez, jarri harremanetan instantziaren administratzailearekin." + }, + "about": { + "mrf": { + "keyword": { + "keyword_policies": "Gako-hitz politika" + }, + "federation": "Federazioa" + } } } From 947d7cd6f285c7c683b92f79d9d2c08dd2131f5d Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Mon, 7 Sep 2020 14:27:37 +0300 Subject: [PATCH 07/22] added import/export mutes --- local.json | 4 --- .../tabs/data_import_export_tab.js | 28 ++++++++++++++----- .../tabs/data_import_export_tab.vue | 17 +++++++++++ src/i18n/en.json | 6 ++++ src/services/api/api.service.js | 13 +++++++++ 5 files changed, 57 insertions(+), 11 deletions(-) delete mode 100644 local.json diff --git a/local.json b/local.json deleted file mode 100644 index e9f4df0b..00000000 --- a/local.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "target": "https://aqueous-sea-10253.herokuapp.com/", - "staticConfigPreference": false -} diff --git a/src/components/settings_modal/tabs/data_import_export_tab.js b/src/components/settings_modal/tabs/data_import_export_tab.js index 168f89e1..f4b736d2 100644 --- a/src/components/settings_modal/tabs/data_import_export_tab.js +++ b/src/components/settings_modal/tabs/data_import_export_tab.js @@ -1,6 +1,7 @@ import Importer from 'src/components/importer/importer.vue' import Exporter from 'src/components/exporter/exporter.vue' import Checkbox from 'src/components/checkbox/checkbox.vue' +import { mapState } from 'vuex' const DataImportExportTab = { data () { @@ -18,21 +19,26 @@ const DataImportExportTab = { Checkbox }, computed: { - user () { - return this.$store.state.users.currentUser - } + ...mapState({ + backendInteractor: (state) => state.api.backendInteractor, + user: (state) => state.users.currentUser + }) }, methods: { getFollowsContent () { - return this.$store.state.api.backendInteractor.exportFriends({ id: this.$store.state.users.currentUser.id }) + return this.backendInteractor.exportFriends({ id: this.user.id }) .then(this.generateExportableUsersContent) }, getBlocksContent () { - return this.$store.state.api.backendInteractor.fetchBlocks() + return this.backendInteractor.fetchBlocks() + .then(this.generateExportableUsersContent) + }, + getMutesContent () { + return this.backendInteractor.fetchMutes() .then(this.generateExportableUsersContent) }, importFollows (file) { - return this.$store.state.api.backendInteractor.importFollows({ file }) + return this.backendInteractor.importFollows({ file }) .then((status) => { if (!status) { throw new Error('failed') @@ -40,7 +46,15 @@ const DataImportExportTab = { }) }, importBlocks (file) { - return this.$store.state.api.backendInteractor.importBlocks({ file }) + return this.backendInteractor.importBlocks({ file }) + .then((status) => { + if (!status) { + throw new Error('failed') + } + }) + }, + importMutes (file) { + return this.backendInteractor.importMutes({ file }) .then((status) => { if (!status) { throw new Error('failed') diff --git a/src/components/settings_modal/tabs/data_import_export_tab.vue b/src/components/settings_modal/tabs/data_import_export_tab.vue index b5d0f5ed..a406077d 100644 --- a/src/components/settings_modal/tabs/data_import_export_tab.vue +++ b/src/components/settings_modal/tabs/data_import_export_tab.vue @@ -36,6 +36,23 @@ :export-button-label="$t('settings.block_export_button')" /> +
+

{{ $t('settings.mute_import') }}

+

{{ $t('settings.import_mutes_from_a_csv_file') }}

+ +
+
+

{{ $t('settings.mute_export') }}

+ +
diff --git a/src/i18n/en.json b/src/i18n/en.json index 8540f551..cf0a7e7c 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -276,6 +276,12 @@ "block_import": "Block import", "block_import_error": "Error importing blocks", "blocks_imported": "Blocks imported! Processing them will take a while.", + "mute_export": "Mute export", + "mute_export_button": "Export your mutes to a csv file", + "mute_import": "Mute import", + "mute_import_error": "Error importing mutes", + "mutes_imported": "Mutes imported! Processing them will take a while.", + "import_mutes_from_a_csv_file": "Import mutes from a csv file", "blocks_tab": "Blocks", "bot": "This is a bot account", "btnRadius": "Buttons", diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index da519001..34f86f93 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -3,6 +3,7 @@ import { parseStatus, parseUser, parseNotification, parseAttachment, parseChat, import { RegistrationError, StatusCodeError } from '../errors/errors' /* eslint-env browser */ +const MUTES_IMPORT_URL = '/api/pleroma/mutes_import' const BLOCKS_IMPORT_URL = '/api/pleroma/blocks_import' const FOLLOW_IMPORT_URL = '/api/pleroma/follow_import' const DELETE_ACCOUNT_URL = '/api/pleroma/delete_account' @@ -710,6 +711,17 @@ const setMediaDescription = ({ id, description, credentials }) => { }).then((data) => parseAttachment(data)) } +const importMutes = ({ file, credentials }) => { + const formData = new FormData() + formData.append('list', file) + return fetch(MUTES_IMPORT_URL, { + body: formData, + method: 'POST', + headers: authHeaders(credentials) + }) + .then((response) => response.ok) +} + const importBlocks = ({ file, credentials }) => { const formData = new FormData() formData.append('list', file) @@ -1280,6 +1292,7 @@ const apiService = { getCaptcha, updateProfileImages, updateProfile, + importMutes, importBlocks, importFollows, deleteAccount, From 8975589bca81ff6eb84084047bf74e16ee5d1cd7 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Tue, 8 Sep 2020 10:44:08 +0300 Subject: [PATCH 08/22] fix vue warnings and errors --- .../contrast_ratio/contrast_ratio.vue | 7 +++-- src/components/poll/poll.vue | 2 ++ .../tabs/theme_tab/theme_tab.vue | 30 +++++++++---------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/components/contrast_ratio/contrast_ratio.vue b/src/components/contrast_ratio/contrast_ratio.vue index ba92bc17..9dc871b6 100644 --- a/src/components/contrast_ratio/contrast_ratio.vue +++ b/src/components/contrast_ratio/contrast_ratio.vue @@ -39,13 +39,16 @@ export default { props: { large: { - required: false + required: false, + type: Boolean, + default: false }, // TODO: Make theme switcher compute theme initially so that contrast // component won't be called without contrast data contrast: { required: false, - type: Object + type: Object, + default: () => ({}) } }, computed: { diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue index 1858f3e1..fedb92c8 100644 --- a/src/components/poll/poll.vue +++ b/src/components/poll/poll.vue @@ -17,7 +17,9 @@ {{ percentageForOption(option.votes_count) }}% + +
@@ -359,7 +359,7 @@ />
@@ -740,57 +740,57 @@
{{ $t('settings.style.advanced_colors.chat.incoming') }}
{{ $t('settings.style.advanced_colors.chat.outgoing') }}
From afb2241a5ba057f5d21abb23fa5400e461ba8cf5 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Tue, 8 Sep 2020 16:29:10 +0300 Subject: [PATCH 09/22] change a eslint disable to nextline only --- src/components/poll/poll.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue index fedb92c8..5f54b416 100644 --- a/src/components/poll/poll.vue +++ b/src/components/poll/poll.vue @@ -17,9 +17,8 @@ {{ percentageForOption(option.votes_count) }}% - + -
Date: Wed, 16 Sep 2020 05:08:12 +0300 Subject: [PATCH 10/22] Fix the chat list order and last message timestamp updates --- src/modules/chats.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/chats.js b/src/modules/chats.js index c7609018..aef16322 100644 --- a/src/modules/chats.js +++ b/src/modules/chats.js @@ -143,6 +143,7 @@ const chats = { const isNewMessage = (chat.lastMessage && chat.lastMessage.id) !== (updatedChat.lastMessage && updatedChat.lastMessage.id) chat.lastMessage = updatedChat.lastMessage chat.unread = updatedChat.unread + chat.updated_at = updatedChat.updated_at if (isNewMessage && chat.unread) { newChatMessageSideEffects(updatedChat) } From 8c4514013d5a53218830a82a6ac46f5969edd69b Mon Sep 17 00:00:00 2001 From: eugenijm Date: Wed, 16 Sep 2020 02:34:19 +0300 Subject: [PATCH 11/22] Fix chat messages being missed when the streaming is disabled and the messages are sent by both participants simultaneously --- src/components/chat/chat.js | 12 +++++++---- src/modules/chats.js | 20 +++---------------- src/services/chat_service/chat_service.js | 17 +++++++++------- .../chat_service/chat_service.spec.js | 10 +++++----- 4 files changed, 26 insertions(+), 33 deletions(-) diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js index 9c4e5b05..803abf69 100644 --- a/src/components/chat/chat.js +++ b/src/components/chat/chat.js @@ -204,9 +204,9 @@ const Chat = { } }, readChat () { - if (!(this.currentChatMessageService && this.currentChatMessageService.lastMessage)) { return } + if (!(this.currentChatMessageService && this.currentChatMessageService.maxId)) { return } if (document.hidden) { return } - const lastReadId = this.currentChatMessageService.lastMessage.id + const lastReadId = this.currentChatMessageService.maxId this.$store.dispatch('readChat', { id: this.currentChat.id, lastReadId }) }, bottomedOut (offset) { @@ -244,7 +244,7 @@ const Chat = { const chatId = chatMessageService.chatId const fetchOlderMessages = !!maxId - const sinceId = fetchLatest && chatMessageService.lastMessage && chatMessageService.lastMessage.id + const sinceId = fetchLatest && chatMessageService.maxId this.backendInteractor.chatMessages({ id: chatId, maxId, sinceId }) .then((messages) => { @@ -303,7 +303,11 @@ const Chat = { return this.backendInteractor.sendChatMessage(params) .then(data => { - this.$store.dispatch('addChatMessages', { chatId: this.currentChat.id, messages: [data] }).then(() => { + this.$store.dispatch('addChatMessages', { + chatId: this.currentChat.id, + messages: [data], + updateMaxId: false + }).then(() => { this.$nextTick(() => { this.handleResize() // When the posting form size changes because of a media attachment, we need an extra resize diff --git a/src/modules/chats.js b/src/modules/chats.js index c7609018..e752c6df 100644 --- a/src/modules/chats.js +++ b/src/modules/chats.js @@ -181,30 +181,16 @@ const chats = { setChatsLoading (state, { value }) { state.chats.loading = value }, - addChatMessages (state, { commit, chatId, messages }) { + addChatMessages (state, { chatId, messages, updateMaxId }) { const chatMessageService = state.openedChatMessageServices[chatId] if (chatMessageService) { - chatService.add(chatMessageService, { messages: messages.map(parseChatMessage) }) - commit('refreshLastMessage', { chatId }) + chatService.add(chatMessageService, { messages: messages.map(parseChatMessage), updateMaxId }) } }, - refreshLastMessage (state, { chatId }) { - const chatMessageService = state.openedChatMessageServices[chatId] - if (chatMessageService) { - const chat = getChatById(state, chatId) - if (chat) { - chat.lastMessage = chatMessageService.lastMessage - if (chatMessageService.lastMessage) { - chat.updated_at = chatMessageService.lastMessage.created_at - } - } - } - }, - deleteChatMessage (state, { commit, chatId, messageId }) { + deleteChatMessage (state, { chatId, messageId }) { const chatMessageService = state.openedChatMessageServices[chatId] if (chatMessageService) { chatService.deleteMessage(chatMessageService, messageId) - commit('refreshLastMessage', { chatId }) } }, resetChatNewMessageCount (state, _value) { diff --git a/src/services/chat_service/chat_service.js b/src/services/chat_service/chat_service.js index b60a889b..95c69482 100644 --- a/src/services/chat_service/chat_service.js +++ b/src/services/chat_service/chat_service.js @@ -8,7 +8,7 @@ const empty = (chatId) => { lastSeenTimestamp: 0, chatId: chatId, minId: undefined, - lastMessage: undefined + maxId: undefined } } @@ -18,7 +18,7 @@ const clear = (storage) => { storage.newMessageCount = 0 storage.lastSeenTimestamp = 0 storage.minId = undefined - storage.lastMessage = undefined + storage.maxId = undefined } const deleteMessage = (storage, messageId) => { @@ -26,8 +26,9 @@ const deleteMessage = (storage, messageId) => { storage.messages = storage.messages.filter(m => m.id !== messageId) delete storage.idIndex[messageId] - if (storage.lastMessage && (storage.lastMessage.id === messageId)) { - storage.lastMessage = _.maxBy(storage.messages, 'id') + if (storage.maxId === messageId) { + const lastMessage = _.maxBy(storage.messages, 'id') + storage.maxId = lastMessage.id } if (storage.minId === messageId) { @@ -36,7 +37,7 @@ const deleteMessage = (storage, messageId) => { } } -const add = (storage, { messages: newMessages }) => { +const add = (storage, { messages: newMessages, updateMaxId = true }) => { if (!storage) { return } for (let i = 0; i < newMessages.length; i++) { const message = newMessages[i] @@ -48,8 +49,10 @@ const add = (storage, { messages: newMessages }) => { storage.minId = message.id } - if (!storage.lastMessage || message.id > storage.lastMessage.id) { - storage.lastMessage = message + if (!storage.maxId || message.id > storage.maxId) { + if (updateMaxId) { + storage.maxId = message.id + } } if (!storage.idIndex[message.id]) { diff --git a/test/unit/specs/services/chat_service/chat_service.spec.js b/test/unit/specs/services/chat_service/chat_service.spec.js index 3ee9839d..2eb89a2d 100644 --- a/test/unit/specs/services/chat_service/chat_service.spec.js +++ b/test/unit/specs/services/chat_service/chat_service.spec.js @@ -33,12 +33,12 @@ describe('chatService', () => { const chat = chatService.empty() chatService.add(chat, { messages: [ message1 ] }) - expect(chat.lastMessage.id).to.eql(message1.id) + expect(chat.maxId).to.eql(message1.id) expect(chat.minId).to.eql(message1.id) expect(chat.newMessageCount).to.eql(1) chatService.add(chat, { messages: [ message2 ] }) - expect(chat.lastMessage.id).to.eql(message2.id) + expect(chat.maxId).to.eql(message2.id) expect(chat.minId).to.eql(message1.id) expect(chat.newMessageCount).to.eql(2) @@ -60,15 +60,15 @@ describe('chatService', () => { chatService.add(chat, { messages: [ message2 ] }) chatService.add(chat, { messages: [ message3 ] }) - expect(chat.lastMessage.id).to.eql(message3.id) + expect(chat.maxId).to.eql(message3.id) expect(chat.minId).to.eql(message1.id) chatService.deleteMessage(chat, message3.id) - expect(chat.lastMessage.id).to.eql(message2.id) + expect(chat.maxId).to.eql(message2.id) expect(chat.minId).to.eql(message1.id) chatService.deleteMessage(chat, message1.id) - expect(chat.lastMessage.id).to.eql(message2.id) + expect(chat.maxId).to.eql(message2.id) expect(chat.minId).to.eql(message2.id) }) }) From d6fe4f6a4fa4c8fb928bcd187e605c76f985d06d Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Wed, 16 Sep 2020 10:27:31 +0300 Subject: [PATCH 12/22] update changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18dafa8e..c56ac821 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] ## [Unreleased patch] +### Fixed +- Fixed chats list not updating its order when new messages come in +- Fixed chat messages sometimes getting lost when you receive a message at the same time + + +## [2.1.1] - 2020-09-08 ### Changed - Polls will be hidden with status content if "Collapse posts with subjects" is enabled and the post is collapsed. @@ -13,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Autocomplete won't stop at the second @, so it'll still work with "@lain@l" and not start over. - Fixed weird autocomplete behavior when you write ":custom_emoji: ?" + ## [2.1.0] - 2020-08-28 ### Added - Autocomplete domains from list of known instances From 1b811d8b931706927d8fa096435b2c272eb0d7ef Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Wed, 16 Sep 2020 11:29:10 +0300 Subject: [PATCH 13/22] change side drawer to use shoutbox name --- src/components/side_drawer/side_drawer.vue | 2 +- src/i18n/en.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue index 0587ee02..b17813c3 100644 --- a/src/components/side_drawer/side_drawer.vue +++ b/src/components/side_drawer/side_drawer.vue @@ -90,7 +90,7 @@ @click="toggleDrawer" > - {{ $t("nav.chat") }} + {{ $t("shoutbox.title") }} diff --git a/src/i18n/en.json b/src/i18n/en.json index 8540f551..027e99be 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -113,7 +113,6 @@ "about": "About", "administration": "Administration", "back": "Back", - "chat": "Local Chat", "friend_requests": "Follow Requests", "mentions": "Mentions", "interactions": "Interactions", From 20d33c2fbc1e3cf9cdbab94c26b138acd505d001 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Wed, 16 Sep 2020 11:53:54 +0300 Subject: [PATCH 14/22] change icon to a megaphone --- src/components/chat_panel/chat_panel.vue | 2 +- src/components/side_drawer/side_drawer.vue | 2 +- static/fontello.json | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/chat_panel/chat_panel.vue b/src/components/chat_panel/chat_panel.vue index ca529b5a..570435e7 100644 --- a/src/components/chat_panel/chat_panel.vue +++ b/src/components/chat_panel/chat_panel.vue @@ -63,7 +63,7 @@ @click.stop.prevent="togglePanel" >
- + {{ $t('shoutbox.title') }}
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue index b17813c3..eda5a68c 100644 --- a/src/components/side_drawer/side_drawer.vue +++ b/src/components/side_drawer/side_drawer.vue @@ -90,7 +90,7 @@ @click="toggleDrawer" > - {{ $t("shoutbox.title") }} + {{ $t("shoutbox.title") }} diff --git a/static/fontello.json b/static/fontello.json index 706800cd..b0136fd9 100644 --- a/static/fontello.json +++ b/static/fontello.json @@ -405,6 +405,12 @@ "css": "block", "code": 59434, "src": "fontawesome" + }, + { + "uid": "3e674995cacc2b09692c096ea7eb6165", + "css": "megaphone", + "code": 59435, + "src": "fontawesome" } ] } \ No newline at end of file From 70a5619496db1620fcc6d0127449ffb498a3dae4 Mon Sep 17 00:00:00 2001 From: Dym Sohin Date: Fri, 18 Sep 2020 11:07:38 +0200 Subject: [PATCH 15/22] [fix] case in/sensitive emoji search --- src/components/emoji_picker/emoji_picker.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js index 0f397b59..5c09f6ca 100644 --- a/src/components/emoji_picker/emoji_picker.js +++ b/src/components/emoji_picker/emoji_picker.js @@ -8,7 +8,10 @@ const LOAD_EMOJI_BY = 60 const LOAD_EMOJI_MARGIN = 64 const filterByKeyword = (list, keyword = '') => { - return list.filter(x => x.displayText.includes(keyword)) + const keywordLowercase = keyword.toLowerCase() + return list.filter(emoji => + emoji.displayText.toLowerCase().includes(keywordLowercase) + ) } const EmojiPicker = { From 5942001626d01f6438e53943f1b8a8a2448d1378 Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Fri, 18 Sep 2020 22:09:05 +0300 Subject: [PATCH 16/22] updated changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c56ac821..15aeb7cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Fixed - Fixed chats list not updating its order when new messages come in -- Fixed chat messages sometimes getting lost when you receive a message at the same time +- Fixed chat messages sometimes getting lost when you receive a message at the same time +### Added +- Import/export a muted users ## [2.1.1] - 2020-09-08 ### Changed From f9977dbb3c9b316521b6be40ddd1a34411f2d835 Mon Sep 17 00:00:00 2001 From: Dym Sohin Date: Sat, 19 Sep 2020 21:28:03 +0200 Subject: [PATCH 17/22] fix excessive underline in sidebar --- src/App.scss | 1 + src/components/nav_panel/nav_panel.vue | 10 +++++----- src/components/timeline_menu/timeline_menu.vue | 6 +----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/App.scss b/src/App.scss index e2e2d079..8b1bbd2d 100644 --- a/src/App.scss +++ b/src/App.scss @@ -809,6 +809,7 @@ nav { .button-icon { font-size: 1.2em; + margin-right: 0.5em; } @keyframes shakeError { diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue index f8459fd1..080e547f 100644 --- a/src/components/nav_panel/nav_panel.vue +++ b/src/components/nav_panel/nav_panel.vue @@ -7,12 +7,12 @@ :to="{ name: timelinesRoute }" :class="onTimelineRoute && 'router-link-active'" > - {{ $t("nav.timelines") }} + {{ $t("nav.timelines") }}
  • - {{ $t("nav.interactions") }} + {{ $t("nav.interactions") }}
  • @@ -23,12 +23,12 @@ > {{ unreadChatCount }} - {{ $t("nav.chats") }} + {{ $t("nav.chats") }}
  • - {{ $t("nav.friend_requests") }} + {{ $t("nav.friend_requests") }}
  • - {{ $t("nav.about") }} + {{ $t("nav.about") }}
    • diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue index be512d60..3c029093 100644 --- a/src/components/timeline_menu/timeline_menu.vue +++ b/src/components/timeline_menu/timeline_menu.vue @@ -64,7 +64,7 @@ .timeline-menu-popover-wrap { overflow: hidden; // Match panel heading padding to line up menu with bottom of heading - margin-top: 0.6rem; + margin-top: 0.6rem 0.65em; padding: 0 15px 15px 15px; } .timeline-menu-popover { @@ -138,10 +138,6 @@ &:last-child { border: none; } - - i { - margin: 0 0.5em; - } } a { From 20362546d10287cbba8150424e5e073c39219757 Mon Sep 17 00:00:00 2001 From: Dym Sohin Date: Sat, 19 Sep 2020 21:50:56 +0200 Subject: [PATCH 18/22] fix/overflow-for-chat-unread --- src/App.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/App.scss b/src/App.scss index e2e2d079..88e5df86 100644 --- a/src/App.scss +++ b/src/App.scss @@ -941,6 +941,9 @@ nav { min-height: 1.3rem; max-height: 1.3rem; line-height: 1.3rem; + max-width: 10em; + overflow: hidden; + text-overflow: ellipsis; } .chat-layout { From 3dacef944cf6980dc3a3c1843d5b3f94b851240a Mon Sep 17 00:00:00 2001 From: Dym Sohin Date: Thu, 24 Sep 2020 12:05:51 +0200 Subject: [PATCH 19/22] remove bio-table's max-width --- src/components/user_profile/user_profile.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index c7c67c0a..b26499b4 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -156,8 +156,7 @@ .user-profile-field { display: flex; - margin: 0.25em auto; - max-width: 32em; + margin: 0.25em; border: 1px solid var(--border, $fallback--border); border-radius: $fallback--inputRadius; border-radius: var(--inputRadius, $fallback--inputRadius); From f174f289a93e6bef1182a2face00bb809da49d18 Mon Sep 17 00:00:00 2001 From: Shpuld Shpludson Date: Tue, 29 Sep 2020 10:18:37 +0000 Subject: [PATCH 20/22] Timeline virtual scrolling --- CHANGELOG.md | 3 + src/components/attachment/attachment.vue | 4 ++ src/components/conversation/conversation.js | 20 +++++- src/components/conversation/conversation.vue | 11 +++- src/components/react_button/react_button.js | 5 +- .../retweet_button/retweet_button.js | 5 +- .../settings_modal/tabs/general_tab.vue | 5 ++ src/components/status/status.js | 31 +++++++-- src/components/status/status.scss | 5 ++ src/components/status/status.vue | 7 +- .../status_content/status_content.vue | 2 + src/components/still-image/still-image.js | 10 +-- src/components/timeline/timeline.js | 64 ++++++++++++++++++- src/components/timeline/timeline.vue | 6 +- .../video_attachment/video_attachment.js | 49 ++++++++++---- .../video_attachment/video_attachment.vue | 3 +- src/i18n/en.json | 1 + src/modules/config.js | 3 +- src/modules/instance.js | 1 + src/modules/statuses.js | 6 ++ src/services/api/api.service.js | 2 + 21 files changed, 204 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18dafa8e..eebc7115 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] +### Added +- New option to optimize timeline rendering to make the site more responsive (enabled by default) + ## [Unreleased patch] ### Changed diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index 63e0ceba..7fabc963 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -80,6 +80,8 @@ class="video" :attachment="attachment" :controls="allowPlay" + @play="$emit('play')" + @pause="$emit('pause')" />
    @@ -18,6 +20,7 @@
    +
    @@ -53,8 +60,8 @@ .conversation-status { border-color: $fallback--border; border-color: var(--border, $fallback--border); - border-left: 4px solid $fallback--cRed; - border-left: 4px solid var(--cRed, $fallback--cRed); + border-left-color: $fallback--cRed; + border-left-color: var(--cRed, $fallback--cRed); } .conversation-status:last-child { diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js index abcf0455..11627e9c 100644 --- a/src/components/react_button/react_button.js +++ b/src/components/react_button/react_button.js @@ -1,5 +1,4 @@ import Popover from '../popover/popover.vue' -import { mapGetters } from 'vuex' const ReactButton = { props: ['status'], @@ -35,7 +34,9 @@ const ReactButton = { } return this.$store.state.instance.emoji || [] }, - ...mapGetters(['mergedConfig']) + mergedConfig () { + return this.$store.getters.mergedConfig + } } } diff --git a/src/components/retweet_button/retweet_button.js b/src/components/retweet_button/retweet_button.js index d9a0f92e..5a41f22d 100644 --- a/src/components/retweet_button/retweet_button.js +++ b/src/components/retweet_button/retweet_button.js @@ -1,4 +1,3 @@ -import { mapGetters } from 'vuex' const RetweetButton = { props: ['status', 'loggedIn', 'visibility'], @@ -28,7 +27,9 @@ const RetweetButton = { 'animate-spin': this.animated } }, - ...mapGetters(['mergedConfig']) + mergedConfig () { + return this.$store.getters.mergedConfig + } } } diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue index 7f06d0bd..13482de7 100644 --- a/src/components/settings_modal/tabs/general_tab.vue +++ b/src/components/settings_modal/tabs/general_tab.vue @@ -58,6 +58,11 @@ {{ $t('settings.emoji_reactions_on_timeline') }} +
  • + + {{ $t('settings.virtual_scrolling') }} + +
    • diff --git a/src/components/status/status.js b/src/components/status/status.js index d263da68..cd6e2f72 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -15,7 +15,6 @@ import generateProfileLink from 'src/services/user_profile_link_generator/user_p import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js' import { muteWordHits } from '../../services/status_parser/status_parser.js' import { unescape, uniqBy } from 'lodash' -import { mapGetters, mapState } from 'vuex' const Status = { name: 'Status', @@ -54,6 +53,8 @@ const Status = { replying: false, unmuted: false, userExpanded: false, + mediaPlaying: [], + suspendable: true, error: null } }, @@ -157,7 +158,7 @@ const Status = { return this.mergedConfig.hideFilteredStatuses }, hideStatus () { - return this.deleted || (this.muted && this.hideFilteredStatuses) + return this.deleted || (this.muted && this.hideFilteredStatuses) || this.virtualHidden }, isFocused () { // retweet or root of an expanded conversation @@ -207,11 +208,18 @@ const Status = { hidePostStats () { return this.mergedConfig.hidePostStats }, - ...mapGetters(['mergedConfig']), - ...mapState({ - betterShadow: state => state.interface.browserSupport.cssFilter, - currentUser: state => state.users.currentUser - }) + currentUser () { + return this.$store.state.users.currentUser + }, + betterShadow () { + return this.$store.state.interface.browserSupport.cssFilter + }, + mergedConfig () { + return this.$store.getters.mergedConfig + }, + isSuspendable () { + return !this.replying && this.mediaPlaying.length === 0 + } }, methods: { visibilityIcon (visibility) { @@ -251,6 +259,12 @@ const Status = { }, generateUserProfileLink (id, name) { return generateProfileLink(id, name, this.$store.state.instance.restrictedNicknames) + }, + addMediaPlaying (id) { + this.mediaPlaying.push(id) + }, + removeMediaPlaying (id) { + this.mediaPlaying = this.mediaPlaying.filter(mediaId => mediaId !== id) } }, watch: { @@ -280,6 +294,9 @@ const Status = { if (this.isFocused && this.statusFromGlobalRepository.favoritedBy && this.statusFromGlobalRepository.favoritedBy.length !== num) { this.$store.dispatch('fetchFavs', this.status.id) } + }, + 'isSuspendable': function (val) { + this.suspendable = val } }, filters: { diff --git a/src/components/status/status.scss b/src/components/status/status.scss index 8d292d3f..c92d870b 100644 --- a/src/components/status/status.scss +++ b/src/components/status/status.scss @@ -25,6 +25,11 @@ $status-margin: 0.75em; --icon: var(--selectedPostIcon, $fallback--icon); } + &.-conversation { + border-left-width: 4px; + border-left-style: solid; + } + .status-container { display: flex; padding: $status-margin; diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 282ad37d..aa67e433 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -16,7 +16,7 @@ />
    diff --git a/src/i18n/en.json b/src/i18n/en.json index 8540f551..8d831e3d 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -430,6 +430,7 @@ "false": "no", "true": "yes" }, + "virtual_scrolling": "Optimize timeline rendering", "fun": "Fun", "greentext": "Meme arrows", "notifications": "Notifications", diff --git a/src/modules/config.js b/src/modules/config.js index 409d77a4..444b8ec7 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -65,7 +65,8 @@ export const defaultState = { useContainFit: false, greentext: undefined, // instance default hidePostStats: undefined, // instance default - hideUserStats: undefined // instance default + hideUserStats: undefined, // instance default + virtualScrolling: undefined // instance default } // caching the instance default properties diff --git a/src/modules/instance.js b/src/modules/instance.js index 3fe3bbf3..b3cbffc6 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -41,6 +41,7 @@ const defaultState = { sidebarRight: false, subjectLineBehavior: 'email', theme: 'pleroma-dark', + virtualScrolling: true, // Nasty stuff customEmoji: [], diff --git a/src/modules/statuses.js b/src/modules/statuses.js index e108b2a7..155cc4b9 100644 --- a/src/modules/statuses.js +++ b/src/modules/statuses.js @@ -568,6 +568,9 @@ export const mutations = { updateStatusWithPoll (state, { id, poll }) { const status = state.allStatusesObject[id] status.poll = poll + }, + setVirtualHeight (state, { statusId, height }) { + state.allStatusesObject[statusId].virtualHeight = height } } @@ -753,6 +756,9 @@ const statuses = { store.commit('addNewStatuses', { statuses: data.statuses }) return data }) + }, + setVirtualHeight ({ commit }, { statusId, height }) { + commit('setVirtualHeight', { statusId, height }) } }, mutations diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index da519001..d1842e17 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -539,8 +539,10 @@ const fetchTimeline = ({ const queryString = map(params, (param) => `${param[0]}=${param[1]}`).join('&') url += `?${queryString}` + let status = '' let statusText = '' + let pagination = {} return fetch(url, { headers: authHeaders(credentials) }) .then((data) => { From 1675f1a133934956a39ca4ade99b809789bb84a2 Mon Sep 17 00:00:00 2001 From: Dym Sohin Date: Tue, 29 Sep 2020 13:13:42 +0200 Subject: [PATCH 21/22] scoped back margin-right on icons --- src/App.scss | 1 - src/components/nav_panel/nav_panel.vue | 4 ++++ src/components/timeline_menu/timeline_menu.vue | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/App.scss b/src/App.scss index 8b1bbd2d..e2e2d079 100644 --- a/src/App.scss +++ b/src/App.scss @@ -809,7 +809,6 @@ nav { .button-icon { font-size: 1.2em; - margin-right: 0.5em; } @keyframes shakeError { diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue index 080e547f..4f944c95 100644 --- a/src/components/nav_panel/nav_panel.vue +++ b/src/components/nav_panel/nav_panel.vue @@ -125,6 +125,10 @@ } } +.nav-panel .button-icon { + margin-right: 0.5em; +} + .nav-panel .button-icon:before { width: 1.1em; } diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue index 3c029093..481b1d09 100644 --- a/src/components/timeline_menu/timeline_menu.vue +++ b/src/components/timeline_menu/timeline_menu.vue @@ -170,6 +170,10 @@ text-decoration: underline; } } + + i { + margin: 0 0.5em; + } } } From c17012cfe19ecab7efc27a54c90c4369c36de343 Mon Sep 17 00:00:00 2001 From: Dym Sohin Date: Tue, 29 Sep 2020 13:20:16 +0200 Subject: [PATCH 22/22] fix appended 0.65em on wrong line --- src/components/timeline_menu/timeline_menu.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue index 481b1d09..b7e5f2da 100644 --- a/src/components/timeline_menu/timeline_menu.vue +++ b/src/components/timeline_menu/timeline_menu.vue @@ -64,7 +64,7 @@ .timeline-menu-popover-wrap { overflow: hidden; // Match panel heading padding to line up menu with bottom of heading - margin-top: 0.6rem 0.65em; + margin-top: 0.6rem; padding: 0 15px 15px 15px; } .timeline-menu-popover { @@ -142,7 +142,7 @@ a { display: block; - padding: 0.6em 0; + padding: 0.6em 0.65em; &:hover { background-color: $fallback--lightBg; @@ -172,7 +172,7 @@ } i { - margin: 0 0.5em; + margin-right: 0.5em; } } }