moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'chat-no-self-reports' into 'develop' 

Do not let users report their own chat messages

See merge request soapbox-pub/soapbox-fe!999
This commit is contained in:
marcin mikołajczak 2022-01-19 08:19:05 +00:00
parent 84acbe93c6 050ee1a5f0
commit 70c79ce297
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/soapbox/features/chats/components/chat_message_list.js
View File

@ -268,12 +268,15 @@ class ChatMessageList extends ImmutablePureComponent {
icon: require('@tabler/icons/icons/trash.svg'), icon: require('@tabler/icons/icons/trash.svg'),
destructive: true, destructive: true,
}, },
{ ];
if (chatMessage.get('account_id') !== me) {
menu.push({
text: intl.formatMessage(messages.report), text: intl.formatMessage(messages.report),
action: this.handleReportUser(chatMessage.get('account_id')), action: this.handleReportUser(chatMessage.get('account_id')),
icon: require('@tabler/icons/icons/flag.svg'), icon: require('@tabler/icons/icons/flag.svg'),
}, });
]; }
return ( return (
<div <div

2
app/soapbox/locales/pl.json
View File

@ -329,7 +329,7 @@
"edit_federation.save": "Zapisz", "edit_federation.save": "Zapisz",
"edit_federation.success": "Zaktualizowano federację {host}", "edit_federation.success": "Zaktualizowano federację {host}",
"edit_federation.unlisted": "Wymuś oznaczanie wpisów jako niewypisane", "edit_federation.unlisted": "Wymuś oznaczanie wpisów jako niewypisane",
"edit_profile.error": "Akktualizacja profilu nie powiodła się", "edit_profile.error": "Aktualizacja profilu nie powiodła się",
"edit_profile.fields.accepts_email_list_label": "Zasubskrybuj newsletter", "edit_profile.fields.accepts_email_list_label": "Zasubskrybuj newsletter",
"edit_profile.fields.avatar_label": "Awatar", "edit_profile.fields.avatar_label": "Awatar",
"edit_profile.fields.bio_label": "Opis", "edit_profile.fields.bio_label": "Opis",