treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Add `legal` as report category (#23941)

lolsob-rspec
Eugen Rochko 2023-06-06 23:41:59 +02:00 committed by GitHub
parent 7abfddd8a5
commit 66a5173629
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/features/report/category.jsx
View File

@ -16,6 +16,8 @@ const messages = defineMessages({
dislike_description: { id: 'report.reasons.dislike_description', defaultMessage: 'It is not something you want to see' }, dislike_description: { id: 'report.reasons.dislike_description', defaultMessage: 'It is not something you want to see' },
spam: { id: 'report.reasons.spam', defaultMessage: 'It\'s spam' }, spam: { id: 'report.reasons.spam', defaultMessage: 'It\'s spam' },
spam_description: { id: 'report.reasons.spam_description', defaultMessage: 'Malicious links, fake engagement, or repetitive replies' }, spam_description: { id: 'report.reasons.spam_description', defaultMessage: 'Malicious links, fake engagement, or repetitive replies' },
legal: { id: 'report.reasons.legal', defaultMessage: 'It\'s illegal' },
legal_description: { id: 'report.reasons.legal_description', defaultMessage: 'You believe it violates the law of your or the server\'s country' },
violation: { id: 'report.reasons.violation', defaultMessage: 'It violates server rules' }, violation: { id: 'report.reasons.violation', defaultMessage: 'It violates server rules' },
violation_description: { id: 'report.reasons.violation_description', defaultMessage: 'You are aware that it breaks specific rules' }, violation_description: { id: 'report.reasons.violation_description', defaultMessage: 'You are aware that it breaks specific rules' },
other: { id: 'report.reasons.other', defaultMessage: 'It\'s something else' }, other: { id: 'report.reasons.other', defaultMessage: 'It\'s something else' },
@ -69,11 +71,13 @@ class Category extends PureComponent {
const options = rules.size > 0 ? [ const options = rules.size > 0 ? [
'dislike', 'dislike',
'spam', 'spam',
'legal',
'violation', 'violation',
'other', 'other',
] : [ ] : [
'dislike', 'dislike',
'spam', 'spam',
'legal',
'other', 'other',
]; ];

2
app/javascript/mastodon/locales/en.json
View File

@ -532,6 +532,8 @@
"report.placeholder": "Additional comments", "report.placeholder": "Additional comments",
"report.reasons.dislike": "I don't like it", "report.reasons.dislike": "I don't like it",
"report.reasons.dislike_description": "It is not something you want to see", "report.reasons.dislike_description": "It is not something you want to see",
"report.reasons.legal": "It's illegal",
"report.reasons.legal_description": "You believe it violates the law of your or the server's country",
"report.reasons.other": "It's something else", "report.reasons.other": "It's something else",
"report.reasons.other_description": "The issue does not fit into other categories", "report.reasons.other_description": "The issue does not fit into other categories",
"report.reasons.spam": "It's spam", "report.reasons.spam": "It's spam",

1
app/models/report.rb
View File

@ -51,6 +51,7 @@ class Report < ApplicationRecord
enum category: { enum category: {
other: 0, other: 0,
spam: 1_000, spam: 1_000,
legal: 1_500,
violation: 2_000, violation: 2_000,
} }