Feature force unspam

dev/Sieve/Commands.js

@@ -11,7 +11,8 @@ import {
 	DiscardCommand,
 	FileIntoCommand,
 	KeepCommand,
-	RedirectCommand
+	RedirectCommand,
+	ForceUnspamCommand
 } from 'Sieve/Commands/Actions';
 
 import {
@@ -75,6 +76,7 @@ export const
 		FileIntoCommand,
 		KeepCommand,
 		RedirectCommand,
+		ForceUnspamCommand,
 		// Test commands
 		AddressTest,
 		AllOfTest,

dev/Sieve/Commands/Actions.js

@@ -109,3 +109,10 @@ export class KeepCommand extends ActionCommand
 export class DiscardCommand extends ActionCommand
 {
 }
+
+/**
+ * https://tools.ietf.org/html/rfc5228#section-4.4
+ */
+export class ForceUnspamCommand extends ActionCommand
+{
+}

dev/Sieve/Model/Filter.js

@@ -16,7 +16,8 @@ export const FilterAction = {
 	Discard: 'Discard',
 	Vacation: 'Vacation',
 	Reject: 'Reject',
-	Forward: 'Forward'
+	Forward: 'Forward',
+	ForceUnspam: 'ForceUnspam'
 };
 
 /**
@@ -93,6 +94,9 @@ export class FilterModel extends AbstractModel {
 					case FilterAction.Discard:
 						result = rl.i18n(root + 'DISCARD');
 						break;
+					case FilterAction.ForceUnspam:
+						result = rl.i18n(root + 'FORCE_UNSPAM');
+						break;
 					// no default
 				}
 
@@ -112,6 +116,8 @@ export class FilterModel extends AbstractModel {
 						return result + 'None';
 					case FilterAction.Discard:
 						return result + 'Discard';
+					case FilterAction.ForceUnspam:
+						return result + 'ForceUnspam';
 					case FilterAction.MoveTo:
 					default:
 						return result + 'MoveToFolder';

dev/Sieve/Model/Script.js

@@ -139,6 +139,10 @@ function filtersToSieveScript(filters)
 			case 'Discard':
 				result.push(sTab + 'discard;');
 				break;
+			case 'ForceUnspam':
+				require.fileinto = 1;
+				result.push(sTab + 'fileinto "INBOX";');
+				break;
 			case 'Vacation':
 				if (value) {
 					require.vacation = 1;

dev/Sieve/View/Filter.js

@@ -150,6 +150,8 @@ export class FilterPopupView extends rl.pluginPopupView {
 
 		this.actionTypeOptions.push({ id: FilterAction.Discard, name: i18nFilter('ACTION_DISCARD') });
 
+		this.actionTypeOptions.push({ id: FilterAction.ForceUnspam, name: i18nFilter('FORCE_UNSPAM') });
+
 		this.typeOptionsSize([
 			{ id: FilterConditionType.Over, name: i18nFilter('TYPE_OVER') },
 			{ id: FilterConditionType.Under, name: i18nFilter('TYPE_UNDER') }

snappymail/v/0.0.0/app/localization/ar-SA/user.json

@@ -326,6 +326,7 @@
 		"SELECT_ACTION_REJECT": "الرفض",
 		"SELECT_ACTION_VACATION_MESSAGE": "رسالة العطلة",
 		"SELECT_ACTION_DISCARD": "تجاهل",
+		"SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox",
 		"SELECT_FIELD_RECIPIENTS": "المستلمين (الى أو نسخة الى)",
 		"SELECT_FIELD_HEADER": "Header",
 		"SELECT_FIELD_BODY": "Body",
@@ -431,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "\"%EMAIL%\" إعادة توجيه الى",
 		"SUBNAME_REJECT": "رفض",
 		"SUBNAME_VACATION_MESSAGE": "رسالة العطلة",
-		"SUBNAME_DISCARD": "تجاهل"
+		"SUBNAME_DISCARD": "تجاهل",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "الأمان",

snappymail/v/0.0.0/app/localization/bg-BG/user.json

@@ -326,6 +326,7 @@
 		"SELECT_ACTION_REJECT": "Отхвърли",
 		"SELECT_ACTION_VACATION_MESSAGE": "Съобщение в отпуска",
 		"SELECT_ACTION_DISCARD": "Отхвърли",
+		"SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox",
 		"SELECT_FIELD_RECIPIENTS": "Получатели (\"До\" и \"Копие до\")",
 		"SELECT_FIELD_HEADER": "Заглавие",
 		"SELECT_FIELD_BODY": "Body",
@@ -431,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Препрати към \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Откажи",
 		"SUBNAME_VACATION_MESSAGE": "Съобщение в отпуска",
-		"SUBNAME_DISCARD": "Отхвърли"
+		"SUBNAME_DISCARD": "Отхвърли",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Сигурност",

snappymail/v/0.0.0/app/localization/cs-CZ/user.json

@@ -326,6 +326,7 @@
 		"SELECT_ACTION_REJECT": "Odmítnout",
 		"SELECT_ACTION_VACATION_MESSAGE": "Odpověď v nepřítomnosti",
 		"SELECT_ACTION_DISCARD": "Zahodit",
+		"SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox",
 		"SELECT_FIELD_RECIPIENTS": "Příjemci (Komu nebo Kopie)",
 		"SELECT_FIELD_HEADER": "Hlavička",
 		"SELECT_FIELD_BODY": "Body",
@@ -431,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Přeposlat to \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Odmítnout",
 		"SUBNAME_VACATION_MESSAGE": "Odpověď v nepřítomnosti",
-		"SUBNAME_DISCARD": "Zahodit"
+		"SUBNAME_DISCARD": "Zahodit",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Zabezpečení",

snappymail/v/0.0.0/app/localization/da-DK/user.json

@@ -326,6 +326,7 @@
 		"SELECT_ACTION_REJECT": "Afvis",
 		"SELECT_ACTION_VACATION_MESSAGE": "Feriemeddelelse",
 		"SELECT_ACTION_DISCARD": "Kassér",
+		"SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox",
 		"SELECT_FIELD_RECIPIENTS": "Modtagere (Til eller CC)",
 		"SELECT_FIELD_HEADER": "Meddelelsesoplysninger",
 		"SELECT_FIELD_BODY": "Body",
@@ -431,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Videresend til \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Afvis",
 		"SUBNAME_VACATION_MESSAGE": "Feriemeddelelse",
-		"SUBNAME_DISCARD": "Kassér"
+		"SUBNAME_DISCARD": "Kassér",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Sikkerhed",

snappymail/v/0.0.0/app/localization/de-DE/user.json

@@ -326,6 +326,7 @@
 		"SELECT_ACTION_REJECT": "Ablehnen",
 		"SELECT_ACTION_VACATION_MESSAGE": "Urlaubsbenachrichtigung",
 		"SELECT_ACTION_DISCARD": "Verwerfen",
+		"SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox",
 		"SELECT_FIELD_RECIPIENTS": "Empfänger (An oder CC)",
 		"SELECT_FIELD_HEADER": "Nachrichtenkopf",
 		"SELECT_FIELD_BODY": "Nachrichteninhalt",
@@ -431,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Weiterleiten nach \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Ablehnen",
 		"SUBNAME_VACATION_MESSAGE": "Urlaubsbenachrichtigung",
-		"SUBNAME_DISCARD": "Verwerfen"
+		"SUBNAME_DISCARD": "Verwerfen",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Sicherheit",

snappymail/v/0.0.0/app/localization/el-GR/user.json

@@ -326,6 +326,7 @@
 		"SELECT_ACTION_REJECT": "Απόρριψη",
 		"SELECT_ACTION_VACATION_MESSAGE": "Μήνυμα διακοπών",
 		"SELECT_ACTION_DISCARD": "Απόρριψη",
+		"SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox",
 		"SELECT_FIELD_RECIPIENTS": "Παραλήπτες (Προς ή κοινοποίηση)",
 		"SELECT_FIELD_HEADER": "Επικεφαλίδα",
 		"SELECT_FIELD_BODY": "Body",
@@ -431,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Προώθηση στο \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Απόρριψη",
 		"SUBNAME_VACATION_MESSAGE": "Μήνυμα διακοπών",
-		"SUBNAME_DISCARD": "Απόρριψη"
+		"SUBNAME_DISCARD": "Απόρριψη",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Ασφάλεια",

snappymail/v/0.0.0/app/localization/en-GB/user.json

@@ -326,6 +326,7 @@
 		"SELECT_ACTION_REJECT": "Reject",
 		"SELECT_ACTION_VACATION_MESSAGE": "Vacation message",
 		"SELECT_ACTION_DISCARD": "Discard",
+		"SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox",
 		"SELECT_FIELD_RECIPIENTS": "Recipients (To or CC)",
 		"SELECT_FIELD_HEADER": "Header",
 		"SELECT_FIELD_BODY": "Body",
@@ -431,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Reject",
 		"SUBNAME_VACATION_MESSAGE": "Vacation message",
-		"SUBNAME_DISCARD": "Discard"
+		"SUBNAME_DISCARD": "Discard",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Security",

snappymail/v/0.0.0/app/localization/en/user.json

@@ -326,6 +326,7 @@
 		"SELECT_ACTION_REJECT": "Reject",
 		"SELECT_ACTION_VACATION_MESSAGE": "Vacation message",
 		"SELECT_ACTION_DISCARD": "Discard",
+		"SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox",
 		"SELECT_FIELD_RECIPIENTS": "Recipients (To or CC)",
 		"SELECT_FIELD_HEADER": "Header",
 		"SELECT_FIELD_BODY": "Body",
@@ -431,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Reject",
 		"SUBNAME_VACATION_MESSAGE": "Vacation message",
-		"SUBNAME_DISCARD": "Discard"
+		"SUBNAME_DISCARD": "Discard",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Security",

snappymail/v/0.0.0/app/localization/es-ES/user.json

@@ -326,6 +326,7 @@
 		"SELECT_ACTION_REJECT": "Rechazar",
 		"SELECT_ACTION_VACATION_MESSAGE": "Mensaje fuera de línea",
 		"SELECT_ACTION_DISCARD": "Descartar",
+		"SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox",
 		"SELECT_FIELD_RECIPIENTS": "Destinatarios (A o CC)",
 		"SELECT_FIELD_HEADER": "Encabezado",
 		"SELECT_FIELD_BODY": "Body",
@@ -431,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Reenviar a \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Rechazar",
 		"SUBNAME_VACATION_MESSAGE": "Mensaje de vacaciones",
-		"SUBNAME_DISCARD": "Descartar"
+		"SUBNAME_DISCARD": "Descartar",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Seguridad",

snappymail/v/0.0.0/app/localization/et-EE/user.json

@@ -326,6 +326,7 @@
 		"SELECT_ACTION_REJECT": "Lükka tagasi",
 		"SELECT_ACTION_VACATION_MESSAGE": "Puhkuse teade",
 		"SELECT_ACTION_DISCARD": "Hülga",
+		"SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox",
 		"SELECT_FIELD_RECIPIENTS": "Saaja",
 		"SELECT_FIELD_HEADER": "Päis",
 		"SELECT_FIELD_BODY": "Body",
@@ -431,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Edasta aadressile \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Lükka tagasi",
 		"SUBNAME_VACATION_MESSAGE": "Puhkuse teade",
-		"SUBNAME_DISCARD": "Hülga"
+		"SUBNAME_DISCARD": "Hülga",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Turvalisus",

snappymail/v/0.0.0/app/localization/eu/user.json

@@ -326,6 +326,7 @@
 		"SELECT_ACTION_REJECT": "Errefusatu",
 		"SELECT_ACTION_VACATION_MESSAGE": "Opor mezua",
 		"SELECT_ACTION_DISCARD": "Baztertu",
+		"SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox",
 		"SELECT_FIELD_RECIPIENTS": "Hartzaileak (Nori edo CC)",
 		"SELECT_FIELD_HEADER": "Goiburua",
 		"SELECT_FIELD_BODY": "Gorputza",
@@ -431,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Birbidali \"%EMAIL%\"-era",
 		"SUBNAME_REJECT": "Errefusatu",
 		"SUBNAME_VACATION_MESSAGE": "Opor-mezua",
-		"SUBNAME_DISCARD": "Baztertu"
+		"SUBNAME_DISCARD": "Baztertu",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Segurtasuna",

snappymail/v/0.0.0/app/localization/fa-IR/user.json

@@ -326,6 +326,7 @@
 		"SELECT_ACTION_REJECT": "رد کردن",
 		"SELECT_ACTION_VACATION_MESSAGE": "پیام تعطیلات",
 		"SELECT_ACTION_DISCARD": "دور انداختن",
+		"SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox",
 		"SELECT_FIELD_RECIPIENTS": "گیرندگان (به یا رونوشت)",
 		"SELECT_FIELD_HEADER": "سرصفحه",
 		"SELECT_FIELD_BODY": "Body",
@@ -431,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "ارسال به \"%EMAIL%\"",
 		"SUBNAME_REJECT": "برگشت‌زدن",
 		"SUBNAME_VACATION_MESSAGE": "پیام تعطیلات",
-		"SUBNAME_DISCARD": "دور انداختن"
+		"SUBNAME_DISCARD": "دور انداختن",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "امنیت",

snappymail/v/0.0.0/app/localization/fi-FI/user.json

@@ -326,6 +326,7 @@
 		"SELECT_ACTION_REJECT": "Hylkää",
 		"SELECT_ACTION_VACATION_MESSAGE": "Lomaviesti",
 		"SELECT_ACTION_DISCARD": "Poista",
+		"SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox",
 		"SELECT_FIELD_RECIPIENTS": "Vastaanottajat (Vast. ott. tai CC)",
 		"SELECT_FIELD_HEADER": "Header",
 		"SELECT_FIELD_BODY": "Body",
@@ -431,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Välitä osoitteeseen \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Hylkää",
 		"SUBNAME_VACATION_MESSAGE": "Lomaviesti",
-		"SUBNAME_DISCARD": "Poista"
+		"SUBNAME_DISCARD": "Poista",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Turvallisuus",

snappymail/v/0.0.0/app/localization/fr-FR/user.json

@@ -156,7 +156,7 @@
 		"TAGS": "Étiquettes",
 		"NEW_TAG": "Nouvelle étiquette",
 		"ENABLE_TRACKING_LINKS": "Activer les liens de suivi",
-		"TRACKING_ENABLED": "Les liens sont désormais suivis lorsque vous cliquez dessus !"
+		"TRACKING_ENABLED": "Les liens sont désormais suivis lorsque vous cliquez dessus !"
 	},
 	"MESSAGE_TAGS": {
 		"$important": "Important",
@@ -326,6 +326,7 @@
 		"SELECT_ACTION_REJECT": "Rejeter",
 		"SELECT_ACTION_VACATION_MESSAGE": "Message d'absence",
 		"SELECT_ACTION_DISCARD": "Exclure",
+		"SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox",
 		"SELECT_FIELD_RECIPIENTS": "Destinataires (A ou CC)",
 		"SELECT_FIELD_HEADER": "En-tête",
 		"SELECT_FIELD_BODY": "Contenu",
@@ -431,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Faire suivre à \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Rejeter",
 		"SUBNAME_VACATION_MESSAGE": "Message d'absence",
-		"SUBNAME_DISCARD": "Exclure"
+		"SUBNAME_DISCARD": "Exclure",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Sécurité",

snappymail/v/0.0.0/app/localization/hu-HU/user.json

@@ -326,6 +326,7 @@
 		"SELECT_ACTION_REJECT": "Visszautasít",
 		"SELECT_ACTION_VACATION_MESSAGE": "Vakáció üzenet",
 		"SELECT_ACTION_DISCARD": "Elvetés",
+		"SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox",
 		"SELECT_FIELD_RECIPIENTS": "Címzettek (címzett vagy másolat)",
 		"SELECT_FIELD_HEADER": "Fejléc",
 		"SELECT_FIELD_BODY": "Body",
@@ -431,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Továbbítás ide: \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Visszautasít",
 		"SUBNAME_VACATION_MESSAGE": "Vakáció üzenet",
-		"SUBNAME_DISCARD": "Elvetés"
+		"SUBNAME_DISCARD": "Elvetés",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Biztonság",

snappymail/v/0.0.0/app/localization/id-ID/user.json

@@ -326,6 +326,7 @@
 		"SELECT_ACTION_REJECT": "Tolak",
 		"SELECT_ACTION_VACATION_MESSAGE": "Pesan liburan",
 		"SELECT_ACTION_DISCARD": "Buang",
+		"SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox",
 		"SELECT_FIELD_RECIPIENTS": "Penerima (Kepada atau tembusan)",
 		"SELECT_FIELD_HEADER": "Header",
 		"SELECT_FIELD_BODY": "Body",
@@ -431,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Teruskan ke \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Tolak",
 		"SUBNAME_VACATION_MESSAGE": "Pesan liburan",
-		"SUBNAME_DISCARD": "Buang"
+		"SUBNAME_DISCARD": "Buang",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Keamanan",

snappymail/v/0.0.0/app/localization/is-IS/user.json

@@ -326,6 +326,7 @@
 		"SELECT_ACTION_REJECT": "Hafna",
 		"SELECT_ACTION_VACATION_MESSAGE": "Skilaboð vegna fría",
 		"SELECT_ACTION_DISCARD": "Henda",
+		"SELECT_ACTION_FORCE_UNSPAM": "Force remove from spam into Inbox",
 		"SELECT_FIELD_RECIPIENTS": "Viðtakendur (Til eða CC)",
 		"SELECT_FIELD_HEADER": "Haus",
 		"SELECT_FIELD_BODY": "Body",
@@ -431,7 +432,8 @@
 		"SUBNAME_FORWARD_TO": "Áframsenda til \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Hafna",
 		"SUBNAME_VACATION_MESSAGE": "Skilaboð vegna fría",
-		"SUBNAME_DISCARD": "Henda"
+		"SUBNAME_DISCARD": "Henda",
+		"SUBNAME_FORCE_UNSPAM": "Force Unspam"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Öryggi",