-
+
);
}
}
-export default withRouter(injectIntl(FollowRequest));
+export default injectIntl(FollowRequest);
diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
index e12dc6e6ba..dce66a4e4d 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
@@ -1,258 +1,437 @@
-// Package imports.
import PropTypes from 'prop-types';
+import { injectIntl, FormattedMessage, defineMessages } from 'react-intl';
+
+import classNames from 'classnames';
+import { withRouter } from 'react-router-dom';
+
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
-// Our imports,
+import { HotKeys } from 'react-hotkeys';
+
+import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
+import PersonIcon from '@/material-icons/400-24px/person-fill.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import { Icon } from 'flavours/glitch/components/icon';
+import { Permalink } from 'flavours/glitch/components/permalink';
+import AccountContainer from 'flavours/glitch/containers/account_container';
import StatusContainer from 'flavours/glitch/containers/status_container';
+import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
-import NotificationAdminReportContainer from '../containers/admin_report_container';
-import NotificationFollowRequestContainer from '../containers/follow_request_container';
+import FollowRequestContainer from '../containers/follow_request_container';
+import NotificationOverlayContainer from '../containers/overlay_container';
-import NotificationAdminSignup from './admin_signup';
-import NotificationFollow from './follow';
+import Report from './report';
-export default class Notification extends ImmutablePureComponent {
+const messages = defineMessages({
+ follow: { id: 'notification.follow', defaultMessage: '{name} followed you' },
+ adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
+ adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
+});
+const notificationForScreenReader = (intl, message, timestamp) => {
+ const output = [message];
+
+ output.push(intl.formatDate(timestamp, { hour: '2-digit', minute: '2-digit', month: 'short', day: 'numeric' }));
+
+ return output.join(', ');
+};
+
+class Notification extends ImmutablePureComponent {
static propTypes = {
notification: ImmutablePropTypes.map.isRequired,
hidden: PropTypes.bool,
onMoveUp: PropTypes.func.isRequired,
onMoveDown: PropTypes.func.isRequired,
onMention: PropTypes.func.isRequired,
+ onFavourite: PropTypes.func.isRequired,
+ onReblog: PropTypes.func.isRequired,
+ onToggleHidden: PropTypes.func.isRequired,
+ status: ImmutablePropTypes.map,
+ intl: PropTypes.object.isRequired,
getScrollPosition: PropTypes.func,
updateScrollBottom: PropTypes.func,
cacheMediaWidth: PropTypes.func,
cachedMediaWidth: PropTypes.number,
onUnmount: PropTypes.func,
unread: PropTypes.bool,
+ ...WithRouterPropTypes,
};
+ handleMoveUp = () => {
+ const { notification, onMoveUp } = this.props;
+ onMoveUp(notification.get('id'));
+ };
+
+ handleMoveDown = () => {
+ const { notification, onMoveDown } = this.props;
+ onMoveDown(notification.get('id'));
+ };
+
+ handleOpen = () => {
+ const { notification } = this.props;
+
+ if (notification.get('status')) {
+ this.props.history.push(`/@${notification.getIn(['status', 'account', 'acct'])}/${notification.get('status')}`);
+ } else {
+ this.handleOpenProfile();
+ }
+ };
+
+ handleOpenProfile = () => {
+ const { notification } = this.props;
+ this.props.history.push(`/@${notification.getIn(['account', 'acct'])}`);
+ };
+
+ handleMention = e => {
+ e.preventDefault();
+
+ const { notification, onMention } = this.props;
+ onMention(notification.get('account'), this.props.history);
+ };
+
+ handleHotkeyFavourite = () => {
+ const { status } = this.props;
+ if (status) this.props.onFavourite(status);
+ };
+
+ handleHotkeyBoost = e => {
+ const { status } = this.props;
+ if (status) this.props.onReblog(status, e);
+ };
+
+ getHandlers () {
+ return {
+ reply: this.handleMention,
+ favourite: this.handleHotkeyFavourite,
+ boost: this.handleHotkeyBoost,
+ mention: this.handleMention,
+ open: this.handleOpen,
+ openProfile: this.handleOpenProfile,
+ moveUp: this.handleMoveUp,
+ moveDown: this.handleMoveDown,
+ };
+ }
+
+ renderFollow (notification, account, link) {
+ const { intl, unread } = this.props;
+
+ return (
+
+
+
+ );
+ }
+
+ renderFollowRequest (notification, account, link) {
+ const { intl, unread } = this.props;
+
+ return (
+
+
+
+ );
+ }
+
+ renderMention (notification) {
+ return (
+
+ );
+ }
+
+ renderFavourite (notification) {
+ return (
+
+ );
+ }
+
+ renderReaction (notification) {
+ return (
+
+ );
+ }
+
+ renderReblog (notification) {
+ return (
+
+ );
+ }
+
+ renderStatus (notification) {
+ return (
+
+ );
+ }
+
+ renderUpdate (notification) {
+ return (
+
+ );
+ }
+
+ renderPoll (notification) {
+ return (
+
+ );
+ }
+
+ renderAdminSignUp (notification, account, link) {
+ const { intl, unread } = this.props;
+
+ return (
+
+
+
+ );
+ }
+
+ renderAdminReport (notification, account, link) {
+ const { intl, unread, report } = this.props;
+
+ if (!report) {
+ return null;
+ }
+
+ const targetAccount = report.get('target_account');
+ const targetDisplayNameHtml = { __html: targetAccount.get('display_name_html') };
+ const targetLink = (
+
+
+
+ );
+
+ return (
+
+
+
+ );
+ }
+
render () {
- const {
- hidden,
- notification,
- onMoveDown,
- onMoveUp,
- onMention,
- getScrollPosition,
- updateScrollBottom,
- } = this.props;
+ const { notification } = this.props;
+ const account = notification.get('account');
+ const displayNameHtml = { __html: account.get('display_name_html') };
+ const link = (
+
+
+
+ );
switch(notification.get('type')) {
case 'follow':
- return (
-
- );
+ return this.renderFollow(notification, account, link);
case 'follow_request':
- return (
-
- );
- case 'admin.sign_up':
- return (
-
- );
- case 'admin.report':
- return (
-
- );
+ return this.renderFollowRequest(notification, account, link);
case 'mention':
- return (
-
- );
- case 'status':
- return (
-
- );
+ return this.renderMention(notification);
case 'favourite':
- return (
-
- );
+ return this.renderFavourite(notification);
case 'reaction':
- return (
-
- );
+ return this.renderReaction(notification);
case 'reblog':
- return (
-
- );
- case 'poll':
- return (
-
- );
+ return this.renderReblog(notification);
+ case 'status':
+ return this.renderStatus(notification);
case 'update':
- return (
-
- );
- default:
- return null;
+ return this.renderUpdate(notification);
+ case 'poll':
+ return this.renderPoll(notification);
+ case 'admin.sign_up':
+ return this.renderAdminSignUp(notification, account, link);
+ case 'admin.report':
+ return this.renderAdminReport(notification, account, link);
}
+
+ return null;
}
}
+
+export default withRouter(injectIntl(Notification));
diff --git a/app/javascript/flavours/glitch/features/notifications/containers/admin_report_container.js b/app/javascript/flavours/glitch/features/notifications/containers/admin_report_container.js
deleted file mode 100644
index 62809b57b2..0000000000
--- a/app/javascript/flavours/glitch/features/notifications/containers/admin_report_container.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { connect } from 'react-redux';
-
-import { makeGetReport } from 'flavours/glitch/selectors';
-
-import AdminReport from '../components/admin_report';
-
-const mapStateToProps = (state, { notification }) => {
- const getReport = makeGetReport();
-
- return {
- report: notification.get('report') ? getReport(state, notification.get('report'), notification.getIn(['report', 'target_account', 'id'])) : null,
- };
-};
-
-export default connect(mapStateToProps)(AdminReport);
diff --git a/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js b/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
index 2fda4ac3a2..8a4b5c8ed5 100644
--- a/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
+++ b/app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
@@ -1,24 +1,62 @@
import { connect } from 'react-redux';
-import { mentionCompose } from 'flavours/glitch/actions/compose';
-import { makeGetNotification } from 'flavours/glitch/selectors';
-
+import { initBoostModal } from '../../../actions/boosts';
+import { mentionCompose } from '../../../actions/compose';
+import {
+ reblog,
+ favourite,
+ unreblog,
+ unfavourite,
+} from '../../../actions/interactions';
+import { boostModal } from '../../../initial_state';
+import { makeGetNotification, makeGetStatus, makeGetReport } from '../../../selectors';
import Notification from '../components/notification';
const makeMapStateToProps = () => {
const getNotification = makeGetNotification();
+ const getStatus = makeGetStatus();
+ const getReport = makeGetReport();
- const mapStateToProps = (state, props) => ({
- notification: getNotification(state, props.notification, props.accountId),
- notifCleaning: state.getIn(['notifications', 'cleaningMode']),
- });
+ const mapStateToProps = (state, props) => {
+ const notification = getNotification(state, props.notification, props.accountId);
+ return {
+ notification: notification,
+ status: notification.get('status') ? getStatus(state, { id: notification.get('status'), contextType: 'notifications' }) : null,
+ report: notification.get('report') ? getReport(state, notification.get('report'), notification.getIn(['report', 'target_account', 'id'])) : null,
+ notifCleaning: state.getIn(['notifications', 'cleaningMode']),
+ };
+ };
return mapStateToProps;
};
const mapDispatchToProps = dispatch => ({
- onMention: (account, history) => {
- dispatch(mentionCompose(account, history));
+ onMention: (account, router) => {
+ dispatch(mentionCompose(account, router));
+ },
+
+ onModalReblog (status, privacy) {
+ dispatch(reblog(status, privacy));
+ },
+
+ onReblog (status, e) {
+ if (status.get('reblogged')) {
+ dispatch(unreblog(status));
+ } else {
+ if (e.shiftKey || !boostModal) {
+ this.onModalReblog(status);
+ } else {
+ dispatch(initBoostModal({ status, onReblog: this.onModalReblog }));
+ }
+ }
+ },
+
+ onFavourite (status) {
+ if (status.get('favourited')) {
+ dispatch(unfavourite(status));
+ } else {
+ dispatch(favourite(status));
+ }
},
});
diff --git a/app/javascript/flavours/glitch/locales/de.json b/app/javascript/flavours/glitch/locales/de.json
index 1e4af9f78d..1896093fd5 100644
--- a/app/javascript/flavours/glitch/locales/de.json
+++ b/app/javascript/flavours/glitch/locales/de.json
@@ -14,6 +14,7 @@
"column_subheading.lists": "Listen",
"column_subheading.navigation": "Navigation",
"community.column_settings.allow_local_only": "Nur-lokale Toots anzeigen",
+ "compose.attach.doodle": "Male etwas",
"compose.change_federation": "Föderationseinstellungen ändern",
"compose.content-type.change": "Erweiterte Formatierungsoptionen ändern",
"compose.content-type.html": "HTML",
@@ -22,6 +23,8 @@
"compose.content-type.markdown_meta": "Deine Beiträge mit Markdown formatieren",
"compose.content-type.plain": "Unformatierter Text",
"compose.content-type.plain_meta": "Ohne erweiterte Formatierung verfassen",
+ "compose.disable_threaded_mode": "Thread-Modus deaktivieren",
+ "compose.enable_threaded_mode": "Thread-Modus aktivieren",
"compose_form.sensitive.hide": "{count, plural, one {Mit einer Inhaltswarnung versehen} other {Mit einer Inhaltswarnung versehen}}",
"compose_form.sensitive.marked": "{count, plural, one {Medien-Datei ist mit einer Inhaltswarnung versehen} other {Medien-Dateien sind mit einer Inhaltswarnung versehen}}",
"compose_form.sensitive.unmarked": "{count, plural, one {Medien-Datei ist nicht mit einer Inhaltswarnung versehen} other {Medien-Dateien sind nicht mit einer Inhaltswarnung versehen}}",
@@ -63,6 +66,9 @@
"notification_purge.btn_invert": "Auswahl\numkehren",
"notification_purge.btn_none": "Auswahl\naufheben",
"notification_purge.start": "Benachrichtigungen-Aufräumen-Modus starten",
+ "notifications.column_settings.filter_bar.advanced": "Zeige alle Kategorien an",
+ "notifications.column_settings.filter_bar.category": "Schnellfilterleiste",
+ "notifications.column_settings.filter_bar.show_bar": "Filterleiste anzeigen",
"notifications.marked_clear": "Ausgewählte Benachrichtigungen entfernen",
"notifications.marked_clear_confirmation": "Möchtest du wirklich alle auswählten Benachrichtigungen für immer entfernen?",
"settings.always_show_spoilers_field": "Das Inhaltswarnungs-Feld immer aktivieren",
@@ -153,5 +159,6 @@
"status.in_reply_to": "Dieser Toot ist eine Antwort",
"status.is_poll": "Dieser Toot ist eine Umfrage",
"status.local_only": "Nur auf deiner Instanz sichtbar",
- "status.uncollapse": "Ausklappen"
+ "status.uncollapse": "Ausklappen",
+ "suggestions.dismiss": "Vorschlag ablehnen"
}
diff --git a/app/javascript/flavours/glitch/locales/es-AR.json b/app/javascript/flavours/glitch/locales/es-AR.json
index 3bba7f27cf..b82c1f384d 100644
--- a/app/javascript/flavours/glitch/locales/es-AR.json
+++ b/app/javascript/flavours/glitch/locales/es-AR.json
@@ -64,6 +64,9 @@
"notification_purge.btn_invert": "Invertir\nselección",
"notification_purge.btn_none": "Seleccionar\nnada",
"notification_purge.start": "Entrar en modo de limpieza de notificaciones",
+ "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
+ "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
+ "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
"notifications.marked_clear": "Limpiar notificaciones seleccionadas",
"notifications.marked_clear_confirmation": "¿Deseas borrar permanentemente todas las notificaciones seleccionadas?",
"settings.always_show_spoilers_field": "Siempre mostrar el campo de advertencia de contenido",
@@ -127,6 +130,7 @@
"settings.shared_settings_link": "preferencias de usuario",
"settings.show_action_bar": "Mostrar botones de acción en toots colapsados",
"settings.show_content_type_choice": "Mostrar selección de tipo de contenido al crear toots",
+ "settings.show_published_toast": "Mostrar brindis al enviar o guardar un mensaje",
"settings.show_reply_counter": "Mostrar un conteo estimado de respuestas",
"settings.side_arm": "Botón secundario:",
"settings.side_arm.none": "Ninguno",
diff --git a/app/javascript/flavours/glitch/locales/zh-CN.json b/app/javascript/flavours/glitch/locales/zh-CN.json
index 49ef64a5e1..9a3dd7f191 100644
--- a/app/javascript/flavours/glitch/locales/zh-CN.json
+++ b/app/javascript/flavours/glitch/locales/zh-CN.json
@@ -64,6 +64,9 @@
"notification_purge.btn_invert": "反选",
"notification_purge.btn_none": "取消全选",
"notification_purge.start": "进入通知清理模式",
+ "notifications.column_settings.filter_bar.advanced": "显示所有类别",
+ "notifications.column_settings.filter_bar.category": "快速筛选栏",
+ "notifications.column_settings.filter_bar.show_bar": "显示筛选栏",
"notifications.marked_clear": "清除选择的通知",
"notifications.marked_clear_confirmation": "你确定要永久清除所有选择的通知吗？",
"settings.always_show_spoilers_field": "始终显示内容警告框",
@@ -127,6 +130,7 @@
"settings.shared_settings_link": "用户偏好设置",
"settings.show_action_bar": "在折叠的嘟文中显示操作按钮",
"settings.show_content_type_choice": "允许在发嘟时选择格式类型",
+ "settings.show_published_toast": "发布/保存嘟文时显示提示",
"settings.show_reply_counter": "显示回复的大致数量",
"settings.side_arm": "辅助发嘟按钮：",
"settings.side_arm.none": "无",
diff --git a/app/javascript/flavours/glitch/locales/zh-TW.json b/app/javascript/flavours/glitch/locales/zh-TW.json
index 715bee8aef..2dfeed8c5c 100644
--- a/app/javascript/flavours/glitch/locales/zh-TW.json
+++ b/app/javascript/flavours/glitch/locales/zh-TW.json
@@ -60,6 +60,9 @@
"notification_purge.btn_invert": "反向選擇",
"notification_purge.btn_none": "取消選取",
"notification_purge.start": "進入通知清理模式",
+ "notifications.column_settings.filter_bar.advanced": "顯示所有分類",
+ "notifications.column_settings.filter_bar.category": "快速過濾欄",
+ "notifications.column_settings.filter_bar.show_bar": "顯示過濾器",
"notifications.marked_clear": "清除被選取的通知訊息",
"notifications.marked_clear_confirmation": "您確定要永久清除所有被選取的通知訊息嗎？",
"settings.always_show_spoilers_field": "永遠啟用內容警告欄位",
@@ -123,6 +126,7 @@
"settings.shared_settings_link": "使用者偏好設定",
"settings.show_action_bar": "在折疊的貼文顯示操作按鈕",
"settings.show_content_type_choice": "在編寫貼文時顯示內容類型選擇",
+ "settings.show_published_toast": "發布或儲存貼文時顯示提示",
"settings.show_reply_counter": "顯示回覆數量的估計值",
"settings.side_arm": "次要發出貼文按鈕",
"settings.side_arm.none": "無",
diff --git a/config/locales-glitch/es-AR.yml b/config/locales-glitch/es-AR.yml
index fb90f56bb2..520f4f03a1 100644
--- a/config/locales-glitch/es-AR.yml
+++ b/config/locales-glitch/es-AR.yml
@@ -11,7 +11,7 @@ es-AR:
flavour_and_skin:
title: Sabor y apariencia
hide_followers_count:
- desc_html: No mostrar el conteo de seguidorxs en perfiles de usuarix
+ desc_html: No mostrar el conteo de seguidores en perfiles de usuario
title: Ocultar conteo de seguidorxs
other:
preamble: Varias configuraciones de glitch-soc que no encajan en otras categorías.
diff --git a/config/locales-glitch/simple_form.es-AR.yml b/config/locales-glitch/simple_form.es-AR.yml
index 491ec7ce8c..b8e12c3cf9 100644
--- a/config/locales-glitch/simple_form.es-AR.yml
+++ b/config/locales-glitch/simple_form.es-AR.yml
@@ -16,8 +16,8 @@ es-AR:
setting_default_content_type_html: HTML
setting_default_content_type_markdown: Markdown
setting_default_content_type_plain: Sin formato
- setting_favourite_modal: Mostrar diálogo de confirmación antes de marcar como favorito (sólo aplica a la edición Glich)
- setting_show_followers_count: Mostrá el conteo de tus seguidores
+ setting_favourite_modal: Mostrar diálogo de confirmación antes de marcar como favorito (solo aplica a la edición Glitch)
+ setting_show_followers_count: Mostrar el conteo de tus seguidores
setting_skin: Diseño
setting_system_emoji_font: Usar la fuente predeterminada del sistema para emojis (sólo aplica a la edición Glitch)
notification_emails: