add nocc option

README.md

@@ -102,6 +102,7 @@ If you want to change them - check available options in the help message (`!pm h
 
 * **!pm nosender** - Get or set `nosender` of the room (`true` - hide email sender; `false` - show email sender)
 * **!pm norecipient** - Get or set `norecipient` of the room (`true` - hide recipient; `false` - show recipient)
+* **!pm nocc** - Get or set `nocc` of the room (`true` - hide CC; `false` - show CC)
 * **!pm nosubject** - Get or set `nosubject` of the room (`true` - hide email subject; `false` - show email subject)
 * **!pm nohtml** - Get or set `nohtml` of the room (`true` - ignore HTML in email; `false` - parse HTML in emails)
 * **!pm nothreads** - Get or set `nothreads` of the room (`true` - ignore email threads; `false` - convert email threads into matrix threads)

bot/command.go

@@ -121,6 +121,15 @@ func (b *Bot) initCommands() commandList {
 			sanitizer: utils.SanitizeBoolString,
 			allowed:   b.allowOwner,
 		},
+		{
+			key: roomOptionNoCC,
+			description: fmt.Sprintf(
+				"Get or set `%s` of the room (`true` - hide CC; `false` - show CC)",
+				roomOptionNoCC,
+			),
+			sanitizer: utils.SanitizeBoolString,
+			allowed:   b.allowOwner,
+		},
 		{
 			key: roomOptionNoSubject,
 			description: fmt.Sprintf(

bot/settings_room.go

@@ -18,6 +18,7 @@ const (
 	roomOptionMailbox       = "mailbox"
 	roomOptionDomain        = "domain"
 	roomOptionNoSend        = "nosend"
+	roomOptionNoCC          = "nocc"
 	roomOptionNoSender      = "nosender"
 	roomOptionNoRecipient   = "norecipient"
 	roomOptionNoSubject     = "nosubject"
@@ -62,6 +63,10 @@ func (s roomSettings) NoSend() bool {
 	return utils.Bool(s.Get(roomOptionNoSend))
 }
 
+func (s roomSettings) NoCC() bool {
+	return utils.Bool(s.Get(roomOptionNoCC))
+}
+
 func (s roomSettings) NoSender() bool {
 	return utils.Bool(s.Get(roomOptionNoSender))
 }
@@ -146,6 +151,7 @@ func (s roomSettings) migrateSpamlistSettings() {
 // ContentOptions converts room display settings to content options
 func (s roomSettings) ContentOptions() *email.ContentOptions {
 	return &email.ContentOptions{
+		CC:        !s.NoCC(),
 		HTML:      !s.NoHTML(),
 		Sender:    !s.NoSender(),
 		Recipient: !s.NoRecipient(),

email/email.go

@@ -107,7 +107,11 @@ func (e *Email) Content(threadID id.EventID, options *ContentOptions) *event.Con
 		text.WriteString(" ➡️ ")
 		text.WriteString(e.To)
 	}
-	if options.Sender || options.Recipient {
+	if options.CC && e.CC != "" {
+		text.WriteString("\ncc: ")
+		text.WriteString(e.CC)
+	}
+	if options.Sender || options.Recipient || options.CC {
 		text.WriteString("\n\n")
 	}
 	if options.Subject && threadID == "" {

email/options.go

@@ -10,6 +10,7 @@ type IncomingFilteringOptions interface {
 // ContentOptions represents settings that specify how an email is to be converted to a Matrix message
 type ContentOptions struct {
 	// On/Off
+	CC        bool
 	Sender    bool
 	Recipient bool
 	Subject   bool