From 775f9237083a035ae16a24cc091e82da4876e110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A1rbara=20de=20Castro=20Fernandes?=
 <barbara.dcf@gmail.com>
Date: Fri, 29 May 2020 15:05:24 -0300
Subject: [PATCH] Add 'block user' option to the report window

---
 app/soapbox/actions/reports.js                | Bin 2066 -> 2231 bytes
 .../features/ui/components/report_modal.js    | Bin 5143 -> 6058 bytes
 app/soapbox/locales/defaultMessages.json      |  10 +++++++++-
 app/soapbox/locales/en.json                   |   2 ++
 app/soapbox/reducers/reports.js               | Bin 2109 -> 2236 bytes
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/actions/reports.js b/app/soapbox/actions/reports.js
index afa0c341218b4b32bda42eeb85e604cc849f23f9..a1214fc567a0a1cc2bda1a1c8ef5b6bf43c9733b 100644
GIT binary patch
delta 113
zcmbOvuw8J21k>bOj3RPQKK{<$@y;HOe(tUc3JSIg>Ormn{y`z}V2RCqOe}1Z*Dwo;
uCubz)rKbj^7UUO|IOXIgXKN&Z$jKkr6cmxo(BT4_q5zfyF>9^4fCvD2_#pcL

delta 12
TcmdlkI7wiG1k>gareCZ89H9g~

diff --git a/app/soapbox/features/ui/components/report_modal.js b/app/soapbox/features/ui/components/report_modal.js
index 3469aebbf16cb98d0d5f6a07066265fde6570307..fcd31afb1aac02618d751da98e89c5b155467b5e 100644
GIT binary patch
delta 392
zcmbQPu}XhJsbF$OVqSV`P-;PbQHfJdescE2Vr%Xs5W_J!IlnY-VuLhWBAB&tfeb4v
zSZ4AA79|L4^F~%_Ca9nwyV&M4><WymU}GltbC^I`r#Rwd6cjSk6f{aQGK=*Jit-DJ
z^}q&cDpYeRC`_KuA;E)WWy$2{oU)vnn$|!$1%=wps+^`!J2ppf+p$kp5)hvJl2-w0
zZJdC(noGVyWqzqbVoq_sLV03di9$)f0@y$Wkc|ou_m@mQBOp0hT3BH6cLBx8Qi8%_
zU?u7b$r-81*{LbE)nI<@<T*l;lM@6*p{}nHl%70OP@D~-c=BrjsmYfF)nuT0Q&Q6s
zOLIzmQ;Ule(^GBLoj@TsS)Nx`7;33rdTNP=I*?PMt~uFGNOp3pkT4LlPZkj7-aJ{T
Gg%JQ|hJx(?

delta 42
zcmV+_0M-AhFPA8gb&-fUvHK1Mvp@zA0<&ufAOVx>2|Tlq3Niw-$qYOPvndvV0aW4+
Aga7~l

diff --git a/app/soapbox/locales/defaultMessages.json b/app/soapbox/locales/defaultMessages.json
index 5def1219d0..8b9393ffa0 100644
--- a/app/soapbox/locales/defaultMessages.json
+++ b/app/soapbox/locales/defaultMessages.json
@@ -2700,6 +2700,14 @@
       {
         "defaultMessage": "Forward to {target}",
         "id": "report.forward"
+      },
+      {
+        "defaultMessage": "Do you also want to block this account?",
+        "id": "report.block_hint"
+      },
+      {
+        "defaultMessage": "Block {target}",
+        "id": "report.block"
       }
     ],
     "path": "app/soapbox/features/ui/components/report_modal.json"
@@ -2894,4 +2902,4 @@
     ],
     "path": "app/soapbox/features/video/index.json"
   }
-]
\ No newline at end of file
+]
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 57933503a5..769d3ab6dc 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -325,6 +325,8 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "reply_indicator.cancel": "Cancel",
+  "report.block": "Block {target}",
+  "report.block_hint": "Do you also want to block this account?",
   "report.forward": "Forward to {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
   "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
diff --git a/app/soapbox/reducers/reports.js b/app/soapbox/reducers/reports.js
index 21ae6f93f77dcf37e67d9689aabc527597dcbca0..3e79a80208ceee21c3be63996f1a61ecb1e14e44 100644
GIT binary patch
delta 90
zcmdlhut#vhZaxKtAlCr@ppbYcAAe`>jhkc{*%cI$a`Kb2Hy>e~&LRL7j(7HO^mBK$
l;!;qUEXbxH3YJ%o)lo=HF3HT#(*yG-&u5d^oWypU5daB19DD!(

delta 24
gcmdlZxL07p?v0m37&rf5>|vR#&(6O2A=_<60EPt$00000